diff options
author | Zach Copley <zach@status.net> | 2009-12-03 12:51:21 -0800 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2009-12-03 12:51:21 -0800 |
commit | bf4ed35a90d5cc906dbae7c097551fb3a10f14d6 (patch) | |
tree | 6e4e4c172865c81ca8bc05672cd5e5f9256fc0fb /locale/statusnet.po | |
parent | 7ed3328c47ee9aac1d7663bce0c6c6349f7b2570 (diff) | |
parent | 9e0f89ba4ff1695c0137faa89c08f8b5c60050ac (diff) |
Merge branch '0.9.x'
* 0.9.x: (141 commits)
Reload the admin design panel page to show the new CSS when the
Only pick up new default site colors if the theme has NOT changed.
Delete design when user chooses to restore default design, instead
Localisation updates for !StatusNet from !translatewiki.net !sntrans
Do not rebuild/add .mo files by default
If an XHR notice is sent form a page that has no timeline, show a
Revert "If the page doesn't have .notices, silently skip the notice XHR response"
Revert "Clear/reset the XHR notice form on pages where there is no timeline"
Clear/reset the XHR notice form on pages where there is no timeline
If the page doesn't have .notices, silently skip the notice XHR response
Remove useless debugging statement
Moved form control styles (i.e., border and radius) out of base
add pluginhandler to list of daemons to shut down
Using box-shadow only on the current navigation item
Updated theme readme
Fix regression in password settings: users have been unable to change their passwords since introduction of ChangePassword event (later StartChangePassword) November 5 in commit d6ddb84132d7b9510ba82064c67f2a39822dab49
Ticket 2048: make OMB posting HTTP timeout configurable as $config['omb']['timeout']; defaults to 5 seconds instead of 20-second default in Yadis library
ticket 1100: add Drupal source link
Fix makefile wildcards for locale compilation (now works on Ubuntu 8.04)
typo fix: '$this' now spelled correctly. Looks like this'll fix acceptance of 'source' param for direct messages posted to API
...
Conflicts:
js/util.js
locale/ar/LC_MESSAGES/statusnet.po
locale/bg/LC_MESSAGES/statusnet.po
locale/ca/LC_MESSAGES/statusnet.po
locale/cs/LC_MESSAGES/statusnet.po
locale/de/LC_MESSAGES/statusnet.po
locale/el/LC_MESSAGES/statusnet.po
locale/en_GB/LC_MESSAGES/statusnet.po
locale/es/LC_MESSAGES/statusnet.po
locale/fi/LC_MESSAGES/statusnet.po
locale/fr/LC_MESSAGES/statusnet.po
locale/ga/LC_MESSAGES/statusnet.po
locale/he/LC_MESSAGES/statusnet.po
locale/is/LC_MESSAGES/statusnet.po
locale/it/LC_MESSAGES/statusnet.po
locale/ja/LC_MESSAGES/statusnet.po
locale/ko/LC_MESSAGES/statusnet.po
locale/mk/LC_MESSAGES/statusnet.po
locale/nb/LC_MESSAGES/statusnet.po
locale/nl/LC_MESSAGES/statusnet.po
locale/nn/LC_MESSAGES/statusnet.po
locale/pl/LC_MESSAGES/statusnet.po
locale/pt/LC_MESSAGES/statusnet.po
locale/pt_BR/LC_MESSAGES/statusnet.po
locale/ru/LC_MESSAGES/statusnet.po
locale/statusnet.po
locale/sv/LC_MESSAGES/statusnet.po
locale/te/LC_MESSAGES/statusnet.po
locale/tr/LC_MESSAGES/statusnet.po
locale/uk/LC_MESSAGES/statusnet.po
locale/vi/LC_MESSAGES/statusnet.po
locale/zh_CN/LC_MESSAGES/statusnet.po
locale/zh_TW/LC_MESSAGES/statusnet.po
plugins/Realtime/realtimeupdate.js
Diffstat (limited to 'locale/statusnet.po')
-rw-r--r-- | locale/statusnet.po | 88 |
1 files changed, 38 insertions, 50 deletions
diff --git a/locale/statusnet.po b/locale/statusnet.po index 67847bc98..0ab702ae5 100644 --- a/locale/statusnet.po +++ b/locale/statusnet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-28 19:49+0000\n" +"POT-Creation-Date: 2009-12-02 23:18+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" @@ -555,7 +555,7 @@ msgstr "" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -722,7 +722,7 @@ msgid "Conversation" msgstr "" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:206 lib/searchgroupnav.php:82 +#: lib/profileaction.php:216 lib/searchgroupnav.php:82 msgid "Notices" msgstr "" @@ -1220,23 +1220,23 @@ msgstr "" msgid "You can use the local subscription!" msgstr "" -#: actions/finishremotesubscribe.php:96 +#: actions/finishremotesubscribe.php:99 msgid "That user has blocked you from subscribing." msgstr "" -#: actions/finishremotesubscribe.php:106 +#: actions/finishremotesubscribe.php:110 msgid "You are not authorized." msgstr "" -#: actions/finishremotesubscribe.php:109 +#: actions/finishremotesubscribe.php:113 msgid "Could not convert request token to access token." msgstr "" -#: actions/finishremotesubscribe.php:114 +#: actions/finishremotesubscribe.php:118 msgid "Remote service uses unknown version of OMB protocol." msgstr "" -#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306 +#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 msgid "Error updating remote profile" msgstr "" @@ -1431,8 +1431,8 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81 -#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "" @@ -1716,57 +1716,57 @@ msgstr "" msgid "Already logged in." msgstr "" -#: actions/login.php:110 actions/login.php:120 +#: actions/login.php:108 actions/login.php:118 msgid "Invalid or expired token." msgstr "" -#: actions/login.php:143 +#: actions/login.php:146 msgid "Incorrect username or password." msgstr "" -#: actions/login.php:149 +#: actions/login.php:152 msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:204 actions/login.php:257 lib/action.php:458 +#: actions/login.php:207 actions/login.php:260 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "" -#: actions/login.php:243 +#: actions/login.php:246 msgid "Login to site" msgstr "" -#: actions/login.php:246 actions/profilesettings.php:106 +#: actions/login.php:249 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "" -#: actions/login.php:249 actions/register.php:428 +#: actions/login.php:252 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "" -#: actions/login.php:252 actions/register.php:477 +#: actions/login.php:255 actions/register.php:477 msgid "Remember me" msgstr "" -#: actions/login.php:253 actions/register.php:479 +#: actions/login.php:256 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" -#: actions/login.php:263 +#: actions/login.php:266 msgid "Lost or forgotten password?" msgstr "" -#: actions/login.php:282 +#: actions/login.php:285 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -#: actions/login.php:286 +#: actions/login.php:289 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -2652,8 +2652,7 @@ msgid "Invalid profile URL (bad format)" msgstr "" #: actions/remotesubscribe.php:168 -msgid "" -"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)." +msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." msgstr "" #: actions/remotesubscribe.php:176 @@ -2830,7 +2829,7 @@ msgid "Members" msgstr "" #: actions/showgroup.php:386 lib/profileaction.php:117 -#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95 +#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 #: lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -2839,7 +2838,7 @@ msgstr "" msgid "All members" msgstr "" -#: actions/showgroup.php:429 lib/profileaction.php:173 +#: actions/showgroup.php:429 lib/profileaction.php:174 msgid "Statistics" msgstr "" @@ -4177,47 +4176,37 @@ msgstr "" msgid "Can't turn on notification." msgstr "" -#: lib/command.php:597 -#, php-format -msgid "Could not create login token for %s" -msgstr "" - -#: lib/command.php:602 -#, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" -msgstr "" - -#: lib/command.php:618 +#: lib/command.php:592 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:620 +#: lib/command.php:594 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:640 +#: lib/command.php:614 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:642 +#: lib/command.php:616 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:662 +#: lib/command.php:636 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:664 +#: lib/command.php:638 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:678 +#: lib/command.php:652 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4236,7 +4225,6 @@ msgid "" "reply #<notice_id> - reply to notice with a given id\n" "reply <nickname> - reply to the last notice from user\n" "join <group> - join group\n" -"login - Get a link to login to the web interface\n" "drop <group> - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" @@ -4474,7 +4462,7 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:192 +#: lib/jabber.php:191 #, php-format msgid "[%s]" msgstr "" @@ -4872,7 +4860,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "" @@ -4880,7 +4868,7 @@ msgstr "" msgid "All subscriptions" msgstr "" -#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90 +#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "" @@ -4888,15 +4876,15 @@ msgstr "" msgid "All subscribers" msgstr "" -#: lib/profileaction.php:177 +#: lib/profileaction.php:178 msgid "User ID" msgstr "" -#: lib/profileaction.php:182 +#: lib/profileaction.php:183 msgid "Member since" msgstr "" -#: lib/profileaction.php:235 +#: lib/profileaction.php:245 msgid "All groups" msgstr "" |