friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 

* remotes/upstream/master:
  rev update
  rev update

* master:
This commit is contained in:
Simon L'nu 2012-05-10 02:16:49 -04:00
parent 39a7926015 4a42414135
commit 25d5eae955
2 changed files with 73 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1336' ); define ( 'FRIENDICA_VERSION', '3.0.1337' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1143 ); define ( 'DB_UPDATE_VERSION', 1143 );

132
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.3.1336\n" "Project-Id-Version: 2.3.1337\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-05-08 10:00-0700\n" "POT-Creation-Date: 2012-05-09 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -156,7 +156,7 @@ msgstr ""
#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
#: ../../addon/posterous/posterous.php:90 #: ../../addon/posterous/posterous.php:103
#: ../../view/theme/cleanzero/config.php:80 #: ../../view/theme/cleanzero/config.php:80
#: ../../view/theme/diabook/theme.php:683 #: ../../view/theme/diabook/theme.php:683
#: ../../view/theme/diabook/config.php:190 #: ../../view/theme/diabook/config.php:190
@ -220,7 +220,7 @@ msgid "link to source"
msgstr "" msgstr ""
#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:127 #: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:127
#: ../../include/nav.php:52 ../../boot.php:1493 #: ../../include/nav.php:52 ../../boot.php:1499
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -270,7 +270,7 @@ msgid "Description:"
msgstr "" msgstr ""
#: ../../mod/events.php:423 ../../include/event.php:37 #: ../../mod/events.php:423 ../../include/event.php:37
#: ../../include/bb2diaspora.php:260 ../../boot.php:1092 #: ../../include/bb2diaspora.php:260 ../../boot.php:1098
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
@ -345,7 +345,7 @@ msgstr ""
msgid "No" msgid "No"
msgstr "" msgstr ""
#: ../../mod/photos.php:43 ../../boot.php:1487 #: ../../mod/photos.php:43 ../../boot.php:1493
msgid "Photo Albums" msgid "Photo Albums"
msgstr "" msgstr ""
@ -545,7 +545,7 @@ msgstr ""
#: ../../mod/photos.php:1232 ../../mod/photos.php:1272 #: ../../mod/photos.php:1232 ../../mod/photos.php:1272
#: ../../mod/photos.php:1303 ../../include/conversation.php:554 #: ../../mod/photos.php:1303 ../../include/conversation.php:554
#: ../../boot.php:506 #: ../../boot.php:512
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
@ -1166,7 +1166,7 @@ msgid "is interested in:"
msgstr "" msgstr ""
#: ../../mod/match.php:58 ../../mod/suggest.php:59 #: ../../mod/match.php:58 ../../mod/suggest.php:59
#: ../../include/contact_widgets.php:9 ../../boot.php:1036 #: ../../include/contact_widgets.php:9 ../../boot.php:1042
msgid "Connect" msgid "Connect"
msgstr "" msgstr ""
@ -1692,7 +1692,7 @@ msgstr ""
#: ../../addon/facebook/facebook.php:680 #: ../../addon/facebook/facebook.php:680
#: ../../addon/facebook/facebook.php:1170 #: ../../addon/facebook/facebook.php:1170
#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2726 #: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2726
#: ../../boot.php:686 #: ../../boot.php:692
msgid "Administrator" msgid "Administrator"
msgstr "" msgstr ""
@ -1702,7 +1702,7 @@ msgid ""
"Password reset failed." "Password reset failed."
msgstr "" msgstr ""
#: ../../mod/lostpass.php:83 ../../boot.php:818 #: ../../mod/lostpass.php:83 ../../boot.php:824
msgid "Password Reset" msgid "Password Reset"
msgstr "" msgstr ""
@ -2352,7 +2352,7 @@ msgstr ""
msgid "Invalid contact." msgid "Invalid contact."
msgstr "" msgstr ""
#: ../../mod/notes.php:44 ../../boot.php:1499 #: ../../mod/notes.php:44 ../../boot.php:1505
msgid "Personal Notes" msgid "Personal Notes"
msgstr "" msgstr ""
@ -2603,7 +2603,7 @@ msgstr ""
#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:124 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:124
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
#: ../../include/nav.php:50 ../../boot.php:1478 #: ../../include/nav.php:50 ../../boot.php:1484
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
@ -2775,7 +2775,7 @@ msgstr ""
msgid "Choose a nickname: " msgid "Choose a nickname: "
msgstr "" msgstr ""
#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:784 #: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:790
msgid "Register" msgid "Register"
msgstr "" msgstr ""
@ -2818,7 +2818,7 @@ msgid "Access denied."
msgstr "" msgstr ""
#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:126 #: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:126
#: ../../include/nav.php:51 ../../boot.php:1484 #: ../../include/nav.php:51 ../../boot.php:1490
msgid "Photos" msgid "Photos"
msgstr "" msgstr ""
@ -3597,7 +3597,7 @@ msgstr ""
msgid "FTP Password" msgid "FTP Password"
msgstr "" msgstr ""
#: ../../mod/profile.php:21 ../../boot.php:949 #: ../../mod/profile.php:21 ../../boot.php:955
msgid "Requested profile is not available." msgid "Requested profile is not available."
msgstr "" msgstr ""
@ -4005,23 +4005,23 @@ msgstr ""
msgid "Edit/Manage Profiles" msgid "Edit/Manage Profiles"
msgstr "" msgstr ""
#: ../../mod/profiles.php:621 ../../boot.php:1058 #: ../../mod/profiles.php:621 ../../boot.php:1064
msgid "Change profile photo" msgid "Change profile photo"
msgstr "" msgstr ""
#: ../../mod/profiles.php:622 ../../boot.php:1059 #: ../../mod/profiles.php:622 ../../boot.php:1065
msgid "Create New Profile" msgid "Create New Profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:633 ../../boot.php:1069 #: ../../mod/profiles.php:633 ../../boot.php:1075
msgid "Profile Image" msgid "Profile Image"
msgstr "" msgstr ""
#: ../../mod/profiles.php:635 ../../boot.php:1072 #: ../../mod/profiles.php:635 ../../boot.php:1078
msgid "visible to everybody" msgid "visible to everybody"
msgstr "" msgstr ""
#: ../../mod/profiles.php:636 ../../boot.php:1073 #: ../../mod/profiles.php:636 ../../boot.php:1079
msgid "Edit visibility" msgid "Edit visibility"
msgstr "" msgstr ""
@ -4633,8 +4633,8 @@ msgid "Forums"
msgstr "" msgstr ""
#: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87 #: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87
#: ../../include/contact_widgets.php:187 ../../include/conversation.php:466 #: ../../include/contact_widgets.php:188 ../../include/conversation.php:466
#: ../../boot.php:507 #: ../../boot.php:513
msgid "show more" msgid "show more"
msgstr "" msgstr ""
@ -4650,7 +4650,7 @@ msgstr ""
#: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/communityhome.php:34
#: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:28
#: ../../addon/communityhome/twillingham/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:34
#: ../../include/nav.php:64 ../../boot.php:805 #: ../../include/nav.php:64 ../../boot.php:811
msgid "Login" msgid "Login"
msgstr "" msgstr ""
@ -4683,6 +4683,10 @@ msgstr ""
msgid "event" msgid "event"
msgstr "" msgstr ""
#: ../../addon/hangman/hangman.php:19
msgid "Hangman"
msgstr ""
#: ../../addon/uhremotestorage/uhremotestorage.php:84 #: ../../addon/uhremotestorage/uhremotestorage.php:84
#, php-format #, php-format
msgid "" msgid ""
@ -4830,7 +4834,7 @@ msgid "Post to Drupal by default"
msgstr "" msgstr ""
#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190 #: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190
#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:177 #: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:192
msgid "Post from Friendica" msgid "Post from Friendica"
msgstr "" msgstr ""
@ -5549,27 +5553,35 @@ msgstr ""
msgid "Post to Blogger by default" msgid "Post to Blogger by default"
msgstr "" msgstr ""
#: ../../addon/posterous/posterous.php:36 #: ../../addon/posterous/posterous.php:37
msgid "Post to Posterous" msgid "Post to Posterous"
msgstr "" msgstr ""
#: ../../addon/posterous/posterous.php:67 #: ../../addon/posterous/posterous.php:70
msgid "Posterous Post Settings" msgid "Posterous Post Settings"
msgstr "" msgstr ""
#: ../../addon/posterous/posterous.php:69 #: ../../addon/posterous/posterous.php:72
msgid "Enable Posterous Post Plugin" msgid "Enable Posterous Post Plugin"
msgstr "" msgstr ""
#: ../../addon/posterous/posterous.php:74 #: ../../addon/posterous/posterous.php:77
msgid "Posterous login" msgid "Posterous login"
msgstr "" msgstr ""
#: ../../addon/posterous/posterous.php:79 #: ../../addon/posterous/posterous.php:82
msgid "Posterous password" msgid "Posterous password"
msgstr "" msgstr ""
#: ../../addon/posterous/posterous.php:84 #: ../../addon/posterous/posterous.php:87
msgid "Posterous site ID"
msgstr ""
#: ../../addon/posterous/posterous.php:92
msgid "Posterous API token"
msgstr ""
#: ../../addon/posterous/posterous.php:97
msgid "Post to Posterous by default" msgid "Post to Posterous by default"
msgstr "" msgstr ""
@ -5779,7 +5791,7 @@ msgstr ""
msgid "Set colour scheme" msgid "Set colour scheme"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:17 ../../boot.php:1094 #: ../../include/profile_advanced.php:17 ../../boot.php:1100
msgid "Gender:" msgid "Gender:"
msgstr "" msgstr ""
@ -5800,11 +5812,11 @@ msgstr ""
msgid "Age:" msgid "Age:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:37 ../../boot.php:1097 #: ../../include/profile_advanced.php:37 ../../boot.php:1103
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:45 ../../boot.php:1099 #: ../../include/profile_advanced.php:45 ../../boot.php:1105
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
@ -6388,7 +6400,7 @@ msgstr ""
msgid "Contacts not in any group" msgid "Contacts not in any group"
msgstr "" msgstr ""
#: ../../include/nav.php:46 ../../boot.php:804 #: ../../include/nav.php:46 ../../boot.php:810
msgid "Logout" msgid "Logout"
msgstr "" msgstr ""
@ -6396,7 +6408,7 @@ msgstr ""
msgid "End this session" msgid "End this session"
msgstr "" msgstr ""
#: ../../include/nav.php:49 ../../boot.php:1472 #: ../../include/nav.php:49 ../../boot.php:1478
msgid "Status" msgid "Status"
msgstr "" msgstr ""
@ -6476,11 +6488,11 @@ msgstr ""
msgid "Manage other pages" msgid "Manage other pages"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1052 #: ../../include/nav.php:138 ../../boot.php:1058
msgid "Profiles" msgid "Profiles"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1052 #: ../../include/nav.php:138 ../../boot.php:1058
msgid "Manage/edit profiles" msgid "Manage/edit profiles"
msgstr "" msgstr ""
@ -7155,96 +7167,96 @@ msgstr ""
msgid "permissions" msgid "permissions"
msgstr "" msgstr ""
#: ../../boot.php:505 #: ../../boot.php:511
msgid "Delete this item?" msgid "Delete this item?"
msgstr "" msgstr ""
#: ../../boot.php:508 #: ../../boot.php:514
msgid "show fewer" msgid "show fewer"
msgstr "" msgstr ""
#: ../../boot.php:681 #: ../../boot.php:687
#, php-format #, php-format
msgid "Update %s failed. See error logs." msgid "Update %s failed. See error logs."
msgstr "" msgstr ""
#: ../../boot.php:683 #: ../../boot.php:689
#, php-format #, php-format
msgid "Update Error at %s" msgid "Update Error at %s"
msgstr "" msgstr ""
#: ../../boot.php:783 #: ../../boot.php:789
msgid "Create a New Account" msgid "Create a New Account"
msgstr "" msgstr ""
#: ../../boot.php:807 #: ../../boot.php:813
msgid "Nickname or Email address: " msgid "Nickname or Email address: "
msgstr "" msgstr ""
#: ../../boot.php:808 #: ../../boot.php:814
msgid "Password: " msgid "Password: "
msgstr "" msgstr ""
#: ../../boot.php:811 #: ../../boot.php:817
msgid "Or login using OpenID: " msgid "Or login using OpenID: "
msgstr "" msgstr ""
#: ../../boot.php:817 #: ../../boot.php:823
msgid "Forgot your password?" msgid "Forgot your password?"
msgstr "" msgstr ""
#: ../../boot.php:984 #: ../../boot.php:990
msgid "Edit profile" msgid "Edit profile"
msgstr "" msgstr ""
#: ../../boot.php:1044 #: ../../boot.php:1050
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../../boot.php:1160 ../../boot.php:1236 #: ../../boot.php:1166 ../../boot.php:1242
msgid "g A l F d" msgid "g A l F d"
msgstr "" msgstr ""
#: ../../boot.php:1161 ../../boot.php:1237 #: ../../boot.php:1167 ../../boot.php:1243
msgid "F d" msgid "F d"
msgstr "" msgstr ""
#: ../../boot.php:1206 ../../boot.php:1277 #: ../../boot.php:1212 ../../boot.php:1283
msgid "[today]" msgid "[today]"
msgstr "" msgstr ""
#: ../../boot.php:1218 #: ../../boot.php:1224
msgid "Birthday Reminders" msgid "Birthday Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1219 #: ../../boot.php:1225
msgid "Birthdays this week:" msgid "Birthdays this week:"
msgstr "" msgstr ""
#: ../../boot.php:1270 #: ../../boot.php:1276
msgid "[No description]" msgid "[No description]"
msgstr "" msgstr ""
#: ../../boot.php:1288 #: ../../boot.php:1294
msgid "Event Reminders" msgid "Event Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1289 #: ../../boot.php:1295
msgid "Events this week:" msgid "Events this week:"
msgstr "" msgstr ""
#: ../../boot.php:1475 #: ../../boot.php:1481
msgid "Status Messages and Posts" msgid "Status Messages and Posts"
msgstr "" msgstr ""
#: ../../boot.php:1481 #: ../../boot.php:1487
msgid "Profile Details" msgid "Profile Details"
msgstr "" msgstr ""
#: ../../boot.php:1496 #: ../../boot.php:1502
msgid "Events and Calendar" msgid "Events and Calendar"
msgstr "" msgstr ""
#: ../../boot.php:1502 #: ../../boot.php:1508
msgid "Only You Can See This" msgid "Only You Can See This"
msgstr "" msgstr ""