1 files changed, 189 insertions, 48 deletions
diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot
index c7ac8053c..702793c87 100644
--- a/plugins/TwitterBridge/locale/TwitterBridge.pot
+++ b/plugins/TwitterBridge/locale/TwitterBridge.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+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"
@@ -16,16 +16,16 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: twitter.php:342
+#: twitter.php:350
 msgid "Your Twitter bridge has been disabled."
 msgstr ""
 
-#: twitter.php:346
+#: twitter.php:354
 #, 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"
+"status. Did you maybe revoke %3$s's access?\n"
 "\n"
 "You can re-enable your Twitter bridge by visiting your Twitter settings "
 "page:\n"
@@ -33,19 +33,19 @@ msgid ""
 "\t%2$s\n"
 "\n"
 "Regards,\n"
-"%3$s\n"
+"%3$s"
 msgstr ""
 
-#: TwitterBridgePlugin.php:155 TwitterBridgePlugin.php:178
-#: TwitterBridgePlugin.php:291 twitteradminpanel.php:54
+#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174
+#: TwitterBridgePlugin.php:291 twitteradminpanel.php:52
 msgid "Twitter"
 msgstr ""
 
-#: TwitterBridgePlugin.php:156
+#: TwitterBridgePlugin.php:152
 msgid "Login or register using Twitter"
 msgstr ""
 
-#: TwitterBridgePlugin.php:179
+#: TwitterBridgePlugin.php:175
 msgid "Twitter integration options"
 msgstr ""
 
@@ -53,21 +53,21 @@ msgstr ""
 msgid "Twitter bridge configuration"
 msgstr ""
 
-#: TwitterBridgePlugin.php:317
+#: TwitterBridgePlugin.php:316
 msgid ""
-"The Twitter \"bridge\" plugin allows you to integrate your StatusNet "
-"instance with <a href=\"http://twitter.com/\">Twitter</a>."
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
 msgstr ""
 
-#: twitteradminpanel.php:65
+#: twitteradminpanel.php:62
 msgid "Twitter bridge settings"
 msgstr ""
 
-#: twitteradminpanel.php:148
+#: twitteradminpanel.php:145
 msgid "Invalid consumer key. Max length is 255 characters."
 msgstr ""
 
-#: twitteradminpanel.php:154
+#: twitteradminpanel.php:151
 msgid "Invalid consumer secret. Max length is 255 characters."
 msgstr ""
 
@@ -91,6 +91,10 @@ msgstr ""
 msgid "Consumer secret assigned by Twitter"
 msgstr ""
 
+#: twitteradminpanel.php:233
+msgid "Note: a global consumer key and secret are set."
+msgstr ""
+
 #: twitteradminpanel.php:240
 msgid "Integration source"
 msgstr ""
@@ -111,15 +115,54 @@ msgstr ""
 msgid "Allow users to login with their Twitter credentials"
 msgstr ""
 
-#: twitteradminpanel.php:268
+#: twitteradminpanel.php:269
 msgid "Enable Twitter import"
 msgstr ""
 
-#: twitteradminpanel.php:270
-msgid "Allow users to import their Twitter friends' timelines"
+#: twitteradminpanel.php:271
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr ""
+
+#: twitteradminpanel.php:288 twittersettings.php:200
+msgid "Save"
+msgstr ""
+
+#: twitteradminpanel.php:288
+msgid "Save Twitter settings"
+msgstr ""
+
+#: twitterlogin.php:56
+msgid "Already logged in."
+msgstr ""
+
+#: twitterlogin.php:64
+msgid "Twitter Login"
+msgstr ""
+
+#: twitterlogin.php:69
+msgid "Login with your Twitter account"
+msgstr ""
+
+#: twitterlogin.php:87
+msgid "Sign in with Twitter"
+msgstr ""
+
+#: twitterauthorization.php:120 twittersettings.php:226
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: twitterauthorization.php:126
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#: twitterauthorization.php:135
+msgid "Something weird happened."
 msgstr ""
 
 #: twitterauthorization.php:181 twitterauthorization.php:229
+#: twitterauthorization.php:300
 msgid "Couldn't link your Twitter account."
 msgstr ""
 
@@ -127,99 +170,197 @@ msgstr ""
 msgid "Couldn't link your Twitter account: oauth_token mismatch."
 msgstr ""
 
-#: twittersettings.php:59
+#: twitterauthorization.php:312
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your Twitter "
+"account to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+
+#: twitterauthorization.php:318
+msgid "Twitter Account Setup"
+msgstr ""
+
+#: twitterauthorization.php:351
+msgid "Connection options"
+msgstr ""
+
+#: twitterauthorization.php:360
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+
+#: twitterauthorization.php:381
+msgid "Create new account"
+msgstr ""
+
+#: twitterauthorization.php:383
+msgid "Create a new user with this nickname."
+msgstr ""
+
+#: twitterauthorization.php:386
+msgid "New nickname"
+msgstr ""
+
+#: twitterauthorization.php:388
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#: twitterauthorization.php:391
+msgid "Create"
+msgstr ""
+
+#: twitterauthorization.php:396
+msgid "Connect existing account"
+msgstr ""
+
+#: twitterauthorization.php:398
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+
+#: twitterauthorization.php:401
+msgid "Existing nickname"
+msgstr ""
+
+#: twitterauthorization.php:404
+msgid "Password"
+msgstr ""
+
+#: twitterauthorization.php:407
+msgid "Connect"
+msgstr ""
+
+#: twitterauthorization.php:423 twitterauthorization.php:432
+msgid "Registration not allowed."
+msgstr ""
+
+#: twitterauthorization.php:439
+msgid "Not a valid invitation code."
+msgstr ""
+
+#: twitterauthorization.php:449
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+
+#: twitterauthorization.php:454
+msgid "Nickname not allowed."
+msgstr ""
+
+#: twitterauthorization.php:459
+msgid "Nickname already in use. Try another one."
+msgstr ""
+
+#: twitterauthorization.php:474
+msgid "Error registering user."
+msgstr ""
+
+#: twitterauthorization.php:485 twitterauthorization.php:523
+#: twitterauthorization.php:543
+msgid "Error connecting user to Twitter."
+msgstr ""
+
+#: twitterauthorization.php:505
+msgid "Invalid username or password."
+msgstr ""
+
+#: twittersettings.php:58
 msgid "Twitter settings"
 msgstr ""
 
-#: twittersettings.php:70
+#: twittersettings.php:69
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
 msgstr ""
 
-#: twittersettings.php:118
+#: twittersettings.php:116
 msgid "Twitter account"
 msgstr ""
 
-#: twittersettings.php:123
+#: twittersettings.php:121
 msgid "Connected Twitter account"
 msgstr ""
 
-#: twittersettings.php:128
+#: twittersettings.php:126
 msgid "Disconnect my account from Twitter"
 msgstr ""
 
-#: twittersettings.php:133
+#: twittersettings.php:132
 msgid "Disconnecting your Twitter could make it impossible to log in! Please "
 msgstr ""
 
-#: twittersettings.php:137
+#: twittersettings.php:136
 msgid "set a password"
 msgstr ""
 
-#: twittersettings.php:139
+#: twittersettings.php:138
 msgid " first."
 msgstr ""
 
-#: twittersettings.php:143
+#. TRANS: %1$s is the current website name.
+#: twittersettings.php:142
 #, 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
+#: twittersettings.php:150
 msgid "Disconnect"
 msgstr ""
 
-#: twittersettings.php:158
+#: twittersettings.php:157
 msgid "Preferences"
 msgstr ""
 
-#: twittersettings.php:162
+#: twittersettings.php:161
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: twittersettings.php:169
+#: twittersettings.php:168
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: twittersettings.php:176
+#: twittersettings.php:175
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: twittersettings.php:185
-msgid "Import my Friends Timeline."
+#: twittersettings.php:184
+msgid "Import my friends timeline."
 msgstr ""
 
-#: twittersettings.php:201
-msgid "Save"
-msgstr ""
-
-#: twittersettings.php:203
+#: twittersettings.php:202
 msgid "Add"
 msgstr ""
 
-#: twittersettings.php:228
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: twittersettings.php:238
+#: twittersettings.php:236
 msgid "Unexpected form submission."
 msgstr ""
 
-#: twittersettings.php:257
+#: twittersettings.php:254
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: twittersettings.php:261
+#: twittersettings.php:258
 msgid "Twitter account disconnected."
 msgstr ""
 
-#: twittersettings.php:282 twittersettings.php:292
+#: twittersettings.php:278 twittersettings.php:288
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: twittersettings.php:296
+#: twittersettings.php:292
 msgid "Twitter preferences saved."
 msgstr ""
+
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
+#: daemons/twitterstatusfetcher.php:264
+#, php-format
+msgid "RT @%1$s %2$s"
+msgstr ""