Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

[quix0rs-gnu-social.git] / plugins / FacebookBridge / locale / FacebookBridge.pot

diff --git a/plugins/FacebookBridge/locale/FacebookBridge.pot b/plugins/FacebookBridge/locale/FacebookBridge.pot
index 7da9a7758385fd0a4f1e76130d50772897caa462..2eba65cc688d9c05f1469e013ac2e476f837f69d 100644 (file)
--- a/plugins/FacebookBridge/locale/FacebookBridge.pot
+++ b/plugins/FacebookBridge/locale/FacebookBridge.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\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"
@@ -36,7 +36,7 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:106
+#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr ""
 
@@ -44,11 +44,11 @@ msgstr ""
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr ""
 
-#: lib/facebookclient.php:775
+#: lib/facebookclient.php:776
 msgid "Your Facebook connection has been removed"
 msgstr ""
 
-#: lib/facebookclient.php:834
+#: lib/facebookclient.php:835
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr ""
@@ -62,7 +62,7 @@ msgstr ""
 msgid "There is already a local account linked with that Facebook account."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:87
+#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -151,32 +151,28 @@ msgstr ""
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:304 actions/facebookfinishlogin.php:314
+#: actions/facebookfinishlogin.php:308 actions/facebookfinishlogin.php:318
 msgid "Registration not allowed."
 msgstr ""
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:322
+#: actions/facebookfinishlogin.php:326
 msgid "Not a valid invitation code."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:332
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
-#: actions/facebookfinishlogin.php:337
+#: actions/facebookfinishlogin.php:339
 msgid "Nickname not allowed."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:342
+#: actions/facebookfinishlogin.php:344
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:370 actions/facebookfinishlogin.php:507
+#: actions/facebookfinishlogin.php:372 actions/facebookfinishlogin.php:511
 msgid "Error connecting user to Facebook."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:470
+#: actions/facebookfinishlogin.php:474
 msgid "Invalid username or password."
 msgstr ""
 
@@ -238,61 +234,62 @@ msgstr ""
 msgid "Save Facebook settings"
 msgstr ""
 
-#: actions/facebooksettings.php:139
+#: actions/facebooksettings.php:137
 msgid "Connected Facebook user"
 msgstr ""
 
-#: actions/facebooksettings.php:166
+#: actions/facebooksettings.php:164
 msgid "Publish my notices to Facebook."
 msgstr ""
 
-#: actions/facebooksettings.php:176
+#: actions/facebooksettings.php:174
 msgid "Send \"@\" replies to Facebook."
 msgstr ""
 
 #. TRANS: Submit button to save synchronisation settings.
-#: actions/facebooksettings.php:185
+#: actions/facebooksettings.php:183
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
 
 #. TRANS: Legend.
-#: actions/facebooksettings.php:194
+#: actions/facebooksettings.php:192
 msgid "Disconnect my account from Facebook"
 msgstr ""
 
-#: actions/facebooksettings.php:202
+#: actions/facebooksettings.php:199
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
 "a password](%s) first."
 msgstr ""
 
-#: actions/facebooksettings.php:215
+#: actions/facebooksettings.php:213
+#, php-format
 msgid ""
-"Keep your %1$s account but disconnect from Facebook. You'll use your 1%$s "
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
 "password to log in."
 msgstr ""
 
 #. TRANS: Submit button.
-#: actions/facebooksettings.php:222
+#: actions/facebooksettings.php:220
 msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr ""
 
-#: actions/facebooksettings.php:246
+#: actions/facebooksettings.php:243
 msgid "There was a problem saving your sync preferences."
 msgstr ""
 
 #. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: actions/facebooksettings.php:249
+#: actions/facebooksettings.php:246
 msgid "Sync preferences saved."
 msgstr ""
 
-#: actions/facebooksettings.php:264
+#: actions/facebooksettings.php:260
 msgid "Couldn't delete link to Facebook."
 msgstr ""
 
-#: actions/facebooksettings.php:268
+#: actions/facebooksettings.php:264
 msgid "You have disconnected from Facebook."
 msgstr ""