diff options
author | Brion Vibber <brion@pobox.com> | 2010-12-16 15:56:19 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-12-16 15:56:19 -0800 |
commit | e79034e163967a375aee8a9afff54fd9c37030dd (patch) | |
tree | daa48934b25ea7e4f399d59981c9534e7e43fbcc /plugins/FacebookBridge/locale/FacebookBridge.pot | |
parent | bf20258f4b61dd8396db9a1980463c060dab292c (diff) | |
parent | f901c25012f6c83f70c83bff9e76edb4d01b8373 (diff) |
Merge branch '0.9.x' into 1.0.x
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
Diffstat (limited to 'plugins/FacebookBridge/locale/FacebookBridge.pot')
-rw-r--r-- | plugins/FacebookBridge/locale/FacebookBridge.pot | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/plugins/FacebookBridge/locale/FacebookBridge.pot b/plugins/FacebookBridge/locale/FacebookBridge.pot index 08c0813fc..132516b79 100644 --- 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-30 20:16+0000\n" +"POT-Creation-Date: 2010-12-16 15:08+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 "" @@ -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 "" @@ -234,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 "" |