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

[quix0rs-gnu-social.git] / plugins / TwitterBridge / locale / TwitterBridge.po

diff --git a/plugins/TwitterBridge/locale/TwitterBridge.po b/plugins/TwitterBridge/locale/TwitterBridge.po
index 14c30f1c9c0cfbc9f7f76f7e7c972147b1a169f7..eff1255799675bc8210fb6463d3586123c6ae8ec 100644 (file)
--- a/plugins/TwitterBridge/locale/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/TwitterBridge.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 20:38-0800\n"
+"POT-Creation-Date: 2010-03-01 14:58-0800\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"
@@ -16,23 +16,48 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: twitterauthorization.php:81
-msgid "Not logged in."
+#: twitter.php:320
+msgid "Your Twitter bridge has been disabled."
 msgstr ""
 
-#: twitterauthorization.php:131 twitterauthorization.php:150
-#: twitterauthorization.php:170 twitterauthorization.php:217
+#: twitter.php:324
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. We no longer seem to have permission to update your Twitter "
+"status. (Did you revoke %3$s's access?)\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: twitterauthorization.php:181 twitterauthorization.php:229
 msgid "Couldn't link your Twitter account."
 msgstr ""
 
-#: TwitterBridgePlugin.php:89
+#: twitterauthorization.php:201
+msgid "Couldn't link your Twitter account: oauth_token mismatch."
+msgstr ""
+
+#: TwitterBridgePlugin.php:114
 msgid "Twitter"
 msgstr ""
 
-#: TwitterBridgePlugin.php:90
+#: TwitterBridgePlugin.php:115
 msgid "Twitter integration options"
 msgstr ""
 
+#: TwitterBridgePlugin.php:207
+msgid ""
+"The Twitter \"bridge\" plugin allows you to integrate your StatusNet "
+"instance with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+
 #: twittersettings.php:59
 msgid "Twitter settings"
 msgstr ""
@@ -51,78 +76,81 @@ msgstr ""
 msgid "Connected Twitter account"
 msgstr ""
 
-#: twittersettings.php:125
-msgid "Remove"
+#: twittersettings.php:128
+msgid "Disconnect my account from Twitter"
+msgstr ""
+
+#: twittersettings.php:133
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+msgstr ""
+
+#: twittersettings.php:137
+msgid "set a password"
 msgstr ""
 
-#: twittersettings.php:131
+#: twittersettings.php:139
+msgid " first."
+msgstr ""
+
+#: twittersettings.php:143
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+
+#: twittersettings.php:151
+msgid "Disconnect"
+msgstr ""
+
+#: twittersettings.php:158
 msgid "Preferences"
 msgstr ""
 
-#: twittersettings.php:135
+#: twittersettings.php:162
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: twittersettings.php:142
+#: twittersettings.php:169
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: twittersettings.php:149
+#: twittersettings.php:176
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: twittersettings.php:158
+#: twittersettings.php:185
 msgid "Import my Friends Timeline."
 msgstr ""
 
-#: twittersettings.php:174
+#: twittersettings.php:201
 msgid "Save"
 msgstr ""
 
-#: twittersettings.php:176
+#: twittersettings.php:203
 msgid "Add"
 msgstr ""
 
-#: twittersettings.php:201
+#: twittersettings.php:228
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: twittersettings.php:211
+#: twittersettings.php:238
 msgid "Unexpected form submission."
 msgstr ""
 
-#: twittersettings.php:230
+#: twittersettings.php:257
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: twittersettings.php:234
-msgid "Twitter account removed."
+#: twittersettings.php:261
+msgid "Twitter account disconnected."
 msgstr ""
 
-#: twittersettings.php:255 twittersettings.php:265
+#: twittersettings.php:282 twittersettings.php:292
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: twittersettings.php:269
+#: twittersettings.php:296
 msgid "Twitter preferences saved."
 msgstr ""
-
-#: twitter.php:333
-msgid "Your Twitter bridge has been disabled."
-msgstr ""
-
-#: twitter.php:337
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
-"disabled. We no longer seem to have permission to update your Twitter "
-"status. (Did you revoke %3$s's access?)\n"
-"\n"
-"You can re-enable your Twitter bridge by visiting your Twitter settings "
-"page:\n"
-"\n"
-"\t%2$s\n"
-"\n"
-"Regards,\n"
-"%3$s\n"
-msgstr ""