aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--boot.php2
-rw-r--r--util/messages.po141
2 files changed, 101 insertions, 42 deletions
diff --git a/boot.php b/boot.php
index cd9d55b34..abc749493 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1307' );
+define ( 'FRIENDICA_VERSION', '2.3.1308' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1137 );
diff --git a/util/messages.po b/util/messages.po
index d4d2e5d82..2f02d0d8c 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2.3.1307\n"
+"Project-Id-Version: 2.3.1308\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-09 10:00-0700\n"
+"POT-Creation-Date: 2012-04-10 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -134,6 +134,7 @@ msgstr ""
#: ../../mod/admin.php:906 ../../mod/profiles.php:390 ../../mod/invite.php:119
#: ../../addon/facebook/facebook.php:551 ../../addon/yourls/yourls.php:76
#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
+#: ../../addon/planets/planets.php:180
#: ../../addon/uhremotestorage/uhremotestorage.php:89
#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:93
#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
@@ -152,7 +153,7 @@ msgstr ""
#: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
-#: ../../addon/posterous/posterous.php:90
+#: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:90
#: ../../view/theme/quattro/config.php:21 ../../include/conversation.php:555
msgid "Submit"
msgstr ""
@@ -215,7 +216,7 @@ msgstr ""
#: ../../view/theme/diabook-blue/theme.php:244
#: ../../view/theme/diabook/theme.php:251
#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:52
-#: ../../boot.php:1422
+#: ../../boot.php:1469
msgid "Events"
msgstr ""
@@ -265,7 +266,7 @@ msgid "Description:"
msgstr ""
#: ../../mod/events.php:395 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:260 ../../boot.php:1043
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1081
msgid "Location:"
msgstr ""
@@ -1164,7 +1165,7 @@ msgid "is interested in:"
msgstr ""
#: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:987
+#: ../../include/contact_widgets.php:9 ../../boot.php:1025
msgid "Connect"
msgstr ""
@@ -1631,6 +1632,7 @@ msgstr ""
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
#: ../../addon/facebook/facebook.php:621
#: ../../addon/facebook/facebook.php:1073 ../../include/items.php:2658
+#: ../../boot.php:679
msgid "Administrator"
msgstr ""
@@ -1640,7 +1642,7 @@ msgid ""
"Password reset failed."
msgstr ""
-#: ../../mod/lostpass.php:83 ../../boot.php:779
+#: ../../mod/lostpass.php:83 ../../boot.php:808
msgid "Password Reset"
msgstr ""
@@ -2257,7 +2259,7 @@ msgstr ""
msgid "Invalid contact."
msgstr ""
-#: ../../mod/notes.php:44 ../../boot.php:1427
+#: ../../mod/notes.php:44 ../../boot.php:1474
msgid "Personal Notes"
msgstr ""
@@ -2509,7 +2511,7 @@ msgstr ""
#: ../../view/theme/diabook/theme.php:248
#: ../../view/theme/diabook-aerith/theme.php:242
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76
-#: ../../include/nav.php:50 ../../boot.php:1409
+#: ../../include/nav.php:50 ../../boot.php:1456
msgid "Profile"
msgstr ""
@@ -2681,7 +2683,7 @@ msgstr ""
msgid "Choose a nickname: "
msgstr ""
-#: ../../mod/register.php:571 ../../include/nav.php:81 ../../boot.php:745
+#: ../../mod/register.php:571 ../../include/nav.php:81 ../../boot.php:774
msgid "Register"
msgstr ""
@@ -3425,7 +3427,7 @@ msgstr ""
msgid "FTP Password"
msgstr ""
-#: ../../mod/profile.php:20 ../../boot.php:901
+#: ../../mod/profile.php:20 ../../boot.php:938
msgid "Requested profile is not available."
msgstr ""
@@ -3764,23 +3766,23 @@ msgstr ""
msgid "Edit/Manage Profiles"
msgstr ""
-#: ../../mod/profiles.php:477 ../../boot.php:1009
+#: ../../mod/profiles.php:477 ../../boot.php:1047
msgid "Change profile photo"
msgstr ""
-#: ../../mod/profiles.php:478 ../../boot.php:1010
+#: ../../mod/profiles.php:478 ../../boot.php:1048
msgid "Create New Profile"
msgstr ""
-#: ../../mod/profiles.php:489 ../../boot.php:1020
+#: ../../mod/profiles.php:489 ../../boot.php:1058
msgid "Profile Image"
msgstr ""
-#: ../../mod/profiles.php:491 ../../boot.php:1023
+#: ../../mod/profiles.php:491 ../../boot.php:1061
msgid "visible to everybody"
msgstr ""
-#: ../../mod/profiles.php:492 ../../boot.php:1024
+#: ../../mod/profiles.php:492 ../../boot.php:1062
msgid "Edit visibility"
msgstr ""
@@ -4345,11 +4347,19 @@ msgstr ""
msgid "Forums"
msgstr ""
+#: ../../addon/planets/planets.php:172
+msgid "Planets Settings"
+msgstr ""
+
+#: ../../addon/planets/planets.php:174
+msgid "Enable Planets Plugin"
+msgstr ""
+
#: ../../addon/communityhome/communityhome.php:28
#: ../../addon/communityhome/communityhome.php:34
#: ../../addon/communityhome/twillingham/communityhome.php:28
#: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:766
+#: ../../include/nav.php:64 ../../boot.php:795
msgid "Login"
msgstr ""
@@ -4532,7 +4542,7 @@ msgid "Post to Drupal by default"
msgstr ""
#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190
-#: ../../addon/posterous/posterous.php:173
+#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:173
msgid "Post from Friendica"
msgstr ""
@@ -5127,6 +5137,34 @@ msgstr ""
msgid "Popular Channels"
msgstr ""
+#: ../../addon/blogger/blogger.php:42
+msgid "Post to blogger"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:74
+msgid "Blogger Post Settings"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:76
+msgid "Enable Blogger Post Plugin"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:81
+msgid "Blogger username"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:86
+msgid "Blogger password"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:91
+msgid "Blogger API URL"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:96
+msgid "Post to Blogger by default"
+msgstr ""
+
#: ../../addon/posterous/posterous.php:36
msgid "Post to Posterous"
msgstr ""
@@ -5275,7 +5313,7 @@ msgstr ""
#: ../../view/theme/diabook-blue/theme.php:243
#: ../../view/theme/diabook/theme.php:250
#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:51
-#: ../../boot.php:1414
+#: ../../boot.php:1461
msgid "Photos"
msgstr ""
@@ -5327,7 +5365,7 @@ msgstr ""
msgid "Color scheme"
msgstr ""
-#: ../../include/profile_advanced.php:17 ../../boot.php:1045
+#: ../../include/profile_advanced.php:17 ../../boot.php:1083
msgid "Gender:"
msgstr ""
@@ -5348,11 +5386,11 @@ msgstr ""
msgid "Age:"
msgstr ""
-#: ../../include/profile_advanced.php:37 ../../boot.php:1048
+#: ../../include/profile_advanced.php:37 ../../boot.php:1086
msgid "Status:"
msgstr ""
-#: ../../include/profile_advanced.php:45 ../../boot.php:1050
+#: ../../include/profile_advanced.php:45 ../../boot.php:1088
msgid "Homepage:"
msgstr ""
@@ -5912,7 +5950,7 @@ msgstr ""
msgid "Create a new group"
msgstr ""
-#: ../../include/nav.php:46 ../../boot.php:765
+#: ../../include/nav.php:46 ../../boot.php:794
msgid "Logout"
msgstr ""
@@ -5920,7 +5958,7 @@ msgstr ""
msgid "End this session"
msgstr ""
-#: ../../include/nav.php:49 ../../boot.php:1404
+#: ../../include/nav.php:49 ../../boot.php:1451
msgid "Status"
msgstr ""
@@ -6000,11 +6038,11 @@ msgstr ""
msgid "Manage other pages"
msgstr ""
-#: ../../include/nav.php:138 ../../boot.php:1003
+#: ../../include/nav.php:138 ../../boot.php:1041
msgid "Profiles"
msgstr ""
-#: ../../include/nav.php:138 ../../boot.php:1003
+#: ../../include/nav.php:138 ../../boot.php:1041
msgid "Manage/edit profiles"
msgstr ""
@@ -6179,10 +6217,26 @@ msgid "Image/photo"
msgstr ""
#: ../../include/dba.php:41
+msgid "Server name of user name are missing. "
+msgstr ""
+
+#: ../../include/dba.php:50
#, php-format
msgid "Cannot locate DNS info for database server '%s'"
msgstr ""
+#: ../../include/dba.php:84
+msgid "There is no db connection. "
+msgstr ""
+
+#: ../../include/dba.php:107 ../../include/dba.php:109
+msgid " results"
+msgstr ""
+
+#: ../../include/dba.php:113
+msgid "SQL returned "
+msgstr ""
+
#: ../../include/message.php:15 ../../include/message.php:171
msgid "[no subject]"
msgstr ""
@@ -6642,62 +6696,67 @@ msgstr ""
msgid "show fewer"
msgstr ""
-#: ../../boot.php:744
+#: ../../boot.php:676
+#, php-format
+msgid "Update Error at %s"
+msgstr ""
+
+#: ../../boot.php:773
msgid "Create a New Account"
msgstr ""
-#: ../../boot.php:768
+#: ../../boot.php:797
msgid "Nickname or Email address: "
msgstr ""
-#: ../../boot.php:769
+#: ../../boot.php:798
msgid "Password: "
msgstr ""
-#: ../../boot.php:772
+#: ../../boot.php:801
msgid "Or login using OpenID: "
msgstr ""
-#: ../../boot.php:778
+#: ../../boot.php:807
msgid "Forgot your password?"
msgstr ""
-#: ../../boot.php:936
+#: ../../boot.php:973
msgid "Edit profile"
msgstr ""
-#: ../../boot.php:995
+#: ../../boot.php:1033
msgid "Message"
msgstr ""
-#: ../../boot.php:1110 ../../boot.php:1181
+#: ../../boot.php:1149 ../../boot.php:1221
msgid "g A l F d"
msgstr ""
-#: ../../boot.php:1111 ../../boot.php:1182
+#: ../../boot.php:1150 ../../boot.php:1222
msgid "F d"
msgstr ""
-#: ../../boot.php:1136
+#: ../../boot.php:1175
msgid "Birthday Reminders"
msgstr ""
-#: ../../boot.php:1137
+#: ../../boot.php:1176
msgid "Birthdays this week:"
msgstr ""
-#: ../../boot.php:1160 ../../boot.php:1224
+#: ../../boot.php:1199 ../../boot.php:1264
msgid "[today]"
msgstr ""
-#: ../../boot.php:1205
+#: ../../boot.php:1245
msgid "Event Reminders"
msgstr ""
-#: ../../boot.php:1206
+#: ../../boot.php:1246
msgid "Events this week:"
msgstr ""
-#: ../../boot.php:1218
+#: ../../boot.php:1258
msgid "[No description]"
msgstr ""