From 2d4c0f9a47f6534c578a37abe79670cec699caae Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 15 Sep 2010 14:09:52 -0700 Subject: [PATCH 01/76] Revert "Add plural support for minutes/hours/days/months ago." -- currently doesn't work and spews error messages This reverts commit b27882c9166191de4aaea298ba1b1a524cfe9ac7. --- lib/util.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/util.php b/lib/util.php index 0b90cb01d7..89d2bf8c2f 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1105,26 +1105,30 @@ function common_date_string($dt) // TRANS: Used in notices to indicate when the notice was made compared to now. return _('about a minute ago'); } else if ($diff < 3300) { + // XXX: should support plural. // TRANS: Used in notices to indicate when the notice was made compared to now. - return sprintf( ngettext('about one minute ago', 'about %d minutes ago'), round($diff/60)); + return sprintf(_('about %d minutes ago'), round($diff/60)); } else if ($diff < 5400) { // TRANS: Used in notices to indicate when the notice was made compared to now. return _('about an hour ago'); } else if ($diff < 22 * 3600) { + // XXX: should support plural. // TRANS: Used in notices to indicate when the notice was made compared to now. - return sprintf( ngettext('about one hour ago', 'about %d hours ago'), round($diff/3600)); + return sprintf(_('about %d hours ago'), round($diff/3600)); } else if ($diff < 37 * 3600) { // TRANS: Used in notices to indicate when the notice was made compared to now. return _('about a day ago'); } else if ($diff < 24 * 24 * 3600) { + // XXX: should support plural. // TRANS: Used in notices to indicate when the notice was made compared to now. - return sprintf( ngettext('about one day ago', 'about %d days ago'), round($diff/(24*3600))); + return sprintf(_('about %d days ago'), round($diff/(24*3600))); } else if ($diff < 46 * 24 * 3600) { // TRANS: Used in notices to indicate when the notice was made compared to now. return _('about a month ago'); } else if ($diff < 330 * 24 * 3600) { + // XXX: should support plural. // TRANS: Used in notices to indicate when the notice was made compared to now. - return sprintf( ngettext('about one month ago', 'about %d months ago'), round($diff/(30*24*3600))); + return sprintf(_('about %d months ago'), round($diff/(30*24*3600))); } else if ($diff < 480 * 24 * 3600) { // TRANS: Used in notices to indicate when the notice was made compared to now. return _('about a year ago'); From 95b534c5cee56602dffcc11121908c0f518cab6d Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 15 Sep 2010 14:09:23 -0700 Subject: [PATCH 02/76] Move standalone plugin files into subdirectories so they can have locale data, etc added to them at leisure. --- plugins/{ => APC}/APCPlugin.php | 0 plugins/{ => BlogspamNet}/BlogspamNetPlugin.php | 0 plugins/{ => CacheLog}/CacheLogPlugin.php | 0 plugins/{ => DiskCache}/DiskCachePlugin.php | 0 plugins/{ => Disqus}/DisqusPlugin.php | 0 plugins/{ => Echo}/EchoPlugin.php | 0 plugins/{ => GeoURL}/GeoURLPlugin.php | 0 plugins/{ => Geonames}/GeonamesPlugin.php | 0 plugins/{ => GoogleAnalytics}/GoogleAnalyticsPlugin.php | 0 plugins/{ => Linkback}/LinkbackPlugin.php | 0 plugins/{ => Memcache}/MemcachePlugin.php | 0 plugins/{ => Memcached}/MemcachedPlugin.php | 0 plugins/{ => PiwikAnalytics}/PiwikAnalyticsPlugin.php | 0 plugins/{ => Spotify}/SpotifyPlugin.php | 0 plugins/{ => SubscriptionThrottle}/SubscriptionThrottlePlugin.php | 0 plugins/{ => Template}/TemplatePlugin.php | 0 plugins/{ => UserLimit}/UserLimitPlugin.php | 0 plugins/{ => WikiHashtags}/WikiHashtagsPlugin.php | 0 plugins/{ => XCache}/XCachePlugin.php | 0 19 files changed, 0 insertions(+), 0 deletions(-) rename plugins/{ => APC}/APCPlugin.php (100%) rename plugins/{ => BlogspamNet}/BlogspamNetPlugin.php (100%) rename plugins/{ => CacheLog}/CacheLogPlugin.php (100%) rename plugins/{ => DiskCache}/DiskCachePlugin.php (100%) rename plugins/{ => Disqus}/DisqusPlugin.php (100%) rename plugins/{ => Echo}/EchoPlugin.php (100%) rename plugins/{ => GeoURL}/GeoURLPlugin.php (100%) rename plugins/{ => Geonames}/GeonamesPlugin.php (100%) rename plugins/{ => GoogleAnalytics}/GoogleAnalyticsPlugin.php (100%) rename plugins/{ => Linkback}/LinkbackPlugin.php (100%) rename plugins/{ => Memcache}/MemcachePlugin.php (100%) rename plugins/{ => Memcached}/MemcachedPlugin.php (100%) rename plugins/{ => PiwikAnalytics}/PiwikAnalyticsPlugin.php (100%) rename plugins/{ => Spotify}/SpotifyPlugin.php (100%) rename plugins/{ => SubscriptionThrottle}/SubscriptionThrottlePlugin.php (100%) rename plugins/{ => Template}/TemplatePlugin.php (100%) rename plugins/{ => UserLimit}/UserLimitPlugin.php (100%) rename plugins/{ => WikiHashtags}/WikiHashtagsPlugin.php (100%) rename plugins/{ => XCache}/XCachePlugin.php (100%) diff --git a/plugins/APCPlugin.php b/plugins/APC/APCPlugin.php similarity index 100% rename from plugins/APCPlugin.php rename to plugins/APC/APCPlugin.php diff --git a/plugins/BlogspamNetPlugin.php b/plugins/BlogspamNet/BlogspamNetPlugin.php similarity index 100% rename from plugins/BlogspamNetPlugin.php rename to plugins/BlogspamNet/BlogspamNetPlugin.php diff --git a/plugins/CacheLogPlugin.php b/plugins/CacheLog/CacheLogPlugin.php similarity index 100% rename from plugins/CacheLogPlugin.php rename to plugins/CacheLog/CacheLogPlugin.php diff --git a/plugins/DiskCachePlugin.php b/plugins/DiskCache/DiskCachePlugin.php similarity index 100% rename from plugins/DiskCachePlugin.php rename to plugins/DiskCache/DiskCachePlugin.php diff --git a/plugins/DisqusPlugin.php b/plugins/Disqus/DisqusPlugin.php similarity index 100% rename from plugins/DisqusPlugin.php rename to plugins/Disqus/DisqusPlugin.php diff --git a/plugins/EchoPlugin.php b/plugins/Echo/EchoPlugin.php similarity index 100% rename from plugins/EchoPlugin.php rename to plugins/Echo/EchoPlugin.php diff --git a/plugins/GeoURLPlugin.php b/plugins/GeoURL/GeoURLPlugin.php similarity index 100% rename from plugins/GeoURLPlugin.php rename to plugins/GeoURL/GeoURLPlugin.php diff --git a/plugins/GeonamesPlugin.php b/plugins/Geonames/GeonamesPlugin.php similarity index 100% rename from plugins/GeonamesPlugin.php rename to plugins/Geonames/GeonamesPlugin.php diff --git a/plugins/GoogleAnalyticsPlugin.php b/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php similarity index 100% rename from plugins/GoogleAnalyticsPlugin.php rename to plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php diff --git a/plugins/LinkbackPlugin.php b/plugins/Linkback/LinkbackPlugin.php similarity index 100% rename from plugins/LinkbackPlugin.php rename to plugins/Linkback/LinkbackPlugin.php diff --git a/plugins/MemcachePlugin.php b/plugins/Memcache/MemcachePlugin.php similarity index 100% rename from plugins/MemcachePlugin.php rename to plugins/Memcache/MemcachePlugin.php diff --git a/plugins/MemcachedPlugin.php b/plugins/Memcached/MemcachedPlugin.php similarity index 100% rename from plugins/MemcachedPlugin.php rename to plugins/Memcached/MemcachedPlugin.php diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php similarity index 100% rename from plugins/PiwikAnalyticsPlugin.php rename to plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php diff --git a/plugins/SpotifyPlugin.php b/plugins/Spotify/SpotifyPlugin.php similarity index 100% rename from plugins/SpotifyPlugin.php rename to plugins/Spotify/SpotifyPlugin.php diff --git a/plugins/SubscriptionThrottlePlugin.php b/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php similarity index 100% rename from plugins/SubscriptionThrottlePlugin.php rename to plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php diff --git a/plugins/TemplatePlugin.php b/plugins/Template/TemplatePlugin.php similarity index 100% rename from plugins/TemplatePlugin.php rename to plugins/Template/TemplatePlugin.php diff --git a/plugins/UserLimitPlugin.php b/plugins/UserLimit/UserLimitPlugin.php similarity index 100% rename from plugins/UserLimitPlugin.php rename to plugins/UserLimit/UserLimitPlugin.php diff --git a/plugins/WikiHashtagsPlugin.php b/plugins/WikiHashtags/WikiHashtagsPlugin.php similarity index 100% rename from plugins/WikiHashtagsPlugin.php rename to plugins/WikiHashtags/WikiHashtagsPlugin.php diff --git a/plugins/XCachePlugin.php b/plugins/XCache/XCachePlugin.php similarity index 100% rename from plugins/XCachePlugin.php rename to plugins/XCache/XCachePlugin.php From 85154a49d0eb3d401dadd20bda527219e75ba396 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 16 Sep 2010 00:07:47 +0200 Subject: [PATCH 03/76] Add plural support for minutes/hours/days/months ago. Reapply of revised b27882c9166191de4aaea298ba1b1a524cfe9ac7 that was reverted by Brion Vibber in 2d4c0f9a47f6534c578a37abe79670cec699caae. --- lib/util.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/util.php b/lib/util.php index 89d2bf8c2f..6d2e99b2ae 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1105,30 +1105,30 @@ function common_date_string($dt) // TRANS: Used in notices to indicate when the notice was made compared to now. return _('about a minute ago'); } else if ($diff < 3300) { - // XXX: should support plural. + $minutes = round($diff/60); // TRANS: Used in notices to indicate when the notice was made compared to now. - return sprintf(_('about %d minutes ago'), round($diff/60)); + return sprintf( ngettext('about one minute ago', 'about %d minutes ago', $minutes), $minutes); } else if ($diff < 5400) { // TRANS: Used in notices to indicate when the notice was made compared to now. return _('about an hour ago'); } else if ($diff < 22 * 3600) { - // XXX: should support plural. + $hours = round($diff/3600); // TRANS: Used in notices to indicate when the notice was made compared to now. - return sprintf(_('about %d hours ago'), round($diff/3600)); + return sprintf( ngettext('about one hour ago', 'about %d hours ago', $hours), $hours); } else if ($diff < 37 * 3600) { // TRANS: Used in notices to indicate when the notice was made compared to now. return _('about a day ago'); } else if ($diff < 24 * 24 * 3600) { - // XXX: should support plural. + $days = round($diff/(24*3600)); // TRANS: Used in notices to indicate when the notice was made compared to now. - return sprintf(_('about %d days ago'), round($diff/(24*3600))); + return sprintf( ngettext('about one day ago', 'about %d days ago', $days), $days); } else if ($diff < 46 * 24 * 3600) { // TRANS: Used in notices to indicate when the notice was made compared to now. return _('about a month ago'); } else if ($diff < 330 * 24 * 3600) { - // XXX: should support plural. + $months = round($diff/(30*24*3600)); // TRANS: Used in notices to indicate when the notice was made compared to now. - return sprintf(_('about %d months ago'), round($diff/(30*24*3600))); + return sprintf( ngettext('about one month ago', 'about %d months ago',$months), $months); } else if ($diff < 480 * 24 * 3600) { // TRANS: Used in notices to indicate when the notice was made compared to now. return _('about a year ago'); From 20a0a4acffc7f25ac4898130f98f2c0783a551db Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 16 Sep 2010 11:05:31 -0700 Subject: [PATCH 04/76] Explicitly mark a translator note on the command list help message that the command names must not be translated --- lib/command.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/command.php b/lib/command.php index 4887cac452..b1f95fcb69 100644 --- a/lib/command.php +++ b/lib/command.php @@ -901,7 +901,7 @@ class HelpCommand extends Command function handle($channel) { $channel->output($this->user, - // TRANS: Help text for commands. + // TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. _("Commands:\n". "on - turn on notifications\n". "off - turn off notifications\n". From b98abc3ae77965c6935bfb87eef61a3cc436e82f Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 16 Sep 2010 12:36:18 -0700 Subject: [PATCH 05/76] Ticket #2725 - add StatusNet Mobile & platform variants to default notice sources lists. To add just these to an existing table: INSERT INTO notice_source (code, name, url, created) VALUES ('StatusNet Mobile', 'StatusNet Mobile', 'http://status.net/mobile', now()), ('StatusNet iPhone', 'iPhone', 'http://status.net/iphone', now()), ('StatusNet Android', 'Android', 'http://status.net/android', now()), ('StatusNet Blackberry', 'Blackberry', 'http://status.net/blackberry', now()); --- db/notice_source.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/db/notice_source.sql b/db/notice_source.sql index 6bfd5c5f15..04d9d7ba65 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -52,6 +52,10 @@ VALUES ('socialoomphBfD4pMqz31', 'SocialOomph', 'http://www.socialoomph.com/', now()), ('spaz','Spaz','http://funkatron.com/spaz', now()), ('StatusNet Desktop', 'StatusNet Desktop', 'http://status.net/desktop', now()), + ('StatusNet Mobile', 'StatusNet Mobile', 'http://status.net/mobile', now()), + ('StatusNet iPhone', 'iPhone', 'http://status.net/iphone', now()), + ('StatusNet Android', 'Android', 'http://status.net/android', now()), + ('StatusNet Blackberry', 'Blackberry', 'http://status.net/blackberry', now()), ('tarpipe','tarpipe','http://tarpipe.com/', now()), ('tjunar','Tjunar','http://nederflash.nl/boek/titels/tjunar-air', now()), ('tr.im','tr.im','http://tr.im/', now()), From 097d0bd2faad9e067367e88e4ad166b14b0f98b6 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 16 Sep 2010 14:43:27 -0700 Subject: [PATCH 06/76] Ticket #2731: Fix for regression in posting to remote groups (regression in 2d4e0693c88bb8cad47f917db3ac5ecfacf28619) Changes in 2d4e0693c88bb8cad47f917db3ac5ecfacf28619 changed Ostatus_profile::filterReplies() (which sorts out the local, remote, and group recipients on incoming remote messages) from checking for remote profiles with a safe call to Ostatus_profile::staticGet() to calls through Ostatus_profile::ensureProfileURL() and Ostatus_profile::ensureWebfinger(), which throw exceptions and thus abort processing. Since this was done before checking for local groups, the filter would fail when the ensure* functions determined it was looking at a local group and rightfully refused to create a remote group profile for it. Changing the calls to the ensure* functions was done so we can record remote reply recipients for future reply-to-reply processing (the staticGet() call was a cheaper way to do a lookup when we knew we only actually had to process groups that somebody signed up to); most important fix is simply to actually check for the exception! :) Here I'm changing the order of processing so we do the local group lookup first -- where it's nice and safe -- and then when we do the remote checks, we'll go ahead and gracefully skip that entry if the full remote lookup fails, so we'll still process any following recipients. --- plugins/OStatus/classes/Ostatus_profile.php | 33 ++++++++++----------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 19fe5169b4..11ca67b25c 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -703,23 +703,7 @@ class Ostatus_profile extends Memcached_DataObject continue; } - // Is the recipient a remote group? - $oprofile = Ostatus_profile::ensureProfileURI($recipient); - - if ($oprofile) { - if ($oprofile->isGroup()) { - // Deliver to local members of this remote group. - // @fixme sender verification? - $groups[] = $oprofile->group_id; - } else { - // may be canonicalized or something - $replies[] = $oprofile->uri; - } - continue; - } - // Is the recipient a local group? - // @fixme uri on user_group isn't reliable yet // $group = User_group::staticGet('uri', $recipient); $id = OStatusPlugin::localGroupFromUrl($recipient); if ($id) { @@ -738,7 +722,22 @@ class Ostatus_profile extends Memcached_DataObject } } - common_log(LOG_DEBUG, "Skipping reply to unrecognized profile $recipient"); + // Is the recipient a remote user or group? + try { + $oprofile = Ostatus_profile::ensureProfileURI($recipient); + if ($oprofile->isGroup()) { + // Deliver to local members of this remote group. + // @fixme sender verification? + $groups[] = $oprofile->group_id; + } else { + // may be canonicalized or something + $replies[] = $oprofile->uri; + } + continue; + } catch (Exception $e) { + // Neither a recognizable local nor remote user! + common_log(LOG_DEBUG, "Skipping reply to unrecognized profile $recipient: " . $e->getMessage()); + } } $attention_uris = $replies; From 88f3b51affe662783a0f6d01c920dada9e865757 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 17 Sep 2010 01:21:14 +0200 Subject: [PATCH 07/76] Localisation updates from http://translatewiki.net --- locale/af/LC_MESSAGES/statusnet.po | 149 +++- locale/ar/LC_MESSAGES/statusnet.po | 176 +++- locale/arz/LC_MESSAGES/statusnet.po | 176 +++- locale/bg/LC_MESSAGES/statusnet.po | 160 +++- locale/br/LC_MESSAGES/statusnet.po | 170 +++- locale/ca/LC_MESSAGES/statusnet.po | 182 ++++- locale/cs/LC_MESSAGES/statusnet.po | 186 ++++- locale/da/LC_MESSAGES/statusnet.po | 111 ++- locale/de/LC_MESSAGES/statusnet.po | 184 ++++- locale/el/LC_MESSAGES/statusnet.po | 124 ++- locale/en_GB/LC_MESSAGES/statusnet.po | 165 +++- locale/eo/LC_MESSAGES/statusnet.po | 1060 +++++++++++++++++++++---- locale/es/LC_MESSAGES/statusnet.po | 250 +++++- locale/fa/LC_MESSAGES/statusnet.po | 178 ++++- locale/fi/LC_MESSAGES/statusnet.po | 165 +++- locale/fr/LC_MESSAGES/statusnet.po | 182 ++++- locale/ga/LC_MESSAGES/statusnet.po | 135 +++- locale/gl/LC_MESSAGES/statusnet.po | 182 ++++- locale/he/LC_MESSAGES/statusnet.po | 126 ++- locale/hsb/LC_MESSAGES/statusnet.po | 169 +++- locale/ia/LC_MESSAGES/statusnet.po | 189 ++++- locale/is/LC_MESSAGES/statusnet.po | 156 +++- locale/it/LC_MESSAGES/statusnet.po | 182 ++++- locale/ja/LC_MESSAGES/statusnet.po | 178 ++++- locale/ka/LC_MESSAGES/statusnet.po | 173 +++- locale/ko/LC_MESSAGES/statusnet.po | 161 +++- locale/mk/LC_MESSAGES/statusnet.po | 189 ++++- locale/nb/LC_MESSAGES/statusnet.po | 182 ++++- locale/nl/LC_MESSAGES/statusnet.po | 189 ++++- locale/nn/LC_MESSAGES/statusnet.po | 165 +++- locale/pl/LC_MESSAGES/statusnet.po | 186 ++++- locale/pt/LC_MESSAGES/statusnet.po | 189 ++++- locale/pt_BR/LC_MESSAGES/statusnet.po | 184 ++++- locale/ru/LC_MESSAGES/statusnet.po | 186 ++++- locale/statusnet.pot | 6 +- locale/sv/LC_MESSAGES/statusnet.po | 182 ++++- locale/te/LC_MESSAGES/statusnet.po | 149 +++- locale/tr/LC_MESSAGES/statusnet.po | 116 ++- locale/uk/LC_MESSAGES/statusnet.po | 193 ++++- locale/vi/LC_MESSAGES/statusnet.po | 148 +++- locale/zh_CN/LC_MESSAGES/statusnet.po | 187 ++++- locale/zh_TW/LC_MESSAGES/statusnet.po | 97 ++- 42 files changed, 7349 insertions(+), 468 deletions(-) diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po index aee41ce2ba..2596b39c56 100644 --- a/locale/af/LC_MESSAGES/statusnet.po +++ b/locale/af/LC_MESSAGES/statusnet.po @@ -9,17 +9,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:37+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:29+0000\n" "Language-Team: Afrikaans \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: af\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1619,6 +1619,24 @@ msgstr "lede van die groep %s" msgid "Admin" msgstr "Administrateur" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -4092,14 +4110,15 @@ msgstr "" msgid "No user for that token." msgstr "" -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." msgstr "" -#. TRANS: Exception thrown when an attempt is made to remove a revoked token. -#: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form input field instructions. @@ -4587,6 +4606,62 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. #: lib/groupnav.php:129 @@ -5032,6 +5107,23 @@ msgstr "Antwoord" msgid "Nudge" msgstr "Aanpor" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/personalgroupnav.php:99 msgid "Personal" msgstr "Persoonlik" @@ -5129,6 +5221,11 @@ msgstr "" msgid "Keyword(s)" msgstr "Term(e)" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #: lib/searchgroupnav.php:80 msgid "People" msgstr "Gebruikers" @@ -5289,21 +5386,53 @@ msgstr "'n paar sekondes gelede" msgid "about a minute ago" msgstr "ongeveer 'n minuut gelede" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "ongeveer 'n uur gelede" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "ongeveer een dag gelede" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "ongeveer een maand gelede" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 056cfb15e4..b9b1057ed9 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -11,19 +11,19 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:38+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:30+0000\n" "Language-Team: Arabic \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == " "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= " "99) ? 4 : 5 ) ) ) );\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1633,10 +1633,28 @@ msgstr "قائمة بمستخدمي هذه المجموعة." msgid "Admin" msgstr "إداري" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "اجعل المستخدم إداريًا في المجموعة" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -4657,9 +4675,15 @@ msgstr "" msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -5220,6 +5244,78 @@ msgstr "صِف المجموعة أو الموضوع" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "المجموعات الأكثر أعضاءً" @@ -5729,6 +5825,23 @@ msgstr "نبّه هذا المستخدم" msgid "Nudge" msgstr "نبّه" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "تعذّر إدراج اشتراك جديد." @@ -5867,6 +5980,11 @@ msgstr "ابحث في الموقع" msgid "Keyword(s)" msgstr "الكلمات المفتاحية" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -6057,21 +6175,69 @@ msgstr "قبل لحظات قليلة" msgid "about a minute ago" msgstr "قبل دقيقة تقريبًا" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "قبل ساعة تقريبًا" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "قبل يوم تقريبا" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "قبل شهر تقريبًا" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index e549610ab1..2f52f23d57 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -11,19 +11,19 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:40+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:31+0000\n" "Language-Team: Egyptian Spoken Arabic \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1448,6 +1448,24 @@ msgstr "قائمه بمستخدمى هذه المجموعه." msgid "Admin" msgstr "إداري" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -4150,9 +4168,15 @@ msgstr "" msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form input field instructions. @@ -4659,6 +4683,78 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "المجموعات الأكثر أعضاءً" @@ -5113,6 +5209,23 @@ msgstr "نبّه هذا المستخدم" msgid "Nudge" msgstr "نبّه" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "تعذّر إدراج اشتراك جديد." @@ -5242,6 +5355,11 @@ msgstr "ابحث فى الموقع" msgid "Keyword(s)" msgstr "الكلمات المفتاحية" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -5428,21 +5546,69 @@ msgstr "قبل لحظات قليلة" msgid "about a minute ago" msgstr "قبل دقيقه تقريبًا" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "قبل ساعه تقريبًا" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "قبل يوم تقريبا" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "قبل شهر تقريبًا" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 02f1172d0f..5d45496b8f 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -10,17 +10,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:41+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:32+0000\n" "Language-Team: Bulgarian \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1649,6 +1649,24 @@ msgstr "Списък с потребителите в тази група." msgid "Admin" msgstr "Настройки" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -4601,9 +4619,15 @@ msgstr "" msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form input field instructions. @@ -5087,6 +5111,78 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Групи с най-много членове" @@ -5582,6 +5678,23 @@ msgstr "Побутване" msgid "Send a nudge to this user" msgstr "Побутване на този потребител" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Грешка при добавяне на нов абонамент." @@ -5708,6 +5821,11 @@ msgstr "Търсене в сайта" msgid "Keyword(s)" msgstr "Ключови думи" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -5895,21 +6013,53 @@ msgstr "преди няколко секунди" msgid "about a minute ago" msgstr "преди около минута" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "преди около час" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "преди около ден" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "преди около месец" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 4e5bdf2e04..d1c1d2f8d3 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -11,17 +11,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:42+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:34+0000\n" "Language-Team: Breton \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1731,10 +1731,28 @@ msgstr "Roll an implijerien enrollet er strollad-mañ." msgid "Admin" msgstr "Merañ" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Lakaat an implijer da vezañ ur merour eus ar strollad" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -4817,19 +4835,25 @@ msgstr "" msgid "No application for that consumer key." msgstr "" +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "" + #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." msgstr "" -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." msgstr "" -#. TRANS: Exception thrown when an attempt is made to remove a revoked token. -#: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -5356,6 +5380,78 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbypostssection.php:71 msgid "Groups with most posts" msgstr "" @@ -5793,6 +5889,23 @@ msgstr "Blinkadenn" msgid "Send a nudge to this user" msgstr "Kas ur blinkadenn d'an implijer-mañ" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/personalgroupnav.php:99 msgid "Personal" msgstr "Hiniennel" @@ -5910,6 +6023,11 @@ msgstr "Klask el lec'hienn" msgid "Keyword(s)" msgstr "Ger(ioù) alc'hwez" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -6070,21 +6188,53 @@ msgstr "un nebeud eilennoù zo" msgid "about a minute ago" msgstr "1 vunutenn zo well-wazh" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "1 eurvezh zo well-wazh" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "1 devezh zo well-wazh" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "miz zo well-wazh" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 914e8a189d..3d1bdc1836 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -12,17 +12,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:43+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:35+0000\n" "Language-Team: Catalan \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1896,10 +1896,28 @@ msgstr "La llista dels usuaris d'aquest grup." msgid "Admin" msgstr "Admin" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Fes l'usuari un administrador del grup" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5533,14 +5551,25 @@ msgstr "" msgid "No application for that consumer key." msgstr "" +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "" + #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -6195,6 +6224,78 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "Sobrenoms addicionals del grup, separats amb comes o espais, màx. %d" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Grups amb més membres" @@ -6689,6 +6790,23 @@ msgstr "No s'ha pogut moure el fitxer al directori de destinació." msgid "Could not determine file's MIME type." msgstr "No s'ha pogut determinar el tipus MIME del fitxer." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Envia un avís directe" @@ -6804,6 +6922,23 @@ msgstr "Crida l'atenció" msgid "Send a nudge to this user" msgstr "Crida l'atenció a l'usuari" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "No s'ha pogut inserir una nova subscripció." @@ -6947,6 +7082,11 @@ msgstr "Cerca al lloc" msgid "Keyword(s)" msgstr "Paraules clau" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7155,21 +7295,53 @@ msgstr "fa pocs segons" msgid "about a minute ago" msgstr "fa un minut" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "fa una hora" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "fa un dia" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "fa un mes" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index f01a064290..98a89e74c6 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -10,18 +10,18 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:45+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:38+0000\n" "Language-Team: Czech \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : " "2 );\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1879,10 +1879,28 @@ msgstr "Seznam uživatelů v této skupině." msgid "Admin" msgstr "Admin" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Uďelat uživatele adminem skupiny" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5463,14 +5481,25 @@ msgstr "" msgid "No application for that consumer key." msgstr "" +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "" + #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -6125,6 +6154,78 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "Další přezdívky pro skupinu, oddělené čárkou nebo mezerou, max %d" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Skupiny s nejvíce členy" @@ -6617,6 +6718,23 @@ msgstr "Soubor nemohl být přesunut do cílového adresáře." msgid "Could not determine file's MIME type." msgstr "Nelze určit typ MIME souboru." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Pošlete přímou zprávu" @@ -6732,6 +6850,23 @@ msgstr "Pošťouchnout" msgid "Send a nudge to this user" msgstr "Poslat pošťouchnutí tomuto uživateli" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Nelze vložit odebírání" @@ -6875,6 +7010,11 @@ msgstr "Prohledat stránky" msgid "Keyword(s)" msgstr "Klíčová slova" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7083,21 +7223,57 @@ msgstr "před pár sekundami" msgid "about a minute ago" msgstr "asi před minutou" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "asi před hodinou" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "asi přede dnem" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "asi před měsícem" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/da/LC_MESSAGES/statusnet.po b/locale/da/LC_MESSAGES/statusnet.po index 915d860a51..9b3c561cff 100644 --- a/locale/da/LC_MESSAGES/statusnet.po +++ b/locale/da/LC_MESSAGES/statusnet.po @@ -10,17 +10,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:46+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:39+0000\n" "Language-Team: Danish \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: da\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1884,10 +1884,28 @@ msgstr "En liste over brugerne i denne gruppe." msgid "Admin" msgstr "Administrator" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Gør bruger til administrator af gruppen" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -4247,14 +4265,15 @@ msgstr "" msgid "No user for that token." msgstr "" -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." msgstr "" -#. TRANS: Exception thrown when an attempt is made to remove a revoked token. -#: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form input field instructions. @@ -4690,12 +4709,62 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + #. TRANS: Menu item in the group navigation page. #: lib/groupnav.php:95 msgctxt "MENU" msgid "Members" msgstr "" +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. #: lib/groupnav.php:129 @@ -5118,6 +5187,23 @@ msgstr "" msgid "Nudge" msgstr "" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/personalgroupnav.php:99 msgid "Personal" msgstr "" @@ -5204,6 +5290,11 @@ msgstr "" msgid "Keyword(s)" msgstr "" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index ab5c443404..2617519f61 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -19,17 +19,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:47+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:40+0000\n" "Language-Team: German \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1910,10 +1910,28 @@ msgstr "Liste der Benutzer in dieser Gruppe." msgid "Admin" msgstr "Admin" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "Blockieren" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Benutzer zu einem Admin dieser Gruppe ernennen" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5545,14 +5563,25 @@ msgstr "API-Ressource erfordert lesen/schreib Zugriff; du hast nur Leserechte." msgid "No application for that consumer key." msgstr "" +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "" + #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -6208,6 +6237,78 @@ msgstr "" "Zusätzliche Spitznamen für die Gruppe, Komma oder Leerzeichen getrennt, max %" "d" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "%s-Logo hinzufügen oder bearbeiten" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "%s-Design hinzufügen oder bearbeiten" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Gruppen mit den meisten Mitgliedern" @@ -6701,6 +6802,25 @@ msgstr "Datei konnte nicht in das Zielverzeichnis verschoben werden." msgid "Could not determine file's MIME type." msgstr "Konnte den MIME-Typ nicht feststellen." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" +"„%1$s“ ist kein unterstütztes Dateiformat auf diesem Server. Versuche es mit " +"einem anderen %2$s-Format." + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Versende eine direkte Nachricht" @@ -6816,6 +6936,23 @@ msgstr "Stups" msgid "Send a nudge to this user" msgstr "Sende diesem Benutzer einen Stups" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Konnte neues Abonnement nicht eintragen." @@ -6959,6 +7096,11 @@ msgstr "Site durchsuchen" msgid "Keyword(s)" msgstr "Suchbegriff" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7166,21 +7308,53 @@ msgstr "vor wenigen Sekunden" msgid "about a minute ago" msgstr "vor einer Minute" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "vor ca. einer Minute" +msgstr[1] "vor ca. %d Minuten" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "vor einer Stunde" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "vor ca. einer Stunde" +msgstr[1] "vor ca. %d Stunden" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "vor einem Tag" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "vor ca. einem Tag" +msgstr[1] "vor ca. %d Tagen" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "vor einem Monat" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "vor ca. einem Monat" +msgstr[1] "vor ca. %d Monaten" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index fbc7354d0e..ae5cf7a15b 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -11,17 +11,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:48+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:41+0000\n" "Language-Team: Greek \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1372,10 +1372,22 @@ msgstr "" msgid "Admin" msgstr "Διαχειριστής" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + #. TRANS: Submit button title. #: actions/groupmembers.php:537 msgctxt "TOOLTIP" @@ -3930,14 +3942,20 @@ msgstr "" msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Exception thrown when an attempt is made to remove a revoked token. #: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +msgid "Failed to delete revoked token." msgstr "" #. TRANS: Form legend. @@ -4462,6 +4480,78 @@ msgstr "Τοποθεσία της ομάδας (εάν υπάρχει), πχ: \" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Ομάδες με τα περισσότερα μέλη" @@ -4919,6 +5009,23 @@ msgstr "" msgid "Nudge" msgstr "" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Απέτυχε η εισαγωγή νέας συνδρομής." @@ -5046,6 +5153,11 @@ msgstr "" msgid "Keyword(s)" msgstr "" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 0d66123b4f..e04b249f18 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -12,17 +12,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:50+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:44+0000\n" "Language-Team: British English \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1865,10 +1865,28 @@ msgstr "A list of the users in this group." msgid "Admin" msgstr "Admin" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Make user an admin of the group" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5260,14 +5278,15 @@ msgstr "" msgid "No user for that token." msgstr "" -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." msgstr "" -#. TRANS: Exception thrown when an attempt is made to remove a revoked token. -#: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form input field instructions. @@ -5826,6 +5845,78 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Groups with most members" @@ -6354,6 +6445,23 @@ msgstr "Nudge" msgid "Send a nudge to this user" msgstr "Send a nudge to this user" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Couldn't insert new subscription." @@ -6497,6 +6605,11 @@ msgstr "Search site" msgid "Keyword(s)" msgstr "" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -6684,21 +6797,53 @@ msgstr "a few seconds ago" msgid "about a minute ago" msgstr "about a minute ago" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "about an hour ago" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "about a day ago" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "about a month ago" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po index c5b268ea09..a301dcc2e9 100644 --- a/locale/eo/LC_MESSAGES/statusnet.po +++ b/locale/eo/LC_MESSAGES/statusnet.po @@ -3,6 +3,7 @@ # # Author: AVRS # Author: Brion +# Author: Eliovir # Author: Ianmcorvidae # Author: Kris10 # Author: LyzTyphone @@ -13,17 +14,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:49+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:43+0000\n" "Language-Team: Esperanto \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: eo\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1874,10 +1875,28 @@ msgstr "Listo de uzantoj en tiu ĉi grupo" msgid "Admin" msgstr "Administranto" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "Bloki" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Elekti uzanton grupestro." +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "Estrigi" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "Estrigi la uzanton" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -3257,6 +3276,10 @@ msgstr "Pasvorto devas enhavi 6 signojn aŭ pli." msgid "Password and confirmation do not match." msgstr "Pasvorto kaj komfirmo ne kongruas." +#: actions/recoverpassword.php:388 actions/register.php:255 +msgid "Error setting user." +msgstr "Eraris agordi uzanton." + #: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Nova pasvorto sukcese konserviĝas. Vi nun estas ensalutinta." @@ -3635,7 +3658,7 @@ msgstr "Aplikaĵa ago" #: actions/showapplication.php:236 msgid "Reset key & secret" -msgstr "" +msgstr "Rekomencigi ŝlosilon & sekreton" #: actions/showapplication.php:261 msgid "Application info" @@ -3643,19 +3666,19 @@ msgstr "Aplikaĵa informo" #: actions/showapplication.php:263 msgid "Consumer key" -msgstr "" +msgstr "Konsumanta ŝlosilo" #: actions/showapplication.php:268 msgid "Consumer secret" -msgstr "" +msgstr "Konsumanta sekreto" #: actions/showapplication.php:273 msgid "Request token URL" -msgstr "" +msgstr "Pet-ĵetona URL" #: actions/showapplication.php:278 msgid "Access token URL" -msgstr "" +msgstr "Alir-ĵetona URL" #: actions/showapplication.php:283 msgid "Authorize URL" @@ -3669,6 +3692,10 @@ msgstr "" "Rimarku: Ni subtenas HMAC-SHA1-subskribo. Ni ne subtenas platteksta " "subskribado-metodon." +#: actions/showapplication.php:309 +msgid "Are you sure you want to reset your consumer key and secret?" +msgstr "Ĉu vi certe volas rekomencigi vian konsumantan ŝlosilon kaj sekreton?" + #: actions/showfavorites.php:79 #, php-format msgid "%1$s's favorite notices, page %2$d" @@ -3962,7 +3989,7 @@ msgstr "Teksto estu almenaŭ 0 literojn (senlime)." #: actions/siteadminpanel.php:171 msgid "Dupe limit must be one or more seconds." -msgstr "" +msgstr "Refoja limo estu almenaŭ unu sekundo." #: actions/siteadminpanel.php:221 msgid "General" @@ -3982,11 +4009,11 @@ msgstr "Eblige de" #: actions/siteadminpanel.php:230 msgid "Text used for credits link in footer of each page" -msgstr "" +msgstr "Teksto por dankado-ligilo je subo por ĉiu paĝo" #: actions/siteadminpanel.php:234 msgid "Brought by URL" -msgstr "" +msgstr "Alportita de URL" #: actions/siteadminpanel.php:235 msgid "URL used for credits link in footer of each page" @@ -4012,59 +4039,100 @@ msgstr "Defaŭlta horzono de la retejo; kutime UTC." msgid "Default language" msgstr "Defaŭlta lingvo" +#: actions/siteadminpanel.php:263 +msgid "Site language when autodetection from browser settings is not available" +msgstr "Reteja lingvo por kiam lingva prefero ne troviĝas el la foliumilo" + #: actions/siteadminpanel.php:271 msgid "Limits" msgstr "Limoj" #: actions/siteadminpanel.php:274 msgid "Text limit" -msgstr "" +msgstr "Teksta longlimo" #: actions/siteadminpanel.php:274 msgid "Maximum number of characters for notices." -msgstr "" +msgstr "Longlimo por afiŝoj." #: actions/siteadminpanel.php:278 msgid "Dupe limit" -msgstr "" +msgstr "Refoja limo" #: actions/siteadminpanel.php:278 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" +"Kiel longe devas uzantoj atendas (je sekundo) antaŭ afiŝi la saman refejo." #: actions/sitenoticeadminpanel.php:56 msgid "Site Notice" -msgstr "" +msgstr "Reteja Anonco" + +#: actions/sitenoticeadminpanel.php:67 +msgid "Edit site-wide message" +msgstr "Redakti retejan mesaĝon" #: actions/sitenoticeadminpanel.php:103 msgid "Unable to save site notice." -msgstr "" +msgstr "Malsukcesis konservi retejan anoncon." #: actions/sitenoticeadminpanel.php:113 msgid "Max length for the site-wide notice is 255 chars." -msgstr "" +msgstr "Longlimo por reteja anonco estas 255 literoj." #: actions/sitenoticeadminpanel.php:176 msgid "Site notice text" -msgstr "" +msgstr "Teksto de reteja anonco." #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" -msgstr "" +msgstr "Teksto de reteja anonco (apenaŭ 255 literoj; HTML eblas)" #: actions/sitenoticeadminpanel.php:198 msgid "Save site notice" msgstr "Konservi retejan agordon" +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 +msgid "SMS settings" +msgstr "SMM-a agordo" + +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 +#, php-format +msgid "You can receive SMS messages through email from %%site.name%%." +msgstr "Vi povos ricevi SMM-mesaĝon per retpoŝto de %%site.name%%." + +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 +msgid "SMS is not available." +msgstr "SMM ne estas disponebla." + +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "SMM-a adreso" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 +msgid "Current confirmed SMS-enabled phone number." +msgstr "Nuna konfirmita SMM-pova telefonnumero" + #. TRANS: Form guide in IM settings form. #: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." -msgstr "" +msgstr "Atendante konfirmon por la telefonnumero." + +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 +msgid "Confirmation code" +msgstr "Konfirma kodo." #. TRANS: Form field instructions in SMS settings form. #: actions/smssettings.php:144 msgid "Enter the code you received on your phone." -msgstr "" +msgstr "Entajpu la kodon, kiu vi ricevis per poŝtelefono." #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 @@ -4075,12 +4143,17 @@ msgstr "Konfirmi" #. TRANS: Field label for SMS phone number input in SMS settings form. #: actions/smssettings.php:153 msgid "SMS phone number" -msgstr "" +msgstr "SMM-a telefonnumero" #. TRANS: SMS phone number input field instructions in SMS settings form. #: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" -msgstr "" +msgstr "Telefonnumero, sen interpunkcio aŭ spacoj, kun loka kodo" + +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "SMM-aj preferoj" #. TRANS: Checkbox label in SMS preferences form. #: actions/smssettings.php:201 @@ -4088,21 +4161,73 @@ msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" +"Sendu al mi avizoj per SMM; mi komprenas ke la kosto eble estos multa de mia " +"peranto." + +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "SMM-prefero konserviĝas." #. TRANS: Message given saving SMS phone number without having provided one. #: actions/smssettings.php:338 msgid "No phone number." msgstr "Mankas la telefononumero." +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 +msgid "No carrier selected." +msgstr "Neniu peranto elektiĝas." + +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 +msgid "That is already your phone number." +msgstr "Tio estas jam via telefonnumero." + +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 +msgid "That phone number already belongs to another user." +msgstr "Tiu telefonnumero jam apartenas al alia uzanto." + +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 +msgid "" +"A confirmation code was sent to the phone number you added. Check your phone " +"for the code and instructions on how to use it." +msgstr "" +"Konfirmkodo jam sendiĝas al la aldonita telefonnumero. Kontrolu vian " +"poŝtelefonon pri la kodo kaj gvido pri kiel uzi ĝin." + +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 +msgid "That is the wrong confirmation number." +msgstr "Tiu konfirma kodo estas malĝusta." + +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "SMM-a konfirmo nuliĝas." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 +msgid "That is not your phone number." +msgstr "Tio ne estas via telefonnumero." + +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "La SMM-numreo estas forigita." + #. TRANS: Label for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:511 msgid "Mobile carrier" -msgstr "" +msgstr "Poŝtelefona peranto" #. TRANS: Default option for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:516 msgid "Select a carrier" -msgstr "" +msgstr "Elektu peranton" #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. #. TRANS: %s is an administrative contact's e-mail address. @@ -4112,32 +4237,51 @@ msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" +"Poŝtelefona peranto de via telefono. Se vi konas peranton, kiu akceptas SMM " +"per retpoŝto sed ne listiĝas tie ĉi, sendu mesaĝon al ni sciigi, je %s." + +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 +msgid "No code entered" +msgstr "Neniu kodo entajpita" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 #: lib/adminpanelaction.php:395 msgid "Snapshots" -msgstr "" +msgstr "Momentfotoj" + +#: actions/snapshotadminpanel.php:65 +msgid "Manage snapshot configuration" +msgstr "Administri agordon pri momentfoto" + +#: actions/snapshotadminpanel.php:127 +msgid "Invalid snapshot run value." +msgstr "Momentfota ofteco nevalida." #: actions/snapshotadminpanel.php:133 msgid "Snapshot frequency must be a number." -msgstr "" +msgstr "Momentfota ofteco estu nombro." + +#: actions/snapshotadminpanel.php:144 +msgid "Invalid snapshot report URL." +msgstr "Momentfota alraporta URL nevalida." #: actions/snapshotadminpanel.php:200 msgid "Randomly during web hit" -msgstr "" +msgstr "Harzarde dum ret-alklako." #: actions/snapshotadminpanel.php:201 msgid "In a scheduled job" -msgstr "" +msgstr "Laŭplane" #: actions/snapshotadminpanel.php:206 msgid "Data snapshots" -msgstr "" +msgstr "Datumaj momentfotoj" #: actions/snapshotadminpanel.php:208 msgid "When to send statistical data to status.net servers" -msgstr "" +msgstr "Kiam sendu statistikan datumon al status.net serviloj" #: actions/snapshotadminpanel.php:217 msgid "Frequency" @@ -4145,70 +4289,102 @@ msgstr "Ofteco" #: actions/snapshotadminpanel.php:218 msgid "Snapshots will be sent once every N web hits" -msgstr "" +msgstr "Momentfotoj sendiĝos post po N alklakoj" #: actions/snapshotadminpanel.php:226 msgid "Report URL" -msgstr "" +msgstr "Alraporta URL" #: actions/snapshotadminpanel.php:227 msgid "Snapshots will be sent to this URL" -msgstr "" +msgstr "Momentfotoj sendiĝos al ĉi tiu URL" #: actions/snapshotadminpanel.php:248 msgid "Save snapshot settings" msgstr "Konservi retejan agordon" +#: actions/subedit.php:70 +msgid "You are not subscribed to that profile." +msgstr "Vi ne abonis tiun profilon." + +#. TRANS: Exception thrown when a subscription could not be stored on the server. +#: actions/subedit.php:83 classes/Subscription.php:136 +msgid "Could not save subscription." +msgstr "Malsukcesis konservi abonon." + #: actions/subscribe.php:77 msgid "This action only accepts POST requests." -msgstr "" +msgstr "La ago akceptas nur POST-an peton." + +#: actions/subscribe.php:107 +msgid "No such profile." +msgstr "Ne ekzistas tia profilo." #: actions/subscribe.php:117 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." -msgstr "" +msgstr "Vi ne povas aboni foran OMB 0.1-an profilon per ĉi tiu ago." #: actions/subscribe.php:145 msgid "Subscribed" msgstr "Abonita" +#: actions/subscribers.php:50 +#, php-format +msgid "%s subscribers" +msgstr "%s abonantoj" + +#: actions/subscribers.php:52 +#, php-format +msgid "%1$s subscribers, page %2$d" +msgstr "%1$s abonantoj, paĝo %2$d" + #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." -msgstr "" +msgstr "Jen homoj, kiuj rigardas viajn avizojn." #: actions/subscribers.php:67 #, php-format msgid "These are the people who listen to %s's notices." -msgstr "" +msgstr "Jen homoj, kiuj rigardas avizojn de %s." #: actions/subscribers.php:108 msgid "" "You have no subscribers. Try subscribing to people you know and they might " "return the favor" -msgstr "" +msgstr "Vi ne havas abonanton. Provu aboni konatojn, kaj ili eble reaboni vin" #: actions/subscribers.php:110 #, php-format msgid "%s has no subscribers. Want to be the first?" +msgstr "%s ne havas abonantojn. Ĉu vi volas esti la unua?" + +#: actions/subscribers.php:114 +#, php-format +msgid "" +"%s has no subscribers. Why not [register an account](%%%%action.register%%%" +"%) and be the first?" msgstr "" +"%s ne havas abonantojn. Kial ne [krei konton](%%%%*action.*Register%%%%) kaj " +"esti la unua?" #: actions/subscriptions.php:52 #, php-format msgid "%s subscriptions" -msgstr "" +msgstr "%s abonatoj" #: actions/subscriptions.php:54 #, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "" +msgstr "%1$s abonatoj, paĝo %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." -msgstr "" +msgstr "Jen homoj, kies avizoj rigardas vi." #: actions/subscriptions.php:69 #, php-format msgid "These are the people whose notices %s listens to." -msgstr "" +msgstr "Jen homoj, kies avizoj %s rigardas." #: actions/subscriptions.php:126 #, php-format @@ -4219,11 +4395,15 @@ msgid "" "featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " "automatically subscribe to people you already follow there." msgstr "" +"Vi ne nun abonas ies ajn avizoj. Provu aboni konatojn. Provu [homserĉi](%%" +"action.peoplesearch%%), kontrolu grupanojn en interesaj grupoj, kaj nian " +"[elstarajn uzantojn](%%action.featured%%). Se vi estas [Tvitanto](%%action." +"twittersettings%%), vi povas aŭtomate aboni homon, kiun vi jam sekvas tie." #: actions/subscriptions.php:128 actions/subscriptions.php:132 #, php-format msgid "%s is not listening to anyone." -msgstr "" +msgstr "%s ne abonas iun ajn." #: actions/subscriptions.php:208 msgid "Jabber" @@ -4233,34 +4413,87 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:69 +#, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Avizoj etikeditaj per %1$s - paĝo %2$d" + #: actions/tag.php:87 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "" +msgstr "Avizofluo pri etikedo %s (RSS 1.0)" #: actions/tag.php:93 #, php-format msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "" +msgstr "Avizofluo pri etikedo %s (RSS 2.0)" #: actions/tag.php:99 #, php-format msgid "Notice feed for tag %s (Atom)" -msgstr "" +msgstr "Avizofluo pri etikedo %s (Atom)" + +#: actions/tagother.php:65 +#, php-format +msgid "Tag %s" +msgstr "Etikedo %s" + +#: actions/tagother.php:77 lib/userprofile.php:76 +msgid "User profile" +msgstr "Uzanta profilo" #: actions/tagother.php:81 actions/userauthorization.php:132 #: lib/userprofile.php:103 msgid "Photo" msgstr "Foto" +#: actions/tagother.php:141 +msgid "Tag user" +msgstr "Etikedi uzanton" + +#: actions/tagother.php:151 +msgid "" +"Tags for this user (letters, numbers, -, ., and _), comma- or space- " +"separated" +msgstr "" +"Etikedoj por ĉi tiuj uzanto (literoj, ciferoj, -, . Kaj _), apartigu per " +"komo aŭ spaco." + #: actions/tagother.php:193 msgid "" "You can only tag people you are subscribed to or who are subscribed to you." -msgstr "" +msgstr "Vi rajtas entikedi nur abonanton aŭ abonaton." + +#: actions/tagother.php:200 +msgid "Could not save tags." +msgstr "Malsukcesis konservi etikedojn." + +#: actions/tagother.php:236 +msgid "Use this form to add tags to your subscribers or subscriptions." +msgstr "Uzu ĉi tiun formularon por etikedi viajn abonantojn aŭ abonatojn." + +#: actions/tagrss.php:35 +msgid "No such tag." +msgstr "Ne estas tiu etikedo." + +#: actions/unblock.php:59 +msgid "You haven't blocked that user." +msgstr "Vi ne jam blokis la uzanton." #: actions/unsilence.php:72 msgid "User is not silenced." +msgstr "Uzanto ne estas silentigita." + +#: actions/unsubscribe.php:98 +msgid "Unsubscribed" +msgstr "Malabonita" + +#: actions/updateprofile.php:64 actions/userauthorization.php:337 +#, php-format +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" +"Rigardato-flua permesilo \"%1$s\" ne konformas al reteja permesilo \"%2$s\"." #. TRANS: User admin panel title #: actions/useradminpanel.php:59 @@ -4268,9 +4501,13 @@ msgctxt "TITLE" msgid "User" msgstr "Uzanto" +#: actions/useradminpanel.php:70 +msgid "User settings for this StatusNet site." +msgstr "Uzantaj agordoj por ĉi tiu StatusNet-retejo." + #: actions/useradminpanel.php:149 msgid "Invalid bio limit. Must be numeric." -msgstr "" +msgstr "Nevalida biografia longlimo. Estu cifero." #: actions/useradminpanel.php:155 msgid "Invalid welcome text. Max length is 255 characters." @@ -4570,20 +4807,57 @@ msgstr "Dosiero tiel granda superos vian uzantan kvoton kun %d bajtoj." msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Dosiero tiel granda superos vian monatan kvoton kun %d bajtoj." +#. TRANS: Client exception thrown if a file upload does not have a valid name. +#: classes/File.php:248 classes/File.php:263 +msgid "Invalid filename." +msgstr "Nevalida dosiernomo." + #. TRANS: Exception thrown when joining a group fails. #: classes/Group_member.php:42 msgid "Group join failed." -msgstr "" +msgstr "Malsukcesis aniĝi al grupon." + +#. TRANS: Exception thrown when trying to leave a group the user is not a member of. +#: classes/Group_member.php:55 +msgid "Not part of group." +msgstr "Ne grupano." + +#. TRANS: Exception thrown when trying to leave a group fails. +#: classes/Group_member.php:63 +msgid "Group leave failed." +msgstr "Malsukcesis foriri de grupo." + +#. TRANS: Server exception thrown when updating a local group fails. +#: classes/Local_group.php:42 +msgid "Could not update local group." +msgstr "Malsukcesis ĝisdatigi lokan grupon." + +#. TRANS: Exception thrown when trying creating a login token failed. +#. TRANS: %s is the user nickname for which token creation failed. +#: classes/Login_token.php:78 +#, php-format +msgid "Could not create login token for %s" +msgstr "Malsukcesis krei ensalut-ĵetonon por %s" #. TRANS: Exception thrown when database name or Data Source Name could not be found. #: classes/Memcached_DataObject.php:533 msgid "No database name or DSN found anywhere." -msgstr "" +msgstr "Ne troviĝas datumbaza nomo aŭ DSN ie ajn." #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them. #: classes/Message.php:46 msgid "You are banned from sending direct messages." -msgstr "" +msgstr "Vi blokiĝis de sendi rektan mesaĝon." + +#. TRANS: Message given when a message could not be stored on the server. +#: classes/Message.php:63 +msgid "Could not insert message." +msgstr "Malsukcesis enmeti mesaĝon." + +#. TRANS: Message given when a message could not be updated on the server. +#: classes/Message.php:74 +msgid "Could not update message with new URI." +msgstr "Malsukcesis ĝisdatigi mesaĝon per nova URI" #. TRANS: Server exception thrown when a user profile for a notice cannot be found. #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number). @@ -4684,6 +4958,11 @@ msgstr "" msgid "Design your profile" msgstr "" +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 +msgid "Other options" +msgstr "Aliaj" + #. TRANS: Link description in user account settings menu. #: lib/accountsettingsaction.php:146 msgid "Other" @@ -4698,13 +4977,13 @@ msgstr "%1$s - %2$s" #. TRANS: Page title for a page without a title set. #: lib/action.php:164 msgid "Untitled page" -msgstr "" +msgstr "Sentitola paĝo" #. TRANS: Tooltip for main menu option "Personal" #: lib/action.php:455 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" -msgstr "" +msgstr "Tempstrio pri vi kaj amikoj" #. TRANS: Main menu option when logged in for access to personal profile and friends timeline #: lib/action.php:458 @@ -4712,6 +4991,12 @@ msgctxt "MENU" msgid "Personal" msgstr "Persona" +#. TRANS: Tooltip for main menu option "Account" +#: lib/action.php:460 +msgctxt "TOOLTIP" +msgid "Change your email, avatar, password, profile" +msgstr "Ŝanĝu la retpoŝtadreson, vizaĝbildon, pasvorton aŭ la profilon" + #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:465 msgctxt "TOOLTIP" @@ -4741,7 +5026,7 @@ msgstr "Administri" #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" -msgstr "Inviti amikojn kaj kolegojn aliĝi vin sur %s" +msgstr "Inviti amikojn kaj kolegojn al %s kun vi" #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users #: lib/action.php:481 @@ -4749,6 +5034,12 @@ msgctxt "MENU" msgid "Invite" msgstr "Inviti" +#. TRANS: Tooltip for main menu option "Logout" +#: lib/action.php:487 +msgctxt "TOOLTIP" +msgid "Logout from the site" +msgstr "Elsaluti el la retejo" + #. TRANS: Main menu option when logged in to log out the current user #: lib/action.php:490 msgctxt "MENU" @@ -4767,6 +5058,17 @@ msgctxt "MENU" msgid "Register" msgstr "Registriĝi" +#. TRANS: Tooltip for main menu option "Login" +#: lib/action.php:501 +msgctxt "TOOLTIP" +msgid "Login to the site" +msgstr "Ensaluti al la retejo" + +#: lib/action.php:504 +msgctxt "MENU" +msgid "Login" +msgstr "Ensaluti" + #. TRANS: Tooltip for main menu option "Help" #: lib/action.php:507 msgctxt "TOOLTIP" @@ -4782,7 +5084,12 @@ msgstr "Helpo" #: lib/action.php:513 msgctxt "TOOLTIP" msgid "Search for people or text" -msgstr "" +msgstr "Serĉi homon aŭ tekston" + +#: lib/action.php:516 +msgctxt "MENU" +msgid "Search" +msgstr "Serĉi" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration @@ -4793,7 +5100,7 @@ msgstr "" #. TRANS: DT element for local views block. String is hidden in default CSS. #: lib/action.php:605 msgid "Local views" -msgstr "" +msgstr "Loka vido" #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. #: lib/action.php:778 @@ -4818,7 +5125,7 @@ msgstr "Oftaj demandoj" #. TRANS: Secondary navigation menu option leading to Terms of Service. #: lib/action.php:795 msgid "TOS" -msgstr "" +msgstr "Serva Kondiĉo" #. TRANS: Secondary navigation menu option leading to privacy policy. #: lib/action.php:799 @@ -4899,6 +5206,11 @@ msgstr "" msgid "All %1$s content and data are available under the %2$s license." msgstr "" +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1243 +msgid "Pagination" +msgstr "Paĝado" + #. TRANS: Pagination message to go to a page displaying information more in the #. TRANS: present than the currently displayed information. #: lib/action.php:1254 @@ -4982,14 +5294,15 @@ msgstr "" msgid "No user for that token." msgstr "" -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." msgstr "" -#. TRANS: Exception thrown when an attempt is made to remove a revoked token. -#: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form input field instructions. @@ -5032,6 +5345,11 @@ msgstr "" msgid "Default access for this application: read-only, or read-write" msgstr "" +#. TRANS: Submit button title. +#: lib/applicationeditform.php:349 +msgid "Cancel" +msgstr "Nuligi" + #. TRANS: Application access type #: lib/applicationlist.php:135 msgid "read-write" @@ -5042,43 +5360,73 @@ msgstr "" msgid "read-only" msgstr "" -#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) -#: lib/applicationlist.php:143 -#, php-format -msgid "Approved %1$s - \"%2$s\" access." -msgstr "" +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 +msgid "Attachments" +msgstr "Aldonaĵo" + +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:265 +msgid "Author" +msgstr "Aŭtoro" + +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 +msgid "Provider" +msgstr "Donanto" #. TRANS: Title. #: lib/attachmentnoticesection.php:68 msgid "Notices where this attachment appears" -msgstr "" +msgstr "Avizo, kie ĉi tiu aldonaĵo aperos" + +#. TRANS: Title. +#: lib/attachmenttagcloudsection.php:49 +msgid "Tags for this attachment" +msgstr "Etikedoj por ĉi tiu aldonaĵo" + +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 +msgid "Password changing failed" +msgstr "La ŝanĝo de pasvorto maltrafis" + +#: lib/authenticationplugin.php:236 +msgid "Password changing is not allowed" +msgstr "Ne estas permesita ŝanĝi la pasvorton" #. TRANS: Title for the form to block a user. #: lib/blockform.php:70 msgid "Block" msgstr "Bloki" +#: lib/channel.php:157 lib/channel.php:177 +msgid "Command results" +msgstr "Komandaj rezultoj" + #: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" -msgstr "" +msgstr "Komando kompleta" + +#: lib/channel.php:240 +msgid "Command failed" +msgstr "Komando maltrafis" #. TRANS: Command exception text shown when a notice ID is requested that does not exist. #: lib/command.php:84 lib/command.php:108 msgid "Notice with that id does not exist." -msgstr "" +msgstr "Avizo kun tiu identigaĵo ne ekzistas." #. TRANS: Command exception text shown when a last user notice is requested and it does not exist. #. TRANS: Error text shown when a last user notice is requested and it does not exist. #: lib/command.php:101 lib/command.php:630 msgid "User has no last notice." -msgstr "" +msgstr "La uzanto ne havas lastan averton." #. TRANS: Message given requesting a profile for a non-existing user. #. TRANS: %s is the nickname of the user for which the profile could not be found. #: lib/command.php:130 #, php-format msgid "Could not find a user with nickname %s." -msgstr "" +msgstr "Ne povas trovi uzanton kun kromnomo %s." #. TRANS: Message given getting a non-existing user. #. TRANS: %s is the nickname of the user that could not be found. @@ -5090,19 +5438,19 @@ msgstr "" #. TRANS: Error text shown when an unimplemented command is given. #: lib/command.php:185 msgid "Sorry, this command is not yet implemented." -msgstr "" +msgstr "Pardonon, la komando ankoraŭ ne realiĝas." #. TRANS: Command exception text shown when a user tries to nudge themselves. #: lib/command.php:231 msgid "It does not make a lot of sense to nudge yourself!" -msgstr "" +msgstr "Iom sensencas puŝeti vin mem!" #. TRANS: Message given having nudged another user. #. TRANS: %s is the nickname of the user that was nudged. #: lib/command.php:240 #, php-format msgid "Nudge sent to %s." -msgstr "" +msgstr "Puŝeto sendiĝas al %s" #. TRANS: User statistics text. #. TRANS: %1$s is the number of other user the user is subscribed to. @@ -5116,19 +5464,50 @@ msgid "" "Notices: %3$s" msgstr "" +#. TRANS: Text shown when a notice has been marked as favourite successfully. +#: lib/command.php:314 +msgid "Notice marked as fave." +msgstr "Avizo ŝatiĝas." + #. TRANS: Message given having added a user to a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:360 #, php-format msgid "%1$s joined group %2$s." -msgstr "" +msgstr "%1$s aniĝis al grupo %2$s." #. TRANS: Message given having removed a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:408 #, php-format msgid "%1$s left group %2$s." -msgstr "" +msgstr "%1$s foriras de grupo %2$s." + +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:434 +#, php-format +msgid "Fullname: %s" +msgstr "Plennomo: %s" + +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:438 lib/mail.php:268 +#, php-format +msgid "Location: %s" +msgstr "Loko: %s" + +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:442 lib/mail.php:271 +#, php-format +msgid "Homepage: %s" +msgstr "Hejmpaĝo: %s" + +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:446 +#, php-format +msgid "About: %s" +msgstr "Biografio: %s" #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server). #: lib/command.php:474 @@ -5137,6 +5516,8 @@ msgid "" "%s is a remote profile; you can only send direct messages to users on the " "same server." msgstr "" +"%s estas fora profilo; vi povas sendi rektan mesaĝon nur al uzanto je sama " +"servilo." #. TRANS: Message given if content is too long. #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. @@ -5148,14 +5529,19 @@ msgstr "" #. TRANS: Error text shown sending a direct message fails with an unknown reason. #: lib/command.php:517 msgid "Error sending direct message." -msgstr "" +msgstr "Eraris sendi rektan mesaĝon." #. TRANS: Message given having repeated a notice from another user. #. TRANS: %s is the name of the user for which the notice was repeated. #: lib/command.php:554 #, php-format msgid "Notice from %s repeated." -msgstr "" +msgstr "Avizo de %s ripetiĝas." + +#. TRANS: Error text shown when repeating a notice fails with an unknown reason. +#: lib/command.php:557 +msgid "Error repeating notice." +msgstr "Eraris ripeti avizon." #. TRANS: Message given if content of a notice for a reply is too long. #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. @@ -5163,18 +5549,25 @@ msgstr "" #, php-format msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" +"Avizo tro longas - longlimo estas %1$d lietroj, kaj via mesaĝo longas je %2" +"$d." #. TRANS: Text shown having sent a reply to a notice successfully. #. TRANS: %s is the nickname of the user of the notice the reply was sent to. #: lib/command.php:603 #, php-format msgid "Reply to %s sent." -msgstr "" +msgstr "Respondo al %s sendiĝas." + +#. TRANS: Error text shown when a reply to a notice fails with an unknown reason. +#: lib/command.php:606 +msgid "Error saving notice." +msgstr "Eraris sendi avizon." #. TRANS: Error text shown when no username was provided when issuing a subscribe command. #: lib/command.php:655 msgid "Specify the name of the user to subscribe to." -msgstr "" +msgstr "Specifu nomon de la abonota uzanto." #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command. #: lib/command.php:664 @@ -5205,12 +5598,27 @@ msgstr "" #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented. #: lib/command.php:724 lib/command.php:750 msgid "Command not yet implemented." -msgstr "" +msgstr "Komando ankoraŭ ne realigita." + +#. TRANS: Text shown when issuing the command "off" successfully. +#: lib/command.php:728 +msgid "Notification off." +msgstr "Sciigo for." #. TRANS: Error text shown when the command "off" fails for an unknown reason. #: lib/command.php:731 msgid "Can't turn off notification." -msgstr "" +msgstr "Malsukcesis malŝalti sciigon." + +#. TRANS: Text shown when issuing the command "on" successfully. +#: lib/command.php:754 +msgid "Notification on." +msgstr "Sciigo en." + +#. TRANS: Error text shown when the command "on" fails for an unknown reason. +#: lib/command.php:757 +msgid "Can't turn on notification." +msgstr "Malsukcesis ŝalti sciigon." #. TRANS: Error text shown when issuing the login command while login is disabled. #: lib/command.php:771 @@ -5229,13 +5637,27 @@ msgstr "" #: lib/command.php:813 #, php-format msgid "Unsubscribed %s." -msgstr "" +msgstr "%s malaboniĝas." + +#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions. +#: lib/command.php:831 +msgid "You are not subscribed to anyone." +msgstr "Vi ne abonas iun ajn." + +#. TRANS: Text shown after requesting other users a user is subscribed to. +#. TRANS: This message supports plural forms. This message is followed by a +#. TRANS: hard coded space and a comma separated list of subscribed users. +#: lib/command.php:836 +msgid "You are subscribed to this person:" +msgid_plural "You are subscribed to these people:" +msgstr[0] "Vi abonas jenan homon:" +msgstr[1] "Vi abonas jenajn homojn:" #. TRANS: Text shown after requesting other users that are subscribed to a user #. TRANS: (followers) without having any subscribers. #: lib/command.php:858 msgid "No one is subscribed to you." -msgstr "" +msgstr "Neniu abonas vin." #. TRANS: Text shown after requesting other users that are subscribed to a user (followers). #. TRANS: This message supports plural forms. This message is followed by a @@ -5243,8 +5665,23 @@ msgstr "" #: lib/command.php:863 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "La homo abonas vin:" +msgstr[1] "La homoj abonas vin:" + +#. TRANS: Text shown after requesting groups a user is subscribed to without having +#. TRANS: any group subscriptions. +#: lib/command.php:885 +msgid "You are not a member of any groups." +msgstr "Vi ne estas grupano de iu ajn grupo." + +#. TRANS: Text shown after requesting groups a user is subscribed to. +#. TRANS: This message supports plural forms. This message is followed by a +#. TRANS: hard coded space and a comma separated list of subscribed groups. +#: lib/command.php:890 +msgid "You are a member of this group:" +msgid_plural "You are a member of these groups:" +msgstr[0] "Vi estas grupano de jena grupo:" +msgstr[1] "Vi estas grupano de jenaj grupoj:" #. TRANS: Help text for commands. #: lib/command.php:905 @@ -5288,6 +5725,44 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" +"Komandoj:\n" +"on - ŝalti sciigon\n" +"off - malŝalti sciigon\n" +"help - montri ĉi tiun helpon\n" +"follow - aboni uzanton\n" +"groups - listi grupon, kiujn vi aniĝis\n" +"subscriptions - listi viajn abonatojn\n" +"subscribers - listi viajn abonantojn\n" +"leave - malabnoi uzanton\n" +"d - sendi rektan mesaĝon al uzanto\n" +"get - legi la lastan avizon de uzanto\n" +"whois - legi profilan informon pri uzanto\n" +"lose - ĉesigi la uzanton de sekvi vin\n" +"fav - ŝati la lastan avizon de uzanto\n" +"fav # - ŝati la avizon kun la ID\n" +"repeat # - ripeti la avizon kun la ID\n" +"repeat - ripeti la lastan avizon de uzanto\n" +"reply # - respondi la avizon kun la ID\n" +"reply - respondi la lastan avizon de uzanto\n" +"join - aniĝi al grupo\n" +"login - havi ligilon por ensaluti al reta interfaco\n" +"drop - foriri de gruop\n" +"stats - legi vian staton\n" +"stop - same kiel 'off'\n" +"quit - same kiel 'off'\n" +"sub - same kiel 'follow'\n" +"unsub - same kiel 'leave'\n" +"last - same kiel 'get'\n" +"on - ankoraŭ ne realigita.\n" +"off - ankoraŭ ne realigita.\n" +"nudge - puŝeti la uzanton, ke li ĝisdatigu!\n" +"invite - ankoraŭ ne realigita.\n" +"track - ankoraŭ ne realigita.\n" +"untrack - ankoraŭ ne realigita.\n" +"track off - ankoraŭ ne realigita.\n" +"untrack all - ankoraŭ ne realigita.\n" +"tracks - ankoraŭ ne realigita.\n" +"tracking -ankoraŭ ne realigita.\n" #: lib/common.php:136 msgid "I looked for configuration files in the following places: " @@ -5303,51 +5778,89 @@ msgstr "" #: lib/connectsettingsaction.php:110 msgid "IM" -msgstr "" +msgstr "Tujmesaĝilo" #: lib/connectsettingsaction.php:111 msgid "Updates by instant messenger (IM)" -msgstr "" +msgstr "Ĝisdatiĝo per tujmesaĝilo." #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" -msgstr "" +msgstr "Ĝisdatiĝo per SMM" + +#: lib/connectsettingsaction.php:120 +msgid "Connections" +msgstr "Konektoj" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "Konektitaj aplikaĵoj rajtigitaj" #: lib/dberroraction.php:60 msgid "Database error" +msgstr "Datumbaza eraro" + +#: lib/designsettings.php:105 +msgid "Upload file" +msgstr "Alŝuti dosieron" + +#: lib/designsettings.php:109 +msgid "" +"You can upload your personal background image. The maximum file size is 2MB." msgstr "" +"Vi povas alŝuti vian propran fonbildon. La dosiera grandlimo estas 2MB." + +#: lib/designsettings.php:418 +msgid "Design defaults restored." +msgstr "Desegnaj defaŭltoj konserviĝas." + +#: lib/disfavorform.php:114 lib/disfavorform.php:140 +msgid "Disfavor this notice" +msgstr "Neŝati la avizon" + +#: lib/favorform.php:114 lib/favorform.php:140 +msgid "Favor this notice" +msgstr "Ŝati la avizon" #: lib/favorform.php:140 msgid "Favor" -msgstr "" +msgstr "Ŝati" #: lib/feed.php:85 msgid "RSS 1.0" -msgstr "" +msgstr "RSS 1.0" #: lib/feed.php:87 msgid "RSS 2.0" -msgstr "" +msgstr "RSS 2.0" #: lib/feed.php:89 msgid "Atom" -msgstr "" +msgstr "Atom" #: lib/feed.php:91 msgid "FOAF" -msgstr "" +msgstr "FOAF" #: lib/feedlist.php:64 msgid "Export data" -msgstr "" +msgstr "Elporti datumon" #: lib/galleryaction.php:121 msgid "Filter tags" -msgstr "" +msgstr "Filtrilo-etikedoj" + +#: lib/galleryaction.php:131 +msgid "All" +msgstr "Ĉiuj" #: lib/galleryaction.php:139 msgid "Select tag to filter" -msgstr "" +msgstr "Eletu etikedon por filtrado" + +#: lib/galleryaction.php:140 +msgid "Tag" +msgstr "Etikedo" #: lib/galleryaction.php:141 msgid "Choose a tag to narrow list" @@ -5362,14 +5875,86 @@ msgstr "Iri" msgid "Grant this user the \"%s\" role" msgstr "" +#: lib/groupeditform.php:163 +msgid "URL of the homepage or blog of the group or topic" +msgstr "URL de la hejmpaĝo aŭ blogo de la grupo aŭ temo" + #: lib/groupeditform.php:168 msgid "Describe the group or topic" +msgstr "Priskribo de grupo aŭ temo" + +#: lib/groupeditform.php:170 +#, php-format +msgid "Describe the group or topic in %d characters" +msgstr "Priskribo de grupo aŭ temo, apenaŭ je %d literoj" + +#: lib/groupeditform.php:179 +msgid "" +"Location for the group, if any, like \"City, State (or Region), Country\"" msgstr "" +"Loko de la grupo, se iu ajn, ekzemple \"Urbo, Stato (aŭ Regiono), Lando\"" #: lib/groupeditform.php:187 #, php-format msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +"Kromaj alnomoj por la grupo, apartigita per komo aŭ spaco, apenaŭ %d literoj" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "Grupo" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "Grupo %s" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "Grupanoj" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "Grupanoj de %s" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "Blokito" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "Blokito de %s" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "Redakti agordon de grupo %s" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "Emblemo" #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. @@ -5377,7 +5962,7 @@ msgstr "" #, php-format msgctxt "TOOLTIP" msgid "Add or edit %s logo" -msgstr "" +msgstr "Aldoni aŭ redakti emblemon de %s" #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. @@ -5385,21 +5970,25 @@ msgstr "" #, php-format msgctxt "TOOLTIP" msgid "Add or edit %s design" -msgstr "" +msgstr "Aldoni aŭ redakti desegnon de %s" + +#: lib/groupsbymemberssection.php:71 +msgid "Groups with most members" +msgstr "Grupoj kun plej multe da membroj" #: lib/groupsbypostssection.php:71 msgid "Groups with most posts" -msgstr "" +msgstr "Grupoj kun plej multe da avizoj" #: lib/grouptagcloudsection.php:56 #, php-format msgid "Tags in %s group's notices" -msgstr "" +msgstr "Etikedoj en avizoj de gruop %s" #. TRANS: Client exception 406 #: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" -msgstr "" +msgstr "La paĝo estas ne havebla je la komunikil-tipo, kiun vi akceptas" #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason. #: lib/imagefile.php:101 lib/mediafile.php:179 @@ -5412,38 +6001,46 @@ msgstr "" #: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" -msgstr "" +msgstr "Nekonata dosiertipo" #: lib/imagefile.php:244 msgid "MB" -msgstr "" +msgstr "MB" #: lib/imagefile.php:246 msgid "kB" -msgstr "" +msgstr "kB" #: lib/jabber.php:387 #, php-format msgid "[%s]" -msgstr "" +msgstr "[%s]" #: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." -msgstr "" +msgstr "Nekonata alvenkesta fonto %d" + +#: lib/joinform.php:114 +msgid "Join" +msgstr "Aniĝi" #: lib/leaveform.php:114 msgid "Leave" msgstr "Forlasi" +#: lib/logingroupnav.php:80 +msgid "Login with a username and password" +msgstr "Ensaluti per via uzantnomo kaj pasvorto." + #: lib/logingroupnav.php:86 msgid "Sign up for a new account" -msgstr "" +msgstr "Krei novan konton" #. TRANS: Subject for address confirmation email #: lib/mail.php:174 msgid "Email address confirmation" -msgstr "" +msgstr "Retpoŝtadresa konfirmo" #. TRANS: Body for address confirmation email. #: lib/mail.php:177 @@ -5463,12 +6060,20 @@ msgid "" "%s\n" msgstr "" +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 +#, php-format +msgid "%1$s is now listening to your notices on %2$s." +msgstr "%1$s nun rigardas viajn avizojn ĉe %2$s." + #: lib/mail.php:248 #, php-format msgid "" "If you believe this account is being used abusively, you can block them from " "your subscribers list and report as spam to site administrators at %s" msgstr "" +"Se vi kredas, ke ĉi tiun konton iu misuzas, vi rajtas bloki ĝin de via " +"abonanto-listo kaj raporti ĝin kiel rubmesaĝanto al administrantoj ĉe %s" #. TRANS: Main body of new-subscriber notification e-mail #: lib/mail.php:254 @@ -5486,6 +6091,18 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:274 +#, php-format +msgid "Bio: %s" +msgstr "Biografio: %s" + +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:304 +#, php-format +msgid "New email address for posting to %s" +msgstr "Nova retpoŝta adreso por afiŝi ĉe %s" + #. TRANS: Body of notification mail for new posting email address #: lib/mail.php:308 #, php-format @@ -5500,17 +6117,28 @@ msgid "" "%4$s" msgstr "" +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:433 +#, php-format +msgid "%s status" +msgstr "%s stato" + +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:460 +msgid "SMS confirmation" +msgstr "SMS-a konfirmo" + #. TRANS: Main body heading for SMS-by-email address confirmation message #: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" -msgstr "" +msgstr "%s: konfirmi ke vi havas la telefonnumeron per tiu ĉi kodo:" #. TRANS: Subject for 'nudge' notification email #: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" -msgstr "" +msgstr "Vin puŝetis %s" #. TRANS: Body for 'nudge' notification email #: lib/mail.php:489 @@ -5529,6 +6157,12 @@ msgid "" "%4$s\n" msgstr "" +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:536 +#, php-format +msgid "New private message from %s" +msgstr "Nova privata mesaĝo de %s" + #. TRANS: Body for direct-message notification email #: lib/mail.php:541 #, php-format @@ -5549,6 +6183,12 @@ msgid "" "%5$s\n" msgstr "" +#. TRANS: Subject for favorite notification email +#: lib/mail.php:589 +#, php-format +msgid "%s (@%s) added your notice as a favorite" +msgstr "%s (@%s) ŝatis vian avizon" + #. TRANS: Body for favorite notification email #: lib/mail.php:592 #, php-format @@ -5579,6 +6219,9 @@ msgid "" "\n" "\t%s" msgstr "" +"La tutan interparolon oni povas legi jene:\n" +"\n" +"%s" #: lib/mail.php:657 #, php-format @@ -5615,17 +6258,19 @@ msgstr "" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." -msgstr "" +msgstr "Nur uzanto povas legi sian propran paŝton." #: lib/mailbox.php:139 msgid "" "You have no private messages. You can send private message to engage other " "users in conversation. People can send you messages for your eyes only." msgstr "" +"Vi ne ricevis privatan mesaĝon. Vi povas sendi privatan mesaĝon al iu kaj " +"interparoli kun ili. Homo sendas al vi mesaĝon al vi sole." #: lib/mailbox.php:228 lib/noticelist.php:506 msgid "from" -msgstr "" +msgstr "de" #. TRANS: Client exception thrown when a database error was thrown during a file upload operation. #: lib/mediafile.php:99 lib/mediafile.php:125 @@ -5712,45 +6357,56 @@ msgstr "Sendi" #: lib/noticeform.php:174 #, php-format msgid "What's up, %s?" -msgstr "" +msgstr "Kio novas, %s?" #: lib/noticeform.php:193 msgid "Attach" -msgstr "" +msgstr "Aldoni" #: lib/noticeform.php:197 msgid "Attach a file" -msgstr "" +msgstr "Aldoni dosieron" #: lib/noticeform.php:213 msgid "Share my location" -msgstr "" +msgstr "Sciigi mian lokon" + +#: lib/noticeform.php:216 +msgid "Do not share my location" +msgstr "Ne sciigi mian lokon" #: lib/noticeform.php:217 msgid "" "Sorry, retrieving your geo location is taking longer than expected, please " "try again later" msgstr "" +"Pardonon, legi vian lokon estas pli malrapide, ol ni pensis. Bonvolu reprovi " +"poste." + +#. TRANS: Used in coordinates as abbreviation of north +#: lib/noticelist.php:436 +msgid "N" +msgstr "N" #. TRANS: Used in coordinates as abbreviation of south #: lib/noticelist.php:438 msgid "S" -msgstr "" +msgstr "S" #. TRANS: Used in coordinates as abbreviation of east #: lib/noticelist.php:440 msgid "E" -msgstr "" +msgstr "E" #. TRANS: Used in coordinates as abbreviation of west #: lib/noticelist.php:442 msgid "W" -msgstr "" +msgstr "W" #: lib/noticelist.php:444 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" #: lib/noticelist.php:453 msgid "at" @@ -5758,23 +6414,76 @@ msgstr "al" #: lib/noticelist.php:502 msgid "web" -msgstr "" +msgstr "reto" + +#: lib/noticelist.php:568 +msgid "in context" +msgstr "kuntekste" + +#: lib/noticelist.php:630 +msgid "Reply to this notice" +msgstr "Respondi ĉi tiun avizon" #: lib/noticelist.php:631 msgid "Reply" -msgstr "" +msgstr "Respondi" + +#: lib/noticelist.php:675 +msgid "Notice repeated" +msgstr "Avizo ripetiĝas" + +#: lib/nudgeform.php:116 +msgid "Nudge this user" +msgstr "Puŝeti la uzanton" + +#: lib/nudgeform.php:128 +msgid "Nudge" +msgstr "Puŝeti" #: lib/nudgeform.php:128 msgid "Send a nudge to this user" -msgstr "" +msgstr "Sendi puŝeton al la uzanto" + +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "Eraris enmeti novan profilon" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "Eraris enmeti novan vizaĝbildon." + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "Eraris enmeti foran profilon." + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "Refoja avizo." + +#: lib/oauthstore.php:491 +msgid "Couldn't insert new subscription." +msgstr "Eraris enmeti novan abonon." + +#: lib/personalgroupnav.php:99 +msgid "Personal" +msgstr "Persona" #: lib/personalgroupnav.php:104 msgid "Replies" -msgstr "" +msgstr "Respondoj" + +#: lib/personalgroupnav.php:114 +msgid "Favorites" +msgstr "Ŝatolisto" #: lib/personalgroupnav.php:125 msgid "Inbox" -msgstr "" +msgstr "Alvenkesto" + +#: lib/personalgroupnav.php:126 +msgid "Your incoming messages" +msgstr "Viaj alvenaj mesaĝoj" #: lib/personaltagcloudsection.php:56 #, php-format @@ -5821,26 +6530,39 @@ msgstr "" #. TRANS: Fieldset legend for the search form. #: lib/searchaction.php:121 msgid "Search site" -msgstr "" +msgstr "Serĉi ĉe retejo" #. TRANS: Used as a field label for the field where one or more keywords #. TRANS: for searching can be entered. #: lib/searchaction.php:129 msgid "Keyword(s)" -msgstr "" +msgstr "Serĉvorto(j)" + +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "Serĉi" #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" -msgstr "" +msgstr "Serĉa gvido" + +#: lib/searchgroupnav.php:80 +msgid "People" +msgstr "Homon" #: lib/searchgroupnav.php:81 msgid "Find people on this site" -msgstr "" +msgstr "Serĉi homon ĉe la retejo" #: lib/searchgroupnav.php:83 msgid "Find content of notices" -msgstr "" +msgstr "Serĉi enhavon ĉe la retejo" + +#: lib/searchgroupnav.php:85 +msgid "Find groups on this site" +msgstr "Serĉi grupon ĉe la retejo" #: lib/section.php:89 msgid "Untitled section" @@ -5854,15 +6576,33 @@ msgstr "Pli..." msgid "Silence" msgstr "Silento" +#: lib/silenceform.php:78 +msgid "Silence this user" +msgstr "Silentigi la uzanton" + #: lib/subgroupnav.php:83 #, php-format msgid "People %s subscribes to" -msgstr "" +msgstr "Abonatoj de %s" #: lib/subgroupnav.php:91 #, php-format msgid "People subscribed to %s" -msgstr "" +msgstr "Abonantoj de %s" + +#: lib/subgroupnav.php:99 +#, php-format +msgid "Groups %s is a member of" +msgstr "Grupoj de %s" + +#: lib/subgroupnav.php:105 +msgid "Invite" +msgstr "Inviti" + +#: lib/subgroupnav.php:106 +#, php-format +msgid "Invite friends and colleagues to join you on %s" +msgstr "Inviti amikojn kaj kolegojn al %s kun vi" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 @@ -5916,12 +6656,20 @@ msgstr "" #: lib/topposterssection.php:74 msgid "Top posters" -msgstr "" +msgstr "Pintaj afiŝantoj" #: lib/unsandboxform.php:69 msgid "Unsandbox" msgstr "" +#: lib/unsilenceform.php:67 +msgid "Unsilence" +msgstr "Nesilentigi" + +#: lib/unsilenceform.php:78 +msgid "Unsilence this user" +msgstr "Nesilentigi la uzanton" + #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 msgid "Unsubscribe from this user" msgstr "" @@ -5930,6 +6678,10 @@ msgstr "" msgid "Unsubscribe" msgstr "Malaboni" +#: lib/userprofile.php:117 +msgid "Edit Avatar" +msgstr "Redakti vizaĝbildon" + #: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Nekonata ago" @@ -5970,16 +6722,48 @@ msgstr "antaŭ kelkaj sekundoj" msgid "about a minute ago" msgstr "antaŭ ĉirkaŭ unu minuto" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "antaŭ ĉirkaŭ unu horo" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "antaŭ ĉirkaŭ unu tago" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #: lib/webcolor.php:123 #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 22692c8915..636ee89b33 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -16,17 +16,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:52+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:45+0000\n" "Language-Team: Spanish \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1902,10 +1902,28 @@ msgstr "Lista de los usuarios en este grupo." msgid "Admin" msgstr "Admin" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Convertir al usuario en administrador del grupo" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5533,14 +5551,25 @@ msgstr "" msgid "No application for that consumer key." msgstr "" +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "" + #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -6017,43 +6046,43 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" "comandos:\n" -"activar - activar notificaciones\n" -"desactivar - desactivar notificaciones\n" -"ayuda - mostrar esta ayuda\n" -"seguir - suscribirse al usuario\n" -"grupos - listar los grupos que sigues\n" -"suscripciones - listar las personas que sigues\n" -"suscriptores - listar los grupos que te siguen\n" -"abandonar - cancelar la suscripción al usuario\n" +"on - activar notificaciones\n" +"off - desactivar notificaciones\n" +"help - mostrar esta ayuda\n" +"follow - suscribirse al usuario\n" +"groups - listar los grupos que sigues\n" +"subscriptions - listar las personas que sigues\n" +"subscribers - listar los grupos que te siguen\n" +"leave - cancelar la suscripción al usuario\n" "d - dirigir mensaje al usuario\n" -"obtener - obtener último aviso del usuario\n" -"quienes - obtener información del perfil del usuario\n" -"bloquear - obligar al usuario a que deje de seguirte\n" +"get - obtener último aviso del usuario\n" +"whois - obtener información del perfil del usuario\n" +"lose - obligar al usuario a que deje de seguirte\n" "fav - añadir el último aviso del usario a tus favoritos\n" "fav # - añadir el aviso con el ID dado a tus favoritos\n" -"repetir # - repetir el aviso con el ID dado\n" -"repetir - repetir el último aviso del usuario\n" -"responder # - responder al aviso del ID dado\n" -"responder - responder al último aviso del usuario\n" -"unirse - unirse a un grupo\n" -"entrar - obtener un vínculo para iniciar sesión en la interfaz Web\n" -"abandonar - abandonar el grupo\n" -"estadísticas - obtener tus estadísticas\n" -"detener - igual que 'desactivar'\n" -"parar - igual que 'desactivar'\n" -"sus - igual que 'seguir'\n" -"desus - igual que 'abandonar'\n" -"último - igual que 'obtener'\n" -"activado - aún sin implementar.\n" -"desactivado - aún sin implementar.\n" -"toque - recordarle a un ausuario que actualice.\n" -"invitar - aún sin implementar.\n" -"rastrear - aún sin implementar.\n" -"no rastrear - aún sin implementar.\n" -"dejar de rastrear - aún sin implementar.\n" -"dejar de rastrear todos - aún sin implementar.\n" -"rastrear - aún sin implementar.\n" -"rastreando - aún sin implementar.\n" +"repeat # - repetir el aviso con el ID dado\n" +"repeat - repetir el último aviso del usuario\n" +"reply # - responder al aviso del ID dado\n" +"reply - responder al último aviso del usuario\n" +"join - unirse a un grupo\n" +"login - obtener un vínculo para iniciar sesión en la interfaz Web\n" +"drop - abandonar el grupo\n" +"stats - obtener tus estadísticas\n" +"stop - igual que 'desactivar'\n" +"quit - igual que 'desactivar'\n" +"sub - igual que 'seguir'\n" +"unsub - igual que 'abandonar'\n" +"last - igual que 'obtener'\n" +"on - aún sin implementar.\n" +"off - aún sin implementar.\n" +"nudge - recordarle a un ausuario que actualice.\n" +"invite - aún sin implementar.\n" +"track - aún sin implementar.\n" +"untrack - aún sin implementar.\n" +"track off - aún sin implementar.\n" +"untrack all - aún sin implementar.\n" +"tracks - aún sin implementar.\n" +"tracking - aún sin implementar.\n" #: lib/common.php:135 msgid "No configuration file found. " @@ -6197,6 +6226,78 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" "Nombres adicionales para el grupo, separados por comas o espacios. Máximo: %d" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Grupos con más miembros" @@ -6693,6 +6794,23 @@ msgstr "El archivo no se pudo mover al directorio de destino." msgid "Could not determine file's MIME type." msgstr "No se pudo determinar tipo MIME del archivo" +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Enviar un aviso directo" @@ -6808,6 +6926,23 @@ msgstr "Dar un toque a " msgid "Send a nudge to this user" msgstr "Dar un toque a este usuario" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "No se pudo insertar una nueva suscripción." @@ -6951,6 +7086,11 @@ msgstr "Buscar sitio" msgid "Keyword(s)" msgstr "Palabra(s) clave" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7161,21 +7301,53 @@ msgstr "hace unos segundos" msgid "about a minute ago" msgstr "hace un minuto" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "hace una hora" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "hace un día" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "hace un mes" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 6af53edae3..2a7c0dd579 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:54+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:48+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian \n" "MIME-Version: 1.0\n" @@ -23,9 +23,9 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1869,10 +1869,28 @@ msgstr "یک فهرست از کاربران در این گروه" msgid "Admin" msgstr "مدیر" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "کاربر یک مدیر گروه شود" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5376,14 +5394,25 @@ msgstr "" msgid "No application for that consumer key." msgstr "" +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "" + #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -6021,6 +6050,78 @@ msgstr "مکان گروه، در صورت وجود داشتن، مانند «ش msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "نام‌های مستعار اضافی برای گروه، با کاما- یا فاصله- جدا شود، بیشینه %d" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "گروه های با اعضاء بیشتر" @@ -6504,6 +6605,23 @@ msgstr "فایل نتوانست به دایرکتوری مقصد منتقل شو msgid "Could not determine file's MIME type." msgstr "نمی‌توان فرمت پرونده را تعیین کرد." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "فرستادن یک پیام مستقیم" @@ -6614,6 +6732,23 @@ msgstr "یادآوری‌کردن" msgid "Send a nudge to this user" msgstr "یک یادآوری به این کاربر فرستاده شود" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "نمی‌توان اشتراک تازه‌ای افزود." @@ -6745,6 +6880,11 @@ msgstr "جست‌وجوی وب‌گاه" msgid "Keyword(s)" msgstr "کلمه(های) کلیدی" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -6931,21 +7071,49 @@ msgstr "چند ثانیه پیش" msgid "about a minute ago" msgstr "حدود یک دقیقه پیش" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "حدود یک ساعت پیش" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "حدود یک روز پیش" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "حدود یک ماه پیش" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index fd00b99d7d..f29b082d08 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -14,17 +14,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:53+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:46+0000\n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 @@ -1492,10 +1492,28 @@ msgstr "Lista ryhmän käyttäjistä." msgid "Admin" msgstr "Ylläpito" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Tee tästä käyttäjästä ylläpitäjä" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -4145,14 +4163,15 @@ msgstr "" msgid "No user for that token." msgstr "" -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." msgstr "" -#. TRANS: Exception thrown when an attempt is made to remove a revoked token. -#: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -4573,6 +4592,78 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Ryhmät, joissa eniten jäseniä" @@ -5056,6 +5147,23 @@ msgstr "Tönäise" msgid "Send a nudge to this user" msgstr "Lähetä tönäisy tälle käyttäjälle" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Ei voitu lisätä uutta tilausta." @@ -5160,6 +5268,11 @@ msgstr "" msgid "Keyword(s)" msgstr "" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #: lib/searchgroupnav.php:80 msgid "People" msgstr "Henkilö" @@ -5321,21 +5434,53 @@ msgstr "muutama sekunti sitten" msgid "about a minute ago" msgstr "noin minuutti sitten" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "noin tunti sitten" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "noin päivä sitten" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "noin kuukausi sitten" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 3d33750341..121eba4be8 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -19,17 +19,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:55+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:49+0000\n" "Language-Team: French \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1911,10 +1911,28 @@ msgstr "Liste des utilisateurs inscrits à ce groupe." msgid "Admin" msgstr "Administrer" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Faire de cet utilisateur un administrateur du groupe" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5572,14 +5590,25 @@ msgstr "" msgid "No application for that consumer key." msgstr "" +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "" + #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -6244,6 +6273,78 @@ msgstr "" "Pseudos supplémentaires pour le groupe, séparés par des virgules ou des " "espaces, %d au maximum" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Groupes avec le plus de membres" @@ -6740,6 +6841,23 @@ msgstr "Le fichier n’a pas pu être déplacé dans le dossier de destination." msgid "Could not determine file's MIME type." msgstr "Impossible de déterminer le type MIME du fichier." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Envoyer un message direct" @@ -6855,6 +6973,23 @@ msgstr "Clin d’œil" msgid "Send a nudge to this user" msgstr "Envoyer un clin d’œil à cet utilisateur" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Impossible d’insérer un nouvel abonnement." @@ -6998,6 +7133,11 @@ msgstr "Rechercher sur le site" msgid "Keyword(s)" msgstr "Mot(s) clef(s)" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7211,21 +7351,53 @@ msgstr "il y a quelques secondes" msgid "about a minute ago" msgstr "il y a 1 minute" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "il y a 1 heure" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "il y a 1 jour" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "il y a 1 mois" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index e69fe18318..38e2ba1e53 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -9,18 +9,18 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:56+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:50+0000\n" "Language-Team: Irish \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=5; plural=(n == 1) ? 0 : ( (n == 2) ? 1 : ( (n < 7) ? " "2 : ( (n < 11) ? 3 : 4 ) ) );\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page notice #: actions/accessadminpanel.php:67 @@ -1206,6 +1206,12 @@ msgstr "" msgid "Admin" msgstr "" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "" @@ -3687,14 +3693,15 @@ msgstr "" msgid "No user for that token." msgstr "" -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." msgstr "" -#. TRANS: Exception thrown when an attempt is made to remove a revoked token. -#: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -4105,6 +4112,42 @@ msgctxt "MENU" msgid "Group" msgstr "" +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. #: lib/groupnav.php:120 @@ -4113,6 +4156,12 @@ msgctxt "TOOLTIP" msgid "Edit %s group properties" msgstr "" +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. #: lib/groupnav.php:129 @@ -4554,6 +4603,23 @@ msgstr "" msgid "Reply" msgstr "Respostas" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Non se puido inserir a nova subscrición." @@ -4646,6 +4712,11 @@ msgstr "" msgid "Keyword(s)" msgstr "" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #: lib/searchgroupnav.php:80 msgid "People" msgstr "Xente" @@ -4773,21 +4844,65 @@ msgstr "fai uns segundos" msgid "about a minute ago" msgstr "fai un minuto" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "fai unha hora" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "fai un día" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "fai un mes" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po index 44a206e654..eb445fcf8b 100644 --- a/locale/gl/LC_MESSAGES/statusnet.po +++ b/locale/gl/LC_MESSAGES/statusnet.po @@ -10,17 +10,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:58+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:51+0000\n" "Language-Team: Galician \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: gl\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1899,10 +1899,28 @@ msgstr "Unha lista dos usuarios pertencentes a este grupo." msgid "Admin" msgstr "Administrador" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Converter ao usuario en administrador do grupo" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5538,14 +5556,25 @@ msgstr "" msgid "No application for that consumer key." msgstr "" +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "" + #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -6203,6 +6232,78 @@ msgstr "" "Alcumes adicionais para o grupo, separados por comas ou espazos, %d como " "máximo" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Grupos con máis membros" @@ -6695,6 +6796,23 @@ msgstr "Non se puido mover o ficheiro ao directorio de destino." msgid "Could not determine file's MIME type." msgstr "Non se puido determinar o tipo MIME do ficheiro." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Enviar unha nota directa" @@ -6810,6 +6928,23 @@ msgstr "Facer un aceno" msgid "Send a nudge to this user" msgstr "Facerlle un aceno a este usuario" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Non se puido inserir unha subscrición nova." @@ -6953,6 +7088,11 @@ msgstr "Buscar no sitio" msgid "Keyword(s)" msgstr "Termos de busca" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7164,21 +7304,53 @@ msgstr "hai uns segundos" msgid "about a minute ago" msgstr "hai como un minuto" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "hai como unha hora" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "hai como un día" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "hai como un mes" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 3b4dcb6be4..6085f6146e 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -8,17 +8,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:53:59+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:53+0000\n" "Language-Team: Hebrew \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page notice #: actions/accessadminpanel.php:67 @@ -1076,6 +1076,12 @@ msgstr "" msgid "Admin" msgstr "" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "" @@ -3414,14 +3420,20 @@ msgstr "" msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Exception thrown when an attempt is made to remove a revoked token. #: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +msgid "Failed to delete revoked token." msgstr "" #. TRANS: Form legend. @@ -3850,6 +3862,48 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. #: lib/groupnav.php:120 @@ -3858,6 +3912,12 @@ msgctxt "TOOLTIP" msgid "Edit %s group properties" msgstr "" +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. #: lib/groupnav.php:129 @@ -4259,6 +4319,23 @@ msgstr "" msgid "Send a nudge to this user" msgstr "" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "הכנסת מנוי חדש נכשלה." @@ -4356,6 +4433,11 @@ msgstr "" msgid "Keyword(s)" msgstr "" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #: lib/searchgroupnav.php:80 msgid "People" msgstr "אנשים" @@ -4496,21 +4578,53 @@ msgstr "לפני מספר שניות" msgid "about a minute ago" msgstr "לפני כדקה" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "לפני כשעה" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "לפני כיום" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "לפני כחודש" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index c1735aad17..db9e8891d9 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -11,18 +11,18 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:00+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:56+0000\n" "Language-Team: Upper Sorbian \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || " "n%100==4) ? 2 : 3)\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1750,10 +1750,28 @@ msgstr "Lisćina wužiwarjow w tutej skupinje." msgid "Admin" msgstr "Administrator" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Wužiwarja k administratorej skupiny činić" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -4710,9 +4728,15 @@ msgstr "" msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -5294,6 +5318,62 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. #: lib/groupnav.php:129 @@ -5686,6 +5766,23 @@ msgstr "Dataja njeda so do ciloweho zapisa přesunyć." msgid "Could not determine file's MIME type." msgstr "MIME-typ dataje njeda so zwěsćić." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Direktnu zdźělenku pósłać" @@ -5791,6 +5888,23 @@ msgstr "Zdźělenka wospjetowana" msgid "Nudge" msgstr "" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Nowy abonement njeda so zasunyć." @@ -5917,6 +6031,11 @@ msgstr "Pytanske sydło" msgid "Keyword(s)" msgstr "Klučowe hesła" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -6101,21 +6220,61 @@ msgstr "před něšto sekundami" msgid "about a minute ago" msgstr "před něhdźe jednej mjeńšinu" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "před něhdźe jednej hodźinu" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "před něhdźe jednym dnjom" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "před něhdźe jednym měsacom" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index a8e55d6856..c02685c9c9 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -9,17 +9,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:01+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:57+0000\n" "Language-Team: Interlingua \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1892,10 +1892,28 @@ msgstr "Un lista de usatores in iste gruppo." msgid "Admin" msgstr "Administrator" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "Blocar" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Facer le usator administrator del gruppo" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "Facer admin" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "Facer iste usator un administrator" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5507,17 +5525,23 @@ msgstr "" #. TRANS: OAuth exception thrown when no application is found for a given consumer key. #: lib/apiauth.php:175 msgid "No application for that consumer key." -msgstr "" +msgstr "Nulle application pro iste clave de consumitor." + +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "Mal indicio de accesso." #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." -msgstr "" +msgstr "Nulle usator pro iste indicio." -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" -msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "Non poteva authenticar te." #. TRANS: Form legend. #: lib/applicationeditform.php:129 @@ -6172,6 +6196,78 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" "Pseudonymos additional pro le gruppo, separate per commas o spatios, max %d" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "Gruppo" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "Gruppo %s" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "Membros" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "Membros del gruppo %s" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "Blocate" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "%s usatores blocate" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "Modificar proprietates del gruppo %s" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "Logotypo" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "Adder o modificar logotypo de %s" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "Adder o modificar apparentia de %s" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Gruppos con le plus membros" @@ -6664,6 +6760,25 @@ msgstr "File non poteva esser displaciate in le directorio de destination." msgid "Could not determine file's MIME type." msgstr "Non poteva determinar le typo MIME del file." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" +"\"%1$s\" non es un typo de file supportate in iste servitor. Tenta usar un " +"altere formato de %2$s." + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "\"%s\" non es un typo de file supportate in iste servitor." + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Inviar un nota directe" @@ -6779,6 +6894,23 @@ msgstr "Pulsar" msgid "Send a nudge to this user" msgstr "Inviar un pulsata a iste usator" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "Error durante le insertion del nove profilo." + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "Error durante le insertion del avatar." + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "Error durante le insertion del profilo remote." + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "Nota duplicate." + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Non poteva inserer nove subscription." @@ -6922,6 +7054,11 @@ msgstr "Cercar in sito" msgid "Keyword(s)" msgstr "Parola(s)-clave" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "Cercar" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7135,21 +7272,53 @@ msgstr "alcun secundas retro" msgid "about a minute ago" msgstr "circa un minuta retro" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "un minuta" +msgstr[1] "%d minutas" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "circa un hora retro" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "un hora" +msgstr[1] "%d horas" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "circa un die retro" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "un die" +msgstr[1] "%d dies" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "circa un mense retro" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "un mense" +msgstr[1] "%d menses" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 177c00e08a..2a4cbc4ebd 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -9,17 +9,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:02+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:15:59+0000\n" "Language-Team: Icelandic \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 @@ -1263,10 +1263,22 @@ msgstr "Listi yfir notendur í þessum hóp." msgid "Admin" msgstr "Stjórnandi" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + #. TRANS: Submit button title. #: actions/groupmembers.php:537 msgctxt "TOOLTIP" @@ -3890,14 +3902,20 @@ msgstr "" msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Exception thrown when an attempt is made to remove a revoked token. #: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +msgid "Failed to delete revoked token." msgstr "" #. TRANS: Form legend. @@ -4343,6 +4361,78 @@ msgstr "Staðsetning hópsins, ef einhver, eins og \"Borg, landshluti, land\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Hóparnir með flestu meðlimina" @@ -4811,6 +4901,23 @@ msgstr "Pot" msgid "Send a nudge to this user" msgstr "Ýta við þessum notanda" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Gat ekki sett inn nýja áskrift." @@ -4920,6 +5027,11 @@ msgstr "" msgid "Keyword(s)" msgstr "" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #: lib/searchgroupnav.php:80 msgid "People" msgstr "Fólk" @@ -5086,21 +5198,53 @@ msgstr "fyrir nokkrum sekúndum" msgid "about a minute ago" msgstr "fyrir um einni mínútu síðan" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "fyrir um einum klukkutíma síðan" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "fyrir um einum degi síðan" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "fyrir um einum mánuði síðan" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 35f4b1c1f2..3d0cdb6656 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -11,17 +11,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:04+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:00+0000\n" "Language-Team: Italian \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1884,10 +1884,28 @@ msgstr "Un elenco degli utenti in questo gruppo." msgid "Admin" msgstr "Amministra" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Rende l'utente amministratore del gruppo" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5452,14 +5470,25 @@ msgstr "" msgid "No application for that consumer key." msgstr "" +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "" + #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -6115,6 +6144,78 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" "Soprannomi aggiuntivi per il gruppo, separati da virgole o spazi, max %d" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "I gruppi più numerosi" @@ -6609,6 +6710,23 @@ msgstr "Impossibile spostare il file nella directory di destinazione." msgid "Could not determine file's MIME type." msgstr "Impossibile determinare il tipo MIME del file." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Invia un messaggio diretto" @@ -6724,6 +6842,23 @@ msgstr "Richiama" msgid "Send a nudge to this user" msgstr "Invia un richiamo a questo utente" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Impossibile inserire un nuovo abbonamento." @@ -6867,6 +7002,11 @@ msgstr "Cerca nel sito" msgid "Keyword(s)" msgstr "Parole" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7076,21 +7216,53 @@ msgstr "pochi secondi fa" msgid "about a minute ago" msgstr "circa un minuto fa" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "circa un'ora fa" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "circa un giorno fa" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "circa un mese fa" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index e555c52d87..43311a1b0a 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -12,17 +12,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:05+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:01+0000\n" "Language-Team: Japanese \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1750,10 +1750,28 @@ msgstr "このグループのユーザのリスト。" msgid "Admin" msgstr "管理者" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "ユーザをグループの管理者にする" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5047,14 +5065,25 @@ msgstr "" msgid "No application for that consumer key." msgstr "" +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "" + #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -5588,6 +5617,78 @@ msgstr "グループの場所, 例えば \"都市, 都道府県 (または 地 msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "グループのエクストラニックネーム、カンマまたはスペース区切り、最大 %d" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "メンバー数が多いグループ" @@ -5899,6 +6000,23 @@ msgstr "ファイルを目的ディレクトリに動かすことができませ msgid "Could not determine file's MIME type." msgstr "ファイルのMIMEタイプを決定できません。" +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "直接つぶやきを送る" @@ -5989,6 +6107,23 @@ msgstr "合図" msgid "Send a nudge to this user" msgstr "このユーザへ合図を送る" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "サブスクリプションを追加できません" @@ -6127,6 +6262,11 @@ msgstr "サイト検索" msgid "Keyword(s)" msgstr "キーワード" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -6308,21 +6448,49 @@ msgstr "数秒前" msgid "about a minute ago" msgstr "約 1 分前" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "約 1 時間前" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "約 1 日前" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "約 1 ヵ月前" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po index 36eecb2760..7d7e6b53bf 100644 --- a/locale/ka/LC_MESSAGES/statusnet.po +++ b/locale/ka/LC_MESSAGES/statusnet.po @@ -9,17 +9,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:06+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:03+0000\n" "Language-Team: Georgian \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ka\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1871,10 +1871,28 @@ msgstr "ამ ჯგუფის წევრების სია." msgid "Admin" msgstr "ადმინი" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "მიანიჭე მომხმარებელს ჯგუფის ადმინობა" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5463,9 +5481,15 @@ msgstr "" msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -6084,6 +6108,78 @@ msgstr "" "ჯგუფის დამატებითი მეტსახელები. გამოყავით მძიმით ან სივრცით. მაქსიმუმ %d " "სიმბოლო" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "ჯგუფები უმეტესი მომხმარებლებით" @@ -6557,6 +6653,23 @@ msgstr "ფაილის გადატანა დანიშნულე msgid "Could not determine file's MIME type." msgstr "ფაილის MIME ტიპი ვერ დადგინდა." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "გააგზავნე პირდაპირი შეტყობინება" @@ -6672,6 +6785,23 @@ msgstr "" msgid "Send a nudge to this user" msgstr "" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "ახალი გამოწერის ჩასმა ვერ მოხერხდა." @@ -6815,6 +6945,11 @@ msgstr "ძიება საიტზე" msgid "Keyword(s)" msgstr "საკვანძო სიტყვები" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7023,21 +7158,49 @@ msgstr "რამდენიმე წამის წინ" msgid "about a minute ago" msgstr "დაახლოებით 1 წუთის წინ" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "დაახლოებით 1 საათის წინ" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "დაახლოებით 1 დღის წინ" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "დაახლოებით 1 თვის წინ" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 46c1fb4694..d9ca82db61 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -11,17 +11,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:08+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:04+0000\n" "Language-Team: Korean \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1720,6 +1720,24 @@ msgstr "이 그룹의 회원리스트" msgid "Admin" msgstr "관리자" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -4661,14 +4679,15 @@ msgstr "" msgid "No user for that token." msgstr "" -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." msgstr "" -#. TRANS: Exception thrown when an attempt is made to remove a revoked token. -#: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form guide. @@ -5130,6 +5149,78 @@ msgstr "그룹의 위치, \"시/군/구, 도, 국가\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "가장 많은 회원수를 가진 그룹들" @@ -5602,6 +5693,23 @@ msgstr "찔러 보기" msgid "Send a nudge to this user" msgstr "이 사용자에게 찔러 보기 메시지 보내기" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "예약 구독을 추가 할 수 없습니다." @@ -5724,6 +5832,11 @@ msgstr "검색 도움말" msgid "Keyword(s)" msgstr "" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -5911,21 +6024,49 @@ msgstr "몇 초 전" msgid "about a minute ago" msgstr "1분 전" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "1시간 전" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "하루 전" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "1달 전" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 45afa2b711..90659a05cd 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -10,17 +10,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:10+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:05+0000\n" "Language-Team: Macedonian \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1898,10 +1898,28 @@ msgstr "Список на корисниците на оваа група." msgid "Admin" msgstr "Администратор" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "Блокирај" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Направи го корисникот администратор на групата" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "Назначи за администратор" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "Назначи го корисников за администратор" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5525,17 +5543,23 @@ msgstr "" #. TRANS: OAuth exception thrown when no application is found for a given consumer key. #: lib/apiauth.php:175 msgid "No application for that consumer key." -msgstr "" +msgstr "Нема програм за тој потрошувачки клуч." + +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "Лош пристапен жетон." #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." -msgstr "" +msgstr "Нема корисник за тој жетон." -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" -msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "Не можевме да ве потврдиме." #. TRANS: Form legend. #: lib/applicationeditform.php:129 @@ -6189,6 +6213,78 @@ msgstr "" "Дополнителни прекари за групата, одделени со запирка или празно место, " "највеќе до %d" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "Група" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "Група „%s“" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "Членови" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "Членови на групата „%s“" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "Блокирани" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "Блокирани корисници од групата „%s“" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "Уредување на својства на групата „%s“" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "Лого" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "Додавање или уредување на лого на групата „%s “" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "Додавање или уредување на изгледот на групата „%s“" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Групи со највеќе членови" @@ -6681,6 +6777,25 @@ msgstr "Податотеката не може да се премести во msgid "Could not determine file's MIME type." msgstr "Не можев да го утврдам mime-типот на податотеката." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" +"„%1$s“ не е поддржан податотечен тип на овој опслужувач. Обидете се со друг %" +"2$s-формат." + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "„%s„ не е поддржан податотечен тип на овој опслужувач." + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Испрати директна забелешка" @@ -6796,6 +6911,23 @@ msgstr "Подбуцни" msgid "Send a nudge to this user" msgstr "Испрати подбуцнување на корисников" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "Грешка при вметнувањето на новиот профил." + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "Грешка при вметнувањето на аватарот." + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "Грешка при вметнувањето на далечинскиот профил." + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "Дуплирана забелешка." + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Не може да се внесе нова претплата." @@ -6939,6 +7071,11 @@ msgstr "Пребарај по мрежното место" msgid "Keyword(s)" msgstr "Клучен збор" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "Пребарај" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7148,21 +7285,53 @@ msgstr "пред неколку секунди" msgid "about a minute ago" msgstr "пред една минута" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "пред околу една минута" +msgstr[1] "пред околу %d минути" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "пред еден час" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "пред околу еден час" +msgstr[1] "пред околу %d часа" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "пред еден ден" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "пред околу еден ден" +msgstr[1] "пред околу %d дена" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "пред еден месец" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "пред околу еден месец" +msgstr[1] "пред околу %d месеци" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index e74afe48fa..1b82d47547 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -10,17 +10,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:11+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:07+0000\n" "Language-Team: Norwegian (bokmål)‬ \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1828,10 +1828,28 @@ msgstr "En liste over brukerne i denne gruppen." msgid "Admin" msgstr "Administrator" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Gjør brukeren til en administrator for gruppen" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5179,14 +5197,15 @@ msgstr "" msgid "No user for that token." msgstr "" -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." msgstr "" -#. TRANS: Exception thrown when an attempt is made to remove a revoked token. -#: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -5681,6 +5700,78 @@ msgstr "Beskriv programmet ditt med %d tegn" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Grupper med flest medlemmer" @@ -6153,6 +6244,23 @@ msgstr "Filen kunne ikke flyttes til målmappen." msgid "Could not determine file's MIME type." msgstr "Kunne ikke avgjøre filens MIME-type." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Send en direktenotis" @@ -6264,6 +6372,23 @@ msgstr "Knuff" msgid "Send a nudge to this user" msgstr "Send et knuff til denne brukeren" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/personalgroupnav.php:99 msgid "Personal" msgstr "Personlig" @@ -6373,6 +6498,11 @@ msgstr "Søk nettsted" msgid "Keyword(s)" msgstr "Nøkkelord" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -6529,21 +6659,53 @@ msgstr "noen få sekunder siden" msgid "about a minute ago" msgstr "omtrent ett minutt siden" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "omtrent én time siden" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "omtrent én dag siden" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "omtrent én måned siden" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index d34cc5e1db..e3ed459de3 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -12,17 +12,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:13+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:09+0000\n" "Language-Team: Dutch \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1915,10 +1915,28 @@ msgstr "Ledenlijst van deze groep" msgid "Admin" msgstr "Beheerder" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "Blokkeren" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Deze gebruiker groepsbeheerder maken" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "Beheerder maken" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "Deze gebruiker beheerder maken" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5574,17 +5592,23 @@ msgstr "" #. TRANS: OAuth exception thrown when no application is found for a given consumer key. #: lib/apiauth.php:175 msgid "No application for that consumer key." -msgstr "" +msgstr "Er is geen applicatie voor die gebruikerssleutel." + +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "Ongeldig toegangstoken." #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." -msgstr "" +msgstr "Er is geen gebruiker voor dat token." -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" -msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "U kon niet geauthenticeerd worden." #. TRANS: Form legend. #: lib/applicationeditform.php:129 @@ -6246,6 +6270,78 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" "Extra namen voor de groep, gescheiden door komma's of spaties. Maximaal %d." +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "Groep" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "Groep %s" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "Leden" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "Leden van de group %s" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "Geblokkeerd" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "Geblokkeerde gebruikers in %s" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "Eigenschappen van de groep %s bewerken" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "Logo" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "Logo voor de groep %s toevoegen of bewerken" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "Vormgeving van de groep %s toevoegen of aanpassen" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Groepen met de meeste leden" @@ -6742,6 +6838,25 @@ msgstr "Het bestand kon niet verplaatst worden naar de doelmap." msgid "Could not determine file's MIME type." msgstr "Het was niet mogelijk het MIME-type van het bestand te bepalen." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" +"\"%1$s\" is geen ondersteund bestandstype op deze server. Probeer een andere " +"bestandstype van de applicatie \"%2$s\" te gebruiken." + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "\"%s\" is geen ondersteund bestandstype op deze server." + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Directe mededeling verzenden" @@ -6857,6 +6972,23 @@ msgstr "Porren" msgid "Send a nudge to this user" msgstr "Deze gebruiker porren" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "Fout tijdens het invoegen van een nieuw profiel." + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "Fout bij het invoegen van de avatar." + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "Fout bij het invoegen van het profiel van een andere server." + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "Dubbele mededeling." + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Kon nieuw abonnement niet toevoegen." @@ -7000,6 +7132,11 @@ msgstr "Site doorzoeken" msgid "Keyword(s)" msgstr "Term(en)" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "Zoeken" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7215,21 +7352,53 @@ msgstr "een paar seconden geleden" msgid "about a minute ago" msgstr "ongeveer een minuut geleden" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "ongeveer een minuut geleden" +msgstr[1] "ongeveer %d minuten geleden" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "ongeveer een uur geleden" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "ongeveer een uur geleden" +msgstr[1] "ongeveer %d uur geleden" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "ongeveer een dag geleden" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "ongeveer een dag geleden" +msgstr[1] "ongeveer %d dagen geleden" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "ongeveer een maand geleden" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "ongeveer een maand geleden" +msgstr[1] "ongeveer %d maanden geleden" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 743b222c72..e8c54c3837 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -10,17 +10,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:12+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:08+0000\n" "Language-Team: Norwegian Nynorsk \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 @@ -1253,6 +1253,24 @@ msgstr "Ei liste over brukarane i denne gruppa." msgid "Admin" msgstr "Administrator" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -3832,14 +3850,15 @@ msgstr "" msgid "No user for that token." msgstr "" -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." msgstr "" -#. TRANS: Exception thrown when an attempt is made to remove a revoked token. -#: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -4299,6 +4318,78 @@ msgstr "Kvar er du, t.d. «Stavanger, Rogaland, Noreg»" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Grupper med flest medlemmar" @@ -4756,6 +4847,23 @@ msgstr "Dult" msgid "Send a nudge to this user" msgstr "Send eit dult til denne brukaren" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Kan ikkje leggja til ny tinging." @@ -4860,6 +4968,11 @@ msgstr "" msgid "Keyword(s)" msgstr "" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #: lib/searchgroupnav.php:80 msgid "People" msgstr "Folk" @@ -5021,21 +5134,53 @@ msgstr "eit par sekund sidan" msgid "about a minute ago" msgstr "omtrent eitt minutt sidan" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "omtrent ein time sidan" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "omtrent ein dag sidan" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "omtrent ein månad sidan" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 884844bc68..3152d3f8e9 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:15+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -20,11 +20,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && " "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: #out-statusnet\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1883,10 +1883,28 @@ msgstr "Lista użytkowników znajdujących się w tej grupie." msgid "Admin" msgstr "Administrator" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "Zablokuj" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Uczyń użytkownika administratorem grupy" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5501,14 +5519,25 @@ msgstr "" msgid "No application for that consumer key." msgstr "" +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "" + #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -6167,6 +6196,78 @@ msgstr "" "Dodatkowe pseudonimy grupy, oddzielone przecinkami lub spacjami, maksymalnie " "%d" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "Grupa" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "Grupa %s" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "Zablokowany" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "Logo" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Grupy z największą liczbą członków" @@ -6658,6 +6759,23 @@ msgstr "Nie można przenieść pliku do katalogu docelowego." msgid "Could not determine file's MIME type." msgstr "Nie można określić typu MIME pliku." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Wyślij bezpośredni wpis" @@ -6773,6 +6891,23 @@ msgstr "Szturchnij" msgid "Send a nudge to this user" msgstr "Wyślij szturchnięcie do tego użytkownika" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Nie można wprowadzić nowej subskrypcji." @@ -6917,6 +7052,11 @@ msgstr "Przeszukaj witrynę" msgid "Keyword(s)" msgstr "Słowa kluczowe" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "Wyszukaj" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7129,21 +7269,57 @@ msgstr "kilka sekund temu" msgid "about a minute ago" msgstr "około minutę temu" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "około godzinę temu" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "blisko dzień temu" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "około miesiąc temu" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 51a2982b70..46794835b6 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -13,17 +13,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:16+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:12+0000\n" "Language-Team: Portuguese \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1890,10 +1890,28 @@ msgstr "Uma lista dos utilizadores neste grupo." msgid "Admin" msgstr "Gestor" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "Bloquear" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Tornar utilizador o gestor do grupo" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "Tornar Gestor" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "Tornar este utilizador um gestor" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5507,17 +5525,23 @@ msgstr "API requer acesso de leitura e escrita, mas só tem acesso de leitura." #. TRANS: OAuth exception thrown when no application is found for a given consumer key. #: lib/apiauth.php:175 msgid "No application for that consumer key." -msgstr "" +msgstr "Nenhuma aplicação para essa chave de consumidor." + +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "Código de acesso incorrecto." #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." -msgstr "" +msgstr "Nenhum utilizador para esse código." -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" -msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "Não foi possível autenticá-lo." #. TRANS: Form legend. #: lib/applicationeditform.php:129 @@ -6167,6 +6191,78 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" "Nomes adicionais para o grupo, separados por vírgulas ou espaços, máx. %d" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "Grupo" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "Grupo %s" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "Membros" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "Membros do grupo %s" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "Bloqueado" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "Utilizadores bloqueados de %s" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "Editar propriedades do grupo %s" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "Logotipo" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "Adicionar ou editar o logotipo de %s" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "Adicionar ou editar o design de %s" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Grupos com mais membros" @@ -6660,6 +6756,25 @@ msgstr "Não foi possível mover o ficheiro para o directório de destino." msgid "Could not determine file's MIME type." msgstr "Não foi possível determinar o tipo MIME do ficheiro." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" +"\"%1$s\" não é um tipo de ficheiro suportado neste servidor. Tente usar " +"outro formato de %2$s." + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "\"%s\" não é um tipo de ficheiro suportado neste servidor." + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Enviar uma nota directa" @@ -6775,6 +6890,23 @@ msgstr "Tocar" msgid "Send a nudge to this user" msgstr "Enviar toque a este utilizador" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "Erro ao inserir perfil novo." + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "Erro ao inserir avatar." + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "Erro ao inserir perfil remoto." + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "Nota duplicada." + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Não foi possível inserir nova subscrição." @@ -6918,6 +7050,11 @@ msgstr "Pesquisar site" msgid "Keyword(s)" msgstr "Categorias" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "Pesquisar" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7128,21 +7265,53 @@ msgstr "há alguns segundos" msgid "about a minute ago" msgstr "há cerca de um minuto" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "um minuto" +msgstr[1] "%d minutos" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "há cerca de uma hora" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "uma hora" +msgstr[1] "%d horas" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "há cerca de um dia" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "um dia" +msgstr[1] "%d dias" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "há cerca de um mês" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "um mês" +msgstr[1] "%d meses" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 56a02e2bbd..3580e6c994 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -15,18 +15,18 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:17+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:14+0000\n" "Language-Team: Brazilian Portuguese \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1907,10 +1907,28 @@ msgstr "Uma lista dos usuários deste grupo." msgid "Admin" msgstr "Admin" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "Bloquear" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Tornar o usuário um administrador do grupo" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "Tornar administrador" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "Torna este usuário um administrador" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5533,16 +5551,27 @@ msgstr "" #. TRANS: OAuth exception thrown when no application is found for a given consumer key. #: lib/apiauth.php:175 msgid "No application for that consumer key." -msgstr "" +msgstr "Não foi encontrado nenhuma aplicação para essa chave de consumidor." + +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "Token de acesso incorreto." #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -6201,6 +6230,78 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" "Apelidos extras para o grupo, separado por vírgulas ou espaços, no máximo %d" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Grupos com mais membros" @@ -6697,6 +6798,23 @@ msgstr "Não foi possível mover o arquivo para o diretório de destino." msgid "Could not determine file's MIME type." msgstr "Não foi possível determinar o tipo MIME do arquivo." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Enviar uma mensagem direta" @@ -6812,6 +6930,23 @@ msgstr "Chamar a atenção" msgid "Send a nudge to this user" msgstr "Chame a atenção deste usuário" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Não foi possível inserir a nova assinatura." @@ -6955,6 +7090,11 @@ msgstr "Procurar no site" msgid "Keyword(s)" msgstr "Palavra(s)-chave" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7164,21 +7304,53 @@ msgstr "alguns segundos atrás" msgid "about a minute ago" msgstr "cerca de 1 minuto atrás" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "cerca de 1 hora atrás" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "cerca de 1 dia atrás" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "cerca de 1 mês atrás" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 6bc2578872..fafeddfc66 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -14,18 +14,18 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:18+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:15+0000\n" "Language-Team: Russian \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= " "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1903,10 +1903,28 @@ msgstr "Список пользователей, являющихся члена msgid "Admin" msgstr "Настройки" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Сделать пользователя администратором группы" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5519,14 +5537,25 @@ msgstr "" msgid "No application for that consumer key." msgstr "" +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "" + #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -6185,6 +6214,78 @@ msgstr "" "Дополнительные имена для группы, разделённые запятой или пробелом, максимум %" "d имён" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Группы с наибольшим количеством участников" @@ -6676,6 +6777,23 @@ msgstr "Файл не может быть перемещён в целевую msgid "Could not determine file's MIME type." msgstr "Не удаётся определить mime-тип файла." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Послать прямую запись" @@ -6791,6 +6909,23 @@ msgstr "«Подтолкнуть»" msgid "Send a nudge to this user" msgstr "«Подтолкнуть» этого пользователя" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Не удаётся вставить новую подписку." @@ -6934,6 +7069,11 @@ msgstr "Поиск по сайту" msgid "Keyword(s)" msgstr "Ключевые слова" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7143,21 +7283,57 @@ msgstr "пару секунд назад" msgid "about a minute ago" msgstr "около минуты назад" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "около часа назад" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "около дня назад" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "около месяца назад" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/statusnet.pot b/locale/statusnet.pot index 0289924243..ba7c02a7bb 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -5246,12 +5246,12 @@ msgstr "" #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Exception thrown when an attempt is made to remove a revoked token. #: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +msgid "Failed to delete revoked token." msgstr "" #. TRANS: Form legend. diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index f02e50ac44..3996187f2b 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -11,17 +11,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:20+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:16+0000\n" "Language-Team: Swedish \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1882,10 +1882,28 @@ msgstr "En lista av användarna i denna grupp." msgid "Admin" msgstr "Administratör" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Gör användare till en administratör för gruppen" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5488,14 +5506,25 @@ msgstr "" msgid "No application for that consumer key." msgstr "" +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "" + #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -6147,6 +6176,78 @@ msgstr "Plats för gruppen, om den finns, såsom \"Stad, Län, Land\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "Extra smeknamn för gruppen, komma- eller mellanslagsseparerade, max &d" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Grupper med flest medlemmar" @@ -6638,6 +6739,23 @@ msgstr "Fil kunde inte flyttas till destinationskatalog." msgid "Could not determine file's MIME type." msgstr "Kunde inte fastställa filens MIME-typ." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Skicka en direktnotis" @@ -6753,6 +6871,23 @@ msgstr "Knuffa" msgid "Send a nudge to this user" msgstr "Skicka en knuff till denna användare" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Kunde inte infoga ny prenumeration." @@ -6896,6 +7031,11 @@ msgstr "Sök webbplats" msgid "Keyword(s)" msgstr "Nyckelord" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7104,21 +7244,53 @@ msgstr "ett par sekunder sedan" msgid "about a minute ago" msgstr "för nån minut sedan" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "för en timma sedan" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "för en dag sedan" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "för en månad sedan" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 5fe86483d6..f1b479ea34 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -10,17 +10,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:21+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:18+0000\n" "Language-Team: Telugu \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1646,10 +1646,28 @@ msgstr "ఈ గుంపులో వాడుకరులు జాబితా msgid "Admin" msgstr "నిర్వాహకులు" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "వాడుకరిని గుంపుకి ఒక నిర్వాహకునిగా చేయి" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -4642,14 +4660,15 @@ msgstr "" msgid "No user for that token." msgstr "" -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." msgstr "" -#. TRANS: Exception thrown when an attempt is made to remove a revoked token. -#: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -5160,6 +5179,62 @@ msgstr "గుంపు యొక్క ప్రాంతం, ఉంటే, \" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. #: lib/groupnav.php:129 @@ -5738,6 +5813,23 @@ msgstr "స్పందించండి" msgid "Notice repeated" msgstr "నోటీసుని పునరావృతించారు" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "కొత్త చందాని చేర్చలేకపోయాం." @@ -5867,6 +5959,11 @@ msgstr "సైటుని వెతుకు" msgid "Keyword(s)" msgstr "కీపదము(లు)" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -6062,21 +6159,53 @@ msgstr "కొన్ని క్షణాల క్రితం" msgid "about a minute ago" msgstr "ఓ నిమిషం క్రితం" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "ఒక గంట క్రితం" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "ఓ రోజు క్రితం" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "ఓ నెల క్రితం" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" +msgstr[1] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 56f93209eb..94f9bb2649 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -10,17 +10,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:22+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:19+0000\n" "Language-Team: Turkish \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page notice #: actions/accessadminpanel.php:67 @@ -1129,6 +1129,12 @@ msgstr "" msgid "Admin" msgstr "" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "" @@ -3467,14 +3473,20 @@ msgstr "" msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Exception thrown when an attempt is made to remove a revoked token. #: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +msgid "Failed to delete revoked token." msgstr "" #. TRANS: Form legend. @@ -3909,6 +3921,42 @@ msgctxt "MENU" msgid "Group" msgstr "" +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. #: lib/groupnav.php:120 @@ -3917,6 +3965,12 @@ msgctxt "TOOLTIP" msgid "Edit %s group properties" msgstr "" +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. #: lib/groupnav.php:129 @@ -4328,6 +4382,23 @@ msgstr "" msgid "Send a nudge to this user" msgstr "" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Yeni abonelik eklenemedi." @@ -4437,6 +4508,11 @@ msgstr "" msgid "Keyword(s)" msgstr "" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #: lib/searchgroupnav.php:81 msgid "Find people on this site" msgstr "" @@ -4581,21 +4657,49 @@ msgstr "birkaç saniye önce" msgid "about a minute ago" msgstr "yaklaşık bir dakika önce" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "yaklaşık bir saat önce" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "yaklaşık bir gün önce" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "yaklaşık bir ay önce" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 2a3d54b7a2..f19f46649a 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -12,18 +12,18 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:23+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:21+0000\n" "Language-Team: Ukrainian \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= " "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1888,10 +1888,28 @@ msgstr "Список учасників цієї групи." msgid "Admin" msgstr "Адмін" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "Блок" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "Надати користувачеві права адміністратора" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "Зробити адміном" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "Надати цьому користувачеві права адміністратора" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5501,17 +5519,23 @@ msgstr "" #. TRANS: OAuth exception thrown when no application is found for a given consumer key. #: lib/apiauth.php:175 msgid "No application for that consumer key." -msgstr "" +msgstr "Немає додатків для даного споживчого ключа." + +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "Токен погодження невірний." #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." -msgstr "" +msgstr "Немає користувача для цього токену." -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" -msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "Не вдалося автентифікувати Вас." #. TRANS: Form legend. #: lib/applicationeditform.php:129 @@ -6164,6 +6188,78 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" "Додаткові імена для групи, відокремлювати комами або пробілами, максимум %d" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "Група" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "Група %s" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "Учасники" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "Учасники групи %s" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "Заблоковані" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "Заблоковані користувачі %s" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "Редагувати властивості групи %s" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "Логотип" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "Додати або редагувати логотип %s" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "Додати або редагувати дизайн %s" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Групи з найбільшою кількістю учасників" @@ -6657,6 +6753,25 @@ msgstr "Файл не може бути переміщений у директо msgid "Could not determine file's MIME type." msgstr "Не вдається визначити MIME-тип файлу." +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "" +"Тип файлів «%1$s» тепер не підтримується на даному сервері. Спробуйте " +"використати інший формат %2$s." + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "Тип файлів «%s» тепер не підтримується на даному сервері." + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "Надіслати прямий допис" @@ -6772,6 +6887,23 @@ msgstr "«Розштовхати»" msgid "Send a nudge to this user" msgstr "Спробувати «розштовхати» цього користувача" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "Помилка при додаванні нового профілю." + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "Помилка при додаванні аватари." + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "Помилка при додаванні віддаленого профілю." + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "Дублікат допису." + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Не вдалося додати нову підписку." @@ -6915,6 +7047,11 @@ msgstr "Пошук" msgid "Keyword(s)" msgstr "Ключові слова" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "Пошук" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -7126,21 +7263,57 @@ msgstr "мить тому" msgid "about a minute ago" msgstr "хвилину тому" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "хвилину тому" +msgstr[1] "%d хвилин тому" +msgstr[2] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "годину тому" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "годину тому" +msgstr[1] "%d годин тому" +msgstr[2] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "день тому" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "день тому" +msgstr[1] "%d днів тому" +msgstr[2] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "місяць тому" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "місяць тому" +msgstr[1] "%d місяців тому" +msgstr[2] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 4759a8edc4..463bad317c 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -9,17 +9,17 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:24+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:22+0000\n" "Language-Team: Vietnamese \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1152,12 +1152,24 @@ msgstr "" msgid "Admin" msgstr "" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #. TRANS: Button text for the form that will make a user administrator. #: actions/groupmembers.php:533 msgctxt "BUTTON" msgid "Make Admin" msgstr "" +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -3368,6 +3380,11 @@ msgctxt "TOOLTIP" msgid "Login to the site" msgstr "" +#: lib/action.php:510 +msgctxt "MENU" +msgid "Help" +msgstr "Trợ giúp" + #. TRANS: Tooltip for main menu option "Search" #: lib/action.php:513 msgctxt "TOOLTIP" @@ -3511,14 +3528,15 @@ msgstr "" msgid "No user for that token." msgstr "" -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." msgstr "" -#. TRANS: Exception thrown when an attempt is made to remove a revoked token. -#: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Form legend. @@ -3884,6 +3902,10 @@ msgstr "" msgid "Database error" msgstr "" +#: lib/designsettings.php:105 +msgid "Upload file" +msgstr "Tải tập tin lên" + #: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -3942,6 +3964,62 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. #: lib/groupnav.php:129 @@ -4335,6 +4413,23 @@ msgstr "Tìm kiếm thông báo" msgid "Nudge this user" msgstr "Bỏ chặn người dùng này" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Không thể chèn thêm vào đăng nhận." @@ -4426,6 +4521,11 @@ msgstr "" msgid "Keyword(s)" msgstr "" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "" + #: lib/searchgroupnav.php:80 msgid "People" msgstr "Tên tài khoản" @@ -4562,21 +4662,49 @@ msgstr "vài giây trước" msgid "about a minute ago" msgstr "1 phút trước" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "1 giờ trước" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "1 ngày trước" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "1 tháng trước" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index eec5bb093e..39500e6c1d 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -13,18 +13,18 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:26+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:23+0000\n" "Language-Team: Simplified Chinese \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1858,10 +1858,28 @@ msgstr "该小组的成员列表。" msgid "Admin" msgstr "管理" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "屏蔽" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "使用户成为小组的管理员" +#. TRANS: Button text for the form that will make a user administrator. +#: actions/groupmembers.php:533 +msgctxt "BUTTON" +msgid "Make Admin" +msgstr "设置管理员" + +#. TRANS: Submit button title. +#: actions/groupmembers.php:537 +msgctxt "TOOLTIP" +msgid "Make this user an admin" +msgstr "将这个用户设为管理员" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. @@ -5352,17 +5370,23 @@ msgstr "API 资源需要读写的访问权限,但是你只有只读的权限 #. TRANS: OAuth exception thrown when no application is found for a given consumer key. #: lib/apiauth.php:175 msgid "No application for that consumer key." -msgstr "" +msgstr "没有应用使用这个 consumer key。" + +#. TRANS: OAuth exception given when an incorrect access token was given for a user. +#: lib/apiauth.php:212 +msgid "Bad access token." +msgstr "无效的 access token。" #. TRANS: OAuth exception given when no user was found for a given token (no token was found). #: lib/apiauth.php:217 msgid "No user for that token." -msgstr "" +msgstr "没有用户使用这个 token。" -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" -msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "无法验证你。" #. TRANS: Form legend. #: lib/applicationeditform.php:129 @@ -5845,8 +5869,8 @@ msgstr "" "fav #<消息id> - 将该id的消息加为'收藏'\n" "repeat #<消息id> - 转发该id的消息\n" "repeat <昵称> - 转发该用户的最后一条消息\n" -"reply # - 对该id消息回复\n" -"reply <昵称> - 对该用户的最后一条小心回复\n" +"reply #<消息id> - 对该id消息回复\n" +"reply <昵称> - 对该用户的最后一条消息回复\n" "join <小组> - 加入小组\n" "login - 获取网页登录的地址\n" "drop <小组> - 离开小组\n" @@ -6004,6 +6028,78 @@ msgstr "小组的地理位置,例如“国家、省份、城市”" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "该小组额外的昵称,用逗号或者空格分隔开,最长%d" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "小组" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "%s小组" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "组员" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "%s 小组成员" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "屏蔽的用户" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "%s 屏蔽的用户" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "编辑 %s 小组设置" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "Logo" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:129 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s logo" +msgstr "添加或编辑 %s logo" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:138 +#, php-format +msgctxt "TOOLTIP" +msgid "Add or edit %s design" +msgstr "添加或编辑 %s 外观" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "人气最旺的小组" @@ -6489,6 +6585,23 @@ msgstr "文件不能被移动到目标目录。" msgid "Could not determine file's MIME type." msgstr "无法判断文件的 MIME 类型。" +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %1$s is the file type that was denied, %2$s is the application part of +#. TRANS: the MIME type that was denied. +#: lib/mediafile.php:340 +#, php-format +msgid "" +"\"%1$s\" is not a supported file type on this server. Try using another %2$s " +"format." +msgstr "此服务器不支持 “%1$s” 的文件格式,试下使用其他的 %2$s 格式。" + +#. TRANS: Client exception thrown trying to upload a forbidden MIME type. +#. TRANS: %s is the file type that was denied. +#: lib/mediafile.php:345 +#, php-format +msgid "\"%s\" is not a supported file type on this server." +msgstr "这个服务器不支持 %s 的文件格式。" + #: lib/messageform.php:120 msgid "Send a direct notice" msgstr "发送一条私信" @@ -6602,6 +6715,23 @@ msgstr "呼叫" msgid "Send a nudge to this user" msgstr "呼叫这个用户" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "添加新个人信息出错。" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "添加头像出错。" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "添加远程个人信息时出错。" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "复制消息。" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "无法添加新的关注。" @@ -6745,6 +6875,11 @@ msgstr "搜索帮助" msgid "Keyword(s)" msgstr "关键词" +#: lib/searchaction.php:130 +msgctxt "BUTTON" +msgid "Search" +msgstr "搜索" + #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 msgid "Search help" @@ -6951,21 +7086,49 @@ msgstr "几秒前" msgid "about a minute ago" msgstr "约1分钟前" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1109 +#, php-format +msgid "about one minute ago" +msgid_plural "about %d minutes ago" +msgstr[0] "约1分钟前" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1112 msgid "about an hour ago" msgstr "约1小时前" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1115 +#, php-format +msgid "about one hour ago" +msgid_plural "about %d hours ago" +msgstr[0] "约一小时前" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1118 msgid "about a day ago" msgstr "约1天前" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1121 +#, php-format +msgid "about one day ago" +msgid_plural "about %d days ago" +msgstr[0] "约1天前" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 msgid "about a month ago" msgstr "约1个月前" +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1127 +#, php-format +msgid "about one month ago" +msgid_plural "about %d months ago" +msgstr[0] "约1个月前" + #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1130 msgid "about a year ago" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index ab5d0466ad..cae1e01062 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -8,18 +8,18 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 19:53+0000\n" -"PO-Revision-Date: 2010-09-14 19:54:27+0000\n" +"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"PO-Revision-Date: 2010-09-16 23:16:24+0000\n" "Language-Team: Traditional Chinese \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: #out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-POT-Import-Date: 1284-49-16 34::+0000\n" +"X-POT-Import-Date: 1284-49-48 10::+0000\n" #. TRANS: Page notice #: actions/accessadminpanel.php:67 @@ -1254,6 +1254,12 @@ msgstr "" msgid "Admin" msgstr "" +#. TRANS: Button text for the form that will block a user from a group. +#: actions/groupmembers.php:399 +msgctxt "BUTTON" +msgid "Block" +msgstr "" + #: actions/groupmembers.php:498 msgid "Make user an admin of the group" msgstr "" @@ -3816,14 +3822,20 @@ msgstr "" msgid "No user for that token." msgstr "" +#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". +#. TRANS: Client error thrown when authentication fails. +#: lib/apiauth.php:258 lib/apiauth.php:290 +msgid "Could not authenticate you." +msgstr "" + #. TRANS: Exception thrown when an attempt is made to revoke an unknown token. #: lib/apioauthstore.php:178 -msgid "Tried to revoke unknown token" +msgid "Tried to revoke unknown token." msgstr "" #. TRANS: Exception thrown when an attempt is made to remove a revoked token. #: lib/apioauthstore.php:182 -msgid "Failed to delete revoked token" +msgid "Failed to delete revoked token." msgstr "" #. TRANS: Form input field instructions. @@ -4284,6 +4296,62 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:86 +msgctxt "MENU" +msgid "Group" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:89 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group" +msgstr "" + +#. TRANS: Menu item in the group navigation page. +#: lib/groupnav.php:95 +msgctxt "MENU" +msgid "Members" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:98 +#, php-format +msgctxt "TOOLTIP" +msgid "%s group members" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:108 +msgctxt "MENU" +msgid "Blocked" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:111 +#, php-format +msgctxt "TOOLTIP" +msgid "%s blocked users" +msgstr "" + +#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. +#. TRANS: %s is the nickname of the group. +#: lib/groupnav.php:120 +#, php-format +msgctxt "TOOLTIP" +msgid "Edit %s group properties" +msgstr "" + +#. TRANS: Menu item in the group navigation page. Only shown for group administrators. +#: lib/groupnav.php:126 +msgctxt "MENU" +msgid "Logo" +msgstr "" + #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. #: lib/groupnav.php:129 @@ -4715,6 +4783,23 @@ msgstr "" msgid "Send a nudge to this user" msgstr "" +#: lib/oauthstore.php:283 +msgid "Error inserting new profile." +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar." +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile." +msgstr "" + +#. TRANS: Exception thrown when a notice is denied because it has been sent before. +#: lib/oauthstore.php:346 +msgid "Duplicate notice." +msgstr "" + #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "無法新增訂閱" From 234b1e6c236118d915af458b8db966e425645d68 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 00:23:38 +0200 Subject: [PATCH 08/76] Remove do_translatewiki_plugin(). No longer needed. Replaced by MediaWiki Translate extension script http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/Translate/scripts/genStatusNetPluginsConfig.php?view=markup --- scripts/update_po_templates.php | 42 --------------------------------- 1 file changed, 42 deletions(-) diff --git a/scripts/update_po_templates.php b/scripts/update_po_templates.php index f10f208424..a0ab5819d5 100755 --- a/scripts/update_po_templates.php +++ b/scripts/update_po_templates.php @@ -81,45 +81,6 @@ END; chdir($old); } -function do_translatewiki_plugin($basedir, $plugin) -{ - $yamldir = "$basedir/locale/TranslateWiki"; - if (!file_exists($yamldir)) { - mkdir($yamldir); - } - $outfile = "$yamldir/StatusNet-{$plugin}.yml"; - $pluginlc = strtolower( $plugin ); - $data = << Date: Sat, 18 Sep 2010 10:25:13 +0200 Subject: [PATCH 09/76] Update i18n/L10n. --- plugins/Minify/MinifyPlugin.php | 3 +-- plugins/Minify/minify.php | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/Minify/MinifyPlugin.php b/plugins/Minify/MinifyPlugin.php index 13010e75a1..6c1e49eb93 100644 --- a/plugins/Minify/MinifyPlugin.php +++ b/plugins/Minify/MinifyPlugin.php @@ -177,8 +177,7 @@ class MinifyPlugin extends Plugin 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:Minify', 'rawdescription' => - _m('The Minify plugin minifies your CSS and Javascript, removing whitespace and comments.')); + _m('The Minify plugin minifies StatusNet\'s CSS and JavaScript, removing whitespace and comments.')); return true; } } - diff --git a/plugins/Minify/minify.php b/plugins/Minify/minify.php index 64727f5e7e..9a59c4223c 100644 --- a/plugins/Minify/minify.php +++ b/plugins/Minify/minify.php @@ -46,11 +46,11 @@ class MinifyAction extends Action if(file_exists($this->file)) { return true; } else { - $this->clientError(_('f parameter is not a valid path'),404); + $this->clientError(_m('The parameter "f" is not a valid path.'),404); return false; } }else{ - $this->clientError(_('f parameter is required'),500); + $this->clientError(_m('The parameter "f" is required but missing.'),500); return false; } } @@ -108,10 +108,9 @@ class MinifyAction extends Action header('Content-Type: ' . self::TYPE_CSS); break; default: - $this->clientError(_('File type not supported'),500); + $this->clientError(_m('File type not supported.'),500); return false; } return $out; } } - From 14fa75898330bad3fca0d57d1ad0c7fae7a6237b Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 10:30:45 +0200 Subject: [PATCH 10/76] Update L10n --- plugins/NoticeTitle/NoticeTitlePlugin.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/NoticeTitle/NoticeTitlePlugin.php b/plugins/NoticeTitle/NoticeTitlePlugin.php index 9f53173db2..dea0417f5f 100644 --- a/plugins/NoticeTitle/NoticeTitlePlugin.php +++ b/plugins/NoticeTitle/NoticeTitlePlugin.php @@ -123,7 +123,7 @@ class NoticeTitlePlugin extends Plugin 'author' => 'Evan Prodromou', 'homepage' => $url, 'rawdescription' => - _m('Adds optional titles to notices')); + _m('Adds optional titles to notices.')); return true; } @@ -164,7 +164,7 @@ class NoticeTitlePlugin extends Plugin $title = $action->trimmed('notice_title'); if (!empty($title)) { if (mb_strlen($title) > Notice_title::MAXCHARS) { - throw new Exception(sprintf(_m("Notice title too long (max %d)", + throw new Exception(sprintf(_m("The notice title is too long (max %d characters).", Notice_title::MAXCHARS))); } } @@ -296,7 +296,7 @@ class NoticeTitlePlugin extends Plugin if (!empty($title)) { $action->element('title', null, // TRANS: Page title. %1$s is the title, %2$s is the site name. - sprintf(_("%1\$s - %2\$s"), + sprintf(_m("%1\$s - %2\$s"), $title, common_config('site', 'name'))); } @@ -328,4 +328,3 @@ class NoticeTitlePlugin extends Plugin return true; } } - From 90ce201684239e070039af28ee43fc0477bd41ac Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 10:32:54 +0200 Subject: [PATCH 11/76] Update L10n. --- .../OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php index 6756f19930..611f5e5c7b 100644 --- a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php +++ b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php @@ -57,8 +57,7 @@ class OpenExternalLinkTargetPlugin extends Plugin 'author' => 'Sarven Capadisli', 'homepage' => 'http://status.net/wiki/Plugin:OpenExternalLinkTarget', 'rawdescription' => - _m('Opens external links (i.e., with rel=external) on a new window or tab')); + _m('Opens external links (e.g., with rel=external) on a new window or tab.')); return true; } } - From 596d2c212ab2f808aa011269bea00222dc7e5e8e Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 10:41:13 +0200 Subject: [PATCH 12/76] Update i18n/L10n. --- plugins/Recaptcha/RecaptchaPlugin.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php index 7cc34c5686..0c46a33e0b 100644 --- a/plugins/Recaptcha/RecaptchaPlugin.php +++ b/plugins/Recaptcha/RecaptchaPlugin.php @@ -2,7 +2,7 @@ /** * StatusNet, the distributed open-source microblogging tool * - * Plugin to show reCaptcha when a user registers + * Plugin to show reCaptcha when a user registers * * PHP version 5 * @@ -61,14 +61,14 @@ class RecaptchaPlugin extends Plugin function onEndRegistrationFormData($action) { $action->elementStart('li'); - $action->raw(''); + $action->raw(''); // AJAX API will fill this div out. // We're calling that instead of the regular one so we stay compatible // with application/xml+xhtml output as for mobile. $action->element('div', array('id' => 'recaptcha')); $action->elementEnd('li'); - + $action->recaptchaPluginNeedsOutput = true; return true; } @@ -83,7 +83,7 @@ class RecaptchaPlugin extends Plugin $url = "http://api.recaptcha.net/js/recaptcha_ajax.js"; } $action->script($url); - + // And when we're ready, fill out the captcha! $key = json_encode($this->public_key); $action->inlinescript("\$(function(){Recaptcha.create($key, 'recaptcha');});"); @@ -100,9 +100,9 @@ class RecaptchaPlugin extends Plugin if (!$resp->is_valid) { if($this->display_errors) { - $action->showForm ("(reCAPTCHA error: " . $resp->error . ")"); + $action->showForm(sprintf(_("(reCAPTCHA error: %s)", $resp->error))); } - $action->showForm("Captcha does not match!"); + $action->showForm(_m("Captcha does not match!")); return false; } } From eed0b24f231e9285981df1d9fe74ba612b5d4790 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 11:25:11 +0200 Subject: [PATCH 13/76] * i18n/L10n updates * superfluous whitespace removed --- plugins/RSSCloud/LoggingAggregator.php | 15 +++----- plugins/RSSCloud/RSSCloudNotifier.php | 2 -- plugins/RSSCloud/RSSCloudPlugin.php | 3 +- plugins/RSSCloud/RSSCloudQueueHandler.php | 1 - plugins/RSSCloud/RSSCloudRequestNotify.php | 40 ++++++---------------- plugins/RSSCloud/RSSCloudSubscription.php | 1 - 6 files changed, 16 insertions(+), 46 deletions(-) diff --git a/plugins/RSSCloud/LoggingAggregator.php b/plugins/RSSCloud/LoggingAggregator.php index e37eed16a3..c7d7a40e3b 100644 --- a/plugins/RSSCloud/LoggingAggregator.php +++ b/plugins/RSSCloud/LoggingAggregator.php @@ -47,7 +47,6 @@ if (!defined('STATUSNET')) { **/ class LoggingAggregatorAction extends Action { - var $challenge = null; var $url = null; @@ -58,7 +57,6 @@ class LoggingAggregatorAction extends Action * * @return boolean false if user doesn't exist */ - function prepare($args) { parent::prepare($args); @@ -79,22 +77,20 @@ class LoggingAggregatorAction extends Action * * @return void */ - function handle($args) { parent::handle($args); if (empty($this->url)) { - $this->showError('Hey, you have to provide a url parameter.'); + $this->showError(_('A URL parameter is required.')); return; } if (!empty($this->challenge)) { // must be a GET - if ($_SERVER['REQUEST_METHOD'] != 'GET') { - $this->showError('This resource requires an HTTP GET.'); + $this->showError(_m('This resource requires an HTTP GET.')); return; } @@ -104,9 +100,8 @@ class LoggingAggregatorAction extends Action } else { // must be a POST - if ($_SERVER['REQUEST_METHOD'] != 'POST') { - $this->showError('This resource requires an HTTP POST.'); + $this->showError(_m('This resource requires an HTTP POST.')); return; } @@ -128,7 +123,6 @@ class LoggingAggregatorAction extends Action * * @return void */ - function showError($msg) { header('HTTP/1.1 400 Bad Request'); @@ -136,5 +130,4 @@ class LoggingAggregatorAction extends Action echo "\n"; echo "\n"; } - -} \ No newline at end of file +} diff --git a/plugins/RSSCloud/RSSCloudNotifier.php b/plugins/RSSCloud/RSSCloudNotifier.php index 9e7b536803..1f0eab47e8 100644 --- a/plugins/RSSCloud/RSSCloudNotifier.php +++ b/plugins/RSSCloud/RSSCloudNotifier.php @@ -235,6 +235,4 @@ class RSSCloudNotifier } } } - } - diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php index c1951cdbf8..bba0be515d 100644 --- a/plugins/RSSCloud/RSSCloudPlugin.php +++ b/plugins/RSSCloud/RSSCloudPlugin.php @@ -247,10 +247,9 @@ class RSSCloudPlugin extends Plugin 'rawdescription' => _m('The RSSCloud plugin enables your StatusNet instance to publish ' . 'real-time updates for profile RSS feeds using the ' . - 'RSSCloud protocol".')); + 'RSSCloud protocol.')); return true; } } - diff --git a/plugins/RSSCloud/RSSCloudQueueHandler.php b/plugins/RSSCloud/RSSCloudQueueHandler.php index ef11eda2e7..8a09977489 100644 --- a/plugins/RSSCloud/RSSCloudQueueHandler.php +++ b/plugins/RSSCloud/RSSCloudQueueHandler.php @@ -38,4 +38,3 @@ class RSSCloudQueueHandler extends QueueHandler return $notifier->notify($profile); } } - diff --git a/plugins/RSSCloud/RSSCloudRequestNotify.php b/plugins/RSSCloud/RSSCloudRequestNotify.php index 0305295348..41b8685785 100644 --- a/plugins/RSSCloud/RSSCloudRequestNotify.php +++ b/plugins/RSSCloud/RSSCloudRequestNotify.php @@ -41,7 +41,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ **/ - class RSSCloudRequestNotifyAction extends Action { /** @@ -51,7 +50,6 @@ class RSSCloudRequestNotifyAction extends Action * * @return boolean false if user doesn't exist */ - function prepare($args) { parent::prepare($args); @@ -84,13 +82,12 @@ class RSSCloudRequestNotifyAction extends Action * * @return void */ - function handle($args) { parent::handle($args); if ($_SERVER['REQUEST_METHOD'] != 'POST') { - $this->showResult(false, 'Request must be POST.'); + $this->showResult(false, _m('Request must be POST.')); return; } @@ -107,7 +104,7 @@ class RSSCloudRequestNotifyAction extends Action if (empty($this->protocol)) { $missing[] = 'protocol'; } else if (strtolower($this->protocol) != 'http-post') { - $msg = 'Only http-post notifications are supported at this time.'; + $msg = _m('Only http-post notifications are supported at this time.'); $this->showResult(false, $msg); return; } @@ -117,15 +114,15 @@ class RSSCloudRequestNotifyAction extends Action } if (!empty($missing)) { - $msg = 'The following parameters were missing from the request body: ' . - implode(', ', $missing) . '.'; + // TRANS: %s is a comma separated list of parameters. + $msg = sprintf(_m('The following parameters were missing from the request body: %s.'),implode(', ', $missing)); $this->showResult(false, $msg); return; } if (empty($this->feeds)) { - $msg = 'You must provide at least one valid profile feed url ' . - '(url1, url2, url3 ... urlN).'; + $msg = _m('You must provide at least one valid profile feed url ' . + '(url1, url2, url3 ... urlN).'); $this->showResult(false, $msg); return; } @@ -133,7 +130,6 @@ class RSSCloudRequestNotifyAction extends Action // We have to validate everything before saving anything. // We only return one success or failure no matter how // many feeds the subscriber is trying to subscribe to - foreach ($this->feeds as $feed) { if (!$this->validateFeed($feed)) { @@ -142,18 +138,17 @@ class RSSCloudRequestNotifyAction extends Action common_log(LOG_WARNING, "RSSCloud plugin - $nh tried to subscribe to invalid feed: $feed"); - $msg = 'Feed subscription failed - Not a valid feed.'; + $msg = _m('Feed subscription failed - Not a valid feed.'); $this->showResult(false, $msg); return; } if (!$this->testNotificationHandler($feed)) { - $msg = 'Feed subscription failed - ' . - 'notification handler doesn\'t respond correctly.'; + $msg = _m('Feed subscription failed - ' . + 'notification handler doesn\'t respond correctly.'); $this->showResult(false, $msg); return; } - } foreach ($this->feeds as $feed) { @@ -163,9 +158,8 @@ class RSSCloudRequestNotifyAction extends Action // XXX: What to do about deleting stale subscriptions? // 25 hours seems harsh. WordPress doesn't ever remove // subscriptions. - - $msg = 'Thanks for the subscription. ' . - 'When the feed(s) update(s) we\'ll notify you.'; + $msg = _m('Thanks for the subscription. ' . + 'When the feed(s) update(s) we\'ll notify you.'); $this->showResult(true, $msg); } @@ -178,7 +172,6 @@ class RSSCloudRequestNotifyAction extends Action * * @return void */ - function validateFeed($feed) { $user = $this->userFromFeed($feed); @@ -196,7 +189,6 @@ class RSSCloudRequestNotifyAction extends Action * * @return array $feeds the list of feeds */ - function getFeeds() { $feeds = array(); @@ -218,7 +210,6 @@ class RSSCloudRequestNotifyAction extends Action * * @return boolean success result */ - function testNotificationHandler($feed) { $notifyUrl = $this->getNotifyUrl(); @@ -226,9 +217,7 @@ class RSSCloudRequestNotifyAction extends Action $notifier = new RSSCloudNotifier(); if (isset($this->domain)) { - // 'domain' param set, so we have to use GET and send a challenge - common_log(LOG_INFO, 'RSSCloud plugin - Testing notification handler with challenge: ' . $notifyUrl); @@ -248,7 +237,6 @@ class RSSCloudRequestNotifyAction extends Action * * @return string notification handler url */ - function getNotifyUrl() { if (isset($this->domain)) { @@ -267,12 +255,10 @@ class RSSCloudRequestNotifyAction extends Action * * @return boolean success */ - function userFromFeed($feed) { // We only do canonical RSS2 profile feeds (specified by ID), e.g.: // http://www.example.com/api/statuses/user_timeline/2.rss - $path = common_path('api/statuses/user_timeline/'); $valid = '%^' . $path . '(?.*)\.rss$%'; @@ -293,7 +279,6 @@ class RSSCloudRequestNotifyAction extends Action * * @return boolean success result */ - function saveSubscription($feed) { $user = $this->userFromFeed($feed); @@ -334,7 +319,6 @@ class RSSCloudRequestNotifyAction extends Action * * @return boolean success result */ - function showResult($success, $msg) { $this->startXML(); @@ -343,6 +327,4 @@ class RSSCloudRequestNotifyAction extends Action 'msg' => $msg)); $this->endXML(); } - } - diff --git a/plugins/RSSCloud/RSSCloudSubscription.php b/plugins/RSSCloud/RSSCloudSubscription.php index 396c604e71..595af88446 100644 --- a/plugins/RSSCloud/RSSCloudSubscription.php +++ b/plugins/RSSCloud/RSSCloudSubscription.php @@ -75,5 +75,4 @@ class RSSCloudSubscription extends Memcached_DataObject { return false; } - } From 11a98ea41f0702defad84a7923e91afa5aa35b72 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 11:27:37 +0200 Subject: [PATCH 14/76] * L10n update * superfluous whitespace removed. --- plugins/TinyMCE/TinyMCEPlugin.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/TinyMCE/TinyMCEPlugin.php b/plugins/TinyMCE/TinyMCEPlugin.php index ca16f60591..2ec4b71608 100644 --- a/plugins/TinyMCE/TinyMCEPlugin.php +++ b/plugins/TinyMCE/TinyMCEPlugin.php @@ -48,7 +48,6 @@ if (!defined('STATUSNET')) { */ class TinyMCEPlugin extends Plugin { - var $html; function onEndShowScripts($action) @@ -74,7 +73,7 @@ class TinyMCEPlugin extends Plugin 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:TinyMCE', 'rawdescription' => - _m('Use TinyMCE library to allow rich text editing in the browser')); + _m('Use TinyMCE library to allow rich text editing in the browser.')); return true; } @@ -108,7 +107,7 @@ class TinyMCEPlugin extends Plugin /** * Hook for new-notice form processing to take our HTML goodies; * won't affect API posting etc. - * + * * @param NewNoticeAction $action * @param User $user * @param string $content @@ -159,9 +158,9 @@ class TinyMCEPlugin extends Plugin /** * Format the attachment placeholder img with the final version. - * + * * @param DOMElement $img - * @param MediaFile $media + * @param MediaFile $media */ private function formatAttachment($img, $media) { @@ -321,5 +320,4 @@ END_OF_SCRIPT; return $scr; } - } From b99b0555fdfbaac36213b7c342cc2fb5eca1b583 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 11:36:40 +0200 Subject: [PATCH 15/76] Update L10n. --- plugins/TabFocus/TabFocusPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/TabFocus/TabFocusPlugin.php b/plugins/TabFocus/TabFocusPlugin.php index 46e329d8a4..dd8a972767 100644 --- a/plugins/TabFocus/TabFocusPlugin.php +++ b/plugins/TabFocus/TabFocusPlugin.php @@ -51,7 +51,7 @@ class TabFocusPlugin extends Plugin 'author' => 'Craig Andrews and Paul Irish', 'homepage' => 'http://status.net/wiki/Plugin:TabFocus', 'rawdescription' => - _m('TabFocus changes the notice form behavior so that, while in the text area, pressing the tab key focuses the "Send" button, matching the behavor of Twitter.')); + _m('TabFocus changes the notice form behavior so that, while in the text area, pressing the tab key focuses the "Send" button, matching the behavior of Twitter.')); return true; } } From 2d119df6d392699e46556780d1fdc17f4c424e3a Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 11:43:17 +0200 Subject: [PATCH 16/76] * update i18n/L10n * remove superfluous whitespace --- plugins/Imap/ImapPlugin.php | 8 ++++---- plugins/Imap/imapmanager.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/Imap/ImapPlugin.php b/plugins/Imap/ImapPlugin.php index 66be799d3e..1661ed86ea 100644 --- a/plugins/Imap/ImapPlugin.php +++ b/plugins/Imap/ImapPlugin.php @@ -51,16 +51,16 @@ class ImapPlugin extends Plugin function initialize(){ if(!isset($this->mailbox)){ - throw new Exception("must specify a mailbox"); + throw new Exception(_m("A mailbox must be specified.")); } if(!isset($this->user)){ - throw new Exception("must specify a user"); + throw new Exception(_m("A user must be specified."); } if(!isset($this->password)){ - throw new Exception("must specify a password"); + throw new Exception(_m("A password must be specified.")); } if(!isset($this->poll_frequency)){ - throw new Exception("must specify a poll_frequency"); + throw new Exception(_m("A poll_frequency must be specified.")); } return true; diff --git a/plugins/Imap/imapmanager.php b/plugins/Imap/imapmanager.php index 0bbd42e78f..68b8b7d874 100644 --- a/plugins/Imap/imapmanager.php +++ b/plugins/Imap/imapmanager.php @@ -92,12 +92,12 @@ class ImapManager extends IoManager { return $this->check_mailbox() > 0; } - + function pollInterval() { return $this->plugin->poll_frequency; } - + protected function connect() { $this->conn = imap_open($this->plugin->mailbox, $this->plugin->user, $this->plugin->password); From f0716819ec206e6b407c7cefcc463e946127bacf Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 11:45:50 +0200 Subject: [PATCH 17/76] * update i18n/L10n * remove superfluous whitespace --- plugins/ClientSideShorten/ClientSideShortenPlugin.php | 4 +--- plugins/ClientSideShorten/shorten.php | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php index 57f5ad89e0..27a3a56f72 100644 --- a/plugins/ClientSideShorten/ClientSideShortenPlugin.php +++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php @@ -71,9 +71,7 @@ class ClientSideShortenPlugin extends Plugin 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:ClientSideShorten', 'rawdescription' => - _m('ClientSideShorten causes the web interface\'s notice form to automatically shorten urls as they entered, and before the notice is submitted.')); + _m('ClientSideShorten causes the web interface\'s notice form to automatically shorten URLs as they entered, and before the notice is submitted.')); return true; } - } - diff --git a/plugins/ClientSideShorten/shorten.php b/plugins/ClientSideShorten/shorten.php index f67cbf3b28..8c2fc1b3cd 100644 --- a/plugins/ClientSideShorten/shorten.php +++ b/plugins/ClientSideShorten/shorten.php @@ -66,4 +66,3 @@ class ShortenAction extends Action print $shortened_text; } } - From 1ee1f6621f16140c332eec796fb9a344192393f6 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 11:50:27 +0200 Subject: [PATCH 18/76] * update i18n/L10n * remove superfluous whitespace --- plugins/RegisterThrottle/RegisterThrottlePlugin.php | 3 +-- plugins/RegisterThrottle/Registration_ip.php | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/plugins/RegisterThrottle/RegisterThrottlePlugin.php b/plugins/RegisterThrottle/RegisterThrottlePlugin.php index 05709b7807..89c1d3d00c 100644 --- a/plugins/RegisterThrottle/RegisterThrottlePlugin.php +++ b/plugins/RegisterThrottle/RegisterThrottlePlugin.php @@ -113,7 +113,6 @@ class RegisterThrottlePlugin extends Plugin * @return boolean hook value * */ - function onStartRegistrationTry($action) { $ipaddress = $this->_getIpAddress(); @@ -134,7 +133,7 @@ class RegisterThrottlePlugin extends Plugin $now = time(); $this->debug("Comparing {$regtime} to {$now}"); if ($now - $regtime < $seconds) { - throw new Exception(_("Too many registrations. Take a break and try again later.")); + throw new Exception(_m("Too many registrations. Take a break and try again later.")); } } } diff --git a/plugins/RegisterThrottle/Registration_ip.php b/plugins/RegisterThrottle/Registration_ip.php index 7e61d089e7..5c7396b9b0 100644 --- a/plugins/RegisterThrottle/Registration_ip.php +++ b/plugins/RegisterThrottle/Registration_ip.php @@ -42,7 +42,6 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ */ - class Registration_ip extends Memcached_DataObject { public $__table = 'registration_ip'; // table name @@ -59,7 +58,6 @@ class Registration_ip extends Memcached_DataObject * @return User_greeting_count object found, or null for no hits * */ - function staticGet($k, $v=null) { return Memcached_DataObject::staticGet('Registration_ip', $k, $v); @@ -70,7 +68,6 @@ class Registration_ip extends Memcached_DataObject * * @return array array of column definitions */ - function table() { return array('user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL, @@ -86,7 +83,6 @@ class Registration_ip extends Memcached_DataObject * * @return array key definitions */ - function keys() { return array('user_id' => 'K'); @@ -100,7 +96,6 @@ class Registration_ip extends Memcached_DataObject * * @return array key definitions */ - function keyTypes() { return $this->keys(); @@ -116,7 +111,6 @@ class Registration_ip extends Memcached_DataObject * * @return array magic three-false array that stops auto-incrementing. */ - function sequenceKey() { return array(false, false, false); From 26a9963dad3e7bbea6f5f7069f2272a58ee87891 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 11:52:35 +0200 Subject: [PATCH 19/76] Update L10n. --- plugins/RegisterThrottle/RegisterThrottlePlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/RegisterThrottle/RegisterThrottlePlugin.php b/plugins/RegisterThrottle/RegisterThrottlePlugin.php index 89c1d3d00c..b6e9a90265 100644 --- a/plugins/RegisterThrottle/RegisterThrottlePlugin.php +++ b/plugins/RegisterThrottle/RegisterThrottlePlugin.php @@ -196,7 +196,7 @@ class RegisterThrottlePlugin extends Plugin 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:RegisterThrottle', 'description' => - _m('Throttles excessive registration from a single IP.')); + _m('Throttles excessive registration from a single IP address.')); return true; } From f8e91ab33f414e0c0ffbb4d6f312909d196413ce Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 12:05:27 +0200 Subject: [PATCH 20/76] Add translator hints. --- plugins/AutoSandbox/AutoSandboxPlugin.php | 1 + plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/AutoSandbox/AutoSandboxPlugin.php b/plugins/AutoSandbox/AutoSandboxPlugin.php index 870eda86f2..16683e1402 100644 --- a/plugins/AutoSandbox/AutoSandboxPlugin.php +++ b/plugins/AutoSandbox/AutoSandboxPlugin.php @@ -75,6 +75,7 @@ class AutoSandboxPlugin extends Plugin $contactuser = User::staticGet('nickname', $this->contact); if (!empty($contactuser)) { $contactlink = "@uri\">$contactuser->nickname"; + // TRANS: $contactlink is a clickable e-mailaddress. $instr = _m("Note you will initially be \"sandboxed\" so your posts will not appear in the public timeline. ". 'Send a message to $contactlink to speed up the unsandboxing process.'); } diff --git a/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php b/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php index fb4eff7389..f2e2fcbafe 100644 --- a/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php +++ b/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php @@ -47,6 +47,7 @@ class PoweredByStatusNetPlugin extends Plugin { $action->text(' '); $action->elementStart('span', 'poweredby'); + // TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text. $action->raw(sprintf(_m('powered by %s'), sprintf('%s', _m('StatusNet')))); @@ -62,7 +63,7 @@ class PoweredByStatusNetPlugin extends Plugin 'author' => 'Sarven Capadisli', 'homepage' => 'http://status.net/wiki/Plugin:PoweredByStatusNet', 'rawdescription' => - _m('Outputs powered by StatusNet after site name.')); + _m('Outputs "powered by StatusNet" after site name.')); return true; } } From 03e600b797e2ca4dc918143325cc0961949f2f55 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 14:31:03 +0200 Subject: [PATCH 21/76] Update i18n/L10n --- .../CasAuthenticationPlugin.php | 22 +++++++++++-------- plugins/CasAuthentication/caslogin.php | 5 ++--- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/plugins/CasAuthentication/CasAuthenticationPlugin.php b/plugins/CasAuthentication/CasAuthenticationPlugin.php index 1662db3eba..6b751a0aa4 100644 --- a/plugins/CasAuthentication/CasAuthenticationPlugin.php +++ b/plugins/CasAuthentication/CasAuthenticationPlugin.php @@ -79,8 +79,10 @@ class CasAuthenticationPlugin extends AuthenticationPlugin $action_name = $action->trimmed('action'); $action->menuItem(common_local_url('caslogin'), + // TRANS: Menu item. CAS is Central Authentication Service. _m('CAS'), - _m('Login or register with CAS'), + // TRANS: Tooltip for menu item. CAS is Central Authentication Service. + _m('Login or register with CAS.'), $action_name === 'caslogin'); return true; @@ -93,9 +95,11 @@ class CasAuthenticationPlugin extends AuthenticationPlugin switch ($name) { case 'login': - $instr = '(Have an account with CAS? ' . - 'Try our [CAS login]'. - '(%%action.caslogin%%)!)'; + // TRANS: Invitation to users with a CAS account to log in using the service. + // TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL. + // TRANS: These two elements may not be separated. + $instr = _m('(Have an account with CAS? ' . + 'Try our [CAS login](%%action.caslogin%%)!)'); break; default: return true; @@ -121,13 +125,13 @@ class CasAuthenticationPlugin extends AuthenticationPlugin function onInitializePlugin(){ parent::onInitializePlugin(); if(!isset($this->server)){ - throw new Exception("must specify a server"); + throw new Exception(_m("Specifying a server is required."); } if(!isset($this->port)){ - throw new Exception("must specify a port"); + throw new Exception(_m("Specifying a port is required."); } if(!isset($this->path)){ - throw new Exception("must specify a path"); + throw new Exception(_m("Specifying a path is required."); } //These values need to be accessible to a action object //I can't think of any other way than global variables @@ -146,8 +150,8 @@ class CasAuthenticationPlugin extends AuthenticationPlugin 'version' => STATUSNET_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:CasAuthentication', - 'rawdescription' => - _m('The CAS Authentication plugin allows for StatusNet to handle authentication through CAS (Central Authentication Service).')); + // TRANS: Plugin description. CAS is Central Authentication Service. + 'rawdescription' => _m('The CAS Authentication plugin allows for StatusNet to handle authentication through CAS (Central Authentication Service).')); return true; } } diff --git a/plugins/CasAuthentication/caslogin.php b/plugins/CasAuthentication/caslogin.php index a66774dc17..846774e7c6 100644 --- a/plugins/CasAuthentication/caslogin.php +++ b/plugins/CasAuthentication/caslogin.php @@ -36,13 +36,13 @@ class CasloginAction extends Action $casTempPassword = common_good_rand(16); $user = common_check_user(phpCAS::getUser(), $casTempPassword); if (!$user) { - $this->serverError(_('Incorrect username or password.')); + $this->serverError(_m('Incorrect username or password.')); return; } // success! if (!common_set_user($user)) { - $this->serverError(_('Error setting user. You are probably not authorized.')); + $this->serverError(_m('Error setting user. You are probably not authorized.')); return; } @@ -69,7 +69,6 @@ class CasloginAction extends Action } common_redirect($url, 303); - } } } From 09c99461e5dfeba443398c4c7b38c35104328b5e Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 14:35:04 +0200 Subject: [PATCH 22/76] * update L10n * remove superfluous whitespace --- plugins/WikiHowProfile/WikiHowProfilePlugin.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/plugins/WikiHowProfile/WikiHowProfilePlugin.php b/plugins/WikiHowProfile/WikiHowProfilePlugin.php index b72bd55d6d..fa683c4836 100644 --- a/plugins/WikiHowProfile/WikiHowProfilePlugin.php +++ b/plugins/WikiHowProfile/WikiHowProfilePlugin.php @@ -47,7 +47,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ - class WikiHowProfilePlugin extends Plugin { function onPluginVersion(&$versions) @@ -57,7 +56,7 @@ class WikiHowProfilePlugin extends Plugin 'author' => 'Brion Vibber', 'homepage' => 'http://status.net/wiki/Plugin:Sample', 'rawdescription' => - _m('Fetches avatar and other profile info for WikiHow users when setting up an account via OpenID.')); + _m('Fetches avatar and other profile information for WikiHow users when setting up an account via OpenID.')); return true; } @@ -107,14 +106,14 @@ class WikiHowProfilePlugin extends Plugin /** * Given a user's WikiHow profile URL, find their avatar. - * + * * @param string $profileUrl user page on the wiki - * + * * @return array of data; possible members: * 'avatar' => full URL to avatar image - * + * * @throws Exception on various low-level failures - * + * * @todo pull location, web site, and about sections -- they aren't currently marked up cleanly. */ private function fetchProfile($profileUrl) @@ -169,14 +168,14 @@ class WikiHowProfilePlugin extends Plugin private function saveAvatar($user, $url) { if (!common_valid_http_url($url)) { - throw new ServerException(sprintf(_m("Invalid avatar URL %s"), $url)); + throw new ServerException(sprintf(_m("Invalid avatar URL %s."), $url)); } // @fixme this should be better encapsulated // ripped from OStatus via oauthstore.php (for old OMB client) $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar'); if (!copy($url, $temp_filename)) { - throw new ServerException(sprintf(_m("Unable to fetch avatar from %s"), $url)); + throw new ServerException(sprintf(_m("Unable to fetch avatar from %s."), $url)); } $profile = $user->getProfile(); @@ -191,6 +190,4 @@ class WikiHowProfilePlugin extends Plugin rename($temp_filename, Avatar::path($filename)); $profile->setOriginal($filename); } - } - From 977472bcf69e20e795bc697e9f839c261a17a5a8 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 14:39:06 +0200 Subject: [PATCH 23/76] remove superfluous whitespace --- plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php index af75b96e0b..719dba89cd 100644 --- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php +++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php @@ -170,4 +170,3 @@ class RequireValidatedEmailPlugin extends Plugin return true; } } - From 34f95c26fd9f51c730d05287d5b201a6cbedc285 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 15:10:49 +0200 Subject: [PATCH 24/76] * FIXME/CHECKMEs added for (possible) bad i18n * translator hints added * superfluous whitespace removed --- plugins/Mapstraction/MapstractionPlugin.php | 8 ++------ plugins/Mapstraction/allmap.php | 9 +++++++-- plugins/Mapstraction/map.php | 2 -- plugins/Mapstraction/usermap.php | 7 ++++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index e7240a6449..c4ba6464ea 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -44,7 +44,6 @@ if (!defined('STATUSNET')) { * * @seeAlso Location */ - class MapstractionPlugin extends Plugin { const VERSION = STATUSNET_VERSION; @@ -64,7 +63,6 @@ class MapstractionPlugin extends Plugin * * @return boolean event handler return */ - function onRouterInitialized($m) { $m->connect(':nickname/all/map', @@ -85,7 +83,6 @@ class MapstractionPlugin extends Plugin * * @return boolean event handler return */ - function onAutoload($cls) { switch ($cls) @@ -109,7 +106,6 @@ class MapstractionPlugin extends Plugin * * @return boolean event handler return */ - function onEndShowScripts($action) { $actionName = $action->trimmed('action'); @@ -190,6 +186,7 @@ class MapstractionPlugin extends Plugin array('nickname' => $action->trimmed('nickname'))); $action->element('a', array('href' => $mapUrl), + // TRANS: Clickable item to allow opening the map in full size. _m("Full size")); $action->elementEnd('div'); @@ -203,8 +200,7 @@ class MapstractionPlugin extends Plugin 'homepage' => 'http://status.net/wiki/Plugin:Mapstraction', 'rawdescription' => _m('Show maps of users\' and friends\' notices '. - 'with Mapstraction '. - 'JavaScript library.')); + 'with Mapstraction.')); return true; } } diff --git a/plugins/Mapstraction/allmap.php b/plugins/Mapstraction/allmap.php index 5dab670e26..fa05ccc7ae 100644 --- a/plugins/Mapstraction/allmap.php +++ b/plugins/Mapstraction/allmap.php @@ -42,7 +42,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class AllmapAction extends MapAction { function prepare($args) @@ -63,16 +62,22 @@ class AllmapAction extends MapAction function title() { if (!empty($this->profile->fullname)) { + // @todo FIXME: Bad i18n. Should be "%1$s (%2$s)". $base = $this->profile->fullname . ' (' . $this->user->nickname . ') '; } else { $base = $this->user->nickname; } if ($this->page == 1) { + // TRANS: Page title. + // TRANS: %s is a user nickname. return sprintf(_m("%s friends map"), $base); } else { - return sprintf(_m("%s friends map, page %d"), + // @todo CHECKME: does this even happen? May not be needed. + // TRANS: Page title. + // TRANS: %1$s is a user nickname, %2$d is a page number. + return sprintf(_m("%1$s friends map, page %2$d"), $base, $this->page); } diff --git a/plugins/Mapstraction/map.php b/plugins/Mapstraction/map.php index 7dab8e10a9..50ff82b67e 100644 --- a/plugins/Mapstraction/map.php +++ b/plugins/Mapstraction/map.php @@ -42,7 +42,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class MapAction extends OwnerDesignAction { var $profile = null; @@ -116,7 +115,6 @@ class MapAction extends OwnerDesignAction * * @return boolean event handler return */ - function showScripts() { parent::showScripts(); diff --git a/plugins/Mapstraction/usermap.php b/plugins/Mapstraction/usermap.php index 094334f605..0ee956159c 100644 --- a/plugins/Mapstraction/usermap.php +++ b/plugins/Mapstraction/usermap.php @@ -42,10 +42,8 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class UsermapAction extends MapAction { - function prepare($args) { if(parent::prepare($args)) { @@ -61,14 +59,17 @@ class UsermapAction extends MapAction function title() { if (!empty($this->profile->fullname)) { - $base = $this->profile->fullname . ' (' . $this->user->nickname . ') '; + // @todo FIXME: Bad i18n. Should be '%1$s (%2$s)' + $base = $this->profile->fullname . ' (' . $this->user->nickname . ')'; } else { $base = $this->user->nickname; } if ($this->page == 1) { + // @todo CHECKME: inconsisten with paged variant below. " map" missing. return $base; } else { + // @todo CHECKME: Is the part ", page %2$d" relevant here? return sprintf(_m("%s map, page %d"), $base, $this->page); From edb411b4aeec6a19f5d127b619bdbe108b01f264 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 15:23:17 +0200 Subject: [PATCH 25/76] * L10n updates and translator documentation added. * superfluous whitespace removed. --- plugins/Sample/SamplePlugin.php | 8 -------- plugins/Sample/User_greeting_count.php | 16 ++++++---------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/plugins/Sample/SamplePlugin.php b/plugins/Sample/SamplePlugin.php index 913741226b..ef69121a99 100644 --- a/plugins/Sample/SamplePlugin.php +++ b/plugins/Sample/SamplePlugin.php @@ -101,7 +101,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ - class SamplePlugin extends Plugin { /** @@ -129,7 +128,6 @@ class SamplePlugin extends Plugin * * @return boolean hook value; true means continue processing, false means stop. */ - function initialize() { return true; @@ -143,7 +141,6 @@ class SamplePlugin extends Plugin * * @return boolean hook value; true means continue processing, false means stop. */ - function cleanup() { return true; @@ -168,7 +165,6 @@ class SamplePlugin extends Plugin * * @return boolean hook value; true means continue processing, false means stop. */ - function onCheckSchema() { $schema = Schema::get(); @@ -201,7 +197,6 @@ class SamplePlugin extends Plugin * * @return boolean hook value; true means continue processing, false means stop. */ - function onAutoload($cls) { $dir = dirname(__FILE__); @@ -231,7 +226,6 @@ class SamplePlugin extends Plugin * * @return boolean hook value; true means continue processing, false means stop. */ - function onRouterInitialized($m) { $m->connect('main/hello', @@ -256,7 +250,6 @@ class SamplePlugin extends Plugin * * @see Action */ - function onEndPrimaryNav($action) { // common_local_url() gets the correct URL for the action name @@ -278,4 +271,3 @@ class SamplePlugin extends Plugin return true; } } - diff --git a/plugins/Sample/User_greeting_count.php b/plugins/Sample/User_greeting_count.php index fc0cbd28ff..38d68c91ed 100644 --- a/plugins/Sample/User_greeting_count.php +++ b/plugins/Sample/User_greeting_count.php @@ -70,7 +70,6 @@ class User_greeting_count extends Memcached_DataObject * @return User_greeting_count object found, or null for no hits * */ - function staticGet($k, $v=null) { return Memcached_DataObject::staticGet('User_greeting_count', $k, $v); @@ -84,7 +83,6 @@ class User_greeting_count extends Memcached_DataObject * * @return array array of column definitions */ - function table() { return array('user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL, @@ -100,7 +98,6 @@ class User_greeting_count extends Memcached_DataObject * * @return array list of key field names */ - function keys() { return array_keys($this->keyTypes()); @@ -118,7 +115,6 @@ class User_greeting_count extends Memcached_DataObject * 'K' for primary key: for compound keys, add an entry for each component; * 'U' for unique keys: compound keys are not well supported here. */ - function keyTypes() { return array('user_id' => 'K'); @@ -134,7 +130,6 @@ class User_greeting_count extends Memcached_DataObject * * @return array magic three-false array that stops auto-incrementing. */ - function sequenceKey() { return array(false, false, false); @@ -150,7 +145,6 @@ class User_greeting_count extends Memcached_DataObject * * @return User_greeting_count instance for this user, with count already incremented. */ - static function inc($user_id) { $gc = User_greeting_count::staticGet('user_id', $user_id); @@ -165,12 +159,12 @@ class User_greeting_count extends Memcached_DataObject $result = $gc->insert(); if (!$result) { - throw Exception(sprintf(_m("Could not save new greeting count for %d"), + // TRANS: Exception thrown when the user greeting count could not be saved in the database. + // TRANS: %d is a user ID (number). + throw Exception(sprintf(_m("Could not save new greeting count for %d."), $user_id)); } - } else { - $orig = clone($gc); $gc->greeting_count++; @@ -178,7 +172,9 @@ class User_greeting_count extends Memcached_DataObject $result = $gc->update($orig); if (!$result) { - throw Exception(sprintf(_m("Could not increment greeting count for %d"), + // TRANS: Exception thrown when the user greeting count could not be saved in the database. + // TRANS: %d is a user ID (number). + throw Exception(sprintf(_m("Could not increment greeting count for %d."), $user_id)); } } From 52ccc8e521d47713643f558daf93855a875a6c73 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 15:26:48 +0200 Subject: [PATCH 26/76] * update L10n * remove superfluous whitespace --- plugins/Sample/hello.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/plugins/Sample/hello.php b/plugins/Sample/hello.php index dfbd0ad4f2..a793ac6de2 100644 --- a/plugins/Sample/hello.php +++ b/plugins/Sample/hello.php @@ -46,7 +46,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ */ - class HelloAction extends Action { var $user = null; @@ -67,7 +66,6 @@ class HelloAction extends Action * * @return boolean success flag */ - function prepare($args) { parent::prepare($args); @@ -93,7 +91,6 @@ class HelloAction extends Action * * @return void */ - function handle($args) { parent::handle($args); @@ -108,13 +105,12 @@ class HelloAction extends Action * * @return string Title of the page */ - function title() { if (empty($this->user)) { return _m('Hello'); } else { - return sprintf(_m('Hello, %s'), $this->user->nickname); + return sprintf(_m('Hello, %s!'), $this->user->nickname); } } @@ -130,7 +126,6 @@ class HelloAction extends Action * * @return void */ - function showContent() { if (empty($this->user)) { @@ -162,7 +157,6 @@ class HelloAction extends Action * * @return boolean is read only action? */ - function isReadOnly($args) { return false; From 326e351d448382ae85588f1d7d69e7bf507eebe4 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 15:38:15 +0200 Subject: [PATCH 27/76] Fix typo. --- plugins/Blacklist/BlacklistPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php index 0008348389..bc8b82492d 100644 --- a/plugins/Blacklist/BlacklistPlugin.php +++ b/plugins/Blacklist/BlacklistPlugin.php @@ -231,7 +231,7 @@ class BlacklistPlugin extends Plugin $url = htmlspecialchars_decode($url); if (!$this->_checkUrl($url)) { - $msg = sprintf(_m("You may not use UTL \"%s\" in notices."), + $msg = sprintf(_m("You may not use URL \"%s\" in notices."), $url); throw new ClientException($msg); } From cfe60815bc5e96a7711cd836ab829d297aaba269 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 17:14:00 +0200 Subject: [PATCH 28/76] Remove superfluous whitespace. --- plugins/Gravatar/GravatarPlugin.php | 18 +++++++++--------- plugins/Gravatar/README | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php index 8a9721ea90..208262d0e9 100644 --- a/plugins/Gravatar/GravatarPlugin.php +++ b/plugins/Gravatar/GravatarPlugin.php @@ -34,17 +34,17 @@ class GravatarPlugin extends Plugin { return true; } - + function onStartAvatarFormData($action) { $user = common_current_user(); $hasGravatar = $this->hasGravatar($user->id); - + if($hasGravatar) { return false; } } - + function onEndAvatarFormData($action) { $user = common_current_user(); @@ -91,7 +91,7 @@ class GravatarPlugin extends Plugin _m('To use a Gravatar first enter in an email address.')); } } - + function onStartAvatarSaveForm($action) { if ($action->arg('add')) { @@ -131,19 +131,19 @@ class GravatarPlugin extends Plugin } return false; } - + function gravatar_save() { $cur = common_current_user(); - + if(empty($cur->email)) { return array('message' => _m('You do not have a email set in your profile.'), 'success' => false); } //Get rid of previous Avatar $this->gravatar_remove(); - + foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) { $gravatar = new Avatar(); $gravatar->profile_id = $cur->id; @@ -181,7 +181,7 @@ class GravatarPlugin extends Plugin return array('message' => _m('Gravatar removed.'), 'success' => true); } - + function gravatar_url($email, $size) { $url = "http://www.gravatar.com/avatar.php?gravatar_id=". @@ -202,4 +202,4 @@ class GravatarPlugin extends Plugin return true; } -} \ No newline at end of file +} diff --git a/plugins/Gravatar/README b/plugins/Gravatar/README index 9337e24a0a..2639048089 100644 --- a/plugins/Gravatar/README +++ b/plugins/Gravatar/README @@ -10,4 +10,4 @@ addPlugin('Gravatar', array()); ToDo: Site default all on for gravatar by default Migration Script -Localize \ No newline at end of file +Localize From 1c5e00df3035b2f0280ad98d028742adef2b09c4 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 17:16:48 +0200 Subject: [PATCH 29/76] Fix typo. --- plugins/Gravatar/GravatarPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php index 208262d0e9..f415541bfe 100644 --- a/plugins/Gravatar/GravatarPlugin.php +++ b/plugins/Gravatar/GravatarPlugin.php @@ -138,7 +138,7 @@ class GravatarPlugin extends Plugin $cur = common_current_user(); if(empty($cur->email)) { - return array('message' => _m('You do not have a email set in your profile.'), + return array('message' => _m('You do not have a email address set in your profile.'), 'success' => false); } //Get rid of previous Avatar From ba6538ed78df3049fa59aed0855b0e3af54c994f Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 18 Sep 2010 17:45:18 +0200 Subject: [PATCH 30/76] * i18n/L10n updates * whitespace updates. --- plugins/TwitterBridge/TwitterBridgePlugin.php | 13 +--- .../TwitterBridge/Twitter_synch_status.php | 10 ---- .../daemons/synctwitterfriends.php | 7 --- .../daemons/twitterstatusfetcher.php | 24 +------- plugins/TwitterBridge/twitter.php | 7 --- plugins/TwitterBridge/twitteradminpanel.php | 14 +---- .../TwitterBridge/twitterauthorization.php | 59 +++++++++---------- plugins/TwitterBridge/twitterlogin.php | 9 ++- plugins/TwitterBridge/twitteroauthclient.php | 1 - plugins/TwitterBridge/twittersettings.php | 8 +-- 10 files changed, 39 insertions(+), 113 deletions(-) diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php index 34b82ef83a..94d4d9e475 100644 --- a/plugins/TwitterBridge/TwitterBridgePlugin.php +++ b/plugins/TwitterBridge/TwitterBridgePlugin.php @@ -45,7 +45,6 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php'; * @link http://status.net/ * @link http://twitter.com/ */ - class TwitterBridgePlugin extends Plugin { @@ -55,7 +54,6 @@ class TwitterBridgePlugin extends Plugin /** * Initializer for the plugin. */ - function initialize() { // Allow the key and secret to be passed in @@ -86,7 +84,6 @@ class TwitterBridgePlugin extends Plugin * * @return boolean result */ - static function hasKeys() { $ckey = common_config('twitter', 'consumer_key'); @@ -113,7 +110,6 @@ class TwitterBridgePlugin extends Plugin * * @return boolean hook return */ - function onRouterInitialized($m) { $m->connect('admin/twitter', array('action' => 'twitteradminpanel')); @@ -310,7 +306,6 @@ class TwitterBridgePlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(&$versions) { $versions[] = array( @@ -319,8 +314,8 @@ class TwitterBridgePlugin extends Plugin 'author' => 'Zach Copley, Julien C', 'homepage' => 'http://status.net/wiki/Plugin:TwitterBridge', 'rawdescription' => _m( - 'The Twitter "bridge" plugin allows you to integrate ' . - 'your StatusNet instance with ' . + 'The Twitter "bridge" plugin allows integration ' . + 'of a StatusNet instance with ' . 'Twitter.' ) ); @@ -374,7 +369,6 @@ class TwitterBridgePlugin extends Plugin * * @return boolean hook value; true means continue processing, false means stop. */ - function onCheckSchema() { $schema = Schema::get(); @@ -416,7 +410,6 @@ class TwitterBridgePlugin extends Plugin * * @return boolean hook value */ - function onStartDeleteOwnNotice(User $user, Notice $notice) { $n2s = Notice_to_status::staticGet('notice_id', $notice->id); @@ -452,7 +445,6 @@ class TwitterBridgePlugin extends Plugin * @param Notice $notice being favored * @return hook return value */ - function onEndFavorNotice(Profile $profile, Notice $notice) { $flink = Foreign_link::getByUserID($profile->id, @@ -489,7 +481,6 @@ class TwitterBridgePlugin extends Plugin * * @return hook return value */ - function onEndDisfavorNotice(Profile $profile, Notice $notice) { $flink = Foreign_link::getByUserID($profile->id, diff --git a/plugins/TwitterBridge/Twitter_synch_status.php b/plugins/TwitterBridge/Twitter_synch_status.php index 2a5f1fd605..a8337862c8 100644 --- a/plugins/TwitterBridge/Twitter_synch_status.php +++ b/plugins/TwitterBridge/Twitter_synch_status.php @@ -48,7 +48,6 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; * * @see DB_DataObject */ - class Twitter_synch_status extends Memcached_DataObject { public $__table = 'twitter_synch_status'; // table name @@ -67,7 +66,6 @@ class Twitter_synch_status extends Memcached_DataObject * @return Twitter_synch_status object found, or null for no hits * */ - function staticGet($k, $v=null) { throw new Exception("Use pkeyGet() for this class."); @@ -81,7 +79,6 @@ class Twitter_synch_status extends Memcached_DataObject * @return Twitter_synch_status object found, or null for no hits * */ - function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('Twitter_synch_status', $kv); @@ -95,7 +92,6 @@ class Twitter_synch_status extends Memcached_DataObject * * @return array array of column definitions */ - function table() { return array('foreign_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL, @@ -115,7 +111,6 @@ class Twitter_synch_status extends Memcached_DataObject * * @return array list of key field names */ - function keys() { return array_keys($this->keyTypes()); @@ -133,7 +128,6 @@ class Twitter_synch_status extends Memcached_DataObject * 'K' for primary key: for compound keys, add an entry for each component; * 'U' for unique keys: compound keys are not well supported here. */ - function keyTypes() { return array('foreign_id' => 'K', @@ -150,7 +144,6 @@ class Twitter_synch_status extends Memcached_DataObject * * @return array magic three-false array that stops auto-incrementing. */ - function sequenceKey() { return array(false, false, false); @@ -174,7 +167,6 @@ class Twitter_synch_status extends Memcached_DataObject 'timeline' => $timeline)); if (empty($tss)) { - $tss = new Twitter_synch_status(); $tss->foreign_id = $foreign_id; @@ -186,9 +178,7 @@ class Twitter_synch_status extends Memcached_DataObject $tss->insert(); return true; - } else { - $orig = clone($tss); $tss->last_id = $last_id; diff --git a/plugins/TwitterBridge/daemons/synctwitterfriends.php b/plugins/TwitterBridge/daemons/synctwitterfriends.php index 02546a02ca..38a8b89ebb 100755 --- a/plugins/TwitterBridge/daemons/synctwitterfriends.php +++ b/plugins/TwitterBridge/daemons/synctwitterfriends.php @@ -45,7 +45,6 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitteroauthclient.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class SyncTwitterFriendsDaemon extends ParallelizingDaemon { /** @@ -59,7 +58,6 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon * @return void * **/ - function __construct($id = null, $interval = 60, $max_children = 2, $debug = null) { @@ -71,7 +69,6 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon * * @return string Name of the daemon. */ - function name() { return ('synctwitterfriends.' . $this->_id); @@ -110,12 +107,10 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon } function childTask($flink) { - // Each child ps needs its own DB connection // Note: DataObject::getDatabaseConnection() creates // a new connection if there isn't one already - $conn = &$flink->getDatabaseConnection(); $this->subscribeTwitterFriends($flink); @@ -127,7 +122,6 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon // XXX: Couldn't find a less brutal way to blow // away a cached connection - global $_DB_DATAOBJECT; unset($_DB_DATAOBJECT['CONNECTIONS']); } @@ -277,4 +271,3 @@ if (have_option('d') || have_option('debug')) { $syncer = new SyncTwitterFriendsDaemon($id, 60, 2, $debug); $syncer->runOnce(); - diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php index f1305696b3..31129b96d9 100755 --- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php +++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php @@ -62,7 +62,6 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitteroauthclient.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class TwitterStatusFetcher extends ParallelizingDaemon { /** @@ -87,7 +86,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon * * @return string Name of the daemon. */ - function name() { return ('twitterstatusfetcher.'.$this->_id); @@ -99,7 +97,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon * * @return array flinks an array of Foreign_link objects */ - function getObjects() { global $_DB_DATAOBJECT; @@ -133,12 +130,10 @@ class TwitterStatusFetcher extends ParallelizingDaemon } function childTask($flink) { - // Each child ps needs its own DB connection // Note: DataObject::getDatabaseConnection() creates // a new connection if there isn't one already - $conn = &$flink->getDatabaseConnection(); $this->getTimeline($flink); @@ -150,7 +145,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon // XXX: Couldn't find a less brutal way to blow // away a cached connection - global $_DB_DATAOBJECT; unset($_DB_DATAOBJECT['CONNECTIONS']); } @@ -201,9 +195,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon // Reverse to preserve order foreach (array_reverse($timeline) as $status) { - // Hacktastic: filter out stuff coming from this StatusNet - $source = mb_strtolower(common_config('integration', 'source')); if (preg_match("/$source/", mb_strtolower($status->source))) { @@ -214,7 +206,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon // Don't save it if the user is protected // FIXME: save it but treat it as private - if ($status->user->protected) { continue; } @@ -232,7 +223,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon } // Okay, record the time we synced with Twitter for posterity - $flink->last_noticesync = common_sql_now(); $flink->update(); } @@ -250,7 +240,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon $statusUri = $this->makeStatusURI($status->user->screen_name, $status->id); // check to see if we've already imported the status - $n2s = Notice_to_status::staticGet('status_id', $status->id); if (!empty($n2s)) { @@ -263,7 +252,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon } // If it's a retweet, save it as a repeat! - if (!empty($status->retweeted_status)) { common_log(LOG_INFO, "Status {$status->id} is a retweet of {$status->retweeted_status->id}."); $original = $this->saveStatus($status->retweeted_status); @@ -273,7 +261,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon $author = $original->getProfile(); // 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. - $content = sprintf(_('RT @%1$s %2$s'), + $content = sprintf(_m('RT @%1$s %2$s'), $author->nickname, $original->content); @@ -365,7 +353,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon * * @return string URI */ - function makeStatusURI($username, $id) { return 'http://twitter.com/' @@ -383,7 +370,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon * * @return mixed value the first Profile with that url, or null */ - function getProfileByUrl($nickname, $profileurl) { $profile = new Profile(); @@ -407,7 +393,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon * * @return mixed value a matching Notice or null */ - function checkDupe($profile, $statusUri) { $notice = new Notice(); @@ -426,7 +411,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon function ensureProfile($user) { // check to see if there's already a profile for this user - $profileurl = 'http://twitter.com/' . $user->screen_name; $profile = $this->getProfileByUrl($user->screen_name, $profileurl); @@ -440,7 +424,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon return $profile; } else { - common_debug($this->name() . ' - Adding profile and remote profile ' . "for Twitter user: $profileurl."); @@ -472,7 +455,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon $remote_pro = Remote_profile::staticGet('uri', $profileurl); if (empty($remote_pro)) { - $remote_pro = new Remote_profile(); $remote_pro->id = $id; @@ -619,7 +601,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon $avatar = $profile->getAvatar($sizes[$size]); // Delete the avatar, if present - if ($avatar) { $avatar->delete(); } @@ -644,10 +625,8 @@ class TwitterStatusFetcher extends ParallelizingDaemon $avatar->height = 48; break; default: - // Note: Twitter's big avatars are a different size than // StatusNet's (StatusNet's = 96) - $avatar->width = 73; $avatar->height = 73; } @@ -822,4 +801,3 @@ if (have_option('d') || have_option('debug')) { $fetcher = new TwitterStatusFetcher($id, 60, 2, $debug); $fetcher->runOnce(); - diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index 90b0f0f14f..3bff0af72d 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -69,7 +69,6 @@ function save_twitter_user($twitter_id, $screen_name) { // Check to see whether the Twitter user is already in the system, // and update its screen name and uri if so. - $fuser = Foreign_user::getForeignUser($twitter_id, TWITTER_SERVICE); if (!empty($fuser)) { @@ -87,9 +86,7 @@ function save_twitter_user($twitter_id, $screen_name) } } else { - // Kill any old, invalid records for this screen name - $fuser = Foreign_user::getByNickname($screen_name, TWITTER_SERVICE); if (!empty($fuser)) { @@ -110,13 +107,11 @@ function save_twitter_user($twitter_id, $screen_name) } function is_twitter_bound($notice, $flink) { - // Check to see if notice should go to Twitter if (!empty($flink) && ($flink->noticesync & FOREIGN_NOTICE_SEND)) { // If it's not a Twitter-style reply, or if the user WANTS to send replies, // or if it's in reply to a twitter notice - if (!preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) || ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) || is_twitter_notice($notice->reply_to)) { @@ -242,7 +237,6 @@ function broadcast_oauth($notice, $flink) { } // Notice crossed the great divide - $msg = sprintf('Twitter bridge - posted notice %d to Twitter using ' . 'OAuth for User %s (user id %d).', $notice->id, @@ -378,4 +372,3 @@ function mail_twitter_bridge_removed($user) common_switch_locale(); return mail_to_user($user, $subject, $body); } - diff --git a/plugins/TwitterBridge/twitteradminpanel.php b/plugins/TwitterBridge/twitteradminpanel.php index 69f8da078a..d05a2c6b3e 100644 --- a/plugins/TwitterBridge/twitteradminpanel.php +++ b/plugins/TwitterBridge/twitteradminpanel.php @@ -40,7 +40,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class TwitteradminpanelAction extends AdminPanelAction { /** @@ -48,7 +47,6 @@ class TwitteradminpanelAction extends AdminPanelAction * * @return string page title */ - function title() { return _m('Twitter'); @@ -59,7 +57,6 @@ class TwitteradminpanelAction extends AdminPanelAction * * @return string instructions */ - function getInstructions() { return _m('Twitter bridge settings'); @@ -70,7 +67,6 @@ class TwitteradminpanelAction extends AdminPanelAction * * @return void */ - function showForm() { $form = new TwitterAdminPanelForm($this); @@ -83,7 +79,6 @@ class TwitteradminpanelAction extends AdminPanelAction * * @return void */ - function saveSettings() { static $settings = array( @@ -173,7 +168,6 @@ class TwitterAdminPanelForm extends AdminForm * * @return int ID of the form */ - function id() { return 'twitteradminpanel'; @@ -184,7 +178,6 @@ class TwitterAdminPanelForm extends AdminForm * * @return string class of the form */ - function formClass() { return 'form_settings'; @@ -195,7 +188,6 @@ class TwitterAdminPanelForm extends AdminForm * * @return string URL of the action */ - function action() { return common_local_url('twitteradminpanel'); @@ -206,7 +198,6 @@ class TwitterAdminPanelForm extends AdminForm * * @return void */ - function formData() { $this->out->elementStart( @@ -239,7 +230,7 @@ class TwitterAdminPanelForm extends AdminForm if (!empty($globalConsumerKey) && !empty($globalConsumerSec)) { $this->li(); - $this->out->element('p', 'form_guide', _('Note: a global consumer key and secret are set.')); + $this->out->element('p', 'form_guide', _m('Note: a global consumer key and secret are set.')); $this->unli(); } @@ -292,9 +283,8 @@ class TwitterAdminPanelForm extends AdminForm * * @return void */ - function formActions() { - $this->out->submit('submit', _('Save'), 'submit', null, _('Save Twitter settings')); + $this->out->submit('submit', _m('Save'), 'submit', null, _m('Save Twitter settings')); } } diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php index 7a896e1687..931a037230 100644 --- a/plugins/TwitterBridge/twitterauthorization.php +++ b/plugins/TwitterBridge/twitterauthorization.php @@ -117,13 +117,13 @@ class TwitterauthorizationAction extends Action $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { - $this->showForm(_('There was a problem with your session token. Try again, please.')); + $this->showForm(_m('There was a problem with your session token. Try again, please.')); return; } if ($this->arg('create')) { if (!$this->boolean('license')) { - $this->showForm(_('You can\'t register if you don\'t agree to the license.'), + $this->showForm(_m('You can\'t register if you don\'t agree to the license.'), $this->trimmed('newname')); return; } @@ -132,7 +132,7 @@ class TwitterauthorizationAction extends Action $this->connectNewUser(); } else { common_debug('Twitter bridge - ' . print_r($this->args, true)); - $this->showForm(_('Something weird happened.'), + $this->showForm(_m('Something weird happened.'), $this->trimmed('newname')); } } else { @@ -231,7 +231,6 @@ class TwitterauthorizationAction extends Action } if (common_logged_in()) { - // Save the access token and Twitter user info $user = common_current_user(); @@ -298,7 +297,7 @@ class TwitterauthorizationAction extends Action if (empty($flink_id)) { common_log_db_error($flink, 'INSERT', __FILE__); - $this->serverError(_('Couldn\'t link your Twitter account.')); + $this->serverError(_m('Couldn\'t link your Twitter account.')); } return $flink_id; @@ -310,13 +309,13 @@ class TwitterauthorizationAction extends Action $this->element('div', array('class' => 'error'), $this->error); } else { $this->element('div', 'instructions', - sprintf(_('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.'), common_config('site', 'name'))); + sprintf(_m('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.'), common_config('site', 'name'))); } } function title() { - return _('Twitter Account Setup'); + return _m('Twitter Account Setup'); } function showForm($error=null, $username=null) @@ -349,7 +348,7 @@ class TwitterauthorizationAction extends Action 'class' => 'form_settings', 'action' => common_local_url('twitterauthorization'))); $this->elementStart('fieldset', array('id' => 'settings_twitter_connect_options')); - $this->element('legend', null, _('Connection options')); + $this->element('legend', null, _m('Connection options')); $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->element('input', array('type' => 'checkbox', @@ -358,7 +357,7 @@ class TwitterauthorizationAction extends Action 'name' => 'license', 'value' => 'true')); $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license')); - $message = _('My text and files are available under %s ' . + $message = _m('My text and files are available under %s ' . 'except this private data: password, ' . 'email address, IM address, and phone number.'); $link = 'text(_m('Disconnecting your Faceboook ' . 'would make it impossible to log in! Please ')); $this->element('a', array('href' => common_local_url('passwordsettings')), + // TRANS: Preceded by "Please " and followed by " first." _m('set a password')); - + // TRANS: Preceded by "Please set a password". $this->text(_m(' first.')); $this->elementEnd('p'); } else { diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index f65b97c865..467c6af84f 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -219,22 +219,22 @@ class FacebookAction extends Action function showInstructions() { - $this->elementStart('div', array('class' => 'facebook_guide')); $this->elementStart('dl', array('class' => 'system_notice')); $this->element('dt', null, 'Page Notice'); $loginmsg_part1 = _m('To use the %s Facebook Application you need to login ' . - 'with your username and password. Don\'t have a username yet? '); + 'with your username and password. Don\'t have a username yet?'); $loginmsg_part2 = _m(' a new account.'); $this->elementStart('dd'); $this->elementStart('p'); $this->text(sprintf($loginmsg_part1, common_config('site', 'name'))); + // @todo FIXME: Bad i18n. Patchwork message in two parts. $this->element('a', array('href' => common_local_url('register')), _m('Register')); - $this->text($loginmsg_part2); + $this->text( " " . $loginmsg_part2); $this->elementEnd('p'); $this->elementEnd('dd'); diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index 3bff0af72d..d984698ee8 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -30,7 +30,6 @@ function add_twitter_user($twitter_id, $screen_name) // Clear out any bad old foreign_users with the new user's legit URL // This can happen when users move around or fakester accounts get // repoed, and things like that. - $luser = Foreign_user::getForeignUser($twitter_id, TWITTER_SERVICE); if (!empty($luser)) { @@ -135,7 +134,6 @@ function broadcast_twitter($notice) TWITTER_SERVICE); // Don't bother with basic auth, since it's no longer allowed - if (!empty($flink) && TwitterOAuthClient::isPackedToken($flink->credentials)) { if (!empty($notice->repeat_of) && is_twitter_notice($notice->repeat_of)) { $retweet = retweet_notice($flink, Notice::staticGet('id', $notice->repeat_of)); @@ -224,7 +222,6 @@ function broadcast_oauth($notice, $flink) { // This could represent a failure posting, // or the Twitter API might just be behaving flakey. - $errmsg = sprintf('Twitter bridge - No data returned by Twitter API when ' . 'trying to post notice %d for User %s (user id %d).', $notice->id, @@ -347,7 +344,6 @@ function remove_twitter_link($flink) * * @return boolean success flag */ - function mail_twitter_bridge_removed($user) { $profile = $user->getProfile(); @@ -360,8 +356,8 @@ function mail_twitter_bridge_removed($user) $body = sprintf(_m('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" . + 'permission to update your Twitter 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\n\t%2\$s\n\n" . "Regards,\n%3\$s\n"), diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php index 6b087353a6..dab8ab34fe 100644 --- a/plugins/TwitterBridge/twittersettings.php +++ b/plugins/TwitterBridge/twittersettings.php @@ -128,6 +128,7 @@ class TwittersettingsAction extends ConnectSettingsAction if (!$user->password) { $this->elementStart('p', array('class' => 'form_guide')); + // @todo FIXME: Bad i18n (patchwork in three parts). $this->text(_m('Disconnecting your Twitter ' . 'could make it impossible to log in! Please ')); $this->element('a', @@ -180,7 +181,7 @@ class TwittersettingsAction extends ConnectSettingsAction if (common_config('twitterimport','enabled')) { $this->elementStart('li'); $this->checkbox('noticerecv', - _m('Import my Friends Timeline.'), + _m('Import my friends timeline.'), ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_RECV) : false); From 159e3e7b7138b4425c64e01c498f21ccb14026c6 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 19 Sep 2010 00:13:06 +0200 Subject: [PATCH 36/76] Fix typo --- plugins/Gravatar/GravatarPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php index 23f04e7db6..e4782cb9fb 100644 --- a/plugins/Gravatar/GravatarPlugin.php +++ b/plugins/Gravatar/GravatarPlugin.php @@ -138,7 +138,7 @@ class GravatarPlugin extends Plugin $cur = common_current_user(); if(empty($cur->email)) { - return array('message' => _m('You do not have a email address set in your profile.'), + return array('message' => _m('You do not have an email address set in your profile.'), 'success' => false); } //Get rid of previous Avatar From 8b44063ca14d3101d39b081ec85421a221b45bb7 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 19 Sep 2010 00:17:24 +0200 Subject: [PATCH 37/76] * L10n update * superfluous whitespace removed --- plugins/CacheLog/CacheLogPlugin.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/CacheLog/CacheLogPlugin.php b/plugins/CacheLog/CacheLogPlugin.php index 4c47de80eb..5b0b439354 100644 --- a/plugins/CacheLog/CacheLogPlugin.php +++ b/plugins/CacheLog/CacheLogPlugin.php @@ -50,7 +50,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ - class CacheLogPlugin extends Plugin { function onStartCacheGet(&$key, &$value) @@ -114,8 +113,7 @@ class CacheLogPlugin extends Plugin 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:CacheLog', 'description' => - _m('Log reads and writes to the cache')); + _m('Log reads and writes to the cache.')); return true; } } - From 1564b6aa49f47ac59ea15eef2f138b17d2c35cff Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 19 Sep 2010 00:19:02 +0200 Subject: [PATCH 38/76] * L10n update * remove superfluous whitespace --- plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php b/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php index c646bf113b..bb937ec5b9 100644 --- a/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php +++ b/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php @@ -47,7 +47,6 @@ if (!defined('STATUSNET')) { * * @see Event */ - class GoogleAnalyticsPlugin extends Plugin { var $code = null; @@ -79,7 +78,7 @@ class GoogleAnalyticsPlugin extends Plugin 'homepage' => 'http://status.net/wiki/Plugin:GoogleAnalytics', 'rawdescription' => _m('Use Google Analytics'. - ' to track Web access.')); + ' to track web access.')); return true; } } From 53cfa5349f1f9c964d5a8136399f03a85bc6d484 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 19 Sep 2010 00:20:16 +0200 Subject: [PATCH 39/76] * L10n update * superfluous whitespace removed. --- plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php index b353d72552..777fd9c5d3 100644 --- a/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php +++ b/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php @@ -49,7 +49,6 @@ if (!defined('STATUSNET')) { * analytics setup - for example '8'. * */ - class PiwikAnalyticsPlugin extends Plugin { /** the base of your Piwik installation */ @@ -63,7 +62,6 @@ class PiwikAnalyticsPlugin extends Plugin * @param string $root Piwik root URL * @param string $id Piwik ID of this app */ - function __construct($root=null, $id=null) { $this->piwikroot = $root; @@ -78,7 +76,6 @@ class PiwikAnalyticsPlugin extends Plugin * * @return boolean ignored */ - function onEndShowScripts($action) { $piwikCode1 = << 'Tobias Diekershoff, Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:Piwik', 'rawdescription' => - _m('Use Piwik Open Source Web analytics software.')); + _m('Use Piwik Open Source web analytics software.')); return true; } - } From f1d78942b37d40c3aaa31ed52bc37a76a958dd66 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 19 Sep 2010 00:23:10 +0200 Subject: [PATCH 40/76] L10n updates. --- plugins/RSSCloud/RSSCloudRequestNotify.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/RSSCloud/RSSCloudRequestNotify.php b/plugins/RSSCloud/RSSCloudRequestNotify.php index 41b8685785..e9c0eab5f8 100644 --- a/plugins/RSSCloud/RSSCloudRequestNotify.php +++ b/plugins/RSSCloud/RSSCloudRequestNotify.php @@ -138,7 +138,7 @@ class RSSCloudRequestNotifyAction extends Action common_log(LOG_WARNING, "RSSCloud plugin - $nh tried to subscribe to invalid feed: $feed"); - $msg = _m('Feed subscription failed - Not a valid feed.'); + $msg = _m('Feed subscription failed: Not a valid feed.'); $this->showResult(false, $msg); return; } @@ -159,7 +159,7 @@ class RSSCloudRequestNotifyAction extends Action // 25 hours seems harsh. WordPress doesn't ever remove // subscriptions. $msg = _m('Thanks for the subscription. ' . - 'When the feed(s) update(s) we\'ll notify you.'); + 'When the feed(s) update(s), you will be notified.'); $this->showResult(true, $msg); } From 8135f7d9605ef16d56b6588f3ebea333891d17ef Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 19 Sep 2010 00:24:48 +0200 Subject: [PATCH 41/76] Update pot files for plugins. --- plugins/Adsense/locale/Adsense.pot | 2 +- plugins/AutoSandbox/locale/AutoSandbox.pot | 5 +- plugins/Autocomplete/locale/Autocomplete.pot | 2 +- plugins/BitlyUrl/locale/BitlyUrl.pot | 2 +- plugins/Blacklist/locale/Blacklist.pot | 4 +- .../locale/CasAuthentication.pot | 41 ++- .../locale/ClientSideShorten.pot | 4 +- .../locale/DirectionDetector.pot | 2 +- .../locale/EmailAuthentication.pot | 2 +- plugins/Facebook/locale/Facebook.pot | 27 +- plugins/FirePHP/locale/FirePHP.pot | 2 +- plugins/Gravatar/locale/Gravatar.pot | 6 +- plugins/Imap/locale/Imap.pot | 18 +- .../InfiniteScroll/locale/InfiniteScroll.pot | 2 +- .../locale/LdapAuthentication.pot | 2 +- .../locale/LdapAuthorization.pot | 2 +- plugins/LilUrl/locale/LilUrl.pot | 2 +- plugins/Mapstraction/locale/Mapstraction.pot | 26 +- plugins/Minify/locale/Minify.pot | 18 +- .../MobileProfile/locale/MobileProfile.pot | 2 +- plugins/NoticeTitle/locale/NoticeTitle.pot | 10 +- plugins/OStatus/locale/OStatus.pot | 8 +- .../locale/OpenExternalLinkTarget.pot | 4 +- plugins/OpenID/locale/OpenID.pot | 2 +- plugins/PostDebug/locale/PostDebug.pot | 2 +- .../locale/PoweredByStatusNet.pot | 13 +- plugins/PtitUrl/locale/PtitUrl.pot | 2 +- plugins/RSSCloud/locale/RSSCloud.pot | 46 +++- plugins/Recaptcha/locale/Recaptcha.pot | 10 +- .../locale/RegisterThrottle.pot | 14 +- .../locale/RequireValidatedEmail.pot | 2 +- .../locale/ReverseUsernameAuthentication.pot | 2 +- plugins/Sample/locale/Sample.pot | 35 ++- plugins/SimpleUrl/locale/SimpleUrl.pot | 2 +- plugins/SubMirror/locale/SubMirror.pot | 64 +++-- plugins/TabFocus/locale/TabFocus.pot | 4 +- plugins/TightUrl/locale/TightUrl.pot | 2 +- plugins/TinyMCE/locale/TinyMCE.pot | 6 +- .../TwitterBridge/locale/TwitterBridge.pot | 253 ++++++++++++++---- .../WikiHowProfile/locale/WikiHowProfile.pot | 16 +- 40 files changed, 479 insertions(+), 189 deletions(-) diff --git a/plugins/Adsense/locale/Adsense.pot b/plugins/Adsense/locale/Adsense.pot index d4bed3af5f..6d69f639cd 100644 --- a/plugins/Adsense/locale/Adsense.pot +++ b/plugins/Adsense/locale/Adsense.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:07+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/AutoSandbox/locale/AutoSandbox.pot b/plugins/AutoSandbox/locale/AutoSandbox.pot index c6712c6b83..ff4f387761 100644 --- a/plugins/AutoSandbox/locale/AutoSandbox.pot +++ b/plugins/AutoSandbox/locale/AutoSandbox.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,7 +26,8 @@ msgid "" "the public timeline." msgstr "" -#: AutoSandboxPlugin.php:78 +#. TRANS: $contactlink is a clickable e-mailaddress. +#: AutoSandboxPlugin.php:79 msgid "" "Note you will initially be \"sandboxed\" so your posts will not appear in " "the public timeline. Send a message to $contactlink to speed up the " diff --git a/plugins/Autocomplete/locale/Autocomplete.pot b/plugins/Autocomplete/locale/Autocomplete.pot index 2fd61cfde5..27f74bf09b 100644 --- a/plugins/Autocomplete/locale/Autocomplete.pot +++ b/plugins/Autocomplete/locale/Autocomplete.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/BitlyUrl/locale/BitlyUrl.pot b/plugins/BitlyUrl/locale/BitlyUrl.pot index 12012ba886..4c4455da9f 100644 --- a/plugins/BitlyUrl/locale/BitlyUrl.pot +++ b/plugins/BitlyUrl/locale/BitlyUrl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Blacklist/locale/Blacklist.pot b/plugins/Blacklist/locale/Blacklist.pot index 88db86ebd4..f6bb591a80 100644 --- a/plugins/Blacklist/locale/Blacklist.pot +++ b/plugins/Blacklist/locale/Blacklist.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -38,7 +38,7 @@ msgstr "" #: BlacklistPlugin.php:234 #, php-format -msgid "You may not use UTL \"%s\" in notices." +msgid "You may not use URL \"%s\" in notices." msgstr "" #: BlacklistPlugin.php:338 diff --git a/plugins/CasAuthentication/locale/CasAuthentication.pot b/plugins/CasAuthentication/locale/CasAuthentication.pot index b5c45eb68e..203fd5ede4 100644 --- a/plugins/CasAuthentication/locale/CasAuthentication.pot +++ b/plugins/CasAuthentication/locale/CasAuthentication.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:07+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,15 +16,38 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: CasAuthenticationPlugin.php:82 +#. TRANS: Menu item. CAS is Central Authentication Service. +#: CasAuthenticationPlugin.php:83 msgid "CAS" msgstr "" -#: CasAuthenticationPlugin.php:83 -msgid "Login or register with CAS" +#. TRANS: Tooltip for menu item. CAS is Central Authentication Service. +#: CasAuthenticationPlugin.php:85 +msgid "Login or register with CAS." msgstr "" -#: CasAuthenticationPlugin.php:150 +#. TRANS: Invitation to users with a CAS account to log in using the service. +#. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL. +#. TRANS: These two elements may not be separated. +#: CasAuthenticationPlugin.php:101 +#, php-format +msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)" +msgstr "" + +#: CasAuthenticationPlugin.php:128 +msgid "Specifying a server is required." +msgstr "" + +#: CasAuthenticationPlugin.php:131 +msgid "Specifying a port is required." +msgstr "" + +#: CasAuthenticationPlugin.php:134 +msgid "Specifying a path is required." +msgstr "" + +#. TRANS: Plugin description. CAS is Central Authentication Service. +#: CasAuthenticationPlugin.php:154 msgid "" "The CAS Authentication plugin allows for StatusNet to handle authentication " "through CAS (Central Authentication Service)." @@ -33,3 +56,11 @@ msgstr "" #: caslogin.php:28 msgid "Already logged in." msgstr "" + +#: caslogin.php:39 +msgid "Incorrect username or password." +msgstr "" + +#: caslogin.php:45 +msgid "Error setting user. You are probably not authorized." +msgstr "" diff --git a/plugins/ClientSideShorten/locale/ClientSideShorten.pot b/plugins/ClientSideShorten/locale/ClientSideShorten.pot index d2b4862dd0..8ef97c61b2 100644 --- a/plugins/ClientSideShorten/locale/ClientSideShorten.pot +++ b/plugins/ClientSideShorten/locale/ClientSideShorten.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,7 +19,7 @@ msgstr "" #: ClientSideShortenPlugin.php:74 msgid "" "ClientSideShorten causes the web interface's notice form to automatically " -"shorten urls as they entered, and before the notice is submitted." +"shorten URLs as they entered, and before the notice is submitted." msgstr "" #: shorten.php:56 diff --git a/plugins/DirectionDetector/locale/DirectionDetector.pot b/plugins/DirectionDetector/locale/DirectionDetector.pot index d0199a0407..995bc42eca 100644 --- a/plugins/DirectionDetector/locale/DirectionDetector.pot +++ b/plugins/DirectionDetector/locale/DirectionDetector.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/EmailAuthentication/locale/EmailAuthentication.pot b/plugins/EmailAuthentication/locale/EmailAuthentication.pot index b0d096a49a..469435c6b3 100644 --- a/plugins/EmailAuthentication/locale/EmailAuthentication.pot +++ b/plugins/EmailAuthentication/locale/EmailAuthentication.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:07+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Facebook/locale/Facebook.pot b/plugins/Facebook/locale/Facebook.pot index 14bd372d66..09f027c4e9 100644 --- a/plugins/Facebook/locale/Facebook.pot +++ b/plugins/Facebook/locale/Facebook.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -39,7 +39,7 @@ msgstr "" msgid "There is already a local user linked with this Facebook." msgstr "" -#: FBConnectAuth.php:90 FBConnectSettings.php:164 +#: FBConnectAuth.php:90 FBConnectSettings.php:167 msgid "There was a problem with your session token. Try again, please." msgstr "" @@ -265,14 +265,14 @@ msgstr "" msgid "Settings" msgstr "" -#: facebookaction.php:228 +#: facebookaction.php:227 #, php-format msgid "" "To use the %s Facebook Application you need to login with your username and " -"password. Don't have a username yet? " +"password. Don't have a username yet?" msgstr "" -#: facebookaction.php:230 +#: facebookaction.php:229 msgid " a new account." msgstr "" @@ -349,32 +349,35 @@ msgstr "" msgid "Disconnect my account from Facebook" msgstr "" -#: FBConnectSettings.php:124 +#. TRANS: Followed by a link containing text "set a password". +#: FBConnectSettings.php:126 msgid "" "Disconnecting your Faceboook would make it impossible to log in! Please " msgstr "" -#: FBConnectSettings.php:128 +#. TRANS: Preceded by "Please " and followed by " first." +#: FBConnectSettings.php:131 msgid "set a password" msgstr "" -#: FBConnectSettings.php:130 +#. TRANS: Preceded by "Please set a password". +#: FBConnectSettings.php:133 msgid " first." msgstr "" -#: FBConnectSettings.php:142 +#: FBConnectSettings.php:145 msgid "Disconnect" msgstr "" -#: FBConnectSettings.php:178 +#: FBConnectSettings.php:181 msgid "Couldn't delete link to Facebook." msgstr "" -#: FBConnectSettings.php:194 +#: FBConnectSettings.php:197 msgid "You have disconnected from Facebook." msgstr "" -#: FBConnectSettings.php:197 +#: FBConnectSettings.php:200 msgid "Not sure what you're trying to do." msgstr "" diff --git a/plugins/FirePHP/locale/FirePHP.pot b/plugins/FirePHP/locale/FirePHP.pot index c4b10a499e..ebcc8d3feb 100644 --- a/plugins/FirePHP/locale/FirePHP.pot +++ b/plugins/FirePHP/locale/FirePHP.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:07+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Gravatar/locale/Gravatar.pot b/plugins/Gravatar/locale/Gravatar.pot index 9a71b81663..fda09b7975 100644 --- a/plugins/Gravatar/locale/Gravatar.pot +++ b/plugins/Gravatar/locale/Gravatar.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,11 +45,11 @@ msgid "To use a Gravatar first enter in an email address." msgstr "" #: GravatarPlugin.php:141 -msgid "You do not have a email set in your profile." +msgid "You do not have an email address set in your profile." msgstr "" #: GravatarPlugin.php:159 -msgid "Failed to save Gravatar to the DB." +msgid "Failed to save Gravatar to the database." msgstr "" #: GravatarPlugin.php:163 diff --git a/plugins/Imap/locale/Imap.pot b/plugins/Imap/locale/Imap.pot index 9d807a3d35..1f7497446a 100644 --- a/plugins/Imap/locale/Imap.pot +++ b/plugins/Imap/locale/Imap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:07+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,6 +20,22 @@ msgstr "" msgid "Error" msgstr "" +#: ImapPlugin.php:54 +msgid "A mailbox must be specified." +msgstr "" + +#: ImapPlugin.php:57 +msgid "A user must be specified." +msgstr "" + +#: ImapPlugin.php:60 +msgid "A password must be specified." +msgstr "" + +#: ImapPlugin.php:63 +msgid "A poll_frequency must be specified." +msgstr "" + #: ImapPlugin.php:103 msgid "" "The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for " diff --git a/plugins/InfiniteScroll/locale/InfiniteScroll.pot b/plugins/InfiniteScroll/locale/InfiniteScroll.pot index 52f9ef1eaa..b1af9664f6 100644 --- a/plugins/InfiniteScroll/locale/InfiniteScroll.pot +++ b/plugins/InfiniteScroll/locale/InfiniteScroll.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/LdapAuthentication/locale/LdapAuthentication.pot b/plugins/LdapAuthentication/locale/LdapAuthentication.pot index ce84cbf0e0..d40dd5ebd8 100644 --- a/plugins/LdapAuthentication/locale/LdapAuthentication.pot +++ b/plugins/LdapAuthentication/locale/LdapAuthentication.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/LdapAuthorization/locale/LdapAuthorization.pot b/plugins/LdapAuthorization/locale/LdapAuthorization.pot index 11e7fc5c82..60a7106f97 100644 --- a/plugins/LdapAuthorization/locale/LdapAuthorization.pot +++ b/plugins/LdapAuthorization/locale/LdapAuthorization.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:07+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/LilUrl/locale/LilUrl.pot b/plugins/LilUrl/locale/LilUrl.pot index 2785ee8005..66505e5f82 100644 --- a/plugins/LilUrl/locale/LilUrl.pot +++ b/plugins/LilUrl/locale/LilUrl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Mapstraction/locale/Mapstraction.pot b/plugins/Mapstraction/locale/Mapstraction.pot index 3d7f71f89b..7a971cabed 100644 --- a/plugins/Mapstraction/locale/Mapstraction.pot +++ b/plugins/Mapstraction/locale/Mapstraction.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,39 +16,37 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: MapstractionPlugin.php:182 +#: MapstractionPlugin.php:178 msgid "Map" msgstr "" -#: MapstractionPlugin.php:193 +#. TRANS: Clickable item to allow opening the map in full size. +#: MapstractionPlugin.php:190 msgid "Full size" msgstr "" -#: MapstractionPlugin.php:205 +#: MapstractionPlugin.php:202 msgid "" "Show maps of users' and friends' notices with Mapstraction JavaScript library." +"mapstraction.com/\">Mapstraction." msgstr "" -#: map.php:73 +#: map.php:72 msgid "No such user." msgstr "" -#: map.php:80 +#: map.php:79 msgid "User has no profile." msgstr "" -#: allmap.php:72 +#. TRANS: Page title. +#. TRANS: %s is a user nickname. +#: allmap.php:74 #, php-format msgid "%s friends map" msgstr "" -#: allmap.php:75 -#, php-format -msgid "%s friends map, page %d" -msgstr "" - -#: usermap.php:72 +#: usermap.php:73 #, php-format msgid "%s map, page %d" msgstr "" diff --git a/plugins/Minify/locale/Minify.pot b/plugins/Minify/locale/Minify.pot index 2f65c5df2c..2425d50bc4 100644 --- a/plugins/Minify/locale/Minify.pot +++ b/plugins/Minify/locale/Minify.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,8 +16,20 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#: minify.php:49 +msgid "The parameter \"f\" is not a valid path." +msgstr "" + +#: minify.php:53 +msgid "The parameter \"f\" is required but missing." +msgstr "" + +#: minify.php:111 +msgid "File type not supported." +msgstr "" + #: MinifyPlugin.php:180 msgid "" -"The Minify plugin minifies your CSS and Javascript, removing whitespace and " -"comments." +"The Minify plugin minifies StatusNet's CSS and JavaScript, removing " +"whitespace and comments." msgstr "" diff --git a/plugins/MobileProfile/locale/MobileProfile.pot b/plugins/MobileProfile/locale/MobileProfile.pot index c4af49a226..7c58516b1b 100644 --- a/plugins/MobileProfile/locale/MobileProfile.pot +++ b/plugins/MobileProfile/locale/MobileProfile.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/NoticeTitle/locale/NoticeTitle.pot b/plugins/NoticeTitle/locale/NoticeTitle.pot index 1a451ba74c..f5a9628313 100644 --- a/plugins/NoticeTitle/locale/NoticeTitle.pot +++ b/plugins/NoticeTitle/locale/NoticeTitle.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,5 +17,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: NoticeTitlePlugin.php:126 -msgid "Adds optional titles to notices" +msgid "Adds optional titles to notices." +msgstr "" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: NoticeTitlePlugin.php:299 +#, php-format +msgid "%1$s - %2$s" msgstr "" diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot index 3dc6fd6ade..b3a9074a29 100644 --- a/plugins/OStatus/locale/OStatus.pot +++ b/plugins/OStatus/locale/OStatus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -71,17 +71,17 @@ msgstr "" msgid "Show more" msgstr "" -#: classes/Ostatus_profile.php:1035 +#: classes/Ostatus_profile.php:1034 #, php-format msgid "Invalid avatar URL %s." msgstr "" -#: classes/Ostatus_profile.php:1045 +#: classes/Ostatus_profile.php:1044 #, php-format msgid "Tried to update avatar for unsaved remote profile %s." msgstr "" -#: classes/Ostatus_profile.php:1053 +#: classes/Ostatus_profile.php:1052 #, php-format msgid "Unable to fetch avatar from %s." msgstr "" diff --git a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot index 2fbe4cfa2b..4ceaddf187 100644 --- a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot +++ b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,5 +17,5 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: OpenExternalLinkTargetPlugin.php:60 -msgid "Opens external links (i.e., with rel=external) on a new window or tab" +msgid "Opens external links (e.g., with rel=external) on a new window or tab." msgstr "" diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot index 0a84e060da..033eab320b 100644 --- a/plugins/OpenID/locale/OpenID.pot +++ b/plugins/OpenID/locale/OpenID.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/PostDebug/locale/PostDebug.pot b/plugins/PostDebug/locale/PostDebug.pot index 0e9d768036..1d67b75104 100644 --- a/plugins/PostDebug/locale/PostDebug.pot +++ b/plugins/PostDebug/locale/PostDebug.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot index 1997cc04a2..77c1822c42 100644 --- a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot +++ b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,17 +16,18 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: PoweredByStatusNetPlugin.php:50 +#. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text. +#: PoweredByStatusNetPlugin.php:51 #, php-format msgid "powered by %s" msgstr "" -#: PoweredByStatusNetPlugin.php:52 +#: PoweredByStatusNetPlugin.php:53 msgid "StatusNet" msgstr "" -#: PoweredByStatusNetPlugin.php:65 +#: PoweredByStatusNetPlugin.php:66 msgid "" -"Outputs powered by StatusNet after site " -"name." +"Outputs \"powered by StatusNet\" after " +"site name." msgstr "" diff --git a/plugins/PtitUrl/locale/PtitUrl.pot b/plugins/PtitUrl/locale/PtitUrl.pot index b2f5947af9..c7a8b06677 100644 --- a/plugins/PtitUrl/locale/PtitUrl.pot +++ b/plugins/PtitUrl/locale/PtitUrl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/RSSCloud/locale/RSSCloud.pot b/plugins/RSSCloud/locale/RSSCloud.pot index c7b28632b4..56de24825e 100644 --- a/plugins/RSSCloud/locale/RSSCloud.pot +++ b/plugins/RSSCloud/locale/RSSCloud.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,9 +16,51 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#: RSSCloudRequestNotify.php:90 +msgid "Request must be POST." +msgstr "" + +#: RSSCloudRequestNotify.php:107 +msgid "Only http-post notifications are supported at this time." +msgstr "" + +#. TRANS: %s is a comma separated list of parameters. +#: RSSCloudRequestNotify.php:118 +#, php-format +msgid "The following parameters were missing from the request body: %s." +msgstr "" + +#: RSSCloudRequestNotify.php:124 +msgid "" +"You must provide at least one valid profile feed url (url1, url2, url3 ... " +"urlN)." +msgstr "" + +#: RSSCloudRequestNotify.php:141 +msgid "Feed subscription failed: Not a valid feed." +msgstr "" + +#: RSSCloudRequestNotify.php:147 +msgid "" +"Feed subscription failed - notification handler doesn't respond correctly." +msgstr "" + +#: RSSCloudRequestNotify.php:161 +msgid "" +"Thanks for the subscription. When the feed(s) update(s), you will be notified." +msgstr "" + +#: LoggingAggregator.php:93 +msgid "This resource requires an HTTP GET." +msgstr "" + +#: LoggingAggregator.php:104 +msgid "This resource requires an HTTP POST." +msgstr "" + #: RSSCloudPlugin.php:248 msgid "" "The RSSCloud plugin enables your StatusNet instance to publish real-time " "updates for profile RSS feeds using the RSSCloud protocol\"." +"\">RSSCloud protocol." msgstr "" diff --git a/plugins/Recaptcha/locale/Recaptcha.pot b/plugins/Recaptcha/locale/Recaptcha.pot index 855a1a11a3..547f73ba12 100644 --- a/plugins/Recaptcha/locale/Recaptcha.pot +++ b/plugins/Recaptcha/locale/Recaptcha.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:07+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,14 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#: RecaptchaPlugin.php:64 +msgid "Captcha" +msgstr "" + +#: RecaptchaPlugin.php:105 +msgid "Captcha does not match!" +msgstr "" + #: RecaptchaPlugin.php:117 msgid "" "Uses Recaptcha service to add a " diff --git a/plugins/RegisterThrottle/locale/RegisterThrottle.pot b/plugins/RegisterThrottle/locale/RegisterThrottle.pot index 40327d16fe..97539f9a0d 100644 --- a/plugins/RegisterThrottle/locale/RegisterThrottle.pot +++ b/plugins/RegisterThrottle/locale/RegisterThrottle.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,14 +16,18 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: RegisterThrottlePlugin.php:122 RegisterThrottlePlugin.php:161 +#: RegisterThrottlePlugin.php:121 RegisterThrottlePlugin.php:160 msgid "Cannot find IP address." msgstr "" -#: RegisterThrottlePlugin.php:167 +#: RegisterThrottlePlugin.php:136 +msgid "Too many registrations. Take a break and try again later." +msgstr "" + +#: RegisterThrottlePlugin.php:166 msgid "Cannot find user after successful registration." msgstr "" -#: RegisterThrottlePlugin.php:200 -msgid "Throttles excessive registration from a single IP." +#: RegisterThrottlePlugin.php:199 +msgid "Throttles excessive registration from a single IP address." msgstr "" diff --git a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot index 13c04c338a..f2128e7941 100644 --- a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot +++ b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:07+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot index df2523cb41..c0e66561cb 100644 --- a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot +++ b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Sample/locale/Sample.pot b/plugins/Sample/locale/Sample.pot index 66bcb775d9..b58819655b 100644 --- a/plugins/Sample/locale/Sample.pot +++ b/plugins/Sample/locale/Sample.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,38 +17,47 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: User_greeting_count.php:168 +#. TRANS: Exception thrown when the user greeting count could not be saved in the database. +#. TRANS: %d is a user ID (number). +#: User_greeting_count.php:164 #, php-format -msgid "Could not save new greeting count for %d" +msgid "Could not save new greeting count for %d." msgstr "" -#: User_greeting_count.php:181 +#. TRANS: Exception thrown when the user greeting count could not be saved in the database. +#. TRANS: %d is a user ID (number). +#: User_greeting_count.php:177 #, php-format -msgid "Could not increment greeting count for %d" +msgid "Could not increment greeting count for %d." msgstr "" -#: SamplePlugin.php:266 hello.php:115 +#: SamplePlugin.php:259 hello.php:111 msgid "Hello" msgstr "" -#: SamplePlugin.php:266 +#: SamplePlugin.php:259 msgid "A warm greeting" msgstr "" -#: SamplePlugin.php:277 +#: SamplePlugin.php:270 msgid "A sample plugin to show basics of development for new hackers." msgstr "" -#: hello.php:117 hello.php:141 +#: hello.php:113 +#, php-format +msgid "Hello, %s!" +msgstr "" + +#: hello.php:133 +msgid "Hello, stranger!" +msgstr "" + +#: hello.php:136 #, php-format msgid "Hello, %s" msgstr "" #: hello.php:138 -msgid "Hello, stranger!" -msgstr "" - -#: hello.php:143 #, php-format msgid "I have greeted you %d time." msgid_plural "I have greeted you %d times." diff --git a/plugins/SimpleUrl/locale/SimpleUrl.pot b/plugins/SimpleUrl/locale/SimpleUrl.pot index 7edf70abf9..8fd5aa6bee 100644 --- a/plugins/SimpleUrl/locale/SimpleUrl.pot +++ b/plugins/SimpleUrl/locale/SimpleUrl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/SubMirror/locale/SubMirror.pot b/plugins/SubMirror/locale/SubMirror.pot index f34de8f9f8..b463077043 100644 --- a/plugins/SubMirror/locale/SubMirror.pot +++ b/plugins/SubMirror/locale/SubMirror.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,94 +16,114 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: SubMirrorPlugin.php:92 +#: SubMirrorPlugin.php:90 msgid "Pull feeds into your timeline!" msgstr "" #. TRANS: SubMirror plugin menu item on user settings page. -#: SubMirrorPlugin.php:111 +#: SubMirrorPlugin.php:109 msgctxt "MENU" msgid "Mirroring" msgstr "" #. TRANS: SubMirror plugin tooltip for user settings menu item. -#: SubMirrorPlugin.php:113 +#: SubMirrorPlugin.php:111 msgid "Configure mirroring of posts from other feeds" msgstr "" -#: lib/editmirrorform.php:84 +#: lib/editmirrorform.php:83 msgctxt "LABEL" msgid "Remote feed:" msgstr "" -#: lib/editmirrorform.php:88 +#: lib/editmirrorform.php:87 msgctxt "LABEL" msgid "Local user" msgstr "" -#: lib/editmirrorform.php:94 +#: lib/editmirrorform.php:93 msgid "Mirroring style" msgstr "" -#: lib/editmirrorform.php:96 +#: lib/editmirrorform.php:95 msgid "" "Repeat: reference the original user's post (sometimes shows as 'RT @blah')" msgstr "" -#: lib/editmirrorform.php:97 +#: lib/editmirrorform.php:96 msgid "Repost the content under my account" msgstr "" -#: lib/editmirrorform.php:116 +#: lib/editmirrorform.php:115 msgid "Save" msgstr "" -#: lib/editmirrorform.php:118 +#: lib/editmirrorform.php:117 msgid "Stop mirroring" msgstr "" -#: lib/addmirrorform.php:62 +#: lib/addmirrorform.php:59 msgid "Web page or feed URL:" msgstr "" -#: lib/addmirrorform.php:67 +#: lib/addmirrorform.php:64 +msgctxt "BUTTON" msgid "Add feed" msgstr "" -#: actions/basemirror.php:73 +#: actions/basemirror.php:71 msgid "Invalid feed URL." msgstr "" #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed. -#: actions/basemirror.php:85 +#: actions/basemirror.php:83 msgid "Invalid profile for mirroring." msgstr "" -#: actions/basemirror.php:103 +#: actions/basemirror.php:101 msgid "Can't mirror a StatusNet group at this time." msgstr "" -#: actions/editmirror.php:70 +#: actions/basemirror.php:115 +msgid "This action only accepts POST requests." +msgstr "" + +#: actions/basemirror.php:123 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: actions/basemirror.php:133 +msgid "Not logged in." +msgstr "" + +#: actions/basemirror.php:156 +msgid "Subscribed" +msgstr "" + +#: actions/editmirror.php:68 msgid "Requested invalid profile to edit." msgstr "" -#: actions/editmirror.php:88 +#: actions/editmirror.php:86 msgid "Bad form data." msgstr "" -#: actions/editmirror.php:96 -msgid "Requested edit of missing mirror" +#. TRANS: Client error thrown when a mirror request is made and no result is retrieved. +#: actions/editmirror.php:95 +msgid "Requested edit of missing mirror." msgstr "" -#: actions/addmirror.php:74 +#: actions/addmirror.php:72 msgid "Could not subscribe to feed." msgstr "" +#. TRANS: Title. #: actions/mirrorsettings.php:42 msgid "Feed mirror settings" msgstr "" -#: actions/mirrorsettings.php:53 +#. TRANS: Instructions. +#: actions/mirrorsettings.php:54 msgid "" "You can mirror updates from many RSS and Atom feeds into your StatusNet " "timeline!" diff --git a/plugins/TabFocus/locale/TabFocus.pot b/plugins/TabFocus/locale/TabFocus.pot index 6de47bf08f..31cc259662 100644 --- a/plugins/TabFocus/locale/TabFocus.pot +++ b/plugins/TabFocus/locale/TabFocus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,6 +19,6 @@ msgstr "" #: TabFocusPlugin.php:54 msgid "" "TabFocus changes the notice form behavior so that, while in the text area, " -"pressing the tab key focuses the \"Send\" button, matching the behavor of " +"pressing the tab key focuses the \"Send\" button, matching the behavior of " "Twitter." msgstr "" diff --git a/plugins/TightUrl/locale/TightUrl.pot b/plugins/TightUrl/locale/TightUrl.pot index ea0821eee0..41026d711b 100644 --- a/plugins/TightUrl/locale/TightUrl.pot +++ b/plugins/TightUrl/locale/TightUrl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/TinyMCE/locale/TinyMCE.pot b/plugins/TinyMCE/locale/TinyMCE.pot index 788762ba85..c42fea8719 100644 --- a/plugins/TinyMCE/locale/TinyMCE.pot +++ b/plugins/TinyMCE/locale/TinyMCE.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: TinyMCEPlugin.php:77 -msgid "Use TinyMCE library to allow rich text editing in the browser" +#: TinyMCEPlugin.php:76 +msgid "Use TinyMCE library to allow rich text editing in the browser." msgstr "" diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot index b5f9061742..625ab83768 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-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,16 +16,16 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: twitter.php:363 +#: twitter.php:353 msgid "Your Twitter bridge has been disabled." msgstr "" -#: twitter.php:367 +#: twitter.php:357 #, 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" @@ -36,92 +36,133 @@ msgid "" "%3$s\n" msgstr "" -#: TwitterBridgePlugin.php:156 TwitterBridgePlugin.php:179 -#: TwitterBridgePlugin.php:296 twitteradminpanel.php:54 +#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174 +#: TwitterBridgePlugin.php:291 twitteradminpanel.php:52 msgid "Twitter" msgstr "" -#: TwitterBridgePlugin.php:157 +#: TwitterBridgePlugin.php:152 msgid "Login or register using Twitter" msgstr "" -#: TwitterBridgePlugin.php:180 +#: TwitterBridgePlugin.php:175 msgid "Twitter integration options" msgstr "" -#: TwitterBridgePlugin.php:297 +#: TwitterBridgePlugin.php:292 msgid "Twitter bridge configuration" msgstr "" -#: TwitterBridgePlugin.php:322 +#: TwitterBridgePlugin.php:316 msgid "" -"The Twitter \"bridge\" plugin allows you to integrate your StatusNet " -"instance with Twitter." +"The Twitter \"bridge\" plugin allows integration of a StatusNet instance " +"with Twitter." msgstr "" -#: twitteradminpanel.php:65 +#: twitteradminpanel.php:62 msgid "Twitter bridge settings" msgstr "" -#: twitteradminpanel.php:150 +#: twitteradminpanel.php:145 msgid "Invalid consumer key. Max length is 255 characters." msgstr "" -#: twitteradminpanel.php:156 +#: twitteradminpanel.php:151 msgid "Invalid consumer secret. Max length is 255 characters." msgstr "" -#: twitteradminpanel.php:216 +#: twitteradminpanel.php:207 msgid "Twitter application settings" msgstr "" -#: twitteradminpanel.php:222 +#: twitteradminpanel.php:213 msgid "Consumer key" msgstr "" -#: twitteradminpanel.php:223 +#: twitteradminpanel.php:214 msgid "Consumer key assigned by Twitter" msgstr "" -#: twitteradminpanel.php:231 +#: twitteradminpanel.php:222 msgid "Consumer secret" msgstr "" -#: twitteradminpanel.php:232 +#: twitteradminpanel.php:223 msgid "Consumer secret assigned by Twitter" msgstr "" -#: twitteradminpanel.php:249 +#: twitteradminpanel.php:233 +msgid "Note: a global consumer key and secret are set." +msgstr "" + +#: twitteradminpanel.php:240 msgid "Integration source" msgstr "" -#: twitteradminpanel.php:250 +#: twitteradminpanel.php:241 msgid "Name of your Twitter application" msgstr "" -#: twitteradminpanel.php:262 +#: twitteradminpanel.php:253 msgid "Options" msgstr "" -#: twitteradminpanel.php:269 +#: twitteradminpanel.php:260 msgid "Enable \"Sign-in with Twitter\"" msgstr "" -#: twitteradminpanel.php:271 +#: twitteradminpanel.php:262 msgid "Allow users to login with their Twitter credentials" msgstr "" -#: twitteradminpanel.php:278 +#: twitteradminpanel.php:269 msgid "Enable Twitter import" msgstr "" -#: twitteradminpanel.php:280 +#: 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 "" @@ -129,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 "" diff --git a/plugins/WikiHowProfile/locale/WikiHowProfile.pot b/plugins/WikiHowProfile/locale/WikiHowProfile.pot index a1e49c769c..6da28186c9 100644 --- a/plugins/WikiHowProfile/locale/WikiHowProfile.pot +++ b/plugins/WikiHowProfile/locale/WikiHowProfile.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-14 22:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,18 +16,18 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: WikiHowProfilePlugin.php:60 +#: WikiHowProfilePlugin.php:59 msgid "" -"Fetches avatar and other profile info for WikiHow users when setting up an " -"account via OpenID." +"Fetches avatar and other profile information for WikiHow users when setting " +"up an account via OpenID." msgstr "" -#: WikiHowProfilePlugin.php:172 +#: WikiHowProfilePlugin.php:171 #, php-format -msgid "Invalid avatar URL %s" +msgid "Invalid avatar URL %s." msgstr "" -#: WikiHowProfilePlugin.php:179 +#: WikiHowProfilePlugin.php:178 #, php-format -msgid "Unable to fetch avatar from %s" +msgid "Unable to fetch avatar from %s." msgstr "" From cf3f69368778b0aadea015bfd68c1665b1678712 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 19 Sep 2010 00:25:52 +0200 Subject: [PATCH 42/76] Remove superfluous whitespace. --- plugins/Facebook/FBConnectSettings.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/plugins/Facebook/FBConnectSettings.php b/plugins/Facebook/FBConnectSettings.php index 7599bc8267..ee0b7d13c5 100644 --- a/plugins/Facebook/FBConnectSettings.php +++ b/plugins/Facebook/FBConnectSettings.php @@ -50,7 +50,6 @@ class FBConnectSettingsAction extends ConnectSettingsAction * * @return string Title of the page */ - function title() { return _m('Facebook Connect Settings'); @@ -61,7 +60,6 @@ class FBConnectSettingsAction extends ConnectSettingsAction * * @return instructions for use */ - function getInstructions() { return _m('Manage how your account connects to Facebook'); @@ -74,7 +72,6 @@ class FBConnectSettingsAction extends ConnectSettingsAction * * @return void */ - function showContent() { $user = common_current_user(); @@ -158,7 +155,6 @@ class FBConnectSettingsAction extends ConnectSettingsAction * * @return void */ - function handlePost() { // CSRF protection @@ -202,5 +198,4 @@ class FBConnectSettingsAction extends ConnectSettingsAction } } - } From 8dafb4c61274bfd925b9be9a490c09374b48914e Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 19 Sep 2010 00:26:47 +0200 Subject: [PATCH 43/76] Add pot files. --- plugins/APC/locale/APC.pot | 23 +++++++++++++++++ plugins/CacheLog/locale/CacheLog.pot | 21 ++++++++++++++++ plugins/Disqus/locale/Disqus.pot | 23 +++++++++++++++++ plugins/Echo/locale/Echo.pot | 23 +++++++++++++++++ plugins/GeoURL/locale/GeoURL.pot | 23 +++++++++++++++++ plugins/Geonames/locale/Geonames.pot | 23 +++++++++++++++++ .../locale/GoogleAnalytics.pot | 23 +++++++++++++++++ plugins/Linkback/locale/Linkback.pot | 25 +++++++++++++++++++ plugins/Memcache/locale/Memcache.pot | 22 ++++++++++++++++ plugins/Memcached/locale/Memcached.pot | 22 ++++++++++++++++ .../PiwikAnalytics/locale/PiwikAnalytics.pot | 23 +++++++++++++++++ .../locale/SubscriptionThrottle.pot | 21 ++++++++++++++++ plugins/UserLimit/locale/UserLimit.pot | 21 ++++++++++++++++ plugins/WikiHashtags/locale/WikiHashtags.pot | 23 +++++++++++++++++ plugins/XCache/locale/XCache.pot | 23 +++++++++++++++++ 15 files changed, 339 insertions(+) create mode 100644 plugins/APC/locale/APC.pot create mode 100644 plugins/CacheLog/locale/CacheLog.pot create mode 100644 plugins/Disqus/locale/Disqus.pot create mode 100644 plugins/Echo/locale/Echo.pot create mode 100644 plugins/GeoURL/locale/GeoURL.pot create mode 100644 plugins/Geonames/locale/Geonames.pot create mode 100644 plugins/GoogleAnalytics/locale/GoogleAnalytics.pot create mode 100644 plugins/Linkback/locale/Linkback.pot create mode 100644 plugins/Memcache/locale/Memcache.pot create mode 100644 plugins/Memcached/locale/Memcached.pot create mode 100644 plugins/PiwikAnalytics/locale/PiwikAnalytics.pot create mode 100644 plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot create mode 100644 plugins/UserLimit/locale/UserLimit.pot create mode 100644 plugins/WikiHashtags/locale/WikiHashtags.pot create mode 100644 plugins/XCache/locale/XCache.pot diff --git a/plugins/APC/locale/APC.pot b/plugins/APC/locale/APC.pot new file mode 100644 index 0000000000..122a51f973 --- /dev/null +++ b/plugins/APC/locale/APC.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: APCPlugin.php:115 +msgid "" +"Use the APC variable cache " +"to cache query results." +msgstr "" diff --git a/plugins/CacheLog/locale/CacheLog.pot b/plugins/CacheLog/locale/CacheLog.pot new file mode 100644 index 0000000000..4e0e4112b3 --- /dev/null +++ b/plugins/CacheLog/locale/CacheLog.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: CacheLogPlugin.php:117 +msgid "Log reads and writes to the cache." +msgstr "" diff --git a/plugins/Disqus/locale/Disqus.pot b/plugins/Disqus/locale/Disqus.pot new file mode 100644 index 0000000000..0f9ae44a5f --- /dev/null +++ b/plugins/Disqus/locale/Disqus.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: DisqusPlugin.php:167 +msgid "" +"Use Disqus to add commenting to notice " +"pages." +msgstr "" diff --git a/plugins/Echo/locale/Echo.pot b/plugins/Echo/locale/Echo.pot new file mode 100644 index 0000000000..5f45d2a995 --- /dev/null +++ b/plugins/Echo/locale/Echo.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: EchoPlugin.php:112 +msgid "" +"Use Echo to add commenting to notice " +"pages." +msgstr "" diff --git a/plugins/GeoURL/locale/GeoURL.pot b/plugins/GeoURL/locale/GeoURL.pot new file mode 100644 index 0000000000..3bc63b8511 --- /dev/null +++ b/plugins/GeoURL/locale/GeoURL.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: GeoURLPlugin.php:127 +msgid "" +"Ping GeoURL when new geolocation-enhanced " +"notices are posted." +msgstr "" diff --git a/plugins/Geonames/locale/Geonames.pot b/plugins/Geonames/locale/Geonames.pot new file mode 100644 index 0000000000..1d91af3017 --- /dev/null +++ b/plugins/Geonames/locale/Geonames.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: GeonamesPlugin.php:498 +msgid "" +"Uses Geonames service to get human-" +"readable names for locations based on user-provided lat/long pairs." +msgstr "" diff --git a/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot b/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot new file mode 100644 index 0000000000..4006ccf1f5 --- /dev/null +++ b/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: GoogleAnalyticsPlugin.php:81 +msgid "" +"Use Google Analytics to " +"track web access." +msgstr "" diff --git a/plugins/Linkback/locale/Linkback.pot b/plugins/Linkback/locale/Linkback.pot new file mode 100644 index 0000000000..f97eccdcc6 --- /dev/null +++ b/plugins/Linkback/locale/Linkback.pot @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: LinkbackPlugin.php:243 +msgid "" +"Notify blog authors when their posts have been linked in microblog notices " +"using Pingback " +"or Trackback protocols." +msgstr "" diff --git a/plugins/Memcache/locale/Memcache.pot b/plugins/Memcache/locale/Memcache.pot new file mode 100644 index 0000000000..cba1fe73bd --- /dev/null +++ b/plugins/Memcache/locale/Memcache.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: MemcachePlugin.php:252 +msgid "" +"Use Memcached to cache query results." +msgstr "" diff --git a/plugins/Memcached/locale/Memcached.pot b/plugins/Memcached/locale/Memcached.pot new file mode 100644 index 0000000000..3748566bd7 --- /dev/null +++ b/plugins/Memcached/locale/Memcached.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: MemcachedPlugin.php:223 +msgid "" +"Use Memcached to cache query results." +msgstr "" diff --git a/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot b/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot new file mode 100644 index 0000000000..2578147a2a --- /dev/null +++ b/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: PiwikAnalyticsPlugin.php:108 +msgid "" +"Use Piwik Open Source web analytics " +"software." +msgstr "" diff --git a/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot b/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot new file mode 100644 index 0000000000..f0fb4dd3cb --- /dev/null +++ b/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: SubscriptionThrottlePlugin.php:171 +msgid "Configurable limits for subscriptions and group memberships." +msgstr "" diff --git a/plugins/UserLimit/locale/UserLimit.pot b/plugins/UserLimit/locale/UserLimit.pot new file mode 100644 index 0000000000..fcce8f6762 --- /dev/null +++ b/plugins/UserLimit/locale/UserLimit.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: UserLimitPlugin.php:89 +msgid "Limit the number of users who can register." +msgstr "" diff --git a/plugins/WikiHashtags/locale/WikiHashtags.pot b/plugins/WikiHashtags/locale/WikiHashtags.pot new file mode 100644 index 0000000000..cae1daa5af --- /dev/null +++ b/plugins/WikiHashtags/locale/WikiHashtags.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: WikiHashtagsPlugin.php:110 +msgid "" +"Gets hashtag descriptions from WikiHashtags." +msgstr "" diff --git a/plugins/XCache/locale/XCache.pot b/plugins/XCache/locale/XCache.pot new file mode 100644 index 0000000000..82992fc821 --- /dev/null +++ b/plugins/XCache/locale/XCache.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: XCachePlugin.php:120 +msgid "" +"Use the XCache variable cache to " +"cache query results." +msgstr "" From 07cd52afc7eef0111c9f7bd49a52a51214520287 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 19 Sep 2010 00:32:43 +0200 Subject: [PATCH 44/76] Localisation updates from http://translatewiki.net. --- locale/af/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/ar/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/arz/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/bg/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/br/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/ca/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/cs/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/da/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/de/LC_MESSAGES/statusnet.po | 50 ++++++++++-------- locale/el/LC_MESSAGES/statusnet.po | 32 ++++++------ locale/en_GB/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/eo/LC_MESSAGES/statusnet.po | 33 +++++++----- locale/es/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/fa/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/fi/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/fr/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/ga/LC_MESSAGES/statusnet.po | 35 +++++++------ locale/gl/LC_MESSAGES/statusnet.po | 75 ++++++++++++++------------- locale/he/LC_MESSAGES/statusnet.po | 32 ++++++------ locale/hsb/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/ia/LC_MESSAGES/statusnet.po | 42 +++++++++------ locale/is/LC_MESSAGES/statusnet.po | 32 ++++++------ locale/it/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/ja/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/ka/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/ko/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/mk/LC_MESSAGES/statusnet.po | 44 ++++++++++------ locale/nb/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/nl/LC_MESSAGES/statusnet.po | 42 +++++++++------ locale/nn/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/pl/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/pt/LC_MESSAGES/statusnet.po | 42 +++++++++------ locale/pt_BR/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/ru/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/statusnet.pot | 20 +++---- locale/sv/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/te/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/tr/LC_MESSAGES/statusnet.po | 32 ++++++------ locale/uk/LC_MESSAGES/statusnet.po | 42 +++++++++------ locale/vi/LC_MESSAGES/statusnet.po | 37 +++++++------ locale/zh_CN/LC_MESSAGES/statusnet.po | 42 +++++++++------ locale/zh_TW/LC_MESSAGES/statusnet.po | 32 ++++++------ 42 files changed, 899 insertions(+), 690 deletions(-) diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po index 2596b39c56..982de63ddd 100644 --- a/locale/af/LC_MESSAGES/statusnet.po +++ b/locale/af/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Afrikaans (Afrikaans) +# Translation of StatusNet - Core to Afrikaans (Afrikaans) # Expored from translatewiki.net # # Author: Naudefj @@ -7,19 +7,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:29+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:13+0000\n" "Language-Team: Afrikaans \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: af\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -4121,6 +4121,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form input field instructions. #: lib/applicationeditform.php:200 #, php-format @@ -4454,7 +4459,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "U is 'n lid van hierdie groep:" msgstr[1] "U is 'n lid van hierdie groepe:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -5387,7 +5392,7 @@ msgid "about a minute ago" msgstr "ongeveer 'n minuut gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -5395,12 +5400,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "ongeveer 'n uur gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -5408,12 +5413,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "ongeveer een dag gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -5421,12 +5426,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "ongeveer een maand gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -5434,7 +5439,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "ongeveer een jaar gelede" diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index b9b1057ed9..5ab941eab8 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Arabic (العربية) +# Translation of StatusNet - Core to Arabic (العربية) # Expored from translatewiki.net # # Author: Brion @@ -9,21 +9,21 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:30+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:19+0000\n" "Language-Team: Arabic \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == " "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= " "99) ? 4 : 5 ) ) ) );\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -4686,6 +4686,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5048,7 +5053,7 @@ msgstr[3] "أنت عضو في هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -6176,7 +6181,7 @@ msgid "about a minute ago" msgstr "قبل دقيقة تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -6188,12 +6193,12 @@ msgstr[4] "" msgstr[5] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "قبل ساعة تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -6205,12 +6210,12 @@ msgstr[4] "" msgstr[5] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "قبل يوم تقريبا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -6222,12 +6227,12 @@ msgstr[4] "" msgstr[5] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "قبل شهر تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -6239,7 +6244,7 @@ msgstr[4] "" msgstr[5] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "قبل سنة تقريبًا" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 2f52f23d57..c4c8f4a3bc 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Egyptian Spoken Arabic (مصرى) +# Translation of StatusNet - Core to Egyptian Spoken Arabic (مصرى) # Expored from translatewiki.net # # Author: Dudi @@ -9,21 +9,21 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:31+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:21+0000\n" "Language-Team: Egyptian Spoken Arabic \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -4179,6 +4179,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form input field instructions. #: lib/applicationeditform.php:204 msgid "Describe your application" @@ -4515,7 +4520,7 @@ msgstr[3] "أنت عضو فى هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -5547,7 +5552,7 @@ msgid "about a minute ago" msgstr "قبل دقيقه تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -5559,12 +5564,12 @@ msgstr[4] "" msgstr[5] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "قبل ساعه تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -5576,12 +5581,12 @@ msgstr[4] "" msgstr[5] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "قبل يوم تقريبا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -5593,12 +5598,12 @@ msgstr[4] "" msgstr[5] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "قبل شهر تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -5610,7 +5615,7 @@ msgstr[4] "" msgstr[5] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "قبل سنه تقريبًا" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 5d45496b8f..b3e0e2950d 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Bulgarian (Български) +# Translation of StatusNet - Core to Bulgarian (Български) # Expored from translatewiki.net # # Author: DCLXVI @@ -8,19 +8,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:32+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:23+0000\n" "Language-Team: Bulgarian \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -4630,6 +4630,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form input field instructions. #: lib/applicationeditform.php:204 msgid "Describe your application" @@ -4940,7 +4945,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Не членувате в тази група." msgstr[1] "Не членувате в тази група." -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -6014,7 +6019,7 @@ msgid "about a minute ago" msgstr "преди около минута" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -6022,12 +6027,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "преди около час" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -6035,12 +6040,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "преди около ден" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -6048,12 +6053,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "преди около месец" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -6061,7 +6066,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "преди около година" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index d1c1d2f8d3..cacb78fb44 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Breton (Brezhoneg) +# Translation of StatusNet - Core to Breton (Brezhoneg) # Expored from translatewiki.net # # Author: Fulup @@ -9,19 +9,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:34+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:25+0000\n" "Language-Team: Breton \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -4856,6 +4856,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5230,7 +5235,7 @@ msgstr "Den n'eo koumanantet deoc'h." msgid "You are not a member of any groups." msgstr "N'oc'h ezel eus strollad ebet." -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -6189,7 +6194,7 @@ msgid "about a minute ago" msgstr "1 vunutenn zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -6197,12 +6202,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "1 eurvezh zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -6210,12 +6215,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "1 devezh zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -6223,12 +6228,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "miz zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -6236,7 +6241,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "bloaz zo well-wazh" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 3d1bdc1836..cf1c347757 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Catalan (Català) +# Translation of StatusNet - Core to Catalan (Català) # Expored from translatewiki.net # # Author: Aleator @@ -10,19 +10,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:35+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:26+0000\n" "Language-Team: Catalan \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5572,6 +5572,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -6003,7 +6008,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Sou un membre d'aquest grup:" msgstr[1] "Sou un membre d'aquests grups:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7296,7 +7301,7 @@ msgid "about a minute ago" msgstr "fa un minut" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -7304,12 +7309,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "fa una hora" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -7317,12 +7322,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "fa un dia" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -7330,12 +7335,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "fa un mes" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -7343,7 +7348,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "fa un any" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 98a89e74c6..2c8d855c45 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Czech (Česky) +# Translation of StatusNet - Core to Czech (Česky) # Expored from translatewiki.net # # Author: Koo6 @@ -8,20 +8,20 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:38+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:28+0000\n" "Language-Team: Czech \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : " "2 );\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5502,6 +5502,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5932,7 +5937,7 @@ msgstr[0] "Jste členem této skupiny:" msgstr[1] "Jste členem těchto skupin:" msgstr[2] "" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7224,7 +7229,7 @@ msgid "about a minute ago" msgstr "asi před minutou" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -7233,12 +7238,12 @@ msgstr[1] "" msgstr[2] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "asi před hodinou" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -7247,12 +7252,12 @@ msgstr[1] "" msgstr[2] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "asi přede dnem" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -7261,12 +7266,12 @@ msgstr[1] "" msgstr[2] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "asi před měsícem" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -7275,7 +7280,7 @@ msgstr[1] "" msgstr[2] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "asi před rokem" diff --git a/locale/da/LC_MESSAGES/statusnet.po b/locale/da/LC_MESSAGES/statusnet.po index 9b3c561cff..488347944e 100644 --- a/locale/da/LC_MESSAGES/statusnet.po +++ b/locale/da/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Danish (Dansk) +# Translation of StatusNet - Core to Danish (Dansk) # Expored from translatewiki.net # # Author: Brion @@ -8,19 +8,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:39+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:30+0000\n" "Language-Team: Danish \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: da\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -4276,6 +4276,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form input field instructions. #: lib/applicationeditform.php:200 #, php-format @@ -4566,7 +4571,7 @@ msgstr "" msgid "No one is subscribed to you." msgstr "" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -5442,7 +5447,7 @@ msgid "about a minute ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -5450,12 +5455,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -5463,12 +5468,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -5476,12 +5481,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -5489,7 +5494,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 2617519f61..5664d6cd51 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to German (Deutsch) +# Translation of StatusNet - Core to German (Deutsch) # Expored from translatewiki.net # # Author: Apmon @@ -17,19 +17,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:40+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:32+0000\n" "Language-Team: German \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -414,8 +414,8 @@ msgstr "Konnte keine Statusmeldungen finden." #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" -"Der Nutzername darf nur aus Kleinbuchstaben und Ziffern bestehen. " -"Leerzeichen sind nicht erlaubt." +"Der Nutzername darf nur aus Kleinbuchstaben und Zahlen bestehen. Leerzeichen " +"sind nicht erlaubt." #: actions/apigroupcreate.php:177 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 @@ -2999,7 +2999,7 @@ msgstr "Profilinformation" #: actions/profilesettings.php:108 lib/groupeditform.php:154 msgid "1-64 lowercase letters or numbers, no punctuation or spaces" -msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen" +msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen" #: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 @@ -3372,7 +3372,7 @@ msgstr "Registrieren" #: actions/register.php:142 msgid "Registration not allowed." -msgstr "Registrierung nicht gestattet" +msgstr "Registrierung nicht erlaubt" #: actions/register.php:205 msgid "You can't register if you don't agree to the license." @@ -3398,8 +3398,7 @@ msgstr "" #: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -"1-64 kleingeschriebene Buchstaben oder Zahlen, keine Satz- oder Leerzeichen. " -"Pflicht." +"1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen. Pflicht." #: actions/register.php:437 msgid "6 or more characters. Required." @@ -5257,7 +5256,7 @@ msgstr "Abmelden" #: lib/action.php:495 msgctxt "TOOLTIP" msgid "Create an account" -msgstr "Neues Konto erstellen" +msgstr "Neues Benutzerkonto erstellen" #. TRANS: Main menu option when not logged in to register a new account #: lib/action.php:498 @@ -5584,6 +5583,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -6015,7 +6019,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Du bist Mitglied dieser Gruppe:" msgstr[1] "Du bist Mitglied dieser Gruppen:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7309,7 +7313,7 @@ msgid "about a minute ago" msgstr "vor einer Minute" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -7317,12 +7321,12 @@ msgstr[0] "vor ca. einer Minute" msgstr[1] "vor ca. %d Minuten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "vor einer Stunde" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -7330,12 +7334,12 @@ msgstr[0] "vor ca. einer Stunde" msgstr[1] "vor ca. %d Stunden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "vor einem Tag" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -7343,12 +7347,12 @@ msgstr[0] "vor ca. einem Tag" msgstr[1] "vor ca. %d Tagen" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "vor einem Monat" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -7356,7 +7360,7 @@ msgstr[0] "vor ca. einem Monat" msgstr[1] "vor ca. %d Monaten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "vor einem Jahr" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index ae5cf7a15b..5543c1f24c 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Greek (Ελληνικά) +# Translation of StatusNet - Core to Greek (Ελληνικά) # Expored from translatewiki.net # # Author: Crazymadlover @@ -9,19 +9,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:41+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:34+0000\n" "Language-Team: Greek \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -4312,7 +4312,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Ομάδες με τα περισσότερα μέλη" msgstr[1] "Ομάδες με τα περισσότερα μέλη" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -5313,7 +5313,7 @@ msgid "about a minute ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -5321,12 +5321,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -5334,12 +5334,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -5347,12 +5347,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -5360,7 +5360,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index e04b249f18..b0b3d94541 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to British English (British English) +# Translation of StatusNet - Core to British English (British English) # Expored from translatewiki.net # # Author: Brion @@ -10,19 +10,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:44+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:38+0000\n" "Language-Team: British English \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5289,6 +5289,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form input field instructions. #: lib/applicationeditform.php:200 #, php-format @@ -5629,7 +5634,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "You are not a member of that group." msgstr[1] "You are not a member of that group." -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -6798,7 +6803,7 @@ msgid "about a minute ago" msgstr "about a minute ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -6806,12 +6811,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "about an hour ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -6819,12 +6824,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "about a day ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -6832,12 +6837,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "about a month ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -6845,7 +6850,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "about a year ago" diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po index a301dcc2e9..49aef778db 100644 --- a/locale/eo/LC_MESSAGES/statusnet.po +++ b/locale/eo/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Esperanto (Esperanto) +# Translation of StatusNet - Core to Esperanto (Esperanto) # Expored from translatewiki.net # # Author: AVRS @@ -12,19 +12,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:43+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:36+0000\n" "Language-Team: Esperanto \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: eo\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5305,6 +5305,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form input field instructions. #: lib/applicationeditform.php:233 msgid "URL for the homepage of the organization" @@ -5683,7 +5688,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Vi estas grupano de jena grupo:" msgstr[1] "Vi estas grupano de jenaj grupoj:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -6723,7 +6728,7 @@ msgid "about a minute ago" msgstr "antaŭ ĉirkaŭ unu minuto" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -6731,12 +6736,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "antaŭ ĉirkaŭ unu horo" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -6744,12 +6749,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "antaŭ ĉirkaŭ unu tago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -6757,7 +6762,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 636ee89b33..22cd7512f0 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Spanish (Español) +# Translation of StatusNet - Core to Spanish (Español) # Expored from translatewiki.net # # Author: Brion @@ -14,19 +14,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:45+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:40+0000\n" "Language-Team: Spanish \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5572,6 +5572,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -6003,7 +6008,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Eres miembro de este grupo:" msgstr[1] "Eres miembro de estos grupos:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7302,7 +7307,7 @@ msgid "about a minute ago" msgstr "hace un minuto" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -7310,12 +7315,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "hace una hora" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -7323,12 +7328,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "hace un día" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -7336,12 +7341,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "hace un mes" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -7349,7 +7354,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "hace un año" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 2a7c0dd579..48982013ce 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Persian (فارسی) +# Translation of StatusNet - Core to Persian (فارسی) # Expored from translatewiki.net # # Author: ArianHT @@ -11,21 +11,21 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:48+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:45+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Language-Code: fa\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5415,6 +5415,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5838,7 +5843,7 @@ msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "شما یک عضو این گروه هستید:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7072,50 +7077,50 @@ msgid "about a minute ago" msgstr "حدود یک دقیقه پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "حدود یک ساعت پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "حدود یک روز پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "حدود یک ماه پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "حدود یک سال پیش" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index f29b082d08..b67a82c9a9 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Finnish (Suomi) +# Translation of StatusNet - Core to Finnish (Suomi) # Expored from translatewiki.net # # Author: Crt @@ -12,19 +12,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:46+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:42+0000\n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 @@ -4174,6 +4174,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -4443,7 +4448,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Sinä et kuulu tähän ryhmään." msgstr[1] "Sinä et kuulu tähän ryhmään." -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -5435,7 +5440,7 @@ msgid "about a minute ago" msgstr "noin minuutti sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -5443,12 +5448,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "noin tunti sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -5456,12 +5461,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "noin päivä sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -5469,12 +5474,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "noin kuukausi sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -5482,7 +5487,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "noin vuosi sitten" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 121eba4be8..ccd133acdf 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to French (Français) +# Translation of StatusNet - Core to French (Français) # Expored from translatewiki.net # # Author: Brion @@ -17,19 +17,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:49+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:50+0000\n" "Language-Team: French \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5611,6 +5611,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -6047,7 +6052,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Vous êtes membre de ce groupe :" msgstr[1] "Vous êtes membre de ces groupes :" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7352,7 +7357,7 @@ msgid "about a minute ago" msgstr "il y a 1 minute" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -7360,12 +7365,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "il y a 1 heure" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -7373,12 +7378,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "il y a 1 jour" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -7386,12 +7391,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "il y a 1 mois" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -7399,7 +7404,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "il y a environ 1 an" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 38e2ba1e53..b306b5ef0f 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Irish (Gaeilge) +# Translation of StatusNet - Core to Irish (Gaeilge) # Expored from translatewiki.net # # Author: McDutchie @@ -7,20 +7,20 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:50+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:52+0000\n" "Language-Team: Irish \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=5; plural=(n == 1) ? 0 : ( (n == 2) ? 1 : ( (n < 7) ? " "2 : ( (n < 11) ? 3 : 4 ) ) );\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page notice #: actions/accessadminpanel.php:67 @@ -3704,6 +3704,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -4845,7 +4850,7 @@ msgid "about a minute ago" msgstr "fai un minuto" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -4856,12 +4861,12 @@ msgstr[3] "" msgstr[4] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "fai unha hora" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -4872,12 +4877,12 @@ msgstr[3] "" msgstr[4] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "fai un día" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -4888,12 +4893,12 @@ msgstr[3] "" msgstr[4] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "fai un mes" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -4904,7 +4909,7 @@ msgstr[3] "" msgstr[4] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "fai un ano" diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po index eb445fcf8b..e2322622e0 100644 --- a/locale/gl/LC_MESSAGES/statusnet.po +++ b/locale/gl/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Galician (Galego) +# Translation of StatusNet - Core to Galician (Galego) # Expored from translatewiki.net # # Author: Gallaecio @@ -8,19 +8,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:51+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:54+0000\n" "Language-Team: Galician \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: gl\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -1903,7 +1903,7 @@ msgstr "Administrador" #: actions/groupmembers.php:399 msgctxt "BUTTON" msgid "Block" -msgstr "" +msgstr "Bloquear" #: actions/groupmembers.php:498 msgid "Make user an admin of the group" @@ -1913,13 +1913,13 @@ msgstr "Converter ao usuario en administrador do grupo" #: actions/groupmembers.php:533 msgctxt "BUTTON" msgid "Make Admin" -msgstr "" +msgstr "Converter en administrador" #. TRANS: Submit button title. #: actions/groupmembers.php:537 msgctxt "TOOLTIP" msgid "Make this user an admin" -msgstr "" +msgstr "Converter a este usuario en administrador" #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title in atom group notice feed. %s is a group name. @@ -5577,6 +5577,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -6008,7 +6013,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Vostede pertence a este grupo:" msgstr[1] "Vostede pertence a estes grupos:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -6236,7 +6241,7 @@ msgstr "" #: lib/groupnav.php:86 msgctxt "MENU" msgid "Group" -msgstr "" +msgstr "Grupo" #. TRANS: Tooltip for menu item in the group navigation page. #. TRANS: %s is the nickname of the group. @@ -6244,13 +6249,13 @@ msgstr "" #, php-format msgctxt "TOOLTIP" msgid "%s group" -msgstr "" +msgstr "Grupo %s" #. TRANS: Menu item in the group navigation page. #: lib/groupnav.php:95 msgctxt "MENU" msgid "Members" -msgstr "" +msgstr "Membros" #. TRANS: Tooltip for menu item in the group navigation page. #. TRANS: %s is the nickname of the group. @@ -6258,13 +6263,13 @@ msgstr "" #, php-format msgctxt "TOOLTIP" msgid "%s group members" -msgstr "" +msgstr "Membros do grupo %s" #. TRANS: Menu item in the group navigation page. Only shown for group administrators. #: lib/groupnav.php:108 msgctxt "MENU" msgid "Blocked" -msgstr "" +msgstr "Bloqueado" #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. @@ -6272,7 +6277,7 @@ msgstr "" #, php-format msgctxt "TOOLTIP" msgid "%s blocked users" -msgstr "" +msgstr "Usuarios bloqueados en %s" #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. @@ -6280,13 +6285,13 @@ msgstr "" #, php-format msgctxt "TOOLTIP" msgid "Edit %s group properties" -msgstr "" +msgstr "Modificar as propiedades do grupo %s" #. TRANS: Menu item in the group navigation page. Only shown for group administrators. #: lib/groupnav.php:126 msgctxt "MENU" msgid "Logo" -msgstr "" +msgstr "Logotipo" #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. @@ -6294,7 +6299,7 @@ msgstr "" #, php-format msgctxt "TOOLTIP" msgid "Add or edit %s logo" -msgstr "" +msgstr "Engadir ou modificar o logotipo de %s" #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. @@ -6302,7 +6307,7 @@ msgstr "" #, php-format msgctxt "TOOLTIP" msgid "Add or edit %s design" -msgstr "" +msgstr "Engadir ou modificar o deseño de %s" #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" @@ -6811,7 +6816,7 @@ msgstr "" #: lib/mediafile.php:345 #, php-format msgid "\"%s\" is not a supported file type on this server." -msgstr "" +msgstr "Neste servidor non se soporta o tipo de ficheiro \"%s\"." #: lib/messageform.php:120 msgid "Send a direct notice" @@ -6930,20 +6935,20 @@ msgstr "Facerlle un aceno a este usuario" #: lib/oauthstore.php:283 msgid "Error inserting new profile." -msgstr "" +msgstr "Houbo un erro ao inserir o novo perfil." #: lib/oauthstore.php:291 msgid "Error inserting avatar." -msgstr "" +msgstr "Houbo un erro ao inserir o avatar." #: lib/oauthstore.php:311 msgid "Error inserting remote profile." -msgstr "" +msgstr "Houbo un erro ao inserir o perfil remoto." #. TRANS: Exception thrown when a notice is denied because it has been sent before. #: lib/oauthstore.php:346 msgid "Duplicate notice." -msgstr "" +msgstr "Nota duplicada." #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." @@ -7091,7 +7096,7 @@ msgstr "Termos de busca" #: lib/searchaction.php:130 msgctxt "BUTTON" msgid "Search" -msgstr "" +msgstr "Procurar" #. TRANS: Definition list item with instructions on how to get (better) search results. #: lib/searchaction.php:170 @@ -7305,7 +7310,7 @@ msgid "about a minute ago" msgstr "hai como un minuto" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -7313,12 +7318,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "hai como unha hora" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -7326,12 +7331,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "hai como un día" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -7339,12 +7344,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "hai como un mes" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -7352,7 +7357,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "hai como un ano" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 6085f6146e..ce4ca83ffc 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Hebrew (עברית) +# Translation of StatusNet - Core to Hebrew (עברית) # Expored from translatewiki.net # # -- @@ -6,19 +6,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:53+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:55+0000\n" "Language-Team: Hebrew \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page notice #: actions/accessadminpanel.php:67 @@ -3725,7 +3725,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -4579,7 +4579,7 @@ msgid "about a minute ago" msgstr "לפני כדקה" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -4587,12 +4587,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "לפני כשעה" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -4600,12 +4600,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "לפני כיום" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -4613,12 +4613,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "לפני כחודש" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -4626,7 +4626,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "לפני כשנה" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index db9e8891d9..05bd870d63 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Upper Sorbian (Hornjoserbsce) +# Translation of StatusNet - Core to Upper Sorbian (Hornjoserbsce) # Expored from translatewiki.net # # Author: Brion @@ -9,20 +9,20 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:56+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:57+0000\n" "Language-Team: Upper Sorbian \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || " "n%100==4) ? 2 : 3)\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -4739,6 +4739,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5154,7 +5159,7 @@ msgstr[1] "Sy čłon tuteju skupinow:" msgstr[2] "Sy čłon tutych skupinow:" msgstr[3] "Sy čłon tutych skupinow:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -6221,7 +6226,7 @@ msgid "about a minute ago" msgstr "před něhdźe jednej mjeńšinu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -6231,12 +6236,12 @@ msgstr[2] "" msgstr[3] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "před něhdźe jednej hodźinu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -6246,12 +6251,12 @@ msgstr[2] "" msgstr[3] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "před něhdźe jednym dnjom" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -6261,12 +6266,12 @@ msgstr[2] "" msgstr[3] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "před něhdźe jednym měsacom" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -6276,7 +6281,7 @@ msgstr[2] "" msgstr[3] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "před něhdźe jednym lětom" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index c02685c9c9..aa3e0c055a 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Interlingua (Interlingua) +# Translation of StatusNet - Core to Interlingua (Interlingua) # Expored from translatewiki.net # # Author: McDutchie @@ -7,19 +7,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:57+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:07:58+0000\n" "Language-Team: Interlingua \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5543,6 +5543,16 @@ msgstr "Nulle usator pro iste indicio." msgid "Could not authenticate you." msgstr "Non poteva authenticar te." +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." +msgstr "Tentava revocar un indicio non cognoscite." + +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "Falleva de deler le indicio revocate." + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5974,7 +5984,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Tu es membro de iste gruppo:" msgstr[1] "Tu es membro de iste gruppos:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7273,7 +7283,7 @@ msgid "about a minute ago" msgstr "circa un minuta retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -7281,12 +7291,12 @@ msgstr[0] "un minuta" msgstr[1] "%d minutas" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "circa un hora retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -7294,12 +7304,12 @@ msgstr[0] "un hora" msgstr[1] "%d horas" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "circa un die retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -7307,12 +7317,12 @@ msgstr[0] "un die" msgstr[1] "%d dies" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "circa un mense retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -7320,7 +7330,7 @@ msgstr[0] "un mense" msgstr[1] "%d menses" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "circa un anno retro" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 2a4cbc4ebd..d9819ca594 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Icelandic (Íslenska) +# Translation of StatusNet - Core to Icelandic (Íslenska) # Expored from translatewiki.net # # Author: McDutchie @@ -7,19 +7,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:15:59+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:00+0000\n" "Language-Team: Icelandic \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 @@ -4215,7 +4215,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Þú ert ekki meðlimur í þessum hópi." msgstr[1] "Þú ert ekki meðlimur í þessum hópi." -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -5199,7 +5199,7 @@ msgid "about a minute ago" msgstr "fyrir um einni mínútu síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -5207,12 +5207,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "fyrir um einum klukkutíma síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -5220,12 +5220,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "fyrir um einum degi síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -5233,12 +5233,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "fyrir um einum mánuði síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -5246,7 +5246,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "fyrir um einu ári síðan" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 3d0cdb6656..505f6abaf2 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Italian (Italiano) +# Translation of StatusNet - Core to Italian (Italiano) # Expored from translatewiki.net # # Author: HalphaZ @@ -9,19 +9,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:00+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:01+0000\n" "Language-Team: Italian \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5491,6 +5491,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5919,7 +5924,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Non fai parte di questo gruppo:" msgstr[1] "Non fai parte di questi gruppi:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7217,7 +7222,7 @@ msgid "about a minute ago" msgstr "circa un minuto fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -7225,12 +7230,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "circa un'ora fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -7238,12 +7243,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "circa un giorno fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -7251,12 +7256,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "circa un mese fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -7264,7 +7269,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "circa un anno fa" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 43311a1b0a..c9d1ed3352 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Japanese (日本語) +# Translation of StatusNet - Core to Japanese (日本語) # Expored from translatewiki.net # # Author: Brion @@ -10,19 +10,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:01+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:03+0000\n" "Language-Team: Japanese \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5086,6 +5086,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5433,7 +5438,7 @@ msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "あなたはこのグループのメンバーではありません:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -6449,50 +6454,50 @@ msgid "about a minute ago" msgstr "約 1 分前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "約 1 時間前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "約 1 日前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "約 1 ヵ月前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "約 1 年前" diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po index 7d7e6b53bf..a76101d6cd 100644 --- a/locale/ka/LC_MESSAGES/statusnet.po +++ b/locale/ka/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Georgian (ქართული) +# Translation of StatusNet - Core to Georgian (ქართული) # Expored from translatewiki.net # # Author: Zaal @@ -7,19 +7,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:03+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:04+0000\n" "Language-Team: Georgian \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ka\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5492,6 +5492,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5922,7 +5927,7 @@ msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7159,50 +7164,50 @@ msgid "about a minute ago" msgstr "დაახლოებით 1 წუთის წინ" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "დაახლოებით 1 საათის წინ" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "დაახლოებით 1 დღის წინ" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "დაახლოებით 1 თვის წინ" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "დაახლოებით 1 წლის წინ" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index d9ca82db61..0a7d97343d 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Korean (한국어) +# Translation of StatusNet - Core to Korean (한국어) # Expored from translatewiki.net # # Author: Brion @@ -9,19 +9,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:04+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:05+0000\n" "Language-Team: Korean \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -4690,6 +4690,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form guide. #: lib/applicationeditform.php:178 msgid "Icon for this application" @@ -4990,7 +4995,7 @@ msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다." -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -6025,50 +6030,50 @@ msgid "about a minute ago" msgstr "1분 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "1시간 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "하루 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "1달 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "1년 전" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 90659a05cd..75b672334d 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Macedonian (Македонски) +# Translation of StatusNet - Core to Macedonian (Македонски) # Expored from translatewiki.net # # Author: Bjankuloski06 @@ -8,19 +8,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:05+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:07+0000\n" "Language-Team: Macedonian \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -4605,7 +4605,7 @@ msgstr "Неважечко ограничување за биографијат #: actions/useradminpanel.php:155 msgid "Invalid welcome text. Max length is 255 characters." -msgstr "НЕважечки текст за добредојде. Дозволени се највеќе 255 знаци." +msgstr "Неважечки текст за добредојде. Дозволени се највеќе 255 знаци." #: actions/useradminpanel.php:165 #, php-format @@ -5561,6 +5561,16 @@ msgstr "Нема корисник за тој жетон." msgid "Could not authenticate you." msgstr "Не можевме да ве потврдиме." +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." +msgstr "Се обидовте да отповикате непознат жетон." + +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "Не успеав да го избришам отповиканиот жетон." + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5992,7 +6002,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7286,7 +7296,7 @@ msgid "about a minute ago" msgstr "пред една минута" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -7294,12 +7304,12 @@ msgstr[0] "пред околу една минута" msgstr[1] "пред околу %d минути" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "пред еден час" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -7307,12 +7317,12 @@ msgstr[0] "пред околу еден час" msgstr[1] "пред околу %d часа" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "пред еден ден" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -7320,12 +7330,12 @@ msgstr[0] "пред околу еден ден" msgstr[1] "пред околу %d дена" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "пред еден месец" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -7333,7 +7343,7 @@ msgstr[0] "пред околу еден месец" msgstr[1] "пред околу %d месеци" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "пред една година" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 1b82d47547..466cdba68e 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬) +# Translation of StatusNet - Core to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬) # Expored from translatewiki.net # # Author: Laaknor @@ -8,19 +8,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:07+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:10+0000\n" "Language-Team: Norwegian (bokmål)‬ \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5208,6 +5208,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5566,7 +5571,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Du er allerede logget inn!" msgstr[1] "Du er allerede logget inn!" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -6660,7 +6665,7 @@ msgid "about a minute ago" msgstr "omtrent ett minutt siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -6668,12 +6673,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "omtrent én time siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -6681,12 +6686,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "omtrent én dag siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -6694,12 +6699,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "omtrent én måned siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -6707,7 +6712,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "omtrent ett år siden" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index e3ed459de3..ff15376dfd 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Dutch (Nederlands) +# Translation of StatusNet - Core to Dutch (Nederlands) # Expored from translatewiki.net # # Author: Brion @@ -10,19 +10,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:09+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:13+0000\n" "Language-Team: Dutch \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5610,6 +5610,16 @@ msgstr "Er is geen gebruiker voor dat token." msgid "Could not authenticate you." msgstr "U kon niet geauthenticeerd worden." +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." +msgstr "Er is geprobeerd een onbekend token in te trekken." + +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "Het was niet mogelijk een ingetrokken token te verwijderen." + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -6045,7 +6055,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "U bent lid van deze groep:" msgstr[1] "U bent lid van deze groepen:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7353,7 +7363,7 @@ msgid "about a minute ago" msgstr "ongeveer een minuut geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -7361,12 +7371,12 @@ msgstr[0] "ongeveer een minuut geleden" msgstr[1] "ongeveer %d minuten geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "ongeveer een uur geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -7374,12 +7384,12 @@ msgstr[0] "ongeveer een uur geleden" msgstr[1] "ongeveer %d uur geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "ongeveer een dag geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -7387,12 +7397,12 @@ msgstr[0] "ongeveer een dag geleden" msgstr[1] "ongeveer %d dagen geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "ongeveer een maand geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -7400,7 +7410,7 @@ msgstr[0] "ongeveer een maand geleden" msgstr[1] "ongeveer %d maanden geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "ongeveer een jaar geleden" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index e8c54c3837..2091d1431e 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Norwegian Nynorsk (‪Norsk (nynorsk)‬) +# Translation of StatusNet - Core to Norwegian Nynorsk (‪Norsk (nynorsk)‬) # Expored from translatewiki.net # # Author: Nghtwlkr @@ -8,19 +8,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:08+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:11+0000\n" "Language-Team: Norwegian Nynorsk \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 @@ -3861,6 +3861,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -4163,7 +4168,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Du er ikkje medlem av den gruppa." msgstr[1] "Du er ikkje medlem av den gruppa." -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -5135,7 +5140,7 @@ msgid "about a minute ago" msgstr "omtrent eitt minutt sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -5143,12 +5148,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "omtrent ein time sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -5156,12 +5161,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "omtrent ein dag sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -5169,12 +5174,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "omtrent ein månad sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -5182,7 +5187,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "omtrent eitt år sidan" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 3152d3f8e9..879e8e0622 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Polish (Polski) +# Translation of StatusNet - Core to Polish (Polski) # Expored from translatewiki.net # # Author: McDutchie @@ -9,10 +9,10 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:10+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:14+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -20,11 +20,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && " "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" -"X-Message-Group: #out-statusnet\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-Message-Group: #out-statusnet-core\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5540,6 +5540,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5972,7 +5977,7 @@ msgstr[0] "Jesteś członkiem tej grupy:" msgstr[1] "Jesteś członkiem tych grup:" msgstr[2] "Jesteś członkiem tych grup:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7270,7 +7275,7 @@ msgid "about a minute ago" msgstr "około minutę temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -7279,12 +7284,12 @@ msgstr[1] "" msgstr[2] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "około godzinę temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -7293,12 +7298,12 @@ msgstr[1] "" msgstr[2] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "blisko dzień temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -7307,12 +7312,12 @@ msgstr[1] "" msgstr[2] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "około miesiąc temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -7321,7 +7326,7 @@ msgstr[1] "" msgstr[2] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "około rok temu" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 46794835b6..37a54142d3 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Portuguese (Português) +# Translation of StatusNet - Core to Portuguese (Português) # Expored from translatewiki.net # # Author: Gallaecio @@ -11,19 +11,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:12+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:16+0000\n" "Language-Team: Portuguese \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5543,6 +5543,16 @@ msgstr "Nenhum utilizador para esse código." msgid "Could not authenticate you." msgstr "Não foi possível autenticá-lo." +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." +msgstr "Tentou revogar um código desconhecido." + +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "Falha ao eliminar código revogado." + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5970,7 +5980,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Está no grupo:" msgstr[1] "Está nos grupos:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7266,7 +7276,7 @@ msgid "about a minute ago" msgstr "há cerca de um minuto" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -7274,12 +7284,12 @@ msgstr[0] "um minuto" msgstr[1] "%d minutos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "há cerca de uma hora" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -7287,12 +7297,12 @@ msgstr[0] "uma hora" msgstr[1] "%d horas" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "há cerca de um dia" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -7300,12 +7310,12 @@ msgstr[0] "um dia" msgstr[1] "%d dias" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "há cerca de um mês" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -7313,7 +7323,7 @@ msgstr[0] "um mês" msgstr[1] "%d meses" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "há cerca de um ano" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 3580e6c994..4a286a4bc5 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Brazilian Portuguese (Português do Brasil) +# Translation of StatusNet - Core to Brazilian Portuguese (Português do Brasil) # Expored from translatewiki.net # # Author: Aracnus @@ -13,20 +13,20 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:14+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:17+0000\n" "Language-Team: Brazilian Portuguese \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5574,6 +5574,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -6007,7 +6012,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Você é membro deste grupo:" msgstr[1] "Você é membro destes grupos:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7305,7 +7310,7 @@ msgid "about a minute ago" msgstr "cerca de 1 minuto atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -7313,12 +7318,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "cerca de 1 hora atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -7326,12 +7331,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "cerca de 1 dia atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -7339,12 +7344,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "cerca de 1 mês atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -7352,7 +7357,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "cerca de 1 ano atrás" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index fafeddfc66..67326b72fb 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Russian (Русский) +# Translation of StatusNet - Core to Russian (Русский) # Expored from translatewiki.net # # Author: Brion @@ -12,20 +12,20 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:15+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:19+0000\n" "Language-Team: Russian \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= " "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5558,6 +5558,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5992,7 +5997,7 @@ msgstr[0] "Вы являетесь участником следующих гр msgstr[1] "Вы являетесь участником следующих групп:" msgstr[2] "Вы являетесь участником следующих групп:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7284,7 +7289,7 @@ msgid "about a minute ago" msgstr "около минуты назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -7293,12 +7298,12 @@ msgstr[1] "" msgstr[2] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "около часа назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -7307,12 +7312,12 @@ msgstr[1] "" msgstr[2] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "около дня назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -7321,12 +7326,12 @@ msgstr[1] "" msgstr[2] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "около месяца назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -7335,7 +7340,7 @@ msgstr[1] "" msgstr[2] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "около года назад" diff --git a/locale/statusnet.pot b/locale/statusnet.pot index ba7c02a7bb..c4dfe75f9b 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -5676,7 +5676,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "" msgstr[1] "" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -6814,7 +6814,7 @@ msgid "about a minute ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -6822,12 +6822,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -6835,12 +6835,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -6848,12 +6848,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -6861,7 +6861,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 3996187f2b..fddbf065c2 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Swedish (Svenska) +# Translation of StatusNet - Core to Swedish (Svenska) # Expored from translatewiki.net # # Author: Jamminjohn @@ -9,19 +9,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:16+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:24+0000\n" "Language-Team: Swedish \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5527,6 +5527,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5956,7 +5961,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "Du är en medlem i denna grupp:" msgstr[1] "Du är en medlem i dessa grupper:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7245,7 +7250,7 @@ msgid "about a minute ago" msgstr "för nån minut sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -7253,12 +7258,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "för en timma sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -7266,12 +7271,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "för en dag sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -7279,12 +7284,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "för en månad sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -7292,7 +7297,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "för ett år sedan" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index f1b479ea34..f35ee97fa7 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Telugu (తెలుగు) +# Translation of StatusNet - Core to Telugu (తెలుగు) # Expored from translatewiki.net # # Author: Brion @@ -8,19 +8,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:18+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:25+0000\n" "Language-Team: Telugu \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -4671,6 +4671,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5011,7 +5016,7 @@ msgid_plural "You are a member of these groups:" msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -6160,7 +6165,7 @@ msgid "about a minute ago" msgstr "ఓ నిమిషం క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -6168,12 +6173,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "ఒక గంట క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -6181,12 +6186,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "ఓ రోజు క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -6194,12 +6199,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "ఓ నెల క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -6207,7 +6212,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "ఒక సంవత్సరం క్రితం" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 94f9bb2649..1664f062d0 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Turkish (Türkçe) +# Translation of StatusNet - Core to Turkish (Türkçe) # Expored from translatewiki.net # # Author: Joseph @@ -8,19 +8,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:19+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:27+0000\n" "Language-Team: Turkish \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page notice #: actions/accessadminpanel.php:67 @@ -3774,7 +3774,7 @@ msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Bize o profili yollamadınız" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -4658,50 +4658,50 @@ msgid "about a minute ago" msgstr "yaklaşık bir dakika önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "yaklaşık bir saat önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "yaklaşık bir gün önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "yaklaşık bir ay önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "yaklaşık bir yıl önce" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index f19f46649a..180a64e64f 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Ukrainian (Українська) +# Translation of StatusNet - Core to Ukrainian (Українська) # Expored from translatewiki.net # # Author: AS @@ -10,20 +10,20 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:21+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:28+0000\n" "Language-Team: Ukrainian \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= " "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5537,6 +5537,16 @@ msgstr "Немає користувача для цього токену." msgid "Could not authenticate you." msgstr "Не вдалося автентифікувати Вас." +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." +msgstr "Спроба скасувати невідомий токен." + +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "Не вдалося видалити скасований токен." + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5970,7 +5980,7 @@ msgstr[0] "Ви є учасником групи:" msgstr[1] "Ви є учасником таких груп:" msgstr[2] "Ви є учасником таких груп:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7264,7 +7274,7 @@ msgid "about a minute ago" msgstr "хвилину тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -7273,12 +7283,12 @@ msgstr[1] "%d хвилин тому" msgstr[2] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "годину тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -7287,12 +7297,12 @@ msgstr[1] "%d годин тому" msgstr[2] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "день тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -7301,12 +7311,12 @@ msgstr[1] "%d днів тому" msgstr[2] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "місяць тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -7315,7 +7325,7 @@ msgstr[1] "%d місяців тому" msgstr[2] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "рік тому" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 463bad317c..2c99c22900 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Vietnamese (Tiếng Việt) +# Translation of StatusNet - Core to Vietnamese (Tiếng Việt) # Expored from translatewiki.net # # Author: Minh Nguyen @@ -7,19 +7,19 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:22+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:30+0000\n" "Language-Team: Vietnamese \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -3539,6 +3539,11 @@ msgstr "" msgid "Tried to revoke unknown token." msgstr "" +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -3827,7 +3832,7 @@ msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Bạn chưa cập nhật thông tin riêng" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -4663,50 +4668,50 @@ msgid "about a minute ago" msgstr "1 phút trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "1 giờ trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "1 ngày trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "1 tháng trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "1 năm trước" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 39500e6c1d..e2257f3319 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Simplified Chinese (‪中文(简体)‬) +# Translation of StatusNet - Core to Simplified Chinese (‪中文(简体)‬) # Expored from translatewiki.net # # Author: Chenxiaoqino @@ -11,20 +11,20 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:23+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:31+0000\n" "Language-Team: Simplified Chinese \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page title #. TRANS: Menu item for site administration @@ -5388,6 +5388,16 @@ msgstr "没有用户使用这个 token。" msgid "Could not authenticate you." msgstr "无法验证你。" +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/apioauthstore.php:178 +msgid "Tried to revoke unknown token." +msgstr "" + +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/apioauthstore.php:182 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Form legend. #: lib/applicationeditform.php:129 msgid "Edit application" @@ -5810,7 +5820,7 @@ msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "你是该小组成员:" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -7087,50 +7097,50 @@ msgid "about a minute ago" msgstr "约1分钟前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" msgstr[0] "约1分钟前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "约1小时前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" msgstr[0] "约一小时前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "约1天前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" msgstr[0] "约1天前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "约1个月前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" msgstr[0] "约1个月前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "约1年前" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index cae1e01062..d9fcb3ff45 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# Translation of StatusNet to Traditional Chinese (‪中文(繁體)‬) +# Translation of StatusNet - Core to Traditional Chinese (‪中文(繁體)‬) # Expored from translatewiki.net # # -- @@ -6,20 +6,20 @@ # msgid "" msgstr "" -"Project-Id-Version: StatusNet\n" +"Project-Id-Version: StatusNet - Core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 23:15+0000\n" -"PO-Revision-Date: 2010-09-16 23:16:24+0000\n" +"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"PO-Revision-Date: 2010-09-18 22:08:32+0000\n" "Language-Team: Traditional Chinese \n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n" +"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" -"X-Message-Group: #out-statusnet\n" +"X-Message-Group: #out-statusnet-core\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-POT-Import-Date: 1284-49-48 10::+0000\n" +"X-POT-Import-Date: 1284-74-75 38::+0000\n" #. TRANS: Page notice #: actions/accessadminpanel.php:67 @@ -4145,7 +4145,7 @@ msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "無法連結到伺服器:%s" -#. TRANS: Help text for commands. +#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings. #: lib/command.php:905 msgid "" "Commands:\n" @@ -5065,50 +5065,50 @@ msgid "about a minute ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1109 +#: lib/util.php:1110 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1112 +#: lib/util.php:1113 msgid "about an hour ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1115 +#: lib/util.php:1117 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1118 +#: lib/util.php:1120 msgid "about a day ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1121 +#: lib/util.php:1124 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1124 +#: lib/util.php:1127 msgid "about a month ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1127 +#: lib/util.php:1131 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" msgstr[0] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1130 +#: lib/util.php:1134 msgid "about a year ago" msgstr "" From 5a6f6162061985c9d0e67b7d25b94b5a53205ace Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 19 Sep 2010 15:17:36 +0200 Subject: [PATCH 45/76] * i18n/L10n update * translator comments added * remove superfluous whitespace --- plugins/OStatus/OStatusPlugin.php | 37 ++++---- plugins/OStatus/actions/groupsalmon.php | 30 ++++--- plugins/OStatus/actions/hostmeta.php | 1 - plugins/OStatus/actions/ostatusgroup.php | 8 +- plugins/OStatus/actions/ostatusinit.php | 22 ++++- plugins/OStatus/actions/ostatussub.php | 42 ++++++---- plugins/OStatus/actions/ownerxrd.php | 2 +- plugins/OStatus/actions/pushcallback.php | 26 +++--- plugins/OStatus/actions/pushhub.php | 37 ++++---- plugins/OStatus/actions/usersalmon.php | 48 ++++++----- plugins/OStatus/actions/userxrd.php | 8 +- plugins/OStatus/classes/FeedSub.php | 9 +- plugins/OStatus/classes/HubSub.php | 13 ++- plugins/OStatus/classes/Magicsig.php | 4 - plugins/OStatus/classes/Ostatus_profile.php | 93 +++++++++++---------- plugins/OStatus/classes/Ostatus_source.php | 4 - plugins/OStatus/lib/discovery.php | 4 +- plugins/OStatus/lib/discoveryhints.php | 1 - plugins/OStatus/lib/linkheader.php | 3 + plugins/OStatus/lib/magicenvelope.php | 6 +- plugins/OStatus/lib/ostatusqueuehandler.php | 1 - plugins/OStatus/lib/pushinqueuehandler.php | 1 - plugins/OStatus/lib/salmon.php | 5 +- plugins/OStatus/lib/salmonaction.php | 17 +++- plugins/OStatus/lib/xrd.php | 7 +- plugins/OStatus/lib/xrdaction.php | 1 - 26 files changed, 236 insertions(+), 194 deletions(-) diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index 77bc9872b4..2dddfcbe2b 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -223,6 +223,7 @@ class OStatusPlugin extends Plugin array('nickname' => $profile->nickname)); $output->element('a', array('href' => $url, 'class' => 'entity_remote_subscribe'), + // TRANS: Link description for link to subscribe to a remote user. _m('Subscribe')); $output->elementEnd('li'); @@ -241,6 +242,7 @@ class OStatusPlugin extends Plugin array('group' => $group->nickname)); $output->element('a', array('href' => $url, 'class' => 'entity_remote_subscribe'), + // TRANS: Link description for link to join a remote group. _m('Join')); } @@ -453,6 +455,7 @@ class OStatusPlugin extends Plugin } $url = $notice->url; + // TRANSLATE: %s is a domain. $title = sprintf(_m("Sent from %s via OStatus"), $domain); return false; } @@ -524,6 +527,7 @@ class OStatusPlugin extends Plugin } if (!$oprofile->subscribe()) { + // TRANS: Exception. throw new Exception(_m('Could not set up remote subscription.')); } } @@ -563,10 +567,10 @@ class OStatusPlugin extends Plugin common_date_iso8601(time())); $act->time = time(); - $act->title = _("Follow"); + $act->title = _m("Follow"); // TRANS: Success message for subscribe to user attempt through OStatus. // TRANS: %1$s is the subscriber name, %2$s is the subscribed user's name. - $act->content = sprintf(_("%1$s is now following %2$s."), + $act->content = sprintf(_m('%1$s is now following %2$s.'), $subscriber->getBestName(), $other->getBestName()); @@ -613,10 +617,10 @@ class OStatusPlugin extends Plugin common_date_iso8601(time())); $act->time = time(); - $act->title = _("Unfollow"); + $act->title = _m('Unfollow'); // TRANS: Success message for unsubscribe from user attempt through OStatus. // TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name. - $act->content = sprintf(_("%1$s stopped following %2$s."), + $act->content = sprintf(_m('%1$s stopped following %2$s.'), $profile->getBestName(), $other->getBestName()); @@ -671,6 +675,7 @@ class OStatusPlugin extends Plugin return true; } else { $oprofile->garbageCollect(); + // TRANS: Exception. throw new Exception(_m("Failed joining remote group.")); } } @@ -729,7 +734,6 @@ class OStatusPlugin extends Plugin * @param Notice $notice being favored * @return hook return value */ - function onEndFavorNotice(Profile $profile, Notice $notice) { $user = User::staticGet('id', $profile->id); @@ -753,10 +757,10 @@ class OStatusPlugin extends Plugin common_date_iso8601(time())); $act->time = time(); - $act->title = _("Favor"); + $act->title = _m('Favor'); // TRANS: Success message for adding a favorite notice through OStatus. // TRANS: %1$s is the favoring user's name, %2$s is URI to the favored notice. - $act->content = sprintf(_("%1$s marked notice %2$s as a favorite."), + $act->content = sprintf(_m('%1$s marked notice %2$s as a favorite.'), $profile->getBestName(), $notice->uri); @@ -799,10 +803,10 @@ class OStatusPlugin extends Plugin $notice->id, common_date_iso8601(time())); $act->time = time(); - $act->title = _("Disfavor"); + $act->title = _m('Disfavor'); // TRANS: Success message for remove a favorite notice through OStatus. // TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice. - $act->content = sprintf(_("%1$s marked notice %2$s as no longer a favorite."), + $act->content = sprintf(_m('%1$s marked notice %2$s as no longer a favorite.'), $profile->getBestName(), $notice->uri); @@ -876,8 +880,9 @@ class OStatusPlugin extends Plugin $action->elementStart('p', array('id' => 'entity_remote_subscribe', 'class' => 'entity_subscribe')); $action->element('a', array('href' => common_local_url($target), - 'class' => 'entity_remote_subscribe') - , _m('Remote')); // @todo: i18n: Add translator hint for this text. + 'class' => 'entity_remote_subscribe'), + // TRANS: Link text for link to remote subscribe. + _m('Remote')); $action->elementEnd('p'); $action->elementEnd('div'); } @@ -916,6 +921,7 @@ class OStatusPlugin extends Plugin $profile->id, common_date_iso8601(time())); $act->time = time(); + // TRANS: Title for activity. $act->title = _m("Profile update"); // TRANS: Ping text for remote profile update through OStatus. // TRANS: %s is user that updated their profile. @@ -948,7 +954,8 @@ class OStatusPlugin extends Plugin array('nickname' => $profileUser->nickname)); $output->element('a', array('href' => $url, 'class' => 'entity_remote_subscribe'), - _m('Subscribe')); // @todo: i18n: Add context. + // TRANS: Link text for a user to subscribe to an OStatus user. + _m('Subscribe')); $output->elementEnd('li'); } } @@ -962,9 +969,9 @@ class OStatusPlugin extends Plugin 'version' => STATUSNET_VERSION, 'author' => 'Evan Prodromou, James Walker, Brion Vibber, Zach Copley', 'homepage' => 'http://status.net/wiki/Plugin:OStatus', - 'rawdescription' => - _m('Follow people across social networks that implement '. - 'OStatus.')); // @todo i18n: Add translator hint. + // TRANS: Plugin description. + 'rawdescription' => _m('Follow people across social networks that implement '. + 'OStatus.')); return true; } diff --git a/plugins/OStatus/actions/groupsalmon.php b/plugins/OStatus/actions/groupsalmon.php index 5094dccf0f..3a3d63fe20 100644 --- a/plugins/OStatus/actions/groupsalmon.php +++ b/plugins/OStatus/actions/groupsalmon.php @@ -17,15 +17,14 @@ * along with this program. If not, see . */ -/** - * @package OStatusPlugin - * @author James Walker - */ - if (!defined('STATUSNET')) { exit(1); } +/** + * @package OStatusPlugin + * @author James Walker + */ class GroupsalmonAction extends SalmonAction { var $group = null; @@ -37,17 +36,20 @@ class GroupsalmonAction extends SalmonAction $id = $this->trimmed('id'); if (!$id) { - $this->clientError(_('No ID.')); + // TRANS: Client error. + $this->clientError(_m('No ID.')); } $this->group = User_group::staticGet('id', $id); if (empty($this->group)) { - $this->clientError(_('No such group.')); + // TRANS: Client error. + $this->clientError(_m('No such group.')); } $oprofile = Ostatus_profile::staticGet('group_id', $id); if ($oprofile) { + // TRANS: Client error. $this->clientError(_m("Can't accept remote posts for a remote group.")); } @@ -57,7 +59,6 @@ class GroupsalmonAction extends SalmonAction /** * We've gotten a post event on the Salmon backchannel, probably a reply. */ - function handlePost() { // @fixme process all objects? @@ -69,18 +70,20 @@ class GroupsalmonAction extends SalmonAction case ActivityObject::COMMENT: break; default: + // TRANS: Client exception. throw new ClientException("Can't handle that kind of post."); } // Notice must be to the attention of this group - $context = $this->activity->context; if (empty($context->attention)) { + // TRANS: Client exception. throw new ClientException("Not to the attention of anyone."); } else { $uri = common_local_url('groupbyid', array('id' => $this->group->id)); if (!in_array($uri, $context->attention)) { + // TRANS: Client exception. throw new ClientException("Not to the attention of this group."); } } @@ -116,14 +119,15 @@ class GroupsalmonAction extends SalmonAction * currently we're doing the main logic in joingroup action * and so have to repeat it here. */ - function handleJoin() { $oprofile = $this->ensureProfile(); if (!$oprofile) { + // TRANS: Client error. $this->clientError(_m("Can't read profile to set up group membership.")); } if ($oprofile->isGroup()) { + // TRANS: Client error. $this->clientError(_m("Groups can't join groups.")); } @@ -137,7 +141,7 @@ class GroupsalmonAction extends SalmonAction } if (Group_block::isBlocked($this->group, $profile)) { - $this->clientError(_('You have been blocked from that group by the admin.'), 403); + $this->clientError(_m('You have been blocked from that group by the admin.'), 403); return false; } @@ -151,6 +155,7 @@ class GroupsalmonAction extends SalmonAction //Event::handle('EndJoinGroup', array($this->group, $profile)); //} } catch (Exception $e) { + // TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname. $this->serverError(sprintf(_m('Could not join remote user %1$s to group %2$s.'), $oprofile->uri, $this->group->nickname)); } @@ -159,7 +164,6 @@ class GroupsalmonAction extends SalmonAction /** * A remote user left our group. */ - function handleLeave() { $oprofile = $this->ensureProfile(); @@ -180,10 +184,10 @@ class GroupsalmonAction extends SalmonAction //Event::handle('EndLeaveGroup', array($this->group, $profile)); //} } catch (Exception $e) { + // TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname. $this->serverError(sprintf(_m('Could not remove remote user %1$s from group %2$s.'), $oprofile->uri, $this->group->nickname)); return; } } - } diff --git a/plugins/OStatus/actions/hostmeta.php b/plugins/OStatus/actions/hostmeta.php index 8ca07f9165..db4c913e16 100644 --- a/plugins/OStatus/actions/hostmeta.php +++ b/plugins/OStatus/actions/hostmeta.php @@ -26,7 +26,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } class HostMetaAction extends Action { - function handle() { parent::handle(); diff --git a/plugins/OStatus/actions/ostatusgroup.php b/plugins/OStatus/actions/ostatusgroup.php index 1861e866f2..7db00ffbef 100644 --- a/plugins/OStatus/actions/ostatusgroup.php +++ b/plugins/OStatus/actions/ostatusgroup.php @@ -72,13 +72,16 @@ class OStatusGroupAction extends OStatusSubAction $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('profile', + // TRANS: Field label. _m('Join group'), $this->profile_uri, + // TRANS: Tooltip for field label "Join group". _m("OStatus group's address, like http://example.net/group/nickname.")); $this->elementEnd('li'); $this->elementEnd('ul'); - $this->submit('validate', _m('Continue')); + // TRANS: Button text. + $this->submit('validate', _m('BUTTON','Continue')); $this->elementEnd('fieldset'); @@ -156,7 +159,6 @@ class OStatusGroupAction extends OStatusSubAction * * @return string Title of the page */ - function title() { // TRANS: Page title for OStatus remote group join form @@ -168,9 +170,9 @@ class OStatusGroupAction extends OStatusSubAction * * @return instructions for use */ - function getInstructions() { + // TRANS: Instructions. return _m('You can subscribe to groups from other supported sites. Paste the group\'s profile URI below:'); } diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php index 0c991aba98..f576823e31 100644 --- a/plugins/OStatus/actions/ostatusinit.php +++ b/plugins/OStatus/actions/ostatusinit.php @@ -27,7 +27,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } class OStatusInitAction extends Action { - var $nickname; var $group; var $profile; @@ -38,6 +37,7 @@ class OStatusInitAction extends Action parent::prepare($args); if (common_logged_in()) { + // TRANS: Client error. $this->clientError(_m('You can use the local subscription!')); return false; } @@ -78,6 +78,7 @@ class OStatusInitAction extends Action $this->xw->startDocument('1.0', 'UTF-8'); $this->elementStart('html'); $this->elementStart('head'); + // TRANS: Form title. $this->element('title', null, _m('Subscribe to user')); $this->elementEnd('head'); $this->elementStart('body'); @@ -92,11 +93,15 @@ class OStatusInitAction extends Action function showContent() { if ($this->group) { + // TRANS: Form legend. $header = sprintf(_m('Join group %s'), $this->group); - $submit = _m('Join'); + // TRANS: Button text. + $submit = _m('BUTTON','Join'); } else { + // TRANS: Form legend. $header = sprintf(_m('Subscribe to %s'), $this->nickname); - $submit = _m('Subscribe'); + // TRANS: Button text. + $submit = _m('BUTTON','Subscribe'); } $this->elementStart('form', array('id' => 'form_ostatus_connect', 'method' => 'post', @@ -108,12 +113,15 @@ class OStatusInitAction extends Action $this->elementStart('ul', 'form_data'); $this->elementStart('li', array('id' => 'ostatus_nickname')); + // TRANS: Field label. $this->input('nickname', _m('User nickname'), $this->nickname, _m('Nickname of the user you want to follow.')); $this->hidden('group', $this->group); // pass-through for magic links $this->elementEnd('li'); $this->elementStart('li', array('id' => 'ostatus_profile')); + // TRANS: Field label. $this->input('profile', _m('Profile Account'), $this->profile, + // TRANS: Tooltip for field label "Profile Account". _m('Your account id (e.g. user@identi.ca).')); $this->elementEnd('li'); $this->elementEnd('ul'); @@ -135,6 +143,7 @@ class OStatusInitAction extends Action } elseif (strpos($this->profile, '@') !== false) { $this->connectWebfinger($this->profile); } else { + // TRANS: Client error. $this->clientError(_m("Must provide a remote profile.")); } } @@ -146,6 +155,7 @@ class OStatusInitAction extends Action $disco = new Discovery; $result = $disco->lookup($acct); if (!$result) { + // TRANS: Client error. $this->clientError(_m("Couldn't look up OStatus account profile.")); } @@ -158,6 +168,7 @@ class OStatusInitAction extends Action } } + // TRANS: Client error. $this->clientError(_m("Couldn't confirm remote profile address.")); } @@ -183,6 +194,7 @@ class OStatusInitAction extends Action if ($user) { return common_local_url('userbyid', array('id' => $user->id)); } else { + // TRANS: Client error. $this->clientError("No such user."); } } else if ($this->group) { @@ -190,16 +202,18 @@ class OStatusInitAction extends Action if ($group) { return common_local_url('groupbyid', array('id' => $group->group_id)); } else { + // TRANS: Client error. $this->clientError("No such group."); } } else { + // TRANS: Client error. $this->clientError("No local user or group nickname provided."); } } function title() { + // TRANS: Page title. return _m('OStatus Connect'); } - } diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php index 4cbd7d0348..493b519657 100644 --- a/plugins/OStatus/actions/ostatussub.php +++ b/plugins/OStatus/actions/ostatussub.php @@ -62,13 +62,15 @@ class OStatusSubAction extends Action $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('profile', + // TRANS: Field label for a field that takes an OStatus user address. _m('Subscribe to'), $this->profile_uri, - _m("OStatus user's address, like nickname@example.com or http://example.net/nickname")); // @todo i18n FIXME: needs context/translator hint. + // TRANS: Tooltip for field label "Subscribe to". + _m('OStatus user\'s address, like nickname@example.com or http://example.net/nickname')); $this->elementEnd('li'); $this->elementEnd('ul'); - - $this->submit('validate', _m('Continue')); // @todo i18n FIXME: needs context/translator hint. + // TRANS: Button text. + $this->submit('validate', _m('BUTTON','Continue')); $this->elementEnd('fieldset'); @@ -103,10 +105,14 @@ class OStatusSubAction extends Action $this->hidden('profile', $this->profile_uri); if ($this->oprofile->isGroup()) { $this->submit('submit', _m('Join'), 'submit', null, - _m('Join this group')); // @todo i18n FIXME: needs context/translator hint. + // TRANS: Button text. + // TRANS: Tooltip for button "Join". + _m('BUTTON','Join this group')); } else { - $this->submit('submit', _m('Confirm'), 'submit', null, - _m('Subscribe to this user')); // @todo i18n FIXME: needs context/translator hint. + // TRANS: Button text. + $this->submit('submit', _m('BUTTON','Confirm'), 'submit', null, + // TRANS: Tooltip for button "Confirm". + _m('Subscribe to this user')); } $this->elementEnd('fieldset'); $this->elementEnd('form'); @@ -156,7 +162,7 @@ class OStatusSubAction extends Action $this->elementStart('div', 'entity_profile vcard'); $this->elementStart('dl', 'entity_depiction'); - $this->element('dt', null, _('Photo')); + $this->element('dt', null, _m('Photo')); $this->elementStart('dd'); $this->element('img', array('src' => $avatar, 'class' => 'photo avatar', @@ -167,7 +173,7 @@ class OStatusSubAction extends Action $this->elementEnd('dl'); $this->elementStart('dl', 'entity_nickname'); - $this->element('dt', null, _('Nickname')); + $this->element('dt', null, _m('Nickname')); $this->elementStart('dd'); $hasFN = ($fullname !== '') ? 'nickname' : 'fn nickname'; $this->elementStart('a', array('href' => $profile, @@ -188,7 +194,7 @@ class OStatusSubAction extends Action } if (!is_null($location)) { $this->elementStart('dl', 'entity_location'); - $this->element('dt', null, _('Location')); + $this->element('dt', null, _m('Location')); $this->elementStart('dd', 'label'); $this->raw($location); $this->elementEnd('dd'); @@ -197,7 +203,7 @@ class OStatusSubAction extends Action if (!is_null($homepage)) { $this->elementStart('dl', 'entity_url'); - $this->element('dt', null, _('URL')); + $this->element('dt', null, _m('URL')); $this->elementStart('dd'); $this->elementStart('a', array('href' => $homepage, 'class' => 'url')); @@ -209,7 +215,7 @@ class OStatusSubAction extends Action if (!is_null($note)) { $this->elementStart('dl', 'entity_note'); - $this->element('dt', null, _('Note')); + $this->element('dt', null, _m('Note')); $this->elementStart('dd', 'note'); $this->raw($note); $this->elementEnd('dd'); @@ -244,31 +250,39 @@ class OStatusSubAction extends Action } else if (Validate::uri($this->profile_uri)) { $this->oprofile = Ostatus_profile::ensureProfileURL($this->profile_uri); } else { + // TRANS: Error text. $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname."); common_debug('Invalid address format.', __FILE__); return false; } return true; } catch (FeedSubBadURLException $e) { + // TRANS: Error text. $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname."); common_debug('Invalid URL or could not reach server.', __FILE__); } catch (FeedSubBadResponseException $e) { + // TRANS: Error text. $this->error = _m("Sorry, we could not reach that feed. Please try that OStatus address again later."); common_debug('Cannot read feed; server returned error.', __FILE__); } catch (FeedSubEmptyException $e) { + // TRANS: Error text. $this->error = _m("Sorry, we could not reach that feed. Please try that OStatus address again later."); common_debug('Cannot read feed; server returned an empty page.', __FILE__); } catch (FeedSubBadHTMLException $e) { + // TRANS: Error text. $this->error = _m("Sorry, we could not reach that feed. Please try that OStatus address again later."); common_debug('Bad HTML, could not find feed link.', __FILE__); } catch (FeedSubNoFeedException $e) { + // TRANS: Error text. $this->error = _m("Sorry, we could not reach that feed. Please try that OStatus address again later."); common_debug('Could not find a feed linked from this URL.', __FILE__); } catch (FeedSubUnrecognizedTypeException $e) { + // TRANS: Error text. $this->error = _m("Sorry, we could not reach that feed. Please try that OStatus address again later."); common_debug('Not a recognized feed type.', __FILE__); } catch (Exception $e) { // Any new ones we forgot about + // TRANS: Error text. $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname."); common_debug(sprintf('Bad feed URL: %s %s', get_class($e), $e->getMessage()), __FILE__); } @@ -350,7 +364,7 @@ class OStatusSubAction extends Action // CSRF protection $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { - $this->showForm(_('There was a problem with your session token. '. + $this->showForm(_m('There was a problem with your session token. '. 'Try again, please.')); return; } @@ -377,6 +391,7 @@ class OStatusSubAction extends Action $this->xw->startDocument('1.0', 'UTF-8'); $this->elementStart('html'); $this->elementStart('head'); + // TRANS: Form title. $this->element('title', null, _m('Subscribe to user')); $this->elementEnd('head'); $this->elementStart('body'); @@ -408,6 +423,7 @@ class OStatusSubAction extends Action function getInstructions() { + // TRANS: Instructions. return _m('You can subscribe to users from other supported sites. Paste their address or profile URI below:'); } @@ -426,7 +442,6 @@ class OStatusSubAction extends Action * * @return void */ - function showContent() { if ($this->oprofile) { @@ -459,5 +474,4 @@ class OStatusSubAction extends Action function showNoticeForm() { // nop } - } diff --git a/plugins/OStatus/actions/ownerxrd.php b/plugins/OStatus/actions/ownerxrd.php index 3fcb982b87..9e84f72ecb 100644 --- a/plugins/OStatus/actions/ownerxrd.php +++ b/plugins/OStatus/actions/ownerxrd.php @@ -34,7 +34,7 @@ class OwnerxrdAction extends XrdAction $this->user = User::siteOwner(); if (!$this->user) { - $this->clientError(_('No such user.'), 404); + $this->clientError(_m('No such user.'), 404); return false; } diff --git a/plugins/OStatus/actions/pushcallback.php b/plugins/OStatus/actions/pushcallback.php index 6c69787455..701a39c163 100644 --- a/plugins/OStatus/actions/pushcallback.php +++ b/plugins/OStatus/actions/pushcallback.php @@ -24,7 +24,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } - class PushCallbackAction extends Action { function handle() @@ -46,13 +45,13 @@ class PushCallbackAction extends Action $feedid = $this->arg('feed'); common_log(LOG_INFO, "POST for feed id $feedid"); if (!$feedid) { - throw new ServerException('Empty or invalid feed id.', 400); + throw new ServerException(_m('Empty or invalid feed id.'), 400); } $feedsub = FeedSub::staticGet('id', $feedid); if (!$feedsub) { - // @todo i18n FIXME: added i18n and use sprintf when using parameters. - throw new ServerException('Unknown PuSH feed id ' . $feedid, 400); + // TRANS: Server exception. %s is a feed ID. + throw new ServerException(sprintf(_m('Unknown PuSH feed id %s'),$feedid), 400); } $hmac = ''; @@ -84,30 +83,31 @@ class PushCallbackAction extends Action $verify_token = $this->arg('hub_verify_token'); if ($mode != 'subscribe' && $mode != 'unsubscribe') { - throw new ClientException("Bad hub.mode $mode", 404); + // TRANS: Client exception. %s is an invalid value for hub.mode. + throw new ClientException(sprintf(_m('Bad hub.mode "$s".',$mode)), 404); } $feedsub = FeedSub::staticGet('uri', $topic); if (!$feedsub) { - // @todo i18n FIXME: added i18n and use sprintf when using parameters. - throw new ClientException("Bad hub.topic feed $topic.", 404); + // TRANS: Client exception. %s is an invalid feed name. + throw new ClientException(sprintf(_m('Bad hub.topic feed "%s".'),$topic), 404); } if ($feedsub->verify_token !== $verify_token) { - // @todo i18n FIXME: added i18n and use sprintf when using parameters. - throw new ClientException("Bad hub.verify_token $token for $topic.", 404); + // TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given. + throw new ClientException(sprintf(_m('Bad hub.verify_token %1$s for %2$s.'),$token,$topic), 404); } if ($mode == 'subscribe') { // We may get re-sub requests legitimately. if ($feedsub->sub_state != 'subscribe' && $feedsub->sub_state != 'active') { - // @todo i18n FIXME: added i18n and use sprintf when using parameters. - throw new ClientException("Unexpected subscribe request for $topic.", 404); + // TRANS: Client exception. %s is an invalid topic. + throw new ClientException(sprintf(_m('Unexpected subscribe request for %s.'),$topic), 404); } } else { if ($feedsub->sub_state != 'unsubscribe') { - // @todo i18n FIXME: added i18n and use sprintf when using parameters. - throw new ClientException("Unexpected unsubscribe request for $topic.", 404); + // TRANS: Client exception. %s is an invalid topic. + throw new ClientException(sprintf(_m('Unexpected unsubscribe request for %s.'),$topic), 404); } } diff --git a/plugins/OStatus/actions/pushhub.php b/plugins/OStatus/actions/pushhub.php index 6909b85391..68035ab5cc 100644 --- a/plugins/OStatus/actions/pushhub.php +++ b/plugins/OStatus/actions/pushhub.php @@ -62,11 +62,11 @@ class PushHubAction extends Action $this->subunsub($mode); break; case "publish": - // @todo i18n FIXME: added i18n and use sprintf when using parameters. - throw new ClientException("Publishing outside feeds not supported.", 400); + // TRANS: Client exception. + throw new ClientException(_m('Publishing outside feeds not supported.'), 400); default: - // @todo i18n FIXME: added i18n and use sprintf when using parameters. - throw new ClientException("Unrecognized mode '$mode'.", 400); + // TRANS: Client exception. %s is a mode. + throw new ClientException(sprintf(_m('Unrecognized mode "%s".'),$mode), 400); } } @@ -85,28 +85,28 @@ class PushHubAction extends Action $topic = $this->argUrl('hub.topic'); if (!$this->recognizedFeed($topic)) { - // @todo i18n FIXME: added i18n and use sprintf when using parameters. - throw new ClientException("Unsupported hub.topic $topic; this hub only serves local user and group Atom feeds."); + // TRANS: Client exception. %s is a topic. + throw new ClientException(sprintf(_m('Unsupported hub.topic %s this hub only serves local user and group Atom feeds.'),$topic)); } $verify = $this->arg('hub.verify'); // @fixme may be multiple if ($verify != 'sync' && $verify != 'async') { - // @todo i18n FIXME: added i18n and use sprintf when using parameters. - throw new ClientException("Invalid hub.verify $verify; must be sync or async."); + // TRANS: Client exception. + throw new ClientException(sprintf(_m('Invalid hub.verify "%s". It must be sync or async.'),$verify)); } $lease = $this->arg('hub.lease_seconds', null); if ($mode == 'subscribe' && $lease != '' && !preg_match('/^\d+$/', $lease)) { - // @todo i18n FIXME: added i18n and use sprintf when using parameters. - throw new ClientException("Invalid hub.lease $lease; must be empty or positive integer."); + // TRANS: Client exception. + throw new ClientException(sprintf(_m('Invalid hub.lease "%s". It must be empty or positive integer.'),$lease)); } $token = $this->arg('hub.verify_token', null); $secret = $this->arg('hub.secret', null); if ($secret != '' && strlen($secret) >= 200) { - // @todo i18n FIXME: added i18n and use sprintf when using parameters. - throw new ClientException("Invalid hub.secret $secret; must be under 200 bytes."); + // TRANS: Client exception. + throw new ClientException(sprintf(_m('Invalid hub.secret "%s". It must be under 200 bytes.'),$secret)); } $sub = HubSub::staticGet($topic, $callback); @@ -157,8 +157,8 @@ class PushHubAction extends Action if ($feed == $userFeed) { $user = User::staticGet('id', $id); if (!$user) { - // @todo i18n FIXME: added i18n and use sprintf when using parameters. - throw new ClientException("Invalid hub.topic $feed; user doesn't exist."); + // TRANS: Client exception. + throw new ClientException(sprintt(_m('Invalid hub.topic "%s". User doesn\'t exist.'),$feed)); } else { return true; } @@ -166,8 +166,8 @@ class PushHubAction extends Action if ($feed == $groupFeed) { $user = User_group::staticGet('id', $id); if (!$user) { - // @todo i18n FIXME: added i18n and use sprintf when using parameters. - throw new ClientException("Invalid hub.topic $feed; group doesn't exist."); + // TRANS: Client exception. + throw new ClientException(sprintf(_m('Invalid hub.topic "%s". Group doesn\'t exist.'),$feed)); } else { return true; } @@ -190,8 +190,9 @@ class PushHubAction extends Action if (Validate::uri($url, $params)) { return $url; } else { - // @todo i18n FIXME: added i18n and use sprintf when using parameters. - throw new ClientException("Invalid URL passed for $arg: '$url'"); + // TRANS: Client exception. + // TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL. + throw new ClientException(sprintf(_m('Invalid URL passed for %1$s: "%2$s"'),$arg,$url)); } } diff --git a/plugins/OStatus/actions/usersalmon.php b/plugins/OStatus/actions/usersalmon.php index 06a72bf024..e78c653300 100644 --- a/plugins/OStatus/actions/usersalmon.php +++ b/plugins/OStatus/actions/usersalmon.php @@ -17,15 +17,14 @@ * along with this program. If not, see . */ -/** - * @package OStatusPlugin - * @author James Walker - */ - if (!defined('STATUSNET')) { exit(1); } +/** + * @package OStatusPlugin + * @author James Walker + */ class UsersalmonAction extends SalmonAction { function prepare($args) @@ -35,13 +34,13 @@ class UsersalmonAction extends SalmonAction $id = $this->trimmed('id'); if (!$id) { - $this->clientError(_('No ID.')); + $this->clientError(_m('No ID.')); } $this->user = User::staticGet('id', $id); if (empty($this->user)) { - $this->clientError(_('No such user.')); + $this->clientError(_m('No such user.')); } return true; @@ -78,20 +77,24 @@ class UsersalmonAction extends SalmonAction if (!empty($context->replyToID)) { $notice = Notice::staticGet('uri', $context->replyToID); if (empty($notice)) { - throw new ClientException("In reply to unknown notice"); + // TRANS: Client exception. + throw new ClientException(_m('In reply to unknown notice.')); } if ($notice->profile_id != $this->user->id && !in_array($this->user->id, $notice->getReplies())) { - throw new ClientException("In reply to a notice not by this user and not mentioning this user"); + // TRANS: Client exception. + throw new ClientException(_m('In reply to a notice not by this user and not mentioning this user.')); } } else if (!empty($context->attention)) { if (!in_array($this->user->uri, $context->attention) && !in_array(common_profile_url($this->user->nickname), $context->attention)) { common_log(LOG_ERR, "{$this->user->uri} not in attention list (".implode(',', $context->attention).")"); - throw new ClientException("To the attention of user(s) not including this one!"); + // TRANS: Client exception. + throw new ClientException('To the attention of user(s), not including this one.'); } } else { - throw new ClientException("Not to anyone in reply to anything!"); + // TRANS: Client exception. + throw new ClientException('Not to anyone in reply to anything.'); } $existing = Notice::staticGet('uri', $this->activity->objects[0]->id); @@ -108,7 +111,6 @@ class UsersalmonAction extends SalmonAction * We've gotten a follow/subscribe notification from a remote user. * Save a subscription relationship for them. */ - function handleFollow() { $oprofile = $this->ensureProfile(); @@ -152,11 +154,13 @@ class UsersalmonAction extends SalmonAction 'notice_id' => $notice->id)); if (!empty($old)) { - throw new ClientException("We already know that's a fave!"); + // TRANS: Client exception. + throw new ClientException(_('This is already a favorite.')); } if (!Fave::addNew($profile, $notice)) { - throw new ClientException("Could not save new favorite."); + // TRANS: Client exception. + throw new ClientException(_m('Could not save new favorite.')); } } @@ -172,7 +176,8 @@ class UsersalmonAction extends SalmonAction $fave = Fave::pkeyGet(array('user_id' => $profile->id, 'notice_id' => $notice->id)); if (empty($fave)) { - throw new ClientException("Notice wasn't favorited!"); + // TRANS: Client exception. + throw new ClientException(_('Notice wasn\'t favorited!')); } $fave->delete(); @@ -186,7 +191,8 @@ class UsersalmonAction extends SalmonAction function getNotice($object) { if (!$object) { - throw new ClientException("Can't favorite/unfavorite without an object."); + // TRANS: Client exception. + throw new ClientException(_m('Can\'t favorite/unfavorite without an object.')); } switch ($object->type) { @@ -197,20 +203,22 @@ class UsersalmonAction extends SalmonAction case ActivityObject::COMMENT: break; default: - throw new ClientException("Can't handle that kind of object for liking/faving."); + // TRANS: Client exception. + throw new ClientException(_m('Can\'t handle that kind of object for liking/faving.')); } $notice = Notice::staticGet('uri', $object->id); if (empty($notice)) { - throw new ClientException("Notice with ID $object->id unknown."); + // TRANS: Client exception. %s is an object ID. + throw new ClientException(sprintf(_m('Notice with ID %s unknown.'),$object->id)); } if ($notice->profile_id != $this->user->id) { - throw new ClientException("Notice with ID $object->id not posted by $this->user->id."); + // TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID. + throw new ClientException(sprintf(_m('Notice with ID %1$s not posted by %2$s.'),$object->id,$this->user->id)); } return $notice; } - } diff --git a/plugins/OStatus/actions/userxrd.php b/plugins/OStatus/actions/userxrd.php index dd720568b4..9aa7c0306d 100644 --- a/plugins/OStatus/actions/userxrd.php +++ b/plugins/OStatus/actions/userxrd.php @@ -17,16 +17,14 @@ * along with this program. If not, see . */ +if (!defined('STATUSNET')) { exit(1); } + /** * @package OStatusPlugin * @maintainer James Walker */ - -if (!defined('STATUSNET')) { exit(1); } - class UserxrdAction extends XrdAction { - function prepare($args) { parent::prepare($args); @@ -46,7 +44,7 @@ class UserxrdAction extends XrdAction $this->user = User::staticGet('uri', $this->uri); } if (!$this->user) { - $this->clientError(_('No such user.'), 404); + $this->clientError(_m('No such user.'), 404); return false; } diff --git a/plugins/OStatus/classes/FeedSub.php b/plugins/OStatus/classes/FeedSub.php index 6f9e0856ab..58beec6738 100644 --- a/plugins/OStatus/classes/FeedSub.php +++ b/plugins/OStatus/classes/FeedSub.php @@ -39,7 +39,6 @@ PuSH subscription flow: hub sends us updates via POST */ - class FeedDBException extends FeedSubException { public $obj; @@ -88,7 +87,6 @@ class FeedSub extends Memcached_DataObject * * @return array array of column definitions */ - function table() { return array('id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL, @@ -143,7 +141,6 @@ class FeedSub extends Memcached_DataObject * * @return array key definitions */ - function keys() { return array_keys($this->keyTypes()); @@ -157,7 +154,6 @@ class FeedSub extends Memcached_DataObject * * @return array key definitions */ - function keyTypes() { return array('id' => 'K', 'uri' => 'U'); @@ -249,7 +245,7 @@ class FeedSub extends Memcached_DataObject // We'll never actually get updates in this mode. return true; } else { - throw new ServerException("Attempting to start PuSH subscription for feed with no hub."); + throw new ServerException(_m('Attempting to start PuSH subscription for feed with no hub.')); } } @@ -279,7 +275,7 @@ class FeedSub extends Memcached_DataObject // We'll never actually get updates in this mode. return true; } else { - throw new ServerException("Attempting to end PuSH subscription for feed with no hub."); + throw new ServerException(_m('Attempting to end PuSH subscription for feed with no hub.')); } } @@ -500,5 +496,4 @@ class FeedSub extends Memcached_DataObject } return false; } - } diff --git a/plugins/OStatus/classes/HubSub.php b/plugins/OStatus/classes/HubSub.php index e01ae4e798..825d36ebd6 100644 --- a/plugins/OStatus/classes/HubSub.php +++ b/plugins/OStatus/classes/HubSub.php @@ -54,7 +54,6 @@ class HubSub extends Memcached_DataObject * * @return array array of column definitions */ - function table() { return array('hashkey' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, @@ -112,7 +111,6 @@ class HubSub extends Memcached_DataObject * * @return array key definitions */ - function keyTypes() { return array('hashkey' => 'K'); @@ -206,8 +204,8 @@ class HubSub extends Memcached_DataObject if ($status >= 200 && $status < 300) { common_log(LOG_INFO, "Verified $mode of $this->callback:$this->topic"); } else { - // @todo i18n FIXME: add i18n and use sprintf for parameter. - throw new ClientException("Hub subscriber verification returned HTTP $status"); + // TRANS: Client exception. %s is a HTTP status code. + throw new ClientException(sprintf(_m('Hub subscriber verification returned HTTP %s.'),$status)); } $old = HubSub::staticGet($this->topic, $this->callback); @@ -353,10 +351,9 @@ class HubSub extends Memcached_DataObject if ($response->isOk()) { return true; } else { - throw new Exception("Callback returned status: " . - $response->getStatus() . - "; body: " . - trim($response->getBody())); + // TRANS: Exception. %1$s is a response status code, %2$s is the body of the response. + throw new Exception(sprintf(_m('Callback returned status: %1$s. Body: %2$s'), + $response->getStatus(),trim($response->getBody()))); } } } diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php index e39a6d8f7c..20025c37a6 100644 --- a/plugins/OStatus/classes/Magicsig.php +++ b/plugins/OStatus/classes/Magicsig.php @@ -31,7 +31,6 @@ require_once 'Crypt/RSA.php'; class Magicsig extends Memcached_DataObject { - const PUBLICKEYREL = 'magic-public-key'; public $__table = 'magicsig'; @@ -86,7 +85,6 @@ class Magicsig extends Memcached_DataObject 64, false)); } - function keys() { return array_keys($this->keyTypes()); @@ -126,7 +124,6 @@ class Magicsig extends Memcached_DataObject $this->insert(); } - public function toString($full_pair = true) { $mod = Magicsig::base64_url_encode($this->publicKey->modulus->toBytes()); @@ -197,7 +194,6 @@ class Magicsig extends Memcached_DataObject case 'RSA-SHA256': return 'sha256'; } - } public function sign($bytes) diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 11ca67b25c..402d1967f9 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -21,7 +21,6 @@ * @package OStatusPlugin * @maintainer Brion Vibber */ - class Ostatus_profile extends Memcached_DataObject { public $__table = 'ostatus_profile'; @@ -51,7 +50,6 @@ class Ostatus_profile extends Memcached_DataObject * * @return array array of column definitions */ - function table() { return array('uri' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, @@ -92,7 +90,6 @@ class Ostatus_profile extends Memcached_DataObject * * @return array key definitions */ - function keys() { return array_keys($this->keyTypes()); @@ -106,7 +103,6 @@ class Ostatus_profile extends Memcached_DataObject * * @return array key definitions */ - function keyTypes() { return array('uri' => 'K', 'profile_id' => 'U', 'group_id' => 'U', 'feeduri' => 'U'); @@ -188,11 +184,11 @@ class Ostatus_profile extends Memcached_DataObject } else if ($this->group_id && !$this->profile_id) { return true; } else if ($this->group_id && $this->profile_id) { - // @todo i18n FIXME: use sprintf and add i18n. - throw new ServerException("Invalid ostatus_profile state: both group and profile IDs set for $this->uri."); + // TRANS: Server exception. + throw new ServerException(sprintf(_m('Invalid ostatus_profile state: both group and profile IDs set for %s.'),$this->uri)); } else { - // @todo i18n FIXME: use sprintf and add i18n. - throw new ServerException("Invalid ostatus_profile state: both group and profile IDs empty for $this->uri."); + // TRANS: Server exception. + throw new ServerException(sprintf(_m('Invalid ostatus_profile state: both group and profile IDs empty for %s.'),$this->uri)); } } @@ -280,7 +276,9 @@ class Ostatus_profile extends Memcached_DataObject if ($type == 'object') { $type = get_class($actor); } - throw new ServerException("Invalid actor passed to " . __METHOD__ . ": " . $type); + // TRANS: Server exception. + // TRANS: %1$s is the method name the exception occured in, %2$s is the actor type. + throw new ServerException(sprintf(_m('Invalid actor passed to %1$s: %2$s.'),__METHOD__,$type)); } if ($object == null) { $object = $this; @@ -372,8 +370,8 @@ class Ostatus_profile extends Memcached_DataObject } else if ($entry instanceof Notice) { return $preamble . $entry->asAtomEntry(true, true); } else { - // @todo i18n FIXME: use sprintf and add i18n. - throw new ServerException("Invalid type passed to Ostatus_profile::notify; must be XML string or Activity entry."); + // TRANS: Server exception. + throw new ServerException(_m('Invalid type passed to Ostatus_profile::notify. It must be XML string or Activity entry.')); } } @@ -403,7 +401,7 @@ class Ostatus_profile extends Memcached_DataObject } else if ($feed->localName == 'rss') { // @fixme check namespace $this->processRssFeed($feed, $source); } else { - throw new Exception("Unknown feed format."); + throw new Exception(_m('Unknown feed format.')); } } @@ -426,7 +424,7 @@ class Ostatus_profile extends Memcached_DataObject $channels = $rss->getElementsByTagName('channel'); if ($channels->length == 0) { - throw new Exception("RSS feed without a channel."); + throw new Exception(_m('RSS feed without a channel.')); } else if ($channels->length > 1) { common_log(LOG_WARNING, __METHOD__ . ": more than one channel in an RSS feed"); } @@ -470,7 +468,8 @@ class Ostatus_profile extends Memcached_DataObject } break; default: - throw new ClientException("Can't handle that kind of post."); + // TRANS: Client exception. + throw new ClientException(_m('Can\'t handle that kind of post.')); } Event::handle('EndHandleFeedEntry', array($activity)); @@ -552,8 +551,8 @@ class Ostatus_profile extends Memcached_DataObject $sourceContent = $note->title; } else { // @fixme fetch from $sourceUrl? - // @todo i18n FIXME: use sprintf and add i18n. - throw new ClientException("No content for notice {$sourceUri}."); + // TRANS: Client exception. %s is a source URL. + throw new ClientException(sprintf(_m('No content for notice %s.'),$sourceUri)); } // Get (safe!) HTML and text versions of the content @@ -584,14 +583,17 @@ class Ostatus_profile extends Memcached_DataObject // We mark up the attachment link specially for the HTML output // so we can fold-out the full version inline. + + // TRANS: Shown when a notice is longer than supported and/or when attachments are present. + $showMoreText = _m('Show more'); $attachUrl = common_local_url('attachment', array('attachment' => $attachment->id)); $rendered = common_render_text($shortSummary) . '' . + ' title="'. htmlspecialchars($showMoreText) . '">' . '…' . - ''; // @todo i18n FIXME: add translator hint/context. + ''; } } @@ -775,8 +777,8 @@ class Ostatus_profile extends Memcached_DataObject $response = $client->get($profile_url); if (!$response->isOk()) { - // @todo i18n FIXME: use sprintf and add i18n. - throw new Exception("Could not reach profile page: " . $profile_url); + // TRANS: Exception. %s is a profile URL. + throw new Exception(sprintf(_m('Could not reach profile page %s.'),$profile_url)); } // Check if we have a non-canonical URL @@ -833,8 +835,8 @@ class Ostatus_profile extends Memcached_DataObject return self::ensureFeedURL($feedurl, $hints); } - // @todo i18n FIXME: use sprintf and add i18n. - throw new Exception("Could not find a feed URL for profile page " . $finalUrl); + // TRANS: Exception. + throw new Exception(sprintf(_m('Could not find a feed URL for profile page %s.'),$finalUrl)); } /** @@ -866,7 +868,7 @@ class Ostatus_profile extends Memcached_DataObject $user = User::staticGet('id', $profile->id); if (!empty($user)) { - // @todo i18n FIXME: use sprintf and add i18n. + // @todo i18n FIXME: use sprintf and add i18n (?) throw new OStatusShadowException($profile, "'$profile_url' is the profile for local user '{$user->nickname}'."); } @@ -971,8 +973,7 @@ class Ostatus_profile extends Memcached_DataObject } // XXX: make some educated guesses here - - throw new FeedSubException("Can't find enough profile information to make a feed."); + throw new FeedSubException(_m('Can\'t find enough profile information to make a feed.')); } /** @@ -1270,13 +1271,13 @@ class Ostatus_profile extends Memcached_DataObject $user = User::staticGet('uri', $homeuri); if ($user) { - // @todo i18n FIXME: add i18n. - throw new Exception("Local user can't be referenced as remote."); + // TRANS: Exception. + throw new Exception(_m('Local user can\'t be referenced as remote.')); } if (OStatusPlugin::localGroupFromUrl($homeuri)) { - // @todo i18n FIXME: add i18n. - throw new Exception("Local group can't be referenced as remote."); + // TRANS: Exception. + throw new Exception(_m('Local group can\'t be referenced as remote.')); } if (array_key_exists('feedurl', $hints)) { @@ -1327,8 +1328,8 @@ class Ostatus_profile extends Memcached_DataObject $oprofile->profile_id = $profile->insert(); if (!$oprofile->profile_id) { - // @todo i18n FIXME: add i18n. - throw new ServerException("Can't save local profile."); + // TRANS: Exception. + throw new ServerException(_m('Can\'t save local profile.')); } } else { $group = new User_group(); @@ -1338,16 +1339,16 @@ class Ostatus_profile extends Memcached_DataObject $oprofile->group_id = $group->insert(); if (!$oprofile->group_id) { - // @todo i18n FIXME: add i18n. - throw new ServerException("Can't save local profile."); + // TRANS: Exception. + throw new ServerException(_m('Can\'t save local profile.')); } } $ok = $oprofile->insert(); if (!$ok) { - // @todo i18n FIXME: add i18n. - throw new ServerException("Can't save OStatus profile."); + // TRANS: Exception. + throw new ServerException(_m('Can\'t save OStatus profile.')); } $avatar = self::getActivityObjectAvatar($object, $hints); @@ -1605,8 +1606,8 @@ class Ostatus_profile extends Memcached_DataObject if ($uri !== false) { if (is_null($uri)) { // Negative cache entry - // @todo i18n FIXME: add i18n. - throw new Exception('Not a valid webfinger address.'); + // TRANS: Exception. + throw new Exception(_m('Not a valid webfinger address.')); } $oprofile = Ostatus_profile::staticGet('uri', $uri); if (!empty($oprofile)) { @@ -1633,8 +1634,8 @@ class Ostatus_profile extends Memcached_DataObject // Save negative cache entry so we don't waste time looking it up again. // @fixme distinguish temporary failures? self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), null); - // @todo i18n FIXME: add i18n. - throw new Exception('Not a valid webfinger address.'); + // TRANS: Exception. + throw new Exception(_m('Not a valid webfinger address.')); } $hints = array('webfinger' => $addr); @@ -1715,8 +1716,8 @@ class Ostatus_profile extends Memcached_DataObject if (!$profile_id) { common_log_db_error($profile, 'INSERT', __FILE__); - // @todo i18n FIXME: add i18n and use sprintf for parameter. - throw new Exception("Couldn't save profile for '$addr'."); + // TRANS: Exception. %s is a webfinger address. + throw new Exception(sprintf(_m('Couldn\'t save profile for "%s".'),$addr)); } $oprofile = new Ostatus_profile(); @@ -1734,16 +1735,16 @@ class Ostatus_profile extends Memcached_DataObject if (!$result) { common_log_db_error($oprofile, 'INSERT', __FILE__); - // @todo i18n FIXME: add i18n and use sprintf for parameter. - throw new Exception("Couldn't save ostatus_profile for '$addr'."); + // TRANS: Exception. %s is a webfinger address. + throw new Exception(sprintf(_m('Couldn\'t save ostatus_profile for "%s".'),$addr)); } self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri); return $oprofile; } - // @todo i18n FIXME: add i18n and use sprintf for parameter. - throw new Exception("Couldn't find a valid profile for '$addr'"); + // TRANS: Exception. %s is a webfinger address. + throw new Exception(sprintf(_m('Couldn\'t find a valid profile for "%s".'),$addr)); } /** @@ -1785,7 +1786,7 @@ class Ostatus_profile extends Memcached_DataObject if ($file_id === false) { common_log_db_error($file, "INSERT", __FILE__); - throw new ServerException(_('Could not store HTML content of long post as file.')); + throw new ServerException(_m('Could not store HTML content of long post as file.')); } return $file; diff --git a/plugins/OStatus/classes/Ostatus_source.php b/plugins/OStatus/classes/Ostatus_source.php index e6ce7d442b..b76bbce56c 100644 --- a/plugins/OStatus/classes/Ostatus_source.php +++ b/plugins/OStatus/classes/Ostatus_source.php @@ -21,7 +21,6 @@ * @package OStatusPlugin * @maintainer Brion Vibber */ - class Ostatus_source extends Memcached_DataObject { public $__table = 'ostatus_source'; @@ -43,7 +42,6 @@ class Ostatus_source extends Memcached_DataObject * * @return array array of column definitions */ - function table() { return array('notice_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL, @@ -69,7 +67,6 @@ class Ostatus_source extends Memcached_DataObject * * @return array key definitions */ - function keys() { return array_keys($this->keyTypes()); @@ -83,7 +80,6 @@ class Ostatus_source extends Memcached_DataObject * * @return array key definitions */ - function keyTypes() { return array('notice_id' => 'K'); diff --git a/plugins/OStatus/lib/discovery.php b/plugins/OStatus/lib/discovery.php index 04c6727207..905ece2ca5 100644 --- a/plugins/OStatus/lib/discovery.php +++ b/plugins/OStatus/lib/discovery.php @@ -106,8 +106,8 @@ class Discovery } } - // @todo Needs i18n. - throw new Exception('Unable to find services for '. $id . '.'); + // TRANS: Exception. + throw new Exception(sprintf(_m('Unable to find services for %s.'),$id)); } public static function getService($links, $service) { diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php index fa2ead7320..a98f4a6d67 100644 --- a/plugins/OStatus/lib/discoveryhints.php +++ b/plugins/OStatus/lib/discoveryhints.php @@ -20,7 +20,6 @@ */ class DiscoveryHints { - static function fromXRD($xrd) { $hints = array(); diff --git a/plugins/OStatus/lib/linkheader.php b/plugins/OStatus/lib/linkheader.php index cd78d31cef..efa3f65ff3 100644 --- a/plugins/OStatus/lib/linkheader.php +++ b/plugins/OStatus/lib/linkheader.php @@ -1,4 +1,7 @@ $signature_alg->sign($armored_text), 'alg' => $signature_alg->getName() ); - } public function toXML($env) { @@ -110,7 +110,6 @@ class MagicEnvelope return $string; } - public function unfold($env) { $dom = new DOMDocument(); @@ -218,5 +217,4 @@ class MagicEnvelope 'sig' => preg_replace('/\s/', '', $sig_element->nodeValue), ); } - } diff --git a/plugins/OStatus/lib/ostatusqueuehandler.php b/plugins/OStatus/lib/ostatusqueuehandler.php index 9814cab9f1..5e0ab46a5b 100644 --- a/plugins/OStatus/lib/ostatusqueuehandler.php +++ b/plugins/OStatus/lib/ostatusqueuehandler.php @@ -221,5 +221,4 @@ class OStatusQueueHandler extends QueueHandler return $feed; } - } diff --git a/plugins/OStatus/lib/pushinqueuehandler.php b/plugins/OStatus/lib/pushinqueuehandler.php index 1fd29ae301..965d042668 100644 --- a/plugins/OStatus/lib/pushinqueuehandler.php +++ b/plugins/OStatus/lib/pushinqueuehandler.php @@ -22,7 +22,6 @@ * @package FeedSub * @author Brion Vibber */ - class PushInQueueHandler extends QueueHandler { function transport() diff --git a/plugins/OStatus/lib/salmon.php b/plugins/OStatus/lib/salmon.php index 631ebc7d86..963da65084 100644 --- a/plugins/OStatus/lib/salmon.php +++ b/plugins/OStatus/lib/salmon.php @@ -89,8 +89,8 @@ class Salmon $magickey->generate($user->id); } } else { - // @todo i18n FIXME: added i18n and use sprintf when using parameters. - throw new Exception("Salmon invalid actor for signing."); + // TRANS: Exception. + throw new Exception(_m('Salmon invalid actor for signing.')); } try { @@ -101,7 +101,6 @@ class Salmon return $magic_env->toXML($env); } - public function verifyMagicEnv($text) { $magic_env = new MagicEnvelope(); diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php index f97c67edd0..41bdb48928 100644 --- a/plugins/OStatus/lib/salmonaction.php +++ b/plugins/OStatus/lib/salmonaction.php @@ -38,11 +38,12 @@ class SalmonAction extends Action parent::prepare($args); if ($_SERVER['REQUEST_METHOD'] != 'POST') { - // TRANS: POST is a HTTP command. It should not be translated. + // TRANS: Client error. POST is a HTTP command. It should not be translated. $this->clientError(_m('This method requires a POST.')); } if (empty($_SERVER['CONTENT_TYPE']) || $_SERVER['CONTENT_TYPE'] != 'application/magic-envelope+xml') { + // TRANS: Client error. Do not translate "application/magic-envelope+xml" $this->clientError(_m('Salmon requires "application/magic-envelope+xml".')); } @@ -52,6 +53,7 @@ class SalmonAction extends Action $salmon = new Salmon; if (!$salmon->verifyMagicEnv($xml)) { common_log(LOG_DEBUG, "Salmon signature verification failed."); + // TRANS: Client error. $this->clientError(_m('Salmon signature verification failed.')); } else { $magic_env = new MagicEnvelope(); @@ -63,6 +65,7 @@ class SalmonAction extends Action if ($dom->documentElement->namespaceURI != Activity::ATOM || $dom->documentElement->localName != 'entry') { common_log(LOG_DEBUG, "Got invalid Salmon post: $xml"); + // TRANS: Client error. $this->clientError(_m('Salmon post must be an Atom entry.')); } @@ -111,6 +114,7 @@ class SalmonAction extends Action $this->handleUpdateProfile(); break; default: + // TRANS: Client exception. throw new ClientException(_m("Unrecognized activity type.")); } Event::handle('EndHandleSalmon', array($this->activity)); @@ -119,41 +123,49 @@ class SalmonAction extends Action function handlePost() { + // TRANS: Client exception. throw new ClientException(_m("This target doesn't understand posts.")); } function handleFollow() { + // TRANS: Client exception. throw new ClientException(_m("This target doesn't understand follows.")); } function handleUnfollow() { + // TRANS: Client exception. throw new ClientException(_m("This target doesn't understand unfollows.")); } function handleFavorite() { + // TRANS: Client exception. throw new ClientException(_m("This target doesn't understand favorites.")); } function handleUnfavorite() { + // TRANS: Client exception. throw new ClientException(_m("This target doesn't understand unfavorites.")); } function handleShare() { + // TRANS: Client exception. throw new ClientException(_m("This target doesn't understand share events.")); } function handleJoin() { + // TRANS: Client exception. throw new ClientException(_m("This target doesn't understand joins.")); } function handleLeave() { + // TRANS: Client exception. throw new ClientException(_m("This target doesn't understand leave events.")); } @@ -181,7 +193,8 @@ class SalmonAction extends Action if (empty($actor->id)) { common_log(LOG_ERR, "broken actor: " . var_export($actor, true)); common_log(LOG_ERR, "activity with no actor: " . var_export($this->activity, true)); - throw new Exception("Received a salmon slap from unidentified actor."); + // TRANS: Exception. + throw new Exception(_m('Received a salmon slap from unidentified actor.')); } return Ostatus_profile::ensureActivityObjectProfile($actor); diff --git a/plugins/OStatus/lib/xrd.php b/plugins/OStatus/lib/xrd.php index 145cd64cb4..c8cffed9cd 100644 --- a/plugins/OStatus/lib/xrd.php +++ b/plugins/OStatus/lib/xrd.php @@ -27,7 +27,6 @@ * @link http://status.net/ */ - class XRD { const XML_NS = 'http://www.w3.org/2000/xmlns/'; @@ -61,11 +60,13 @@ class XRD error_reporting($old); if (!$ok) { - throw new Exception("Invalid XML."); + // TRANS: Exception. + throw new Exception(_m('Invalid XML.')); } $xrd_element = $dom->getElementsByTagName('XRD')->item(0); if (!$xrd_element) { - throw new Exception("Invalid XML, missing XRD root."); + // TRANS: Exception. + throw new Exception(_m('Invalid XML, missing XRD root.')); } // Check for host-meta host diff --git a/plugins/OStatus/lib/xrdaction.php b/plugins/OStatus/lib/xrdaction.php index 91bb87cc23..c8b5beff37 100644 --- a/plugins/OStatus/lib/xrdaction.php +++ b/plugins/OStatus/lib/xrdaction.php @@ -103,5 +103,4 @@ class XrdAction extends Action header('Content-type: application/xrd+xml'); print $xrd->toXML(); } - } From ecafae84728e05387f3e488b36e583dec9ee3e2b Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 19 Sep 2010 15:52:53 +0200 Subject: [PATCH 46/76] * Remove trailing newline in e-mail message. * Superfluous whitespace removed. --- plugins/TwitterBridge/twitter.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index d984698ee8..f913e4aeae 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -318,11 +318,9 @@ function remove_twitter_link($flink) // Notify the user that her Twitter bridge is down if (isset($user->email)) { - $result = mail_twitter_bridge_removed($user); if (!$result) { - $msg = 'Unable to send email to notify ' . "$user->nickname (user id: $user->id) " . 'that their Twitter bridge link was ' . @@ -331,7 +329,6 @@ function remove_twitter_link($flink) common_log(LOG_WARNING, $msg); } } - } /** @@ -360,7 +357,7 @@ function mail_twitter_bridge_removed($user) '%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"), + "Regards,\n%3\$s"), $profile->getBestName(), common_local_url('twittersettings'), common_config('site', 'name')); From 74785c64f86293a1e81ae8497cc88172fc30ef1b Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 19 Sep 2010 16:32:19 +0200 Subject: [PATCH 47/76] * L10n i18n update * add translator hints * update whitespace * added a bunch of @todos. --- plugins/Facebook/FBC_XDReceiver.php | 8 ++-- plugins/Facebook/FBConnectAuth.php | 32 ++++++++----- plugins/Facebook/FBConnectLogin.php | 2 + plugins/Facebook/FBConnectSettings.php | 8 ++-- plugins/Facebook/FacebookPlugin.php | 61 +++++++------------------ plugins/Facebook/facebookaction.php | 40 ++++++---------- plugins/Facebook/facebookadminpanel.php | 13 +----- plugins/Facebook/facebookhome.php | 33 ++++++------- plugins/Facebook/facebookinvite.php | 15 +++--- plugins/Facebook/facebooklogin.php | 8 ++-- plugins/Facebook/facebooknoticeform.php | 26 ++++------- plugins/Facebook/facebookremove.php | 2 - plugins/Facebook/facebooksettings.php | 12 ++--- plugins/Facebook/facebookutil.php | 15 ------ 14 files changed, 103 insertions(+), 172 deletions(-) diff --git a/plugins/Facebook/FBC_XDReceiver.php b/plugins/Facebook/FBC_XDReceiver.php index 2bc790d5a0..bf4b59bba1 100644 --- a/plugins/Facebook/FBC_XDReceiver.php +++ b/plugins/Facebook/FBC_XDReceiver.php @@ -1,4 +1,7 @@ elementEnd('html'); } - } - diff --git a/plugins/Facebook/FBConnectAuth.php b/plugins/Facebook/FBConnectAuth.php index 8eba7fc135..f06dffaaab 100644 --- a/plugins/Facebook/FBConnectAuth.php +++ b/plugins/Facebook/FBConnectAuth.php @@ -60,12 +60,10 @@ class FBConnectauthAction extends Action parent::handle($args); if (common_is_real_login()) { - // User is already logged in. Does she already have a linked Facebook acct? $flink = Foreign_link::getByForeignID($this->fbuid, FACEBOOK_CONNECT_SERVICE); if (!empty($flink)) { - // User already has a linked Facebook account and shouldn't be here common_debug('Facebook Connect Plugin - ' . 'There is already a local user (' . $flink->user_id . @@ -74,8 +72,7 @@ class FBConnectauthAction extends Action // We don't want these cookies getFacebook()->clear_cookie_state(); - $this->clientError(_m('There is already a local user linked with this Facebook.')); - + $this->clientError(_m('There is already a local user linked with this Facebook account.')); } else { // User came from the Facebook connect settings tab, and @@ -102,7 +99,7 @@ class FBConnectauthAction extends Action } else { common_debug('Facebook Connect Plugin - ' . print_r($this->args, true)); - $this->showForm(_m('Something weird happened.'), + $this->showForm(_m('An unknown error has occured.'), $this->trimmed('newname')); } } else { @@ -116,12 +113,14 @@ class FBConnectauthAction extends Action $this->element('div', array('class' => 'error'), $this->error); } else { $this->element('div', 'instructions', + // TRANS: %s is the site name. sprintf(_m('This is the first time you\'ve logged into %s so we must connect your Facebook to a local account. You can either create a new account, or connect with your existing account, if you have one.'), common_config('site', 'name'))); } } function title() { + // TRANS: Page title. return _m('Facebook Account Setup'); } @@ -155,6 +154,7 @@ class FBConnectauthAction extends Action 'class' => 'form_settings', 'action' => common_local_url('FBConnectAuth'))); $this->elementStart('fieldset', array('id' => 'settings_facebook_connect_options')); + // TRANS: Legend. $this->element('legend', null, _m('Connection options')); $this->elementStart('ul', 'form_data'); $this->elementStart('li'); @@ -164,7 +164,8 @@ class FBConnectauthAction extends Action 'name' => 'license', 'value' => 'true')); $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license')); - $message = _('My text and files are available under %s ' . + // TRANS: %s is the name of the license used by the user for their status updates. + $message = _m('My text and files are available under %s ' . 'except this private data: password, ' . 'email address, IM address, and phone number.'); $link = 'reqFbScripts($action)) { - // XXX: Horrible hack to make Safari, FF2, and Chrome work with // Facebook Connect. These browser cannot use Facebook's // DOM parsing routines unless the mime type of the page is @@ -238,9 +229,7 @@ class FacebookPlugin extends Plugin 'lang' => $language)); return false; - } else { - return true; } } @@ -255,7 +244,6 @@ class FacebookPlugin extends Plugin * @return void * */ - function onEndShowScripts($action) { if ($this->reqFbScripts($action)) { @@ -306,12 +294,10 @@ class FacebookPlugin extends Plugin $js = sprintf($js, $apikey, $login_url, $logout_url); // Compress the bugger down a bit - $js = str_replace(' ', '', $js); $action->inlineScript($js); } - } /** @@ -323,7 +309,6 @@ class FacebookPlugin extends Plugin * @return void * */ - function onEndShowFooter($action) { if ($this->reqFbScripts($action)) { @@ -340,7 +325,6 @@ class FacebookPlugin extends Plugin * @return void * */ - function onEndShowStatusNetStyles($action) { if ($this->reqFbScripts($action)) { @@ -357,7 +341,6 @@ class FacebookPlugin extends Plugin * * @return boolean true */ - function reqFbScripts($action) { if (!self::hasKeys()) { @@ -365,7 +348,6 @@ class FacebookPlugin extends Plugin } // If you're logged in w/FB Connect, you always need the FB stuff - $fbuid = $this->loggedIn(); if (!empty($fbuid)) { @@ -373,7 +355,6 @@ class FacebookPlugin extends Plugin } // List of actions that require FB stuff - $needy = array('FBConnectLoginAction', 'FBConnectauthAction', 'FBConnectSettingsAction'); @@ -383,7 +364,6 @@ class FacebookPlugin extends Plugin } return false; - } /** @@ -391,7 +371,6 @@ class FacebookPlugin extends Plugin * * @return mixed $fbuid the Facebook ID of the logged in user, or null */ - function loggedIn() { $user = common_current_user(); @@ -403,12 +382,9 @@ class FacebookPlugin extends Plugin $fbuid = 0; if (!empty($flink)) { - try { - $facebook = getFacebook(); $fbuid = $facebook->get_loggedin_user(); - } catch (Exception $e) { common_log(LOG_WARNING, 'Facebook Connect Plugin - ' . 'Problem getting Facebook user: ' . @@ -432,17 +408,14 @@ class FacebookPlugin extends Plugin * @return void * */ - function onStartPrimaryNav($action) { if (self::hasKeys()) { $user = common_current_user(); if (!empty($user)) { - $fbuid = $this->loggedIn(); if (!empty($fbuid)) { - /* Default FB silhouette pic for FB users who haven't uploaded a profile pic yet. */ @@ -455,7 +428,7 @@ class FacebookPlugin extends Plugin $action->element('img', array('id' => 'fbc_profile-pic', 'src' => (!empty($url)) ? $url : $silhouetteUrl, - 'alt' => 'Facebook Connect User', + 'alt' => _m('Facebook Connect User'), 'width' => '16'), ''); $iconurl = common_path('plugins/Facebook/fbfavicon.ico'); @@ -477,18 +450,20 @@ class FacebookPlugin extends Plugin * * @return void */ - function onEndLoginGroupNav(&$action) { if (self::hasKeys()) { - $action_name = $action->trimmed('action'); $action->menuItem(common_local_url('FBConnectLogin'), - _m('Facebook'), + // @todo CHECKME: Should be 'Facebook Login'? + // TRANS: Menu item. + _m('MENU','Facebook'), + // TRANS: Tooltip for menu item "Facebook". _m('Login or register using Facebook'), 'FBConnectLogin' === $action_name); } + return true; } @@ -499,18 +474,20 @@ class FacebookPlugin extends Plugin * * @return void */ - function onEndConnectSettingsNav(&$action) { if (self::hasKeys()) { - $action_name = $action->trimmed('action'); $action->menuItem(common_local_url('FBConnectSettings'), - _m('Facebook'), + // @todo CHECKME: Should be 'Facebook Connect'? + // TRANS: Menu item tab. + _m('MENU','Facebook'), + // TRANS: Tooltip for menu item "Facebook". _m('Facebook Connect Settings'), $action_name === 'FBConnectSettings'); } + return true; } @@ -521,7 +498,6 @@ class FacebookPlugin extends Plugin * * @return void */ - function onStartLogout($action) { if (self::hasKeys()) { @@ -550,14 +526,12 @@ class FacebookPlugin extends Plugin * * @return string $url the url for the user's Facebook avatar */ - function getProfilePicURL($fbuid) { $facebook = getFacebook(); $url = null; try { - $fqry = 'SELECT pic_square FROM user WHERE uid = %s'; $result = $facebook->api_client->fql_query(sprintf($fqry, $fbuid)); @@ -582,7 +556,6 @@ class FacebookPlugin extends Plugin * * @return boolean hook return */ - function onStartEnqueueNotice($notice, &$transports) { if (self::hasKeys() && $notice->isLocal()) { @@ -613,14 +586,14 @@ class FacebookPlugin extends Plugin 'version' => self::VERSION, 'author' => 'Zach Copley', 'homepage' => 'http://status.net/wiki/Plugin:Facebook', + // TRANS: Plugin description. 'rawdescription' => _m( - 'The Facebook plugin allows you to integrate ' . - 'your StatusNet instance with ' . + 'The Facebook plugin allows integrating ' . + 'StatusNet instances with ' . 'Facebook ' . 'and Facebook Connect.' ) ); return true; } - } diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index 467c6af84f..4c15fc0397 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -36,7 +36,6 @@ require_once INSTALLDIR . '/plugins/Facebook/facebooknoticeform.php'; class FacebookAction extends Action { - var $facebook = null; var $fbuid = null; var $flink = null; @@ -102,7 +101,6 @@ class FacebookAction extends Action * * @return void */ - function startHTML($type=null) { $this->showStylesheets(); @@ -143,7 +141,6 @@ class FacebookAction extends Action function showHead($error, $success) { - if ($error) { $this->element("h1", null, $error); } @@ -168,7 +165,10 @@ class FacebookAction extends Action $this->elementStart('li', array('class' => ($this->action == 'facebookhome') ? 'current' : 'facebook_home')); $this->element('a', - array('href' => 'index.php', 'title' => _m('Home')), _m('Home')); + // TRANS: Link description for 'Home' link that leads to a start page. + array('href' => 'index.php', 'title' => _m('MENU','Home')), + // TRANS: Tooltip for 'Home' link that leads to a start page. + _m('Home')); $this->elementEnd('li'); if (common_config('invite', 'enabled')) { @@ -176,7 +176,10 @@ class FacebookAction extends Action array('class' => ($this->action == 'facebookinvite') ? 'current' : 'facebook_invite')); $this->element('a', - array('href' => 'invite.php', 'title' => _m('Invite')), _m('Invite')); + // TRANS: Link description for 'Invite' link that leads to a page where friends can be invited. + array('href' => 'invite.php', 'title' => _m('MENU','Invite')), + // TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited. + _m('Invite')); $this->elementEnd('li'); } @@ -185,7 +188,10 @@ class FacebookAction extends Action ($this->action == 'facebooksettings') ? 'current' : 'facebook_settings')); $this->element('a', array('href' => 'settings.php', - 'title' => _m('Settings')), _m('Settings')); + // TRANS: Link description for 'Settings' link that leads to a page user preferences can be set. + 'title' => _m('MENU','Settings')), + // TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set. + _m('Settings')); $this->elementEnd('li'); $this->elementEnd('ul'); @@ -272,7 +278,8 @@ class FacebookAction extends Action $this->elementEnd('li'); $this->elementEnd('ul'); - $this->submit('submit', _m('Login')); + // TRANS: Login button. + $this->submit('submit', _m('BUTTON','Login')); $this->elementEnd('fieldset'); $this->elementEnd('form'); @@ -283,7 +290,6 @@ class FacebookAction extends Action $this->elementEnd('div'); $this->elementEnd('div'); - } function updateProfileBox($notice) @@ -356,7 +362,6 @@ class FacebookAction extends Action function saveNewNotice() { - $user = $this->flink->getUser(); $content = $this->trimmed('status_textarea'); @@ -368,6 +373,7 @@ class FacebookAction extends Action $content_shortened = common_shorten_links($content); if (Notice::contentTooLong($content_shortened)) { + // @todo FIXME: i18n: Needs plural. $this->showPage(sprintf(_m('That\'s too long. Max notice size is %d chars.'), Notice::maxContent())); return; @@ -379,9 +385,7 @@ class FacebookAction extends Action $cmd = $inter->handle_command($user, $content_shortened); if ($cmd) { - // XXX fix this - $cmd->execute(new WebChannel()); return; } @@ -398,12 +402,10 @@ class FacebookAction extends Action } } - } class FacebookNoticeList extends NoticeList { - /** * constructor * @@ -423,7 +425,6 @@ class FacebookNoticeList extends NoticeList * * @return int count of notices listed. */ - function show() { $this->out->elementStart('div', array('id' =>'notices_primary')); @@ -459,17 +460,14 @@ class FacebookNoticeList extends NoticeList * @return FacebookNoticeListItem a list item for displaying the notice * formatted for display in the Facebook App. */ - function newListItem($notice) { return new FacebookNoticeListItem($notice, $this); } - } class FacebookNoticeListItem extends NoticeListItem { - /** * constructor * @@ -477,7 +475,6 @@ class FacebookNoticeListItem extends NoticeListItem * * @param Notice $notice The notice we'll display */ - function __construct($notice, $out=null) { parent::__construct($notice, $out); @@ -491,7 +488,6 @@ class FacebookNoticeListItem extends NoticeListItem * * @return void */ - function show() { $this->showStart(); @@ -502,12 +498,10 @@ class FacebookNoticeListItem extends NoticeListItem $this->showEnd(); } - } class FacebookProfileBoxNotice extends FacebookNoticeListItem { - /** * constructor * @@ -515,7 +509,6 @@ class FacebookProfileBoxNotice extends FacebookNoticeListItem * * @param Notice $notice The notice we'll display */ - function __construct($notice, $out=null) { parent::__construct($notice, $out); @@ -527,7 +520,6 @@ class FacebookProfileBoxNotice extends FacebookNoticeListItem * * @return void */ - function show() { $this->showNotice(); @@ -537,7 +529,6 @@ class FacebookProfileBoxNotice extends FacebookNoticeListItem function showAppLink() { - $this->facebook = getFacebook(); $app_props = $this->facebook->api_client->Admin_getAppProperties( @@ -551,5 +542,4 @@ class FacebookProfileBoxNotice extends FacebookNoticeListItem $this->out->text($this->app_name); $this->out->elementEnd('a'); } - } diff --git a/plugins/Facebook/facebookadminpanel.php b/plugins/Facebook/facebookadminpanel.php index ae1c7302f9..ae26c7d3e8 100644 --- a/plugins/Facebook/facebookadminpanel.php +++ b/plugins/Facebook/facebookadminpanel.php @@ -40,7 +40,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class FacebookadminpanelAction extends AdminPanelAction { /** @@ -48,7 +47,6 @@ class FacebookadminpanelAction extends AdminPanelAction * * @return string page title */ - function title() { return _m('Facebook'); @@ -59,7 +57,6 @@ class FacebookadminpanelAction extends AdminPanelAction * * @return string instructions */ - function getInstructions() { return _m('Facebook integration settings'); @@ -70,7 +67,6 @@ class FacebookadminpanelAction extends AdminPanelAction * * @return void */ - function showForm() { $form = new FacebookAdminPanelForm($this); @@ -83,7 +79,6 @@ class FacebookadminpanelAction extends AdminPanelAction * * @return void */ - function saveSettings() { static $settings = array( @@ -100,7 +95,6 @@ class FacebookadminpanelAction extends AdminPanelAction } // This throws an exception on validation errors - $this->validate($values); // assert(all values are valid); @@ -145,7 +139,6 @@ class FacebookAdminPanelForm extends AdminForm * * @return int ID of the form */ - function id() { return 'facebookadminpanel'; @@ -156,7 +149,6 @@ class FacebookAdminPanelForm extends AdminForm * * @return string class of the form */ - function formClass() { return 'form_settings'; @@ -167,7 +159,6 @@ class FacebookAdminPanelForm extends AdminForm * * @return string URL of the action */ - function action() { return common_local_url('facebookadminpanel'); @@ -178,7 +169,6 @@ class FacebookAdminPanelForm extends AdminForm * * @return void */ - function formData() { $this->out->elementStart( @@ -215,9 +205,8 @@ class FacebookAdminPanelForm extends AdminForm * * @return void */ - function formActions() { - $this->out->submit('submit', _('Save'), 'submit', null, _('Save Facebook settings')); + $this->out->submit('submit', _m('Save'), 'submit', null, _m('Save Facebook settings')); } } diff --git a/plugins/Facebook/facebookhome.php b/plugins/Facebook/facebookhome.php index 60782f63c9..6090f988c5 100644 --- a/plugins/Facebook/facebookhome.php +++ b/plugins/Facebook/facebookhome.php @@ -25,7 +25,6 @@ require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php'; class FacebookhomeAction extends FacebookAction { - var $page = null; function prepare($argarray) @@ -54,7 +53,6 @@ class FacebookhomeAction extends FacebookAction } if ($this->flink) { - $this->user = $this->flink->getUser(); // If this is the first time the user has started the app @@ -82,18 +80,14 @@ class FacebookhomeAction extends FacebookAction // Facebook status update permission? Then show the main page // of the app $this->showPage(); - } else { - // User hasn't authenticated yet, prompt for creds $this->login(); } - } function login() { - $this->showStylesheets(); $nickname = common_canonical_nickname($this->trimmed('nickname')); @@ -102,13 +96,11 @@ class FacebookhomeAction extends FacebookAction $msg = null; if ($nickname) { - if (common_check_user($nickname, $password)) { - $user = User::staticGet('nickname', $nickname); if (!$user) { - $this->showLoginForm(_m("Server error - couldn't get user!")); + $this->showLoginForm(_m("Server error: Couldn't get user!")); } $flink = DB_DataObject::factory('foreign_link'); @@ -126,7 +118,6 @@ class FacebookhomeAction extends FacebookAction $this->getUpdatePermission(); return; - } else { $msg = _m('Incorrect username or password.'); } @@ -134,7 +125,6 @@ class FacebookhomeAction extends FacebookAction $this->showLoginForm($msg); $this->showFooter(); - } function setDefaults() @@ -155,8 +145,15 @@ class FacebookhomeAction extends FacebookAction function title() { if ($this->page > 1) { - return sprintf(_m("%s and friends, page %d"), $this->user->nickname, $this->page); + // @todo FIXME: Core should have methods to get "Full name (nickname)" in a localised form + // so that this can be used consistenly throughout StatusNet without having to implement it + // over and over.. + // TRANS: Page title. + // TRANS: %1$s is a user nickname, %2$s is a page number. + return sprintf(_m("%1$s and friends, page %2$d"), $this->user->nickname, $this->page); } else { + // TRANS: Page title. + // TRANS: %s is a user nickname return sprintf(_m("%s and friends"), $this->user->nickname); } } @@ -175,17 +172,16 @@ class FacebookhomeAction extends FacebookAction function showNoticeList($notice) { - $nl = new NoticeList($notice, $this); return $nl->show(); } function getUpdatePermission() { - $this->showStylesheets(); $this->elementStart('div', array('class' => 'facebook_guide')); + // TRANS: Instructions. %s is the application name. $instructions = sprintf(_m('If you would like the %s app to automatically update ' . 'your Facebook status with your latest notice, you need ' . 'to give it permission.'), $this->app_name); @@ -209,6 +205,7 @@ class FacebookhomeAction extends FacebookAction '&next_cancel=' . $next . '&submit=skip'; $this->elementStart('span', array('class' => 'facebook-button')); + // @todo FIXME: sprintf not needed here? $this->element('a', array('href' => $auth_url), sprintf(_m('Okay, do it!'), $this->app_name)); $this->elementEnd('span'); @@ -216,13 +213,13 @@ class FacebookhomeAction extends FacebookAction $this->elementEnd('li'); $this->elementStart('li', array('id' => 'fb-permissions-item')); - $this->submit('skip', _m('Skip')); + // TRANS: Button text. Clicking the button will skip updating Facebook permissions. + $this->submit('skip', _m('BUTTON','Skip')); $this->elementEnd('li'); $this->elementEnd('ul'); $this->elementEnd('form'); $this->elementEnd('div'); - } /** @@ -238,7 +235,6 @@ class FacebookhomeAction extends FacebookAction */ function pagination($have_before, $have_after, $page, $action, $args=null) { - // Does a little before-after block for next/prev page // XXX: Fix so this uses common_local_url() if possible. @@ -254,6 +250,7 @@ class FacebookhomeAction extends FacebookAction $newargs = $args ? array_merge($args, $pargs) : $pargs; $this->elementStart('li', array('class' => 'nav_prev')); $this->element('a', array('href' => "$action?page=$newargs[page]", 'rel' => 'prev'), + // TRANS: Pagination link. _m('After')); $this->elementEnd('li'); } @@ -262,6 +259,7 @@ class FacebookhomeAction extends FacebookAction $newargs = $args ? array_merge($args, $pargs) : $pargs; $this->elementStart('li', array('class' => 'nav_next')); $this->element('a', array('href' => "$action?page=$newargs[page]", 'rel' => 'next'), + // TRANS: Pagination link. _m('Before')); $this->elementEnd('li'); } @@ -271,5 +269,4 @@ class FacebookhomeAction extends FacebookAction $this->elementEnd('dl'); } } - } diff --git a/plugins/Facebook/facebookinvite.php b/plugins/Facebook/facebookinvite.php index e02c7bf3ed..a50eace12f 100644 --- a/plugins/Facebook/facebookinvite.php +++ b/plugins/Facebook/facebookinvite.php @@ -25,7 +25,6 @@ require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php'; class FacebookinviteAction extends FacebookAction { - function handle($args) { parent::handle($args); @@ -41,7 +40,6 @@ class FacebookinviteAction extends FacebookAction * * @return void */ - function showForm($error=null) { $this->error = $error; @@ -56,7 +54,6 @@ class FacebookinviteAction extends FacebookAction * * @return void */ - function showContent() { if ($this->arg('ids')) { @@ -68,9 +65,10 @@ class FacebookinviteAction extends FacebookAction function showSuccessContent() { - - $this->element('h2', null, sprintf(_m('Thanks for inviting your friends to use %s'), + // TRANS: %s is the name of the site. + $this->element('h2', null, sprintf(_m('Thanks for inviting your friends to use %s.'), common_config('site', 'name'))); + // TRANS: Followed by an unordered list with invited friends. $this->element('p', null, _m('Invitations have been sent to the following users:')); $friend_ids = $_POST['ids']; // XXX: Hmm... is this the best way to access the list? @@ -85,8 +83,7 @@ class FacebookinviteAction extends FacebookAction $this->elementEnd('li'); } - $this->elementEnd("ul"); - + $this->elementEnd('ul'); } function showFormContent() @@ -100,6 +97,7 @@ class FacebookinviteAction extends FacebookAction 'type' => common_config('site', 'name'), 'content' => $content)); $this->hidden('invite', 'true'); + // TRANS: %s is the name of the site. $actiontext = sprintf(_m('Invite your friends to use %s'), common_config('site', 'name')); $multi_params = array('showborder' => 'false'); @@ -122,6 +120,7 @@ class FacebookinviteAction extends FacebookAction if ($exclude_ids) { + // TRANS: %s is the name of the site. $this->element('h2', null, sprintf(_m('Friends already using %s:'), common_config('site', 'name'))); $this->elementStart('ul', array('id' => 'facebook-friends')); @@ -140,7 +139,7 @@ class FacebookinviteAction extends FacebookAction function title() { + // TRANS: Page title. return sprintf(_m('Send invitations')); } - } diff --git a/plugins/Facebook/facebooklogin.php b/plugins/Facebook/facebooklogin.php index 7a173ddaeb..1961be57b6 100644 --- a/plugins/Facebook/facebooklogin.php +++ b/plugins/Facebook/facebooklogin.php @@ -25,7 +25,6 @@ require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php'; class FacebookinviteAction extends FacebookAction { - function handle($args) { parent::handle($args); @@ -37,6 +36,7 @@ class FacebookinviteAction extends FacebookAction $this->facebook->api_client->data_getUserPreference( FACEBOOK_PROMPTED_UPDATE_PREF) == 'true') { + // @todo FIXME: Missing i18n? echo '

REDIRECT TO HOME

'; } } else { @@ -46,7 +46,6 @@ class FacebookinviteAction extends FacebookAction function showContent() { - // If the user has opted not to initially allow the app to have // Facebook status update permission, store that preference. Only // promt the user the first time she uses the app @@ -56,7 +55,6 @@ class FacebookinviteAction extends FacebookAction } if ($this->flink) { - $this->user = $this->flink->getUser(); // If this is the first time the user has started the app @@ -69,7 +67,6 @@ class FacebookinviteAction extends FacebookAction return; } } - } else { $this->showLoginForm(); } @@ -88,6 +85,8 @@ class FacebookinviteAction extends FacebookAction function title() { + // @todo FIXME: Give a more precise description? Suggestion: "Login with Facebook Connect" + // TRANS: Page title. return sprintf(_m('Login')); } @@ -95,5 +94,4 @@ class FacebookinviteAction extends FacebookAction { } - } diff --git a/plugins/Facebook/facebooknoticeform.php b/plugins/Facebook/facebooknoticeform.php index 5989147f49..d52222c933 100644 --- a/plugins/Facebook/facebooknoticeform.php +++ b/plugins/Facebook/facebooknoticeform.php @@ -2,7 +2,7 @@ /** * StatusNet, the distributed open-source microblogging tool * - * Form for posting a notice from within the Facebook App. + * Form for posting a notice from within the Facebook App. * * This is a stripped down version of the normal NoticeForm (sans * location stuff and media upload stuff). I'm not sure we can share the @@ -53,31 +53,26 @@ require_once INSTALLDIR . '/lib/form.php'; * * @see HTMLOutputter */ - class FacebookNoticeForm extends Form { /** * Current action, used for returning to this page. */ - var $action = null; /** * Pre-filled content of the form */ - var $content = null; /** * The current user */ - var $user = null; /** * The notice being replied to */ - var $inreplyto = null; /** @@ -87,7 +82,6 @@ class FacebookNoticeForm extends Form * @param string $action action to return to, if any * @param string $content content to pre-fill */ - function __construct($out=null, $action=null, $content=null, $post_action=null, $user=null, $inreplyto=null) { parent::__construct($out); @@ -102,7 +96,7 @@ class FacebookNoticeForm extends Form } else { $this->user = common_current_user(); } - + // Note: Facebook doesn't allow multipart/form-data posting to // canvas pages, so don't try to set it--no file uploads, at // least not this way. It can be done using multiple servers @@ -114,7 +108,6 @@ class FacebookNoticeForm extends Form * * @return string ID of the form */ - function id() { return 'form_notice'; @@ -125,7 +118,6 @@ class FacebookNoticeForm extends Form * * @return string class of the form */ - function formClass() { return 'form_notice'; @@ -136,7 +128,6 @@ class FacebookNoticeForm extends Form * * @return string URL of the action */ - function action() { return $this->post_action; @@ -149,7 +140,8 @@ class FacebookNoticeForm extends Form */ function formLegend() { - $this->out->element('legend', null, _('Send a notice')); + // TRANS: Legend. + $this->out->element('legend', null, _m('Send a notice')); } /** @@ -157,12 +149,12 @@ class FacebookNoticeForm extends Form * * @return void */ - function formData() { if (Event::handle('StartShowNoticeFormData', array($this))) { $this->out->element('label', array('for' => 'notice_data-text'), - sprintf(_('What\'s up, %s?'), $this->user->nickname)); + // TRANS: Field label. + sprintf(_m('What\'s up, %s?'), $this->user->nickname)); // XXX: vary by defined max size $this->out->element('textarea', array('id' => 'notice_data-text', 'cols' => 35, @@ -174,7 +166,7 @@ class FacebookNoticeForm extends Form if ($contentLimit > 0) { $this->out->elementStart('dl', 'form_note'); - $this->out->element('dt', null, _('Available characters')); + $this->out->element('dt', null, _m('Available characters')); $this->out->element('dd', array('id' => 'notice_text-count'), $contentLimit); $this->out->elementEnd('dl'); @@ -194,13 +186,13 @@ class FacebookNoticeForm extends Form * * @return void */ - function formActions() { $this->out->element('input', array('id' => 'notice_action-submit', 'class' => 'submit', 'name' => 'status_submit', 'type' => 'submit', - 'value' => _('Send'))); + // TRANS: Button text. + 'value' => _m('BUTTON','Send'))); } } diff --git a/plugins/Facebook/facebookremove.php b/plugins/Facebook/facebookremove.php index 09cb333428..b048a435f5 100644 --- a/plugins/Facebook/facebookremove.php +++ b/plugins/Facebook/facebookremove.php @@ -25,7 +25,6 @@ require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php'; class FacebookremoveAction extends FacebookAction { - function handle($args) { parent::handle($args); @@ -65,5 +64,4 @@ class FacebookremoveAction extends FacebookAction 'unsuccessfully tried to remove a foreign link to Facebook!'); } } - } diff --git a/plugins/Facebook/facebooksettings.php b/plugins/Facebook/facebooksettings.php index f94a346b57..1379b9a9cc 100644 --- a/plugins/Facebook/facebooksettings.php +++ b/plugins/Facebook/facebooksettings.php @@ -25,7 +25,6 @@ require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php'; class FacebooksettingsAction extends FacebookAction { - function handle($args) { parent::handle($args); @@ -40,7 +39,6 @@ class FacebooksettingsAction extends FacebookAction * * @return void */ - function showContent() { if ($this->arg('save')) { @@ -62,6 +60,7 @@ class FacebooksettingsAction extends FacebookAction if ($result === false) { $this->showForm(_m('There was a problem saving your sync preferences!')); } else { + // TRANS: Confirmation that synchronisation settings have been saved into the system. $this->showForm(_m('Sync preferences saved.'), true); } } @@ -99,16 +98,16 @@ class FacebooksettingsAction extends FacebookAction $this->elementStart('li'); - $this->submit('save', _m('Save')); + // TRANS: Submit button to save synchronisation settings. + $this->submit('save', _m('BUTTON','Save')); $this->elementEnd('li'); $this->elementEnd('ul'); $this->elementEnd('form'); - } else { - + // TRANS: %s is the application name. $instructions = sprintf(_m('If you would like %s to automatically update ' . 'your Facebook status with your latest notice, you need ' . 'to give it permission.'), $this->app_name); @@ -127,12 +126,11 @@ class FacebooksettingsAction extends FacebookAction $this->elementEnd('li'); $this->elementEnd('ul'); } - } function title() { + // TRANS: Page title for synchronisation settings. return _m('Sync preferences'); } - } diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index 1290fed557..e78856f7c4 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -45,13 +45,11 @@ function getFacebook() } function isFacebookBound($notice, $flink) { - if (empty($flink)) { return false; } // Avoid a loop - if ($notice->source == 'Facebook') { common_log(LOG_INFO, "Skipping notice $notice->id because its " . 'source is Facebook.'); @@ -59,7 +57,6 @@ function isFacebookBound($notice, $flink) { } // If the user does not want to broadcast to Facebook, move along - if (!($flink->noticesync & FOREIGN_NOTICE_SEND == FOREIGN_NOTICE_SEND)) { common_log(LOG_INFO, "Skipping notice $notice->id " . 'because user has FOREIGN_NOTICE_SEND bit off.'); @@ -68,14 +65,12 @@ function isFacebookBound($notice, $flink) { // If it's not a reply, or if the user WANTS to send @-replies, // then, yeah, it can go to Facebook. - if (!preg_match('/@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) || ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY)) { return true; } return false; - } function facebookBroadcastNotice($notice) @@ -87,16 +82,12 @@ function facebookBroadcastNotice($notice) ); if (isFacebookBound($notice, $flink)) { - // Okay, we're good to go, update the FB status - $fbuid = $flink->foreign_id; $user = $flink->getUser(); try { - // Check permissions - common_debug( 'FacebookPlugin - checking for publish_stream permission for user ' . "$user->nickname ($user->id), Facebook UID: $fbuid" @@ -105,7 +96,6 @@ function facebookBroadcastNotice($notice) // NOTE: $facebook->api_client->users_hasAppPermission('publish_stream', $fbuid) // has been returning bogus results, so we're using FQL to check for // publish_stream permission now - $fql = "SELECT publish_stream FROM permissions WHERE uid = $fbuid"; $result = $facebook->api_client->fql_query($fql); @@ -152,7 +142,6 @@ function facebookBroadcastNotice($notice) } // Post to Facebook - if ($notice->hasAttachments() && $canPublish == 1) { publishStream($notice, $user, $fbuid); } elseif ($canUpdate == 1 || $canPublish == 1) { @@ -165,7 +154,6 @@ function facebookBroadcastNotice($notice) } // Finally, attempt to update the user's profile box - if ($canPublish == 1 || $canUpdate == 1) { updateProfileBox($facebook, $flink, $notice, $user); } @@ -412,7 +400,6 @@ function remove_facebook_app($flink) common_log(LOG_WARNING, $msg); } - } /** @@ -423,7 +410,6 @@ function remove_facebook_app($flink) * * @return boolean success flag */ - function mail_facebook_app_removed($user) { $profile = $user->getProfile(); @@ -447,5 +433,4 @@ function mail_facebook_app_removed($user) common_switch_locale(); return mail_to_user($user, $subject, $body); - } From c932c0fdc14af781853aedea89ada2f10f46ea8f Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 19 Sep 2010 17:44:29 +0200 Subject: [PATCH 48/76] Update pot files for plugins. --- plugins/CacheLog/locale/CacheLog.pot | 4 +- plugins/Facebook/locale/Facebook.pot | 300 ++++++--- .../locale/GoogleAnalytics.pot | 4 +- plugins/OStatus/locale/OStatus.pot | 587 +++++++++++++++--- .../PiwikAnalytics/locale/PiwikAnalytics.pot | 4 +- plugins/RSSCloud/locale/RSSCloud.pot | 5 +- .../TwitterBridge/locale/TwitterBridge.pot | 8 +- 7 files changed, 730 insertions(+), 182 deletions(-) diff --git a/plugins/CacheLog/locale/CacheLog.pot b/plugins/CacheLog/locale/CacheLog.pot index 4e0e4112b3..fbcd6dd084 100644 --- a/plugins/CacheLog/locale/CacheLog.pot +++ b/plugins/CacheLog/locale/CacheLog.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"POT-Creation-Date: 2010-09-19 15:29+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: CacheLogPlugin.php:117 +#: CacheLogPlugin.php:116 msgid "Log reads and writes to the cache." msgstr "" diff --git a/plugins/Facebook/locale/Facebook.pot b/plugins/Facebook/locale/Facebook.pot index 09f027c4e9..e6215df01e 100644 --- a/plugins/Facebook/locale/Facebook.pot +++ b/plugins/Facebook/locale/Facebook.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"POT-Creation-Date: 2010-09-19 15:29+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: facebookutil.php:439 +#: facebookutil.php:425 #, php-format msgid "" "Hi, %1$s. We're sorry to inform you that we are unable to update your " @@ -35,23 +35,24 @@ msgstr "" msgid "You must be logged into Facebook to use Facebook Connect." msgstr "" -#: FBConnectAuth.php:77 -msgid "There is already a local user linked with this Facebook." +#: FBConnectAuth.php:75 +msgid "There is already a local user linked with this Facebook account." msgstr "" -#: FBConnectAuth.php:90 FBConnectSettings.php:167 +#: FBConnectAuth.php:87 FBConnectSettings.php:166 msgid "There was a problem with your session token. Try again, please." msgstr "" -#: FBConnectAuth.php:95 +#: FBConnectAuth.php:92 msgid "You can't register if you don't agree to the license." msgstr "" -#: FBConnectAuth.php:105 -msgid "Something weird happened." +#: FBConnectAuth.php:102 +msgid "An unknown error has occured." msgstr "" -#: FBConnectAuth.php:119 +#. TRANS: %s is the site name. +#: FBConnectAuth.php:117 #, php-format msgid "" "This is the first time you've logged into %s so we must connect your " @@ -59,360 +60,469 @@ msgid "" "with your existing account, if you have one." msgstr "" -#: FBConnectAuth.php:125 +#. TRANS: Page title. +#: FBConnectAuth.php:124 msgid "Facebook Account Setup" msgstr "" +#. TRANS: Legend. #: FBConnectAuth.php:158 msgid "Connection options" msgstr "" -#: FBConnectAuth.php:183 +#. TRANS: %s is the name of the license used by the user for their status updates. +#: FBConnectAuth.php:168 +#, php-format +msgid "" +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." +msgstr "" + +#. TRANS: Legend. +#: FBConnectAuth.php:185 msgid "Create new account" msgstr "" -#: FBConnectAuth.php:185 +#: FBConnectAuth.php:187 msgid "Create a new user with this nickname." msgstr "" -#: FBConnectAuth.php:188 +#. TRANS: Field label. +#: FBConnectAuth.php:191 msgid "New nickname" msgstr "" -#: FBConnectAuth.php:190 +#: FBConnectAuth.php:193 msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" -#: FBConnectAuth.php:193 +#. TRANS: Submit button. +#: FBConnectAuth.php:197 +msgctxt "BUTTON" msgid "Create" msgstr "" -#: FBConnectAuth.php:198 +#: FBConnectAuth.php:203 msgid "Connect existing account" msgstr "" -#: FBConnectAuth.php:200 +#: FBConnectAuth.php:205 msgid "" "If you already have an account, login with your username and password to " "connect it to your Facebook." msgstr "" -#: FBConnectAuth.php:203 +#. TRANS: Field label. +#: FBConnectAuth.php:209 msgid "Existing nickname" msgstr "" -#: FBConnectAuth.php:206 facebookaction.php:271 +#: FBConnectAuth.php:212 facebookaction.php:277 msgid "Password" msgstr "" -#: FBConnectAuth.php:209 +#. TRANS: Submit button. +#: FBConnectAuth.php:216 +msgctxt "BUTTON" msgid "Connect" msgstr "" -#: FBConnectAuth.php:225 FBConnectAuth.php:234 +#. TRANS: Client error trying to register with registrations not allowed. +#. TRANS: Client error trying to register with registrations 'invite only'. +#: FBConnectAuth.php:233 FBConnectAuth.php:243 msgid "Registration not allowed." msgstr "" -#: FBConnectAuth.php:241 +#. TRANS: Client error trying to register with an invalid invitation code. +#: FBConnectAuth.php:251 msgid "Not a valid invitation code." msgstr "" -#: FBConnectAuth.php:251 +#: FBConnectAuth.php:261 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" -#: FBConnectAuth.php:256 +#: FBConnectAuth.php:266 msgid "Nickname not allowed." msgstr "" -#: FBConnectAuth.php:261 +#: FBConnectAuth.php:271 msgid "Nickname already in use. Try another one." msgstr "" -#: FBConnectAuth.php:279 FBConnectAuth.php:313 FBConnectAuth.php:333 +#: FBConnectAuth.php:289 FBConnectAuth.php:323 FBConnectAuth.php:343 msgid "Error connecting user to Facebook." msgstr "" -#: FBConnectAuth.php:299 +#: FBConnectAuth.php:309 msgid "Invalid username or password." msgstr "" -#: facebooklogin.php:91 facebookaction.php:249 facebookaction.php:275 +#. TRANS: Page title. +#: facebooklogin.php:90 facebookaction.php:255 msgid "Login" msgstr "" -#: facebookhome.php:111 -msgid "Server error - couldn't get user!" +#. TRANS: Legend. +#: facebooknoticeform.php:144 +msgid "Send a notice" msgstr "" -#: facebookhome.php:131 +#. TRANS: Field label. +#: facebooknoticeform.php:157 +#, php-format +msgid "What's up, %s?" +msgstr "" + +#: facebooknoticeform.php:169 +msgid "Available characters" +msgstr "" + +#. TRANS: Button text. +#: facebooknoticeform.php:196 +msgctxt "BUTTON" +msgid "Send" +msgstr "" + +#: facebookhome.php:103 +msgid "Server error: Couldn't get user!" +msgstr "" + +#: facebookhome.php:122 msgid "Incorrect username or password." msgstr "" -#: facebookhome.php:158 -#, php-format -msgid "%s and friends, page %d" -msgstr "" - -#: facebookhome.php:160 +#. TRANS: Page title. +#. TRANS: %s is a user nickname +#: facebookhome.php:157 #, php-format msgid "%s and friends" msgstr "" -#: facebookhome.php:189 +#. TRANS: Instructions. %s is the application name. +#: facebookhome.php:185 #, php-format msgid "" "If you would like the %s app to automatically update your Facebook status " "with your latest notice, you need to give it permission." msgstr "" -#: facebookhome.php:213 +#: facebookhome.php:210 msgid "Okay, do it!" msgstr "" -#: facebookhome.php:219 +#. TRANS: Button text. Clicking the button will skip updating Facebook permissions. +#: facebookhome.php:217 +msgctxt "BUTTON" msgid "Skip" msgstr "" -#: facebookhome.php:248 facebookaction.php:330 +#: facebookhome.php:244 facebookaction.php:336 msgid "Pagination" msgstr "" -#: facebookhome.php:257 facebookaction.php:339 +#. TRANS: Pagination link. +#: facebookhome.php:254 facebookaction.php:345 msgid "After" msgstr "" -#: facebookhome.php:265 facebookaction.php:347 +#. TRANS: Pagination link. +#: facebookhome.php:263 facebookaction.php:353 msgid "Before" msgstr "" -#: facebookinvite.php:72 +#. TRANS: %s is the name of the site. +#: facebookinvite.php:69 #, php-format -msgid "Thanks for inviting your friends to use %s" +msgid "Thanks for inviting your friends to use %s." msgstr "" -#: facebookinvite.php:74 +#. TRANS: Followed by an unordered list with invited friends. +#: facebookinvite.php:72 msgid "Invitations have been sent to the following users:" msgstr "" -#: facebookinvite.php:94 +#: facebookinvite.php:91 #, php-format msgid "You have been invited to %s" msgstr "" -#: facebookinvite.php:103 +#. TRANS: %s is the name of the site. +#: facebookinvite.php:101 #, php-format msgid "Invite your friends to use %s" msgstr "" -#: facebookinvite.php:125 +#. TRANS: %s is the name of the site. +#: facebookinvite.php:124 #, php-format msgid "Friends already using %s:" msgstr "" +#. TRANS: Page title. #: facebookinvite.php:143 msgid "Send invitations" msgstr "" -#: FacebookPlugin.php:195 FacebookPlugin.php:488 FacebookPlugin.php:510 -#: facebookadminpanel.php:54 +#. TRANS: Menu item. +#. TRANS: Menu item tab. +#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485 +msgctxt "MENU" msgid "Facebook" msgstr "" -#: FacebookPlugin.php:196 +#. TRANS: Tooltip for menu item "Facebook". +#: FacebookPlugin.php:190 msgid "Facebook integration configuration" msgstr "" -#: FacebookPlugin.php:489 +#: FacebookPlugin.php:431 +msgid "Facebook Connect User" +msgstr "" + +#. TRANS: Tooltip for menu item "Facebook". +#: FacebookPlugin.php:463 msgid "Login or register using Facebook" msgstr "" -#: FacebookPlugin.php:511 FBConnectSettings.php:56 +#. TRANS: Tooltip for menu item "Facebook". +#. TRANS: Page title. +#: FacebookPlugin.php:487 FBConnectSettings.php:55 msgid "Facebook Connect Settings" msgstr "" -#: FacebookPlugin.php:617 +#: FacebookPlugin.php:591 msgid "" -"The Facebook plugin allows you to integrate your StatusNet instance with Facebook and Facebook Connect." +"The Facebook plugin allows integrating StatusNet instances with Facebook and Facebook Connect." msgstr "" #: FBConnectLogin.php:33 msgid "Already logged in." msgstr "" -#: FBConnectLogin.php:41 +#. TRANS: Instructions. +#: FBConnectLogin.php:42 msgid "Login with your Facebook Account" msgstr "" -#: FBConnectLogin.php:55 +#. TRANS: Page title. +#: FBConnectLogin.php:57 msgid "Facebook Login" msgstr "" -#: facebookremove.php:58 +#: facebookremove.php:57 msgid "Couldn't remove Facebook user." msgstr "" +#. TRANS: Link description for 'Home' link that leads to a start page. +#: facebookaction.php:169 +msgctxt "MENU" +msgid "Home" +msgstr "" + +#. TRANS: Tooltip for 'Home' link that leads to a start page. #: facebookaction.php:171 msgid "Home" msgstr "" -#: facebookaction.php:179 +#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited. +#: facebookaction.php:180 +msgctxt "MENU" msgid "Invite" msgstr "" -#: facebookaction.php:188 +#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited. +#: facebookaction.php:182 +msgid "Invite" +msgstr "" + +#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set. +#: facebookaction.php:192 +msgctxt "MENU" msgid "Settings" msgstr "" -#: facebookaction.php:227 +#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set. +#: facebookaction.php:194 +msgid "Settings" +msgstr "" + +#: facebookaction.php:233 #, php-format msgid "" "To use the %s Facebook Application you need to login with your username and " "password. Don't have a username yet?" msgstr "" -#: facebookaction.php:229 +#: facebookaction.php:235 msgid " a new account." msgstr "" -#: facebookaction.php:236 +#: facebookaction.php:242 msgid "Register" msgstr "" -#: facebookaction.php:268 +#: facebookaction.php:274 msgid "Nickname" msgstr "" -#: facebookaction.php:281 +#. TRANS: Login button. +#: facebookaction.php:282 +msgctxt "BUTTON" +msgid "Login" +msgstr "" + +#: facebookaction.php:288 msgid "Lost or forgotten password?" msgstr "" -#: facebookaction.php:365 +#: facebookaction.php:370 msgid "No notice content!" msgstr "" -#: facebookaction.php:371 +#: facebookaction.php:377 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: facebookaction.php:430 +#: facebookaction.php:431 msgid "Notices" msgstr "" -#: facebookadminpanel.php:65 +#: facebookadminpanel.php:52 +msgid "Facebook" +msgstr "" + +#: facebookadminpanel.php:62 msgid "Facebook integration settings" msgstr "" -#: facebookadminpanel.php:129 +#: facebookadminpanel.php:123 msgid "Invalid Facebook API key. Max length is 255 characters." msgstr "" -#: facebookadminpanel.php:135 +#: facebookadminpanel.php:129 msgid "Invalid Facebook API secret. Max length is 255 characters." msgstr "" -#: facebookadminpanel.php:188 +#: facebookadminpanel.php:178 msgid "Facebook application settings" msgstr "" -#: facebookadminpanel.php:194 +#: facebookadminpanel.php:184 msgid "API key" msgstr "" -#: facebookadminpanel.php:195 +#: facebookadminpanel.php:185 msgid "API key provided by Facebook" msgstr "" -#: facebookadminpanel.php:203 +#: facebookadminpanel.php:193 msgid "Secret" msgstr "" -#: facebookadminpanel.php:204 +#: facebookadminpanel.php:194 msgid "API secret provided by Facebook" msgstr "" -#: FBConnectSettings.php:67 +#: facebookadminpanel.php:210 +msgid "Save" +msgstr "" + +#: facebookadminpanel.php:210 +msgid "Save Facebook settings" +msgstr "" + +#. TRANS: Instructions. +#: FBConnectSettings.php:66 msgid "Manage how your account connects to Facebook" msgstr "" -#: FBConnectSettings.php:92 +#: FBConnectSettings.php:90 msgid "There is no Facebook user connected to this account." msgstr "" -#: FBConnectSettings.php:100 +#: FBConnectSettings.php:98 msgid "Connected Facebook user" msgstr "" -#: FBConnectSettings.php:119 +#. TRANS: Legend. +#: FBConnectSettings.php:118 msgid "Disconnect my account from Facebook" msgstr "" #. TRANS: Followed by a link containing text "set a password". -#: FBConnectSettings.php:126 +#: FBConnectSettings.php:125 msgid "" "Disconnecting your Faceboook would make it impossible to log in! Please " msgstr "" #. TRANS: Preceded by "Please " and followed by " first." -#: FBConnectSettings.php:131 +#: FBConnectSettings.php:130 msgid "set a password" msgstr "" #. TRANS: Preceded by "Please set a password". -#: FBConnectSettings.php:133 +#: FBConnectSettings.php:132 msgid " first." msgstr "" +#. TRANS: Submit button. #: FBConnectSettings.php:145 +msgctxt "BUTTON" msgid "Disconnect" msgstr "" -#: FBConnectSettings.php:181 +#: FBConnectSettings.php:180 msgid "Couldn't delete link to Facebook." msgstr "" -#: FBConnectSettings.php:197 +#: FBConnectSettings.php:196 msgid "You have disconnected from Facebook." msgstr "" -#: FBConnectSettings.php:200 +#: FBConnectSettings.php:199 msgid "Not sure what you're trying to do." msgstr "" -#: facebooksettings.php:63 +#: facebooksettings.php:61 msgid "There was a problem saving your sync preferences!" msgstr "" -#: facebooksettings.php:65 +#. TRANS: Confirmation that synchronisation settings have been saved into the system. +#: facebooksettings.php:64 msgid "Sync preferences saved." msgstr "" -#: facebooksettings.php:88 +#: facebooksettings.php:87 msgid "Automatically update my Facebook status with my notices." msgstr "" -#: facebooksettings.php:95 +#: facebooksettings.php:94 msgid "Send \"@\" replies to Facebook." msgstr "" +#. TRANS: Submit button to save synchronisation settings. #: facebooksettings.php:102 +msgctxt "BUTTON" msgid "Save" msgstr "" -#: facebooksettings.php:112 +#. TRANS: %s is the application name. +#: facebooksettings.php:111 #, php-format msgid "" "If you would like %s to automatically update your Facebook status with your " "latest notice, you need to give it permission." msgstr "" -#: facebooksettings.php:125 +#: facebooksettings.php:124 #, php-format msgid "Allow %s to update my Facebook status" msgstr "" -#: facebooksettings.php:135 +#. TRANS: Page title for synchronisation settings. +#: facebooksettings.php:134 msgid "Sync preferences" msgstr "" diff --git a/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot b/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot index 4006ccf1f5..111eee88ed 100644 --- a/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot +++ b/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"POT-Creation-Date: 2010-09-19 15:29+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: GoogleAnalyticsPlugin.php:81 +#: GoogleAnalyticsPlugin.php:80 msgid "" "Use Google Analytics to " "track web access." diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot index b3a9074a29..882e8d3080 100644 --- a/plugins/OStatus/locale/OStatus.pot +++ b/plugins/OStatus/locale/OStatus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"POT-Creation-Date: 2010-09-19 15:29+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,309 +16,746 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: OStatusPlugin.php:226 OStatusPlugin.php:951 actions/ostatusinit.php:99 +#. TRANS: Link description for link to subscribe to a remote user. +#. TRANS: Link text for a user to subscribe to an OStatus user. +#: OStatusPlugin.php:227 OStatusPlugin.php:958 msgid "Subscribe" msgstr "" -#: OStatusPlugin.php:244 OStatusPlugin.php:663 actions/ostatussub.php:105 -#: actions/ostatusinit.php:96 +#. TRANS: Link description for link to join a remote group. +#: OStatusPlugin.php:246 OStatusPlugin.php:667 actions/ostatussub.php:107 msgid "Join" msgstr "" -#: OStatusPlugin.php:456 +#. TRANSLATE: %s is a domain. +#: OStatusPlugin.php:459 #, php-format msgid "Sent from %s via OStatus" msgstr "" -#: OStatusPlugin.php:527 +#. TRANS: Exception. +#: OStatusPlugin.php:531 msgid "Could not set up remote subscription." msgstr "" -#: OStatusPlugin.php:647 +#: OStatusPlugin.php:570 +msgid "Follow" +msgstr "" + +#. TRANS: Success message for subscribe to user attempt through OStatus. +#. TRANS: %1$s is the subscriber name, %2$s is the subscribed user's name. +#: OStatusPlugin.php:573 +#, php-format +msgid "%1$s is now following %2$s." +msgstr "" + +#: OStatusPlugin.php:620 +msgid "Unfollow" +msgstr "" + +#. TRANS: Success message for unsubscribe from user attempt through OStatus. +#. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name. +#: OStatusPlugin.php:623 +#, php-format +msgid "%1$s stopped following %2$s." +msgstr "" + +#: OStatusPlugin.php:651 msgid "Could not set up remote group membership." msgstr "" -#: OStatusPlugin.php:674 +#. TRANS: Exception. +#: OStatusPlugin.php:679 msgid "Failed joining remote group." msgstr "" -#: OStatusPlugin.php:714 +#: OStatusPlugin.php:719 msgid "Leave" msgstr "" -#: OStatusPlugin.php:880 +#: OStatusPlugin.php:760 +msgid "Favor" +msgstr "" + +#. TRANS: Success message for adding a favorite notice through OStatus. +#. TRANS: %1$s is the favoring user's name, %2$s is URI to the favored notice. +#: OStatusPlugin.php:763 +#, php-format +msgid "%1$s marked notice %2$s as a favorite." +msgstr "" + +#: OStatusPlugin.php:806 +msgid "Disfavor" +msgstr "" + +#. TRANS: Success message for remove a favorite notice through OStatus. +#. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice. +#: OStatusPlugin.php:809 +#, php-format +msgid "%1$s marked notice %2$s as no longer a favorite." +msgstr "" + +#. TRANS: Link text for link to remote subscribe. +#: OStatusPlugin.php:885 msgid "Remote" msgstr "" -#: OStatusPlugin.php:919 +#. TRANS: Title for activity. +#: OStatusPlugin.php:925 msgid "Profile update" msgstr "" #. TRANS: Ping text for remote profile update through OStatus. #. TRANS: %s is user that updated their profile. -#: OStatusPlugin.php:922 +#: OStatusPlugin.php:928 #, php-format msgid "%s has updated their profile page." msgstr "" -#: OStatusPlugin.php:966 +#. TRANS: Plugin description. +#: OStatusPlugin.php:973 msgid "" "Follow people across social networks that implement OStatus." msgstr "" -#: classes/Ostatus_profile.php:592 +#: classes/FeedSub.php:248 +msgid "Attempting to start PuSH subscription for feed with no hub." +msgstr "" + +#: classes/FeedSub.php:278 +msgid "Attempting to end PuSH subscription for feed with no hub." +msgstr "" + +#. TRANS: Server exception. +#: classes/Ostatus_profile.php:188 +#, php-format +msgid "Invalid ostatus_profile state: both group and profile IDs set for %s." +msgstr "" + +#. TRANS: Server exception. +#: classes/Ostatus_profile.php:191 +#, php-format +msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s." +msgstr "" + +#. TRANS: Server exception. +#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type. +#: classes/Ostatus_profile.php:281 +#, php-format +msgid "Invalid actor passed to %1$s: %2$s." +msgstr "" + +#. TRANS: Server exception. +#: classes/Ostatus_profile.php:374 +msgid "" +"Invalid type passed to Ostatus_profile::notify. It must be XML string or " +"Activity entry." +msgstr "" + +#: classes/Ostatus_profile.php:404 +msgid "Unknown feed format." +msgstr "" + +#: classes/Ostatus_profile.php:427 +msgid "RSS feed without a channel." +msgstr "" + +#. TRANS: Client exception. +#: classes/Ostatus_profile.php:472 +msgid "Can't handle that kind of post." +msgstr "" + +#. TRANS: Client exception. %s is a source URL. +#: classes/Ostatus_profile.php:555 +#, php-format +msgid "No content for notice %s." +msgstr "" + +#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. +#: classes/Ostatus_profile.php:588 msgid "Show more" msgstr "" -#: classes/Ostatus_profile.php:1034 +#. TRANS: Exception. %s is a profile URL. +#: classes/Ostatus_profile.php:781 +#, php-format +msgid "Could not reach profile page %s." +msgstr "" + +#. TRANS: Exception. +#: classes/Ostatus_profile.php:839 +#, php-format +msgid "Could not find a feed URL for profile page %s." +msgstr "" + +#: classes/Ostatus_profile.php:976 +msgid "Can't find enough profile information to make a feed." +msgstr "" + +#: classes/Ostatus_profile.php:1035 #, php-format msgid "Invalid avatar URL %s." msgstr "" -#: classes/Ostatus_profile.php:1044 +#: classes/Ostatus_profile.php:1045 #, php-format msgid "Tried to update avatar for unsaved remote profile %s." msgstr "" -#: classes/Ostatus_profile.php:1052 +#: classes/Ostatus_profile.php:1053 #, php-format msgid "Unable to fetch avatar from %s." msgstr "" -#. TRANS: POST is a HTTP command. It should not be translated. +#. TRANS: Exception. +#: classes/Ostatus_profile.php:1275 +msgid "Local user can't be referenced as remote." +msgstr "" + +#. TRANS: Exception. +#: classes/Ostatus_profile.php:1280 +msgid "Local group can't be referenced as remote." +msgstr "" + +#. TRANS: Exception. +#: classes/Ostatus_profile.php:1332 classes/Ostatus_profile.php:1343 +msgid "Can't save local profile." +msgstr "" + +#. TRANS: Exception. +#: classes/Ostatus_profile.php:1351 +msgid "Can't save OStatus profile." +msgstr "" + +#. TRANS: Exception. +#: classes/Ostatus_profile.php:1610 classes/Ostatus_profile.php:1638 +msgid "Not a valid webfinger address." +msgstr "" + +#. TRANS: Exception. %s is a webfinger address. +#: classes/Ostatus_profile.php:1720 +#, php-format +msgid "Couldn't save profile for \"%s\"." +msgstr "" + +#. TRANS: Exception. %s is a webfinger address. +#: classes/Ostatus_profile.php:1739 +#, php-format +msgid "Couldn't save ostatus_profile for \"%s\"." +msgstr "" + +#. TRANS: Exception. %s is a webfinger address. +#: classes/Ostatus_profile.php:1747 +#, php-format +msgid "Couldn't find a valid profile for \"%s\"." +msgstr "" + +#: classes/Ostatus_profile.php:1789 +msgid "Could not store HTML content of long post as file." +msgstr "" + +#. TRANS: Client exception. %s is a HTTP status code. +#: classes/HubSub.php:208 +#, php-format +msgid "Hub subscriber verification returned HTTP %s." +msgstr "" + +#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response. +#: classes/HubSub.php:355 +#, php-format +msgid "Callback returned status: %1$s. Body: %2$s" +msgstr "" + +#. TRANS: Client error. POST is a HTTP command. It should not be translated. #: lib/salmonaction.php:42 msgid "This method requires a POST." msgstr "" -#: lib/salmonaction.php:46 +#. TRANS: Client error. Do not translate "application/magic-envelope+xml" +#: lib/salmonaction.php:47 msgid "Salmon requires \"application/magic-envelope+xml\"." msgstr "" -#: lib/salmonaction.php:55 +#. TRANS: Client error. +#: lib/salmonaction.php:57 msgid "Salmon signature verification failed." msgstr "" -#: lib/salmonaction.php:66 +#. TRANS: Client error. +#: lib/salmonaction.php:69 msgid "Salmon post must be an Atom entry." msgstr "" -#: lib/salmonaction.php:114 +#. TRANS: Client exception. +#: lib/salmonaction.php:118 msgid "Unrecognized activity type." msgstr "" -#: lib/salmonaction.php:122 +#. TRANS: Client exception. +#: lib/salmonaction.php:127 msgid "This target doesn't understand posts." msgstr "" -#: lib/salmonaction.php:127 +#. TRANS: Client exception. +#: lib/salmonaction.php:133 msgid "This target doesn't understand follows." msgstr "" -#: lib/salmonaction.php:132 +#. TRANS: Client exception. +#: lib/salmonaction.php:139 msgid "This target doesn't understand unfollows." msgstr "" -#: lib/salmonaction.php:137 +#. TRANS: Client exception. +#: lib/salmonaction.php:145 msgid "This target doesn't understand favorites." msgstr "" -#: lib/salmonaction.php:142 +#. TRANS: Client exception. +#: lib/salmonaction.php:151 msgid "This target doesn't understand unfavorites." msgstr "" -#: lib/salmonaction.php:147 +#. TRANS: Client exception. +#: lib/salmonaction.php:157 msgid "This target doesn't understand share events." msgstr "" -#: lib/salmonaction.php:152 +#. TRANS: Client exception. +#: lib/salmonaction.php:163 msgid "This target doesn't understand joins." msgstr "" -#: lib/salmonaction.php:157 +#. TRANS: Client exception. +#: lib/salmonaction.php:169 msgid "This target doesn't understand leave events." msgstr "" +#. TRANS: Exception. +#: lib/salmonaction.php:197 +msgid "Received a salmon slap from unidentified actor." +msgstr "" + +#. TRANS: Exception. +#: lib/discovery.php:110 +#, php-format +msgid "Unable to find services for %s." +msgstr "" + +#. TRANS: Exception. +#: lib/xrd.php:64 +msgid "Invalid XML." +msgstr "" + +#. TRANS: Exception. +#: lib/xrd.php:69 +msgid "Invalid XML, missing XRD root." +msgstr "" + +#. TRANS: Exception. +#: lib/magicenvelope.php:80 +msgid "Unable to locate signer public key." +msgstr "" + +#. TRANS: Exception. +#: lib/salmon.php:93 +msgid "Salmon invalid actor for signing." +msgstr "" + #: tests/gettext-speedtest.php:57 msgid "Feeds" msgstr "" -#: actions/ostatusgroup.php:75 +#. TRANS: Client exception. +#: actions/pushhub.php:66 +msgid "Publishing outside feeds not supported." +msgstr "" + +#. TRANS: Client exception. %s is a mode. +#: actions/pushhub.php:69 +#, php-format +msgid "Unrecognized mode \"%s\"." +msgstr "" + +#. TRANS: Client exception. %s is a topic. +#: actions/pushhub.php:89 +#, php-format +msgid "" +"Unsupported hub.topic %s this hub only serves local user and group Atom " +"feeds." +msgstr "" + +#. TRANS: Client exception. +#: actions/pushhub.php:95 +#, php-format +msgid "Invalid hub.verify \"%s\". It must be sync or async." +msgstr "" + +#. TRANS: Client exception. +#: actions/pushhub.php:101 +#, php-format +msgid "Invalid hub.lease \"%s\". It must be empty or positive integer." +msgstr "" + +#. TRANS: Client exception. +#: actions/pushhub.php:109 +#, php-format +msgid "Invalid hub.secret \"%s\". It must be under 200 bytes." +msgstr "" + +#. TRANS: Client exception. +#: actions/pushhub.php:161 +#, php-format +msgid "Invalid hub.topic \"%s\". User doesn't exist." +msgstr "" + +#. TRANS: Client exception. +#: actions/pushhub.php:170 +#, php-format +msgid "Invalid hub.topic \"%s\". Group doesn't exist." +msgstr "" + +#. TRANS: Client exception. +#. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL. +#: actions/pushhub.php:195 +#, php-format +msgid "Invalid URL passed for %1$s: \"%2$s\"" +msgstr "" + +#: actions/userxrd.php:47 actions/ownerxrd.php:37 actions/usersalmon.php:43 +msgid "No such user." +msgstr "" + +#. TRANS: Client error. +#: actions/usersalmon.php:37 actions/groupsalmon.php:40 +msgid "No ID." +msgstr "" + +#. TRANS: Client exception. +#: actions/usersalmon.php:81 +msgid "In reply to unknown notice." +msgstr "" + +#. TRANS: Client exception. +#: actions/usersalmon.php:86 +msgid "In reply to a notice not by this user and not mentioning this user." +msgstr "" + +#. TRANS: Client exception. +#: actions/usersalmon.php:163 +msgid "Could not save new favorite." +msgstr "" + +#. TRANS: Client exception. +#: actions/usersalmon.php:195 +msgid "Can't favorite/unfavorite without an object." +msgstr "" + +#. TRANS: Client exception. +#: actions/usersalmon.php:207 +msgid "Can't handle that kind of object for liking/faving." +msgstr "" + +#. TRANS: Client exception. %s is an object ID. +#: actions/usersalmon.php:214 +#, php-format +msgid "Notice with ID %s unknown." +msgstr "" + +#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID. +#: actions/usersalmon.php:219 +#, php-format +msgid "Notice with ID %1$s not posted by %2$s." +msgstr "" + +#. TRANS: Field label. +#: actions/ostatusgroup.php:76 msgid "Join group" msgstr "" -#: actions/ostatusgroup.php:77 +#. TRANS: Tooltip for field label "Join group". +#: actions/ostatusgroup.php:79 msgid "OStatus group's address, like http://example.net/group/nickname." msgstr "" -#: actions/ostatusgroup.php:81 actions/ostatussub.php:71 +#. TRANS: Button text. +#: actions/ostatusgroup.php:84 actions/ostatussub.php:73 +msgctxt "BUTTON" msgid "Continue" msgstr "" -#: actions/ostatusgroup.php:100 +#: actions/ostatusgroup.php:103 msgid "You are already a member of this group." msgstr "" #. TRANS: OStatus remote group subscription dialog error. -#: actions/ostatusgroup.php:135 +#: actions/ostatusgroup.php:138 msgid "Already a member!" msgstr "" #. TRANS: OStatus remote group subscription dialog error. -#: actions/ostatusgroup.php:146 +#: actions/ostatusgroup.php:149 msgid "Remote group join failed!" msgstr "" #. TRANS: OStatus remote group subscription dialog error. -#: actions/ostatusgroup.php:150 +#: actions/ostatusgroup.php:153 msgid "Remote group join aborted!" msgstr "" #. TRANS: Page title for OStatus remote group join form -#: actions/ostatusgroup.php:163 +#: actions/ostatusgroup.php:165 msgid "Confirm joining remote group" msgstr "" -#: actions/ostatusgroup.php:174 +#. TRANS: Instructions. +#: actions/ostatusgroup.php:176 msgid "" "You can subscribe to groups from other supported sites. Paste the group's " "profile URI below:" msgstr "" -#: actions/groupsalmon.php:51 +#. TRANS: Client error. +#: actions/groupsalmon.php:47 +msgid "No such group." +msgstr "" + +#. TRANS: Client error. +#: actions/groupsalmon.php:53 msgid "Can't accept remote posts for a remote group." msgstr "" -#: actions/groupsalmon.php:124 +#. TRANS: Client error. +#: actions/groupsalmon.php:127 msgid "Can't read profile to set up group membership." msgstr "" -#: actions/groupsalmon.php:127 actions/groupsalmon.php:170 +#. TRANS: Client error. +#: actions/groupsalmon.php:131 actions/groupsalmon.php:174 msgid "Groups can't join groups." msgstr "" -#: actions/groupsalmon.php:154 +#: actions/groupsalmon.php:144 +msgid "You have been blocked from that group by the admin." +msgstr "" + +#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname. +#: actions/groupsalmon.php:159 #, php-format msgid "Could not join remote user %1$s to group %2$s." msgstr "" -#: actions/groupsalmon.php:167 +#: actions/groupsalmon.php:171 msgid "Can't read profile to cancel group membership." msgstr "" -#: actions/groupsalmon.php:183 +#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname. +#: actions/groupsalmon.php:188 #, php-format msgid "Could not remove remote user %1$s from group %2$s." msgstr "" -#: actions/ostatussub.php:65 +#. TRANS: Field label for a field that takes an OStatus user address. +#: actions/ostatussub.php:66 msgid "Subscribe to" msgstr "" -#: actions/ostatussub.php:67 +#. TRANS: Tooltip for field label "Subscribe to". +#: actions/ostatussub.php:69 msgid "" "OStatus user's address, like nickname@example.com or http://example.net/" "nickname" msgstr "" -#: actions/ostatussub.php:106 +#. TRANS: Button text. +#. TRANS: Tooltip for button "Join". +#: actions/ostatussub.php:110 +msgctxt "BUTTON" msgid "Join this group" msgstr "" -#. TRANS: Page title for OStatus remote subscription form -#: actions/ostatussub.php:108 actions/ostatussub.php:400 +#. TRANS: Button text. +#: actions/ostatussub.php:113 +msgctxt "BUTTON" msgid "Confirm" msgstr "" -#: actions/ostatussub.php:109 +#. TRANS: Tooltip for button "Confirm". +#: actions/ostatussub.php:115 msgid "Subscribe to this user" msgstr "" -#: actions/ostatussub.php:130 +#: actions/ostatussub.php:136 msgid "You are already subscribed to this user." msgstr "" -#: actions/ostatussub.php:247 actions/ostatussub.php:253 -#: actions/ostatussub.php:272 +#: actions/ostatussub.php:165 +msgid "Photo" +msgstr "" + +#: actions/ostatussub.php:176 +msgid "Nickname" +msgstr "" + +#: actions/ostatussub.php:197 +msgid "Location" +msgstr "" + +#: actions/ostatussub.php:206 +msgid "URL" +msgstr "" + +#: actions/ostatussub.php:218 +msgid "Note" +msgstr "" + +#. TRANS: Error text. +#: actions/ostatussub.php:254 actions/ostatussub.php:261 +#: actions/ostatussub.php:286 msgid "" "Sorry, we could not reach that address. Please make sure that the OStatus " "address is like nickname@example.com or http://example.net/nickname." msgstr "" -#: actions/ostatussub.php:256 actions/ostatussub.php:259 -#: actions/ostatussub.php:262 actions/ostatussub.php:265 -#: actions/ostatussub.php:268 +#. TRANS: Error text. +#: actions/ostatussub.php:265 actions/ostatussub.php:269 +#: actions/ostatussub.php:273 actions/ostatussub.php:277 +#: actions/ostatussub.php:281 msgid "" "Sorry, we could not reach that feed. Please try that OStatus address again " "later." msgstr "" #. TRANS: OStatus remote subscription dialog error. -#: actions/ostatussub.php:301 +#: actions/ostatussub.php:315 msgid "Already subscribed!" msgstr "" #. TRANS: OStatus remote subscription dialog error. -#: actions/ostatussub.php:306 +#: actions/ostatussub.php:320 msgid "Remote subscription failed!" msgstr "" -#: actions/ostatussub.php:380 actions/ostatusinit.php:81 +#: actions/ostatussub.php:367 actions/ostatusinit.php:63 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#. TRANS: Form title. +#: actions/ostatussub.php:395 actions/ostatusinit.php:82 msgid "Subscribe to user" msgstr "" -#: actions/ostatussub.php:411 +#. TRANS: Page title for OStatus remote subscription form +#: actions/ostatussub.php:415 +msgid "Confirm" +msgstr "" + +#. TRANS: Instructions. +#: actions/ostatussub.php:427 msgid "" "You can subscribe to users from other supported sites. Paste their address " "or profile URI below:" msgstr "" +#. TRANS: Client error. #: actions/ostatusinit.php:41 msgid "You can use the local subscription!" msgstr "" -#: actions/ostatusinit.php:63 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - -#: actions/ostatusinit.php:95 +#. TRANS: Form legend. +#: actions/ostatusinit.php:97 #, php-format msgid "Join group %s" msgstr "" -#: actions/ostatusinit.php:98 +#. TRANS: Button text. +#: actions/ostatusinit.php:99 +msgctxt "BUTTON" +msgid "Join" +msgstr "" + +#. TRANS: Form legend. +#: actions/ostatusinit.php:102 #, php-format msgid "Subscribe to %s" msgstr "" -#: actions/ostatusinit.php:111 +#. TRANS: Button text. +#: actions/ostatusinit.php:104 +msgctxt "BUTTON" +msgid "Subscribe" +msgstr "" + +#. TRANS: Field label. +#: actions/ostatusinit.php:117 msgid "User nickname" msgstr "" -#: actions/ostatusinit.php:112 +#: actions/ostatusinit.php:118 msgid "Nickname of the user you want to follow." msgstr "" -#: actions/ostatusinit.php:116 +#. TRANS: Field label. +#: actions/ostatusinit.php:123 msgid "Profile Account" msgstr "" -#: actions/ostatusinit.php:117 +#. TRANS: Tooltip for field label "Profile Account". +#: actions/ostatusinit.php:125 msgid "Your account id (e.g. user@identi.ca)." msgstr "" -#: actions/ostatusinit.php:138 +#. TRANS: Client error. +#: actions/ostatusinit.php:147 msgid "Must provide a remote profile." msgstr "" -#: actions/ostatusinit.php:149 +#. TRANS: Client error. +#: actions/ostatusinit.php:159 msgid "Couldn't look up OStatus account profile." msgstr "" -#: actions/ostatusinit.php:161 +#. TRANS: Client error. +#: actions/ostatusinit.php:172 msgid "Couldn't confirm remote profile address." msgstr "" -#: actions/ostatusinit.php:202 +#. TRANS: Page title. +#: actions/ostatusinit.php:217 msgid "OStatus Connect" msgstr "" + +#: actions/pushcallback.php:48 +msgid "Empty or invalid feed id." +msgstr "" + +#. TRANS: Server exception. %s is a feed ID. +#: actions/pushcallback.php:54 +#, php-format +msgid "Unknown PuSH feed id %s" +msgstr "" + +#. TRANS: Client exception. %s is an invalid feed name. +#: actions/pushcallback.php:93 +#, php-format +msgid "Bad hub.topic feed \"%s\"." +msgstr "" + +#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given. +#: actions/pushcallback.php:98 +#, php-format +msgid "Bad hub.verify_token %1$s for %2$s." +msgstr "" + +#. TRANS: Client exception. %s is an invalid topic. +#: actions/pushcallback.php:105 +#, php-format +msgid "Unexpected subscribe request for %s." +msgstr "" + +#. TRANS: Client exception. %s is an invalid topic. +#: actions/pushcallback.php:110 +#, php-format +msgid "Unexpected unsubscribe request for %s." +msgstr "" diff --git a/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot b/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot index 2578147a2a..2afaaaa2dc 100644 --- a/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot +++ b/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"POT-Creation-Date: 2010-09-19 15:29+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: PiwikAnalyticsPlugin.php:108 +#: PiwikAnalyticsPlugin.php:105 msgid "" "Use Piwik Open Source web analytics " "software." diff --git a/plugins/RSSCloud/locale/RSSCloud.pot b/plugins/RSSCloud/locale/RSSCloud.pot index 56de24825e..c91f21f336 100644 --- a/plugins/RSSCloud/locale/RSSCloud.pot +++ b/plugins/RSSCloud/locale/RSSCloud.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-18 22:06+0000\n" +"POT-Creation-Date: 2010-09-19 15:29+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,7 +47,8 @@ msgstr "" #: RSSCloudRequestNotify.php:161 msgid "" -"Thanks for the subscription. When the feed(s) update(s), you will be notified." +"Thanks for the subscription. When the feed(s) update(s), you will be " +"notified." msgstr "" #: LoggingAggregator.php:93 diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot index 625ab83768..5a75bc5f80 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-09-18 22:06+0000\n" +"POT-Creation-Date: 2010-09-19 15:29+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,11 +16,11 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: twitter.php:353 +#: twitter.php:350 msgid "Your Twitter bridge has been disabled." msgstr "" -#: twitter.php:357 +#: twitter.php:354 #, php-format msgid "" "Hi, %1$s. We're sorry to inform you that your link to Twitter has been " @@ -33,7 +33,7 @@ msgid "" "\t%2$s\n" "\n" "Regards,\n" -"%3$s\n" +"%3$s" msgstr "" #: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174 From 667cfcc84a98a3552d604b359cbd1093e254d842 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 20 Sep 2010 19:36:09 +0200 Subject: [PATCH 49/76] * add onPluginVersion() * remove superfluous whitespace. --- plugins/BlankAd/BlankAdPlugin.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/plugins/BlankAd/BlankAdPlugin.php b/plugins/BlankAd/BlankAdPlugin.php index 0e2719aed0..d7182ebc2c 100644 --- a/plugins/BlankAd/BlankAdPlugin.php +++ b/plugins/BlankAd/BlankAdPlugin.php @@ -51,7 +51,6 @@ if (!defined('STATUSNET')) { * * @seeAlso Location */ - class BlankAdPlugin extends UAPPlugin { /** @@ -61,7 +60,6 @@ class BlankAdPlugin extends UAPPlugin * * @return void */ - protected function showMediumRectangle($action) { $action->element('img', @@ -78,7 +76,6 @@ class BlankAdPlugin extends UAPPlugin * * @return void */ - protected function showRectangle($action) { $action->element('img', @@ -95,7 +92,6 @@ class BlankAdPlugin extends UAPPlugin * * @return void */ - protected function showWideSkyscraper($action) { $action->element('img', @@ -112,7 +108,6 @@ class BlankAdPlugin extends UAPPlugin * * @return void */ - protected function showLeaderboard($action) { $action->element('img', @@ -121,4 +116,15 @@ class BlankAdPlugin extends UAPPlugin 'src' => common_path('plugins/BlankAd/redpixel.png')), ''); } -} \ No newline at end of file + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'BlankAdPlugin', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:BlankAdPlugin', + 'rawdescription' => + _m('Plugin for testing ad layout')); + return true; + } +} From a4a39a2cc36df617f5e076f38034d672a1208cd6 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 20 Sep 2010 19:37:43 +0200 Subject: [PATCH 50/76] FIx inconsistencies in onPluginVersion() --- plugins/BlankAd/BlankAdPlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/BlankAd/BlankAdPlugin.php b/plugins/BlankAd/BlankAdPlugin.php index d7182ebc2c..49243aeea9 100644 --- a/plugins/BlankAd/BlankAdPlugin.php +++ b/plugins/BlankAd/BlankAdPlugin.php @@ -119,12 +119,12 @@ class BlankAdPlugin extends UAPPlugin function onPluginVersion(&$versions) { - $versions[] = array('name' => 'BlankAdPlugin', + $versions[] = array('name' => 'BlankAd', 'version' => STATUSNET_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:BlankAdPlugin', 'rawdescription' => - _m('Plugin for testing ad layout')); + _m('Plugin for testing ad layout.')); return true; } } From 7f3731e2badc9db38e75e7a145dbccaf533fd59a Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 20 Sep 2010 19:38:00 +0200 Subject: [PATCH 51/76] Add onPluginVersion() --- plugins/Adsense/AdsensePlugin.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/plugins/Adsense/AdsensePlugin.php b/plugins/Adsense/AdsensePlugin.php index c02430a583..3d733e1509 100644 --- a/plugins/Adsense/AdsensePlugin.php +++ b/plugins/Adsense/AdsensePlugin.php @@ -198,4 +198,15 @@ class AdsensePlugin extends UAPPlugin } return true; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'BlankAdPlugin', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:Adsense', + 'rawdescription' => + _m('Plugin to add Google Adsense to StatusNet sites.')); + return true; + } } From 2236e2eaf0c20442df49090725dea4ec98eb69bd Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 20 Sep 2010 19:38:36 +0200 Subject: [PATCH 52/76] Remove superfluous whitespace. --- plugins/APC/APCPlugin.php | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/APC/APCPlugin.php b/plugins/APC/APCPlugin.php index 666f64b147..0069779004 100644 --- a/plugins/APC/APCPlugin.php +++ b/plugins/APC/APCPlugin.php @@ -116,4 +116,3 @@ class APCPlugin extends Plugin return true; } } - From 3005f26aa23cf8fb8dca0a5ffed284e054fb77b9 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 20 Sep 2010 19:42:56 +0200 Subject: [PATCH 53/76] Add onPluginVersion() --- plugins/BlogspamNet/BlogspamNetPlugin.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/BlogspamNet/BlogspamNetPlugin.php b/plugins/BlogspamNet/BlogspamNetPlugin.php index d52e6006ac..51a86b4f36 100644 --- a/plugins/BlogspamNet/BlogspamNetPlugin.php +++ b/plugins/BlogspamNet/BlogspamNetPlugin.php @@ -53,7 +53,6 @@ define('BLOGSPAMNETPLUGIN_VERSION', '0.1'); * * @see Event */ - class BlogspamNetPlugin extends Plugin { var $baseUrl = 'http://test.blogspam.net:8888/'; @@ -142,4 +141,15 @@ class BlogspamNetPlugin extends Plugin { return 'BlogspamNetPlugin/'.BLOGSPAMNETPLUGIN_VERSION . ' StatusNet/' . STATUSNET_VERSION; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'BlogspamNet', + 'version' => BLOGSPAMNETPLUGIN_VERSION, + 'author' => 'Evan Prodromou, Brion Vibber', + 'homepage' => 'http://status.net/wiki/Plugin:BlogspamNet', + 'rawdescription' => + _m('Plugin to check submitted notices with blogspam.net.')); + return true; + } } From f975c1732936c3380048769bdf7ec55c24086856 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 20 Sep 2010 19:45:43 +0200 Subject: [PATCH 54/76] Add onPluginVersion() --- plugins/Comet/CometPlugin.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php index 29cb3004bf..70b324b5c2 100644 --- a/plugins/Comet/CometPlugin.php +++ b/plugins/Comet/CometPlugin.php @@ -42,7 +42,6 @@ require_once INSTALLDIR.'/plugins/Realtime/RealtimePlugin.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class CometPlugin extends RealtimePlugin { public $server = null; @@ -104,4 +103,15 @@ class CometPlugin extends RealtimePlugin } return '/' . implode('/', $path); } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Comet', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:Comet', + 'rawdescription' => + _m('Plugin to do "real time" updates using Comet/Bayeux.')); + return true; + } } From dfa164069d2dd69c49d1d7eb4182bfffd86329d4 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 20 Sep 2010 19:46:01 +0200 Subject: [PATCH 55/76] Superfluous whitespace removed. --- plugins/Blacklist/BlacklistPlugin.php | 1 - plugins/ClientSideShorten/shorten.php | 1 - 2 files changed, 2 deletions(-) diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php index bc8b82492d..10f89ef723 100644 --- a/plugins/Blacklist/BlacklistPlugin.php +++ b/plugins/Blacklist/BlacklistPlugin.php @@ -348,7 +348,6 @@ class BlacklistPlugin extends Plugin * * @return boolean hook value */ - function onAdminPanelCheck($name, &$isOK) { if ($name == 'blacklist') { diff --git a/plugins/ClientSideShorten/shorten.php b/plugins/ClientSideShorten/shorten.php index 8c2fc1b3cd..53c2cf5d1a 100644 --- a/plugins/ClientSideShorten/shorten.php +++ b/plugins/ClientSideShorten/shorten.php @@ -41,7 +41,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class ShortenAction extends Action { private $text; From 96794672012bcbfa9a2e5613f8d176846ec7d1b3 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 20 Sep 2010 19:59:13 +0200 Subject: [PATCH 56/76] Add onPluginVersion() --- plugins/DiskCache/DiskCachePlugin.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/DiskCache/DiskCachePlugin.php b/plugins/DiskCache/DiskCachePlugin.php index b709ea3b31..47d4b153cf 100644 --- a/plugins/DiskCache/DiskCachePlugin.php +++ b/plugins/DiskCache/DiskCachePlugin.php @@ -164,5 +164,15 @@ class DiskCachePlugin extends Plugin Event::handle('EndCacheDelete', array($key)); return false; } -} + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'DiskCache', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:DiskCache', + 'rawdescription' => + _m('Plugin to implement cache interface with disk files.')); + return true; + } +} From b4887a075696b022e699da393613a8d39741f16b Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 20 Sep 2010 20:00:33 +0200 Subject: [PATCH 57/76] Add FIXME for bad message implementation. --- plugins/Disqus/DisqusPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Disqus/DisqusPlugin.php b/plugins/Disqus/DisqusPlugin.php index c07eaaabdd..681be19dc9 100644 --- a/plugins/Disqus/DisqusPlugin.php +++ b/plugins/Disqus/DisqusPlugin.php @@ -68,7 +68,6 @@ if (!defined('STATUSNET')) { * * @see Event */ - class DisqusPlugin extends Plugin { function onEndShowContentBlock($action) @@ -106,6 +105,7 @@ ENDOFSCRIPT; $action->elementStart('div', $attrs); $action->elementStart('noscript'); + // @todo FIXME: No i18n yet, because of bad implementation. Should be one string. $action->raw('Please enable JavaScript to view the '); $noscriptUrl = 'http://disqus.com/?ref_noscript=' . $this->shortname; $action->element('a', array('href' => $noscriptUrl), 'comments powered by Disqus.'); From c0bc3b3042b5964c958d93c53270511674ac95c9 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 20 Sep 2010 20:39:28 +0200 Subject: [PATCH 58/76] Superfluous whitespace removed. --- plugins/Echo/EchoPlugin.php | 1 - plugins/EmailAuthentication/EmailAuthenticationPlugin.php | 2 -- 2 files changed, 3 deletions(-) diff --git a/plugins/Echo/EchoPlugin.php b/plugins/Echo/EchoPlugin.php index 7b51866ebd..cd8d8c0e73 100644 --- a/plugins/Echo/EchoPlugin.php +++ b/plugins/Echo/EchoPlugin.php @@ -65,7 +65,6 @@ if (!defined('STATUSNET')) { * * @see Event */ - class EchoPlugin extends Plugin { // NOTE: The Echo documentation says that this script will change on diff --git a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php index 4c018537b8..689d6231d1 100644 --- a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php +++ b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php @@ -34,7 +34,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { class EmailAuthenticationPlugin extends Plugin { //---interface implementation---// - function onStartCheckPassword($nickname, $password, &$authenticatedUser) { if(strpos($nickname, '@')) @@ -62,4 +61,3 @@ class EmailAuthenticationPlugin extends Plugin return true; } } - From e0952bf56bea07f0a1ef1ec26803594cd7f97fdd Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 20 Sep 2010 20:40:55 +0200 Subject: [PATCH 59/76] Superfluous whitespace removed. --- plugins/Enjit/enjitqueuehandler.php | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/Enjit/enjitqueuehandler.php b/plugins/Enjit/enjitqueuehandler.php index 14085cc5e3..56fc396d17 100644 --- a/plugins/Enjit/enjitqueuehandler.php +++ b/plugins/Enjit/enjitqueuehandler.php @@ -80,5 +80,4 @@ class EnjitQueueHandler extends QueueHandler return $response->isOk(); } - } From 2475e25e7850d203e90c5f188e80580d41e60a48 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 20 Sep 2010 11:49:39 -0700 Subject: [PATCH 60/76] Update DirectionDetector plugin to 0.2.0 from everplays --- .../DirectionDetectorPlugin.php | 85 ++++++++++++------- .../jquery.DirectionDetector.js | 61 +++++++++++++ 2 files changed, 113 insertions(+), 33 deletions(-) create mode 100644 plugins/DirectionDetector/jquery.DirectionDetector.js diff --git a/plugins/DirectionDetector/DirectionDetectorPlugin.php b/plugins/DirectionDetector/DirectionDetectorPlugin.php index b1362b166f..2a85725e39 100644 --- a/plugins/DirectionDetector/DirectionDetectorPlugin.php +++ b/plugins/DirectionDetector/DirectionDetectorPlugin.php @@ -1,4 +1,5 @@ + * @author Behrooz shabani (everplays) - * @copyright 2009-2010 Behrooz shabani * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * */ if (!defined('STATUSNET')) { - exit(1); + exit(1); } -define('DIRECTIONDETECTORPLUGIN_VERSION', '0.1.2'); +define('DIRECTIONDETECTORPLUGIN_VERSION', '0.2.0'); class DirectionDetectorPlugin extends Plugin { /** * SN plugin API, here we will make changes on rendered column - * - * @param object $notice notice is going to be saved */ public function onStartNoticeSave(&$notice){ if(!preg_match('//', $notice->rendered) && self::isRTL($notice->content)) @@ -44,32 +43,48 @@ class DirectionDetectorPlugin extends Plugin { /** * SN plugin API, here we will add css needed for modifiyed rendered - * - * @param */ - public function onEndShowStatusNetStyles($xml){ - $xml->element('style', array('type' => 'text/css'), 'span.rtl {display:block;direction:rtl;text-align:right;float:right;width:490px;} .notice .author {float:left}'); + public function onEndShowStatusNetStyles(&$xml){ + $xml->element('style', array('type' => 'text/css'), 'span.rtl {display:block;direction:rtl;text-align:right;float:right;} .notice .author {float:left}'); } + /** - * checks that passed string is a RTL language or not - * - * @param string $str String to be checked + * is passed string a rtl content or not */ - public static function isRTL($str){ - self::getClearText($str); + public static function isRTL($content){ + self::getClearText($content); + $words = explode(' ', $content); + $rtl = 0; + foreach($words as &$str) + if(self::startsWithRTLCharacter($str)) + $rtl++; + else + $rtl--; + if($rtl>0)// if number of rtl words is more than ltr words so it's a rtl content + return true; + elseif($rtl==0) + // check first word again + return self::startsWithRTLCharacter($words[0]); + return false; + } + + /** + * checks that passed string starts with a RTL language or not + */ + public static function startsWithRTLCharacter(&$str){ if( is_array($cc = self::utf8ToUnicode(mb_substr($str, 0, 1, 'utf-8'))) ) $cc = $cc[0]; else return false; - if($cc>=1536 && $cc<=1791) // Arabic, Persian, Urdu, Kurdish, ... + if($cc>=1536 && $cc<=1791) // arabic, persian, urdu, kurdish, ... return true; - if($cc>=65136 && $cc<=65279) // Arabic peresent 2 + if($cc>=65136 && $cc<=65279) // arabic peresent 2 return true; - if($cc>=64336 && $cc<=65023) // Arabic peresent 1 + if($cc>=64336 && $cc<=65023) // arabic peresent 1 return true; - if($cc>=1424 && $cc<=1535) // Hebrew + if($cc>=1424 && $cc<=1535) // hebrew return true; - if($cc>=64256 && $cc<=64335) // Hebrew peresent + if($cc>=64256 && $cc<=64335) // hebrew peresent return true; if($cc>=1792 && $cc<=1871) // Syriac return true; @@ -83,25 +98,30 @@ class DirectionDetectorPlugin extends Plugin { } /** - * clears text from replies, tags, groups, repeats & whitespaces - * - * @param string &$str string to be cleared + * clears text from replys, tags, groups, reteets & whitespaces */ private static function getClearText(&$str){ $str = preg_replace('/@[^ ]+|![^ ]+|#[^ ]+/u', '', $str); // reply, tag, group $str = preg_replace('/^RT[: ]{1}| RT | RT: |^RD[: ]{1}| RD | RD: |[♺♻:]/u', '', $str); // redent, retweet $str = preg_replace("/[ \r\t\n]+/", ' ', trim($str)); // remove spaces } + + /** + * adds javascript to do same thing on input textarea + */ + function onEndShowScripts($action){ + if (common_logged_in()) { + $action->script('plugins/DirectionDetector/jquery.DirectionDetector.js'); + } + } /** - * Takes a UTF-8 string and returns an array of ints representing the - * Unicode characters. Astral planes are supported i.e. the ints in the - * output can be > 0xFFFF. Occurrances of the BOM are ignored. Surrogates - * are not allowed. ### modified ### returns first character code - * - * Returns false if the input string isn't a valid UTF-8 octet sequence. + * Takes an UTF-8 string and returns an array of ints representing the + * Unicode characters. Astral planes are supported ie. the ints in the + * output can be > 0xFFFF. O$ccurrances of the BOM are ignored. Surrogates + * are not allowed. */ - private static function utf8ToUnicode($str){ + private static function utf8ToUnicode(&$str){ $mState = 0; // cached expected number of octets after the current octet // until the beginning of the next UTF8 character sequence $mUcs4 = 0; // cached Unicode character @@ -199,7 +219,7 @@ class DirectionDetectorPlugin extends Plugin { } } else { /* ((0xC0 & (*in) != 0x80) && (mState != 0)) - * + * * Incomplete multi-octet sequence. */ return false; @@ -216,9 +236,8 @@ class DirectionDetectorPlugin extends Plugin { $versions[] = array( 'name' => 'Direction detector', 'version' => DIRECTIONDETECTORPLUGIN_VERSION, - 'author' => 'Behrooz Shabani', - // TRANS: Direction detector plugin description. - 'rawdescription' => _m('Shows notices with right-to-left content in correct direction.') + 'author' => 'behrooz shabani', + 'rawdescription' => _m('shows notices with right-to-left content in correct direction.') ); return true; } diff --git a/plugins/DirectionDetector/jquery.DirectionDetector.js b/plugins/DirectionDetector/jquery.DirectionDetector.js new file mode 100644 index 0000000000..6808bcabd8 --- /dev/null +++ b/plugins/DirectionDetector/jquery.DirectionDetector.js @@ -0,0 +1,61 @@ + +/** + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * @category Plugin + * @package StatusNet + * @author Behrooz shabani (everplays) - + * @copyright 2009-2010 Behrooz shabani + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * + */ + +(function($){ + $.fn.isRTL = function(str){ + if(typeof str != typeof "" || str.length<1) + return false; + var cc = str.charCodeAt(0); + if(cc>=1536 && cc<=1791) // arabic, persian, ... + return true; + if(cc>=65136 && cc<=65279) // arabic peresent 2 + return true; + if(cc>=64336 && cc<=65023) // arabic peresent 1 + return true; + if(cc>=1424 && cc<=1535) // hebrew + return true; + if(cc>=64256 && cc<=64335) // hebrew peresent + return true; + if(cc>=1792 && cc<=1871) // Syriac + return true; + if(cc>=1920 && cc<=1983) // Thaana + return true; + if(cc>=1984 && cc<=2047) // NKo + return true; + if(cc>=11568 && cc<=11647) // Tifinagh + return true; + return false; + }; + $(document).ready(function(){ + var tArea = $("#notice_data-text"); + var tCleaner = new RegExp('@[^ ]+|![^ ]+|#[^ ]+|^RT[: ]{1}| RT | RT: |^RD[: ]{1}| RD | RD: |[♺♻:]+', 'g') + tArea.keyup(function(){ + var cleaned = tArea.val().replace(tCleaner, '').replace(/^[ ]+/, ''); + if($().isRTL(cleaned)) + tArea.css('direction', 'rtl'); + else + tArea.css('direction', 'ltr'); + }); + }); +})(jQuery); From 500f8e5a8727bc09e0b935813482881a468af10b Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 20 Sep 2010 20:54:30 +0200 Subject: [PATCH 61/76] * i18n/L10n updates. * remove superfluous whitespace. --- plugins/FirePHP/FirePHPPlugin.php | 1 - plugins/GeoURL/GeoURLPlugin.php | 3 -- plugins/Geonames/GeonamesPlugin.php | 7 ---- plugins/Gravatar/GravatarPlugin.php | 1 - plugins/Imap/imapmanager.php | 2 +- plugins/LdapCommon/LdapCommon.php | 22 +++++------- plugins/LdapCommon/MemcacheSchemaCache.php | 42 +++++++++++----------- plugins/LilUrl/LilUrlPlugin.php | 3 +- plugins/Linkback/LinkbackPlugin.php | 2 -- plugins/Memcache/MemcachePlugin.php | 7 ---- 10 files changed, 32 insertions(+), 58 deletions(-) diff --git a/plugins/FirePHP/FirePHPPlugin.php b/plugins/FirePHP/FirePHPPlugin.php index d984ec1af4..27f760c81c 100644 --- a/plugins/FirePHP/FirePHPPlugin.php +++ b/plugins/FirePHP/FirePHPPlugin.php @@ -69,4 +69,3 @@ class FirePHPPlugin extends Plugin return true; } } - diff --git a/plugins/GeoURL/GeoURLPlugin.php b/plugins/GeoURL/GeoURLPlugin.php index 01178f39c0..91da81a5aa 100644 --- a/plugins/GeoURL/GeoURLPlugin.php +++ b/plugins/GeoURL/GeoURLPlugin.php @@ -46,7 +46,6 @@ if (!defined('STATUSNET')) { * * @seeAlso Location */ - class GeoURLPlugin extends Plugin { public $ping = 'http://geourl.org/ping/'; @@ -58,7 +57,6 @@ class GeoURLPlugin extends Plugin * * @return boolean event handler flag */ - function onEndShowHeadElements($action) { $name = $action->trimmed('action'); @@ -94,7 +92,6 @@ class GeoURLPlugin extends Plugin * * @return boolean event handler flag */ - function onHandleQueuedNotice(&$notice) { if ($notice->is_local == 1) { diff --git a/plugins/Geonames/GeonamesPlugin.php b/plugins/Geonames/GeonamesPlugin.php index 3815a31fa6..310641ce60 100644 --- a/plugins/Geonames/GeonamesPlugin.php +++ b/plugins/Geonames/GeonamesPlugin.php @@ -46,7 +46,6 @@ if (!defined('STATUSNET')) { * * @seeAlso Location */ - class GeonamesPlugin extends Plugin { const LOCATION_NS = 1; @@ -71,7 +70,6 @@ class GeonamesPlugin extends Plugin * * @return boolean whether to continue (results in $location) */ - function onLocationFromName($name, $language, &$location) { $loc = $this->getCache(array('name' => $name, @@ -129,7 +127,6 @@ class GeonamesPlugin extends Plugin * * @return boolean whether to continue (results in $location) */ - function onLocationFromId($id, $ns, $language, &$location) { if ($ns != self::LOCATION_NS) { @@ -198,7 +195,6 @@ class GeonamesPlugin extends Plugin * * @return boolean whether to continue (results in $location) */ - function onLocationFromLatLon($lat, $lon, $language, &$location) { // Make sure they're canonical @@ -276,7 +272,6 @@ class GeonamesPlugin extends Plugin * * @return boolean whether to continue */ - function onLocationNameLanguage($location, $language, &$name) { if ($location->location_ns != self::LOCATION_NS) { @@ -344,7 +339,6 @@ class GeonamesPlugin extends Plugin * * @return boolean whether to continue */ - function onLocationUrl($location, &$url) { if ($location->location_ns != self::LOCATION_NS) { @@ -368,7 +362,6 @@ class GeonamesPlugin extends Plugin * * @return boolean whether to continue */ - function onLocationRdfUrl($location, &$url) { if ($location->location_ns != self::LOCATION_NS) { diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php index e4782cb9fb..dd8ff72176 100644 --- a/plugins/Gravatar/GravatarPlugin.php +++ b/plugins/Gravatar/GravatarPlugin.php @@ -132,7 +132,6 @@ class GravatarPlugin extends Plugin return false; } - function gravatar_save() { $cur = common_current_user(); diff --git a/plugins/Imap/imapmanager.php b/plugins/Imap/imapmanager.php index 68b8b7d874..e2f8c6d543 100644 --- a/plugins/Imap/imapmanager.php +++ b/plugins/Imap/imapmanager.php @@ -44,7 +44,7 @@ class ImapManager extends IoManager */ public static function get() { - throw new Exception('ImapManager should be created using it\'s constructor, not the static get method'); + throw new Exception(_m('ImapManager should be created using its constructor, not the using the static get method.')); } /** diff --git a/plugins/LdapCommon/LdapCommon.php b/plugins/LdapCommon/LdapCommon.php index 1f1647a753..7dea1f0ed4 100644 --- a/plugins/LdapCommon/LdapCommon.php +++ b/plugins/LdapCommon/LdapCommon.php @@ -60,13 +60,13 @@ class LdapCommon $this->ldap_config = $this->get_ldap_config(); if(!isset($this->host)){ - throw new Exception("must specify a host"); + throw new Exception(_m("A host must be specified.")); } if(!isset($this->basedn)){ - throw new Exception("must specify a basedn"); + throw new Exception(_m('"basedn" must be specified.')); } if(!isset($this->attributes['username'])){ - throw new Exception("username attribute must be set."); + throw new Exception(_m('The username attribute must be set.')); } } @@ -173,7 +173,7 @@ class LdapCommon $ldap = $this->get_ldap_connection($config); $entry = $this->get_user($username,array(),$ldap); - + $newCryptedPassword = $this->hashPassword($newpassword, $this->password_encoding); if ($newCryptedPassword===false) { return false; @@ -254,15 +254,14 @@ class LdapCommon * @return string The hashed password. * */ - - function hashPassword( $passwordClear, $encodageType ) + function hashPassword( $passwordClear, $encodageType ) { $encodageType = strtolower( $encodageType ); switch( $encodageType ) { - case 'crypt': - $cryptedPassword = '{CRYPT}' . crypt($passwordClear,$this->randomSalt(2)); + case 'crypt': + $cryptedPassword = '{CRYPT}' . crypt($passwordClear,$this->randomSalt(2)); break; - + case 'ext_des': // extended des crypt. see OpenBSD crypt man page. if ( ! defined( 'CRYPT_EXT_DES' ) || CRYPT_EXT_DES == 0 ) {return FALSE;} //Your system crypt library does not support extended DES encryption. @@ -345,8 +344,7 @@ class LdapCommon * @param int $length The length of the salt string to generate. * @return string The generated salt string. */ - - function randomSalt( $length ) + function randomSalt( $length ) { $possible = '0123456789'. 'abcdefghijklmnopqrstuvwxyz'. @@ -360,10 +358,8 @@ class LdapCommon return $str; } - } class LdapInvalidCredentialsException extends Exception { - } diff --git a/plugins/LdapCommon/MemcacheSchemaCache.php b/plugins/LdapCommon/MemcacheSchemaCache.php index 4ee2e8e16a..960164fd31 100644 --- a/plugins/LdapCommon/MemcacheSchemaCache.php +++ b/plugins/LdapCommon/MemcacheSchemaCache.php @@ -1,5 +1,5 @@ c = $cfg['c']; @@ -57,18 +57,18 @@ class MemcacheSchemaCache implements Net_LDAP2_SchemaCache } /** - * Store a schema object in the cache - * - * This method will be called, if Net_LDAP2 has fetched a fresh - * schema object from LDAP and wants to init or refresh the cache. - * - * To invalidate the cache and cause Net_LDAP2 to refresh the cache, - * you can call this method with null or false as value. - * The next call to $ldap->schema() will then refresh the caches object. - * - * @param mixed $schema The object that should be cached - * @return true|Net_LDAP2_Error|false - */ + * Store a schema object in the cache + * + * This method will be called, if Net_LDAP2 has fetched a fresh + * schema object from LDAP and wants to init or refresh the cache. + * + * To invalidate the cache and cause Net_LDAP2 to refresh the cache, + * you can call this method with null or false as value. + * The next call to $ldap->schema() will then refresh the caches object. + * + * @param mixed $schema The object that should be cached + * @return true|Net_LDAP2_Error|false + */ public function storeSchema($schema) { return $this->c->set($this->cacheKey, $schema); } diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php index 1c3d6f84b3..bd98026fe8 100644 --- a/plugins/LilUrl/LilUrlPlugin.php +++ b/plugins/LilUrl/LilUrlPlugin.php @@ -40,7 +40,7 @@ class LilUrlPlugin extends UrlShortenerPlugin function onInitializePlugin(){ parent::onInitializePlugin(); if(!isset($this->serviceUrl)){ - throw new Exception("must specify a serviceUrl"); + throw new Exception(_m('A serviceUrl must be specified.')); } } @@ -71,4 +71,3 @@ class LilUrlPlugin extends UrlShortenerPlugin return true; } } - diff --git a/plugins/Linkback/LinkbackPlugin.php b/plugins/Linkback/LinkbackPlugin.php index 8e44beae18..797572d7f8 100644 --- a/plugins/Linkback/LinkbackPlugin.php +++ b/plugins/Linkback/LinkbackPlugin.php @@ -49,7 +49,6 @@ define('LINKBACKPLUGIN_VERSION', '0.1'); * * @see Event */ - class LinkbackPlugin extends Plugin { var $notice = null; @@ -154,7 +153,6 @@ class LinkbackPlugin extends Plugin // Largely cadged from trackback_cls.php by // Ran Aroussi , GPL2 or any later version // http://phptrackback.sourceforge.net/ - function getTrackback($text, $url) { if (preg_match_all('/()/sm', $text, $match, PREG_SET_ORDER)) { diff --git a/plugins/Memcache/MemcachePlugin.php b/plugins/Memcache/MemcachePlugin.php index c3ca5c1359..f0c473c313 100644 --- a/plugins/Memcache/MemcachePlugin.php +++ b/plugins/Memcache/MemcachePlugin.php @@ -48,7 +48,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class MemcachePlugin extends Plugin { static $cacheInitialized = false; @@ -70,7 +69,6 @@ class MemcachePlugin extends Plugin * * @return boolean flag value */ - function onInitializePlugin() { if (self::$cacheInitialized) { @@ -101,7 +99,6 @@ class MemcachePlugin extends Plugin * * @return boolean hook success */ - function onStartCacheGet(&$key, &$value) { $this->_ensureConn(); @@ -121,7 +118,6 @@ class MemcachePlugin extends Plugin * * @return boolean hook success */ - function onStartCacheSet(&$key, &$value, &$flag, &$expiry, &$success) { $this->_ensureConn(); @@ -160,7 +156,6 @@ class MemcachePlugin extends Plugin * * @return boolean hook success */ - function onStartCacheDelete(&$key, &$success) { $this->_ensureConn(); @@ -194,7 +189,6 @@ class MemcachePlugin extends Plugin * * @return void */ - private function _ensureConn() { if (empty($this->_conn)) { @@ -253,4 +247,3 @@ class MemcachePlugin extends Plugin return true; } } - From d055b63187b262682c10d18b361b7e828948cad9 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 20 Sep 2010 12:00:39 -0700 Subject: [PATCH 62/76] DirectionDetector plugin: cleanup on reference usage & code comments. Changed getClearText() to return its value instead of changing the input to keep things clearer to maintainers. --- .../DirectionDetectorPlugin.php | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/plugins/DirectionDetector/DirectionDetectorPlugin.php b/plugins/DirectionDetector/DirectionDetectorPlugin.php index 2a85725e39..26eb896968 100644 --- a/plugins/DirectionDetector/DirectionDetectorPlugin.php +++ b/plugins/DirectionDetector/DirectionDetectorPlugin.php @@ -34,8 +34,10 @@ define('DIRECTIONDETECTORPLUGIN_VERSION', '0.2.0'); class DirectionDetectorPlugin extends Plugin { /** * SN plugin API, here we will make changes on rendered column + * + * @param object $notice notice is going to be saved */ - public function onStartNoticeSave(&$notice){ + public function onStartNoticeSave($notice){ if(!preg_match('//', $notice->rendered) && self::isRTL($notice->content)) $notice->rendered = ''.$notice->rendered.''; return true; @@ -43,19 +45,24 @@ class DirectionDetectorPlugin extends Plugin { /** * SN plugin API, here we will add css needed for modifiyed rendered + * + * @param Action $xml */ - public function onEndShowStatusNetStyles(&$xml){ + public function onEndShowStatusNetStyles($xml){ $xml->element('style', array('type' => 'text/css'), 'span.rtl {display:block;direction:rtl;text-align:right;float:right;} .notice .author {float:left}'); } /** * is passed string a rtl content or not + * + * @param string $content + * @return boolean */ public static function isRTL($content){ - self::getClearText($content); + $content = self::getClearText($content); $words = explode(' ', $content); $rtl = 0; - foreach($words as &$str) + foreach($words as $str) if(self::startsWithRTLCharacter($str)) $rtl++; else @@ -70,8 +77,11 @@ class DirectionDetectorPlugin extends Plugin { /** * checks that passed string starts with a RTL language or not + * + * @param string $str + * @return boolean */ - public static function startsWithRTLCharacter(&$str){ + public static function startsWithRTLCharacter($str){ if( is_array($cc = self::utf8ToUnicode(mb_substr($str, 0, 1, 'utf-8'))) ) $cc = $cc[0]; else @@ -99,15 +109,21 @@ class DirectionDetectorPlugin extends Plugin { /** * clears text from replys, tags, groups, reteets & whitespaces + * + * @param string $str + * @return string */ - private static function getClearText(&$str){ + private static function getClearText($str){ $str = preg_replace('/@[^ ]+|![^ ]+|#[^ ]+/u', '', $str); // reply, tag, group $str = preg_replace('/^RT[: ]{1}| RT | RT: |^RD[: ]{1}| RD | RD: |[♺♻:]/u', '', $str); // redent, retweet $str = preg_replace("/[ \r\t\n]+/", ' ', trim($str)); // remove spaces + return $str; } /** * adds javascript to do same thing on input textarea + * + * @param Action $action */ function onEndShowScripts($action){ if (common_logged_in()) { @@ -120,8 +136,11 @@ class DirectionDetectorPlugin extends Plugin { * Unicode characters. Astral planes are supported ie. the ints in the * output can be > 0xFFFF. O$ccurrances of the BOM are ignored. Surrogates * are not allowed. + * + * @param string $str + * @return mixed array of ints, or false on invalid input */ - private static function utf8ToUnicode(&$str){ + private static function utf8ToUnicode($str){ $mState = 0; // cached expected number of octets after the current octet // until the beginning of the next UTF8 character sequence $mUcs4 = 0; // cached Unicode character @@ -236,8 +255,8 @@ class DirectionDetectorPlugin extends Plugin { $versions[] = array( 'name' => 'Direction detector', 'version' => DIRECTIONDETECTORPLUGIN_VERSION, - 'author' => 'behrooz shabani', - 'rawdescription' => _m('shows notices with right-to-left content in correct direction.') + 'author' => 'Behrooz Shabani', + 'rawdescription' => _m('Shows notices with right-to-left content in correct direction.') ); return true; } From a3de417ca54c1cc1a99b25880e944335c43bbdc2 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 20 Sep 2010 12:02:04 -0700 Subject: [PATCH 63/76] DirectionDetector plugin: tabs to spaces --- .../DirectionDetectorPlugin.php | 410 +++++++++--------- 1 file changed, 205 insertions(+), 205 deletions(-) diff --git a/plugins/DirectionDetector/DirectionDetectorPlugin.php b/plugins/DirectionDetector/DirectionDetectorPlugin.php index 26eb896968..ac6b43c1f3 100644 --- a/plugins/DirectionDetector/DirectionDetectorPlugin.php +++ b/plugins/DirectionDetector/DirectionDetectorPlugin.php @@ -26,240 +26,240 @@ */ if (!defined('STATUSNET')) { - exit(1); + exit(1); } define('DIRECTIONDETECTORPLUGIN_VERSION', '0.2.0'); class DirectionDetectorPlugin extends Plugin { - /** - * SN plugin API, here we will make changes on rendered column + /** + * SN plugin API, here we will make changes on rendered column * * @param object $notice notice is going to be saved - */ - public function onStartNoticeSave($notice){ - if(!preg_match('//', $notice->rendered) && self::isRTL($notice->content)) - $notice->rendered = ''.$notice->rendered.''; - return true; - } + */ + public function onStartNoticeSave($notice){ + if(!preg_match('//', $notice->rendered) && self::isRTL($notice->content)) + $notice->rendered = ''.$notice->rendered.''; + return true; + } - /** - * SN plugin API, here we will add css needed for modifiyed rendered + /** + * SN plugin API, here we will add css needed for modifiyed rendered * * @param Action $xml - */ - public function onEndShowStatusNetStyles($xml){ - $xml->element('style', array('type' => 'text/css'), 'span.rtl {display:block;direction:rtl;text-align:right;float:right;} .notice .author {float:left}'); - } - - /** - * is passed string a rtl content or not + */ + public function onEndShowStatusNetStyles($xml){ + $xml->element('style', array('type' => 'text/css'), 'span.rtl {display:block;direction:rtl;text-align:right;float:right;} .notice .author {float:left}'); + } + + /** + * is passed string a rtl content or not * * @param string $content * @return boolean - */ - public static function isRTL($content){ - $content = self::getClearText($content); - $words = explode(' ', $content); - $rtl = 0; - foreach($words as $str) - if(self::startsWithRTLCharacter($str)) - $rtl++; - else - $rtl--; - if($rtl>0)// if number of rtl words is more than ltr words so it's a rtl content - return true; - elseif($rtl==0) - // check first word again - return self::startsWithRTLCharacter($words[0]); - return false; - } - - /** - * checks that passed string starts with a RTL language or not + */ + public static function isRTL($content){ + $content = self::getClearText($content); + $words = explode(' ', $content); + $rtl = 0; + foreach($words as $str) + if(self::startsWithRTLCharacter($str)) + $rtl++; + else + $rtl--; + if($rtl>0)// if number of rtl words is more than ltr words so it's a rtl content + return true; + elseif($rtl==0) + // check first word again + return self::startsWithRTLCharacter($words[0]); + return false; + } + + /** + * checks that passed string starts with a RTL language or not * * @param string $str * @return boolean - */ - public static function startsWithRTLCharacter($str){ - if( is_array($cc = self::utf8ToUnicode(mb_substr($str, 0, 1, 'utf-8'))) ) - $cc = $cc[0]; - else - return false; - if($cc>=1536 && $cc<=1791) // arabic, persian, urdu, kurdish, ... - return true; - if($cc>=65136 && $cc<=65279) // arabic peresent 2 - return true; - if($cc>=64336 && $cc<=65023) // arabic peresent 1 - return true; - if($cc>=1424 && $cc<=1535) // hebrew - return true; - if($cc>=64256 && $cc<=64335) // hebrew peresent - return true; - if($cc>=1792 && $cc<=1871) // Syriac - return true; - if($cc>=1920 && $cc<=1983) // Thaana - return true; - if($cc>=1984 && $cc<=2047) // NKo - return true; - if($cc>=11568 && $cc<=11647) // Tifinagh - return true; - return false; - } + */ + public static function startsWithRTLCharacter($str){ + if( is_array($cc = self::utf8ToUnicode(mb_substr($str, 0, 1, 'utf-8'))) ) + $cc = $cc[0]; + else + return false; + if($cc>=1536 && $cc<=1791) // arabic, persian, urdu, kurdish, ... + return true; + if($cc>=65136 && $cc<=65279) // arabic peresent 2 + return true; + if($cc>=64336 && $cc<=65023) // arabic peresent 1 + return true; + if($cc>=1424 && $cc<=1535) // hebrew + return true; + if($cc>=64256 && $cc<=64335) // hebrew peresent + return true; + if($cc>=1792 && $cc<=1871) // Syriac + return true; + if($cc>=1920 && $cc<=1983) // Thaana + return true; + if($cc>=1984 && $cc<=2047) // NKo + return true; + if($cc>=11568 && $cc<=11647) // Tifinagh + return true; + return false; + } - /** - * clears text from replys, tags, groups, reteets & whitespaces + /** + * clears text from replys, tags, groups, reteets & whitespaces * * @param string $str * @return string - */ - private static function getClearText($str){ - $str = preg_replace('/@[^ ]+|![^ ]+|#[^ ]+/u', '', $str); // reply, tag, group - $str = preg_replace('/^RT[: ]{1}| RT | RT: |^RD[: ]{1}| RD | RD: |[♺♻:]/u', '', $str); // redent, retweet - $str = preg_replace("/[ \r\t\n]+/", ' ', trim($str)); // remove spaces + */ + private static function getClearText($str){ + $str = preg_replace('/@[^ ]+|![^ ]+|#[^ ]+/u', '', $str); // reply, tag, group + $str = preg_replace('/^RT[: ]{1}| RT | RT: |^RD[: ]{1}| RD | RD: |[♺♻:]/u', '', $str); // redent, retweet + $str = preg_replace("/[ \r\t\n]+/", ' ', trim($str)); // remove spaces return $str; - } - - /** - * adds javascript to do same thing on input textarea + } + + /** + * adds javascript to do same thing on input textarea * * @param Action $action - */ - function onEndShowScripts($action){ - if (common_logged_in()) { - $action->script('plugins/DirectionDetector/jquery.DirectionDetector.js'); - } - } + */ + function onEndShowScripts($action){ + if (common_logged_in()) { + $action->script('plugins/DirectionDetector/jquery.DirectionDetector.js'); + } + } - /** - * Takes an UTF-8 string and returns an array of ints representing the - * Unicode characters. Astral planes are supported ie. the ints in the - * output can be > 0xFFFF. O$ccurrances of the BOM are ignored. Surrogates - * are not allowed. + /** + * Takes an UTF-8 string and returns an array of ints representing the + * Unicode characters. Astral planes are supported ie. the ints in the + * output can be > 0xFFFF. O$ccurrances of the BOM are ignored. Surrogates + * are not allowed. * * @param string $str * @return mixed array of ints, or false on invalid input - */ - private static function utf8ToUnicode($str){ - $mState = 0; // cached expected number of octets after the current octet - // until the beginning of the next UTF8 character sequence - $mUcs4 = 0; // cached Unicode character - $mBytes = 1; // cached expected number of octets in the current sequence - $out = array(); - $len = strlen($str); + */ + private static function utf8ToUnicode($str){ + $mState = 0; // cached expected number of octets after the current octet + // until the beginning of the next UTF8 character sequence + $mUcs4 = 0; // cached Unicode character + $mBytes = 1; // cached expected number of octets in the current sequence + $out = array(); + $len = strlen($str); - for($i = 0; $i < $len; $i++) { - $in = ord($str{$i}); - if (0 == $mState) { - // When mState is zero we expect either a US-ASCII character or a - // multi-octet sequence. - if (0 == (0x80 & ($in))) { - // US-ASCII, pass straight through. - $out[] = $in; - $mBytes = 1; - } elseif (0xC0 == (0xE0 & ($in))) { - // First octet of 2 octet sequence - $mUcs4 = ($in); - $mUcs4 = ($mUcs4 & 0x1F) << 6; - $mState = 1; - $mBytes = 2; - } elseif (0xE0 == (0xF0 & ($in))) { - // First octet of 3 octet sequence - $mUcs4 = ($in); - $mUcs4 = ($mUcs4 & 0x0F) << 12; - $mState = 2; - $mBytes = 3; - } elseif (0xF0 == (0xF8 & ($in))) { - // First octet of 4 octet sequence - $mUcs4 = ($in); - $mUcs4 = ($mUcs4 & 0x07) << 18; - $mState = 3; - $mBytes = 4; - } elseif (0xF8 == (0xFC & ($in))) { - /* First octet of 5 octet sequence. - * - * This is illegal because the encoded codepoint must be either - * (a) not the shortest form or - * (b) outside the Unicode range of 0-0x10FFFF. - * Rather than trying to resynchronize, we will carry on until the end - * of the sequence and let the later error handling code catch it. - */ - $mUcs4 = ($in); - $mUcs4 = ($mUcs4 & 0x03) << 24; - $mState = 4; - $mBytes = 5; - } elseif (0xFC == (0xFE & ($in))) { - // First octet of 6 octet sequence, see comments for 5 octet sequence. - $mUcs4 = ($in); - $mUcs4 = ($mUcs4 & 1) << 30; - $mState = 5; - $mBytes = 6; - } else { - /* Current octet is neither in the US-ASCII range nor a legal first - * octet of a multi-octet sequence. - */ - return false; - } - } else { - // When mState is non-zero, we expect a continuation of the multi-octet - // sequence - if (0x80 == (0xC0 & ($in))) { - // Legal continuation. - $shift = ($mState - 1) * 6; - $tmp = $in; - $tmp = ($tmp & 0x0000003F) << $shift; - $mUcs4 |= $tmp; - if (0 == --$mState) { - /* End of the multi-octet sequence. mUcs4 now contains the final - * Unicode codepoint to be output - * - * Check for illegal sequences and codepoints. - */ - // From Unicode 3.1, non-shortest form is illegal - if ( - ((2 == $mBytes) && ($mUcs4 < 0x0080)) || - ((3 == $mBytes) && ($mUcs4 < 0x0800)) || - ((4 == $mBytes) && ($mUcs4 < 0x10000)) || - (4 < $mBytes) || - // From Unicode 3.2, surrogate characters are illegal - (($mUcs4 & 0xFFFFF800) == 0xD800) || - // Codepoints outside the Unicode range are illegal - ($mUcs4 > 0x10FFFF) - ){ - return false; - } - if (0xFEFF != $mUcs4) { - $out[] = $mUcs4; - } - //initialize UTF8 cache - $mState = 0; - $mUcs4 = 0; - $mBytes = 1; - } - } else { - /* ((0xC0 & (*in) != 0x80) && (mState != 0)) - * - * Incomplete multi-octet sequence. - */ - return false; - } - } - } - return $out; - } + for($i = 0; $i < $len; $i++) { + $in = ord($str{$i}); + if (0 == $mState) { + // When mState is zero we expect either a US-ASCII character or a + // multi-octet sequence. + if (0 == (0x80 & ($in))) { + // US-ASCII, pass straight through. + $out[] = $in; + $mBytes = 1; + } elseif (0xC0 == (0xE0 & ($in))) { + // First octet of 2 octet sequence + $mUcs4 = ($in); + $mUcs4 = ($mUcs4 & 0x1F) << 6; + $mState = 1; + $mBytes = 2; + } elseif (0xE0 == (0xF0 & ($in))) { + // First octet of 3 octet sequence + $mUcs4 = ($in); + $mUcs4 = ($mUcs4 & 0x0F) << 12; + $mState = 2; + $mBytes = 3; + } elseif (0xF0 == (0xF8 & ($in))) { + // First octet of 4 octet sequence + $mUcs4 = ($in); + $mUcs4 = ($mUcs4 & 0x07) << 18; + $mState = 3; + $mBytes = 4; + } elseif (0xF8 == (0xFC & ($in))) { + /* First octet of 5 octet sequence. + * + * This is illegal because the encoded codepoint must be either + * (a) not the shortest form or + * (b) outside the Unicode range of 0-0x10FFFF. + * Rather than trying to resynchronize, we will carry on until the end + * of the sequence and let the later error handling code catch it. + */ + $mUcs4 = ($in); + $mUcs4 = ($mUcs4 & 0x03) << 24; + $mState = 4; + $mBytes = 5; + } elseif (0xFC == (0xFE & ($in))) { + // First octet of 6 octet sequence, see comments for 5 octet sequence. + $mUcs4 = ($in); + $mUcs4 = ($mUcs4 & 1) << 30; + $mState = 5; + $mBytes = 6; + } else { + /* Current octet is neither in the US-ASCII range nor a legal first + * octet of a multi-octet sequence. + */ + return false; + } + } else { + // When mState is non-zero, we expect a continuation of the multi-octet + // sequence + if (0x80 == (0xC0 & ($in))) { + // Legal continuation. + $shift = ($mState - 1) * 6; + $tmp = $in; + $tmp = ($tmp & 0x0000003F) << $shift; + $mUcs4 |= $tmp; + if (0 == --$mState) { + /* End of the multi-octet sequence. mUcs4 now contains the final + * Unicode codepoint to be output + * + * Check for illegal sequences and codepoints. + */ + // From Unicode 3.1, non-shortest form is illegal + if ( + ((2 == $mBytes) && ($mUcs4 < 0x0080)) || + ((3 == $mBytes) && ($mUcs4 < 0x0800)) || + ((4 == $mBytes) && ($mUcs4 < 0x10000)) || + (4 < $mBytes) || + // From Unicode 3.2, surrogate characters are illegal + (($mUcs4 & 0xFFFFF800) == 0xD800) || + // Codepoints outside the Unicode range are illegal + ($mUcs4 > 0x10FFFF) + ){ + return false; + } + if (0xFEFF != $mUcs4) { + $out[] = $mUcs4; + } + //initialize UTF8 cache + $mState = 0; + $mUcs4 = 0; + $mBytes = 1; + } + } else { + /* ((0xC0 & (*in) != 0x80) && (mState != 0)) + * + * Incomplete multi-octet sequence. + */ + return false; + } + } + } + return $out; + } - /** - * plugin details - */ - function onPluginVersion(&$versions){ - $versions[] = array( - 'name' => 'Direction detector', - 'version' => DIRECTIONDETECTORPLUGIN_VERSION, - 'author' => 'Behrooz Shabani', - 'rawdescription' => _m('Shows notices with right-to-left content in correct direction.') - ); - return true; - } + /** + * plugin details + */ + function onPluginVersion(&$versions){ + $versions[] = array( + 'name' => 'Direction detector', + 'version' => DIRECTIONDETECTORPLUGIN_VERSION, + 'author' => 'Behrooz Shabani', + 'rawdescription' => _m('Shows notices with right-to-left content in correct direction.') + ); + return true; + } } /* From 5cc08ccd079e026370bcba142328bfaa6b57f14d Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 20 Sep 2010 21:11:05 +0200 Subject: [PATCH 64/76] Superfluous whitespace removed. --- plugins/Memcached/MemcachedPlugin.php | 6 ------ plugins/Minify/MinifyPlugin.php | 1 - 2 files changed, 7 deletions(-) diff --git a/plugins/Memcached/MemcachedPlugin.php b/plugins/Memcached/MemcachedPlugin.php index 77b989b951..3b3383d496 100644 --- a/plugins/Memcached/MemcachedPlugin.php +++ b/plugins/Memcached/MemcachedPlugin.php @@ -69,7 +69,6 @@ class MemcachedPlugin extends Plugin * * @return boolean flag value */ - function onInitializePlugin() { $this->_ensureConn(); @@ -87,7 +86,6 @@ class MemcachedPlugin extends Plugin * * @return boolean hook success */ - function onStartCacheGet(&$key, &$value) { $this->_ensureConn(); @@ -107,7 +105,6 @@ class MemcachedPlugin extends Plugin * * @return boolean hook success */ - function onStartCacheSet(&$key, &$value, &$flag, &$expiry, &$success) { $this->_ensureConn(); @@ -146,7 +143,6 @@ class MemcachedPlugin extends Plugin * * @return boolean hook success */ - function onStartCacheDelete(&$key, &$success) { $this->_ensureConn(); @@ -169,7 +165,6 @@ class MemcachedPlugin extends Plugin * * @return void */ - private function _ensureConn() { if (empty($this->_conn)) { @@ -224,4 +219,3 @@ class MemcachedPlugin extends Plugin return true; } } - diff --git a/plugins/Minify/MinifyPlugin.php b/plugins/Minify/MinifyPlugin.php index 6c1e49eb93..b375311652 100644 --- a/plugins/Minify/MinifyPlugin.php +++ b/plugins/Minify/MinifyPlugin.php @@ -51,7 +51,6 @@ class MinifyPlugin extends Plugin * * @return boolean hook return */ - function onStartInitializeRouter($m) { $m->connect('main/min', From a58877a2f8b580c47a9b73128dba1f3a7b2c38c4 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 20 Sep 2010 21:12:07 +0200 Subject: [PATCH 65/76] * i18n/L10n update. * added onPluginVersion(). * superfluous whitespace removed. --- plugins/Meteor/MeteorPlugin.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php index ec8c9e217c..a48c52b569 100644 --- a/plugins/Meteor/MeteorPlugin.php +++ b/plugins/Meteor/MeteorPlugin.php @@ -42,7 +42,6 @@ require_once INSTALLDIR.'/plugins/Realtime/RealtimePlugin.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class MeteorPlugin extends RealtimePlugin { public $webserver = null; @@ -112,7 +111,8 @@ class MeteorPlugin extends RealtimePlugin // May throw an exception. $this->_socket = stream_socket_client("tcp://{$controlserver}:{$this->controlport}", $errno, $errstr, $timeout, $flags); if (!$this->_socket) { - throw new Exception("Couldn't connect to {$controlserver} on {$this->controlport}"); + // TRANS: Exception. %1$s is the control server, %2$s is the control port. + throw new Exception(sprintf(_m('Couldn\'t connect to %1$s on %2$s.'),$controlserver,$this->controlport)); } } @@ -124,7 +124,8 @@ class MeteorPlugin extends RealtimePlugin $cnt = fwrite($this->_socket, $cmd); $result = fgets($this->_socket); if (preg_match('/^ERR (.*)$/', $result, $matches)) { - throw new Exception('Error adding meteor message "'.$matches[1].'"'); + // TRANS: Exception. %s is the Meteor message that could not be added. + throw new Exception(sprintf(_m('Error adding meteor message "%s"'),$matches[1])); } // TODO: parse and deal with result } @@ -146,4 +147,15 @@ class MeteorPlugin extends RealtimePlugin } return implode('-', $path); } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Meteor', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:Meteor', + 'rawdescription' => + _m('Plugin to do "real time" updates using Comet/Bayeux.')); + return true; + } } From bccbe8f519d8368ed86d08969d0639e401b46ba7 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 20 Sep 2010 21:12:43 +0200 Subject: [PATCH 66/76] * i18n/L10n update. * superfluous whitespace removed. --- plugins/MobileProfile/MobileProfilePlugin.php | 60 ++++++++----------- 1 file changed, 24 insertions(+), 36 deletions(-) diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index 72a6a04fbd..b042bf7edd 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -36,7 +36,6 @@ define('PAGE_TYPE_PREFS_MOBILEPROFILE', require_once INSTALLDIR.'/plugins/Mobile/WAP20Plugin.php'; - /** * Superclass for plugin to output XHTML Mobile Profile * @@ -46,7 +45,6 @@ require_once INSTALLDIR.'/plugins/Mobile/WAP20Plugin.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class MobileProfilePlugin extends WAP20Plugin { public $DTD = null; @@ -60,14 +58,13 @@ class MobileProfilePlugin extends WAP20Plugin parent::__construct(); } - function onStartShowHTML($action) { // XXX: This should probably graduate to WAP20Plugin // If they are on the mobile site, serve them MP if ((common_config('site', 'mobileserver').'/'. - common_config('site', 'path').'/' == + common_config('site', 'path').'/' == $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'])) { $this->serveMobile = true; @@ -78,18 +75,18 @@ class MobileProfilePlugin extends WAP20Plugin //if (strstr('application/vnd.wap.xhtml+xml', $type) !== false) { // $this->serveMobile = true; //} else { - // If they are a mobile device that supports WAP 2.0, + // If they are a mobile device that supports WAP 2.0, // serve them MP // XXX: Browser sniffing sucks - // I really don't like going through this every page, + // I really don't like going through this every page, // perhaps use $_SESSION or cookies - // May be better to group the devices in terms of + // May be better to group the devices in terms of // low,mid,high-end - // Or, detect the mobile devices based on their support for + // Or, detect the mobile devices based on their support for // MP 1.0, 1.1, or 1.2 may be ideal. Possible? $this->mobiledevices = array( @@ -165,11 +162,11 @@ class MobileProfilePlugin extends WAP20Plugin } //} - // If they are okay with MP, and the site has a mobile server, + // If they are okay with MP, and the site has a mobile server, // redirect there - if ($this->serveMobile && + if ($this->serveMobile && common_config('site', 'mobileserver') !== false && - (common_config('site', 'mobileserver') != + (common_config('site', 'mobileserver') != common_config('site', 'server'))) { // FIXME: Redirect to equivalent page on mobile site instead @@ -193,8 +190,8 @@ class MobileProfilePlugin extends WAP20Plugin $type = common_negotiate_type($cp, $sp); if (!$type) { - throw new ClientException(_('This page is not available in a '. - 'media type you accept'), 406); + throw new ClientException(_m('This page is not available in a '. + 'media type you accept.'), 406); } //} @@ -217,7 +214,6 @@ class MobileProfilePlugin extends WAP20Plugin return false; } - function setMobileFeatures($useragent) { $mobiledeviceInputFileType = array( @@ -234,7 +230,6 @@ class MobileProfilePlugin extends WAP20Plugin } } - function onStartShowStatusNetStyles($action) { if (!$this->serveMobile) { @@ -262,7 +257,6 @@ class MobileProfilePlugin extends WAP20Plugin return false; } - function onStartShowUAStyles($action) { if (!$this->serveMobile) { return true; @@ -288,18 +282,17 @@ class MobileProfilePlugin extends WAP20Plugin return false; } - function _showLogo($action) { $action->elementStart('address', 'vcard'); $action->elementStart('a', array('class' => 'url home bookmark', 'href' => common_local_url('public'))); - if (common_config('site', 'mobilelogo') || - file_exists(Theme::file('logo.png')) || + if (common_config('site', 'mobilelogo') || + file_exists(Theme::file('logo.png')) || file_exists(Theme::file('mobilelogo.png'))) { $action->element('img', array('class' => 'photo', - 'src' => (common_config('site', 'mobilelogo')) ? common_config('site', 'mobilelogo') : + 'src' => (common_config('site', 'mobilelogo')) ? common_config('site', 'mobilelogo') : ((file_exists(Theme::file('mobilelogo.png'))) ? (Theme::path('mobilelogo.png')) : Theme::path('logo.png')), 'alt' => common_config('site', 'name'))); } @@ -308,44 +301,42 @@ class MobileProfilePlugin extends WAP20Plugin $action->elementEnd('address'); } - function _showPrimaryNav($action) { $user = common_current_user(); $action->elementStart('ul', array('id' => 'site_nav_global_primary')); if ($user) { $action->menuItem(common_local_url('all', array('nickname' => $user->nickname)), - _('Home')); + _m('Home')); $action->menuItem(common_local_url('profilesettings'), - _('Account')); + _m('Account')); $action->menuItem(common_local_url('oauthconnectionssettings'), - _('Connect')); + _m('Connect')); if ($user->hasRight(Right::CONFIGURESITE)) { $action->menuItem(common_local_url('siteadminpanel'), - _('Admin'), _('Change site configuration'), false, 'nav_admin'); + _m('Admin'), _m('Change site configuration'), false, 'nav_admin'); } if (common_config('invite', 'enabled')) { $action->menuItem(common_local_url('invite'), - _('Invite')); + _m('Invite')); } $action->menuItem(common_local_url('logout'), - _('Logout')); + _m('Logout')); } else { if (!common_config('site', 'closed')) { $action->menuItem(common_local_url('register'), - _('Register')); + _m('Register')); } $action->menuItem(common_local_url('login'), - _('Login')); + _m('Login')); } if ($user || !common_config('site', 'private')) { $action->menuItem(common_local_url('peoplesearch'), - _('Search')); + _m('Search')); } $action->elementEnd('ul'); } - function onStartShowNoticeFormData($form) { if (!$this->serveMobile) { @@ -367,11 +358,11 @@ class MobileProfilePlugin extends WAP20Plugin if (common_config('attachments', 'uploads')) { if ($this->mobileFeatures['inputfiletype']) { - $form->out->element('label', array('for' => 'notice_data-attach'), _('Attach')); + $form->out->element('label', array('for' => 'notice_data-attach'), _m('Attach')); $form->out->element('input', array('id' => 'notice_data-attach', 'type' => 'file', 'name' => 'attach', - 'title' => _('Attach a file'))); + 'title' => _m('Attach a file'))); $form->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota')); } } @@ -383,7 +374,6 @@ class MobileProfilePlugin extends WAP20Plugin return false; } - function onStartShowAside($action) { if ($this->serveMobile) { @@ -391,13 +381,11 @@ class MobileProfilePlugin extends WAP20Plugin } } - function onStartShowScripts($action) { } - function _common_path($relative, $ssl=false) { $pathpart = (common_config('site', 'path')) ? common_config('site', 'path')."/" : ''; From 2f38c9c99cb10be8fab28a624fa6f64cec6c0a9b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 20 Sep 2010 13:19:58 -0700 Subject: [PATCH 67/76] Fix bug in db queue manager: when receiving an invalid or deleted notice, we were running it through the 'temporary fail, release it to try again' path instead of the 'done, discard item' path. Should fix some infinite-loop-of-doom-in-queue cases. --- lib/dbqueuemanager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dbqueuemanager.php b/lib/dbqueuemanager.php index 3dda9fd1ac..51553b8999 100644 --- a/lib/dbqueuemanager.php +++ b/lib/dbqueuemanager.php @@ -100,7 +100,7 @@ class DBQueueManager extends QueueManager } } else { $this->_log(LOG_INFO, "[$queue] Got empty/deleted item, discarding"); - $this->_fail($qi); + $this->_done($qi); } return true; } From 64cdbe6c5578df1dc49d8e3dd72451ab0ac96bd2 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 20 Sep 2010 13:42:58 -0700 Subject: [PATCH 68/76] Ticket #2750: fixes to HTTP caching behavior across login/logout boundaries * now ignoring if-modified-since if we failed an etag if-none-match comparison, per spec * now including a hash of user id/nickname in most etags, so we'll update the view properly after login/logout For API methods, checking the API-auth'ed user. (Many change results to include things like 'you're subscribed to this user' or 'this is one of your favorites', so user info is again needed) There'll still be some last-modified stamps that aren't including user info properly, probably. --- actions/apidirectmessage.php | 1 + actions/apigrouplist.php | 1 + actions/apigrouplistall.php | 1 + actions/apigroupmembership.php | 1 + actions/apigroupshow.php | 1 + actions/apistatusesshow.php | 1 + actions/apisubscriptions.php | 1 + actions/apitimelinefavorites.php | 1 + actions/apitimelinefriends.php | 1 + actions/apitimelinegroup.php | 1 + actions/apitimelinehome.php | 1 + actions/apitimelinementions.php | 1 + actions/apitimelinepublic.php | 1 + actions/apitimelinetag.php | 1 + actions/apitimelineuser.php | 1 + actions/shownotice.php | 1 + lib/action.php | 15 ++++++++++----- lib/util.php | 23 +++++++++++++++++++++++ plugins/Autocomplete/autocomplete.php | 1 + 19 files changed, 50 insertions(+), 5 deletions(-) diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php index 7a0f46274c..e7ea38dfa1 100644 --- a/actions/apidirectmessage.php +++ b/actions/apidirectmessage.php @@ -357,6 +357,7 @@ class ApiDirectMessageAction extends ApiAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), strtotime($this->messages[0]->created), strtotime($this->messages[$last]->created) diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php index 148c802f43..319a1e424d 100644 --- a/actions/apigrouplist.php +++ b/actions/apigrouplist.php @@ -213,6 +213,7 @@ class ApiGroupListAction extends ApiBareAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), $this->user->id, strtotime($this->groups[0]->created), diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php index a8317608d7..cc7cd901dc 100644 --- a/actions/apigrouplistall.php +++ b/actions/apigrouplistall.php @@ -204,6 +204,7 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), strtotime($this->groups[0]->created), strtotime($this->groups[$last]->created)) diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php index ffd5c7c7d5..b7f3064b5a 100644 --- a/actions/apigroupmembership.php +++ b/actions/apigroupmembership.php @@ -183,6 +183,7 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), $this->group->id, strtotime($this->profiles[0]->created), diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php index 2998e505e2..9b90e6b383 100644 --- a/actions/apigroupshow.php +++ b/actions/apigroupshow.php @@ -149,6 +149,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), $this->group->id, strtotime($this->group->modified)) diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php index 476820a43d..84f8079db5 100644 --- a/actions/apistatusesshow.php +++ b/actions/apistatusesshow.php @@ -194,6 +194,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), $this->notice->id, strtotime($this->notice->created)) diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php index 63d65f2893..749d16f067 100644 --- a/actions/apisubscriptions.php +++ b/actions/apisubscriptions.php @@ -181,6 +181,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), $this->user->id, isset($this->ids_only) ? 'IDs' : 'Profiles', diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php index 7228960c0b..f5ce5d2fd4 100644 --- a/actions/apitimelinefavorites.php +++ b/actions/apitimelinefavorites.php @@ -259,6 +259,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), $this->user->id, strtotime($this->notices[0]->created), diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php index 40ce35979b..c96391c129 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -346,6 +346,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), $this->user->id, strtotime($this->notices[0]->created), diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index 7a40fd8084..5138a4b5e1 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -229,6 +229,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), $this->group->id, strtotime($this->notices[0]->created), diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php index 27eb741691..1ceb3d902b 100644 --- a/actions/apitimelinehome.php +++ b/actions/apitimelinehome.php @@ -254,6 +254,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), $this->user->id, strtotime($this->notices[0]->created), diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php index ed1ad20e32..354dc58b68 100644 --- a/actions/apitimelinementions.php +++ b/actions/apitimelinementions.php @@ -244,6 +244,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), $this->user->id, strtotime($this->notices[0]->created), diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php index f901642882..0119b504a7 100644 --- a/actions/apitimelinepublic.php +++ b/actions/apitimelinepublic.php @@ -311,6 +311,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), strtotime($this->notices[0]->created), strtotime($this->notices[$last]->created)) diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php index c7ec172aeb..712703694f 100644 --- a/actions/apitimelinetag.php +++ b/actions/apitimelinetag.php @@ -232,6 +232,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), $this->tag, strtotime($this->notices[0]->created), diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php index 17a2836639..0c97aad21c 100644 --- a/actions/apitimelineuser.php +++ b/actions/apitimelineuser.php @@ -234,6 +234,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), $this->user->id, strtotime($this->notices[0]->created), diff --git a/actions/shownotice.php b/actions/shownotice.php index 9c5d83441b..86df5f9f30 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -151,6 +151,7 @@ class ShownoticeAction extends OwnerDesignAction strtotime($this->avatar->modified) : 0; return 'W/"' . implode(':', array($this->arg('action'), + common_user_cache_hash(), common_language(), $this->notice->id, strtotime($this->notice->created), diff --git a/lib/action.php b/lib/action.php index 5c4b4a7b7d..5dcf78dcc9 100644 --- a/lib/action.php +++ b/lib/action.php @@ -1018,17 +1018,22 @@ class Action extends HTMLOutputter // lawsuit } } + $checked = false; if ($etag) { $if_none_match = (array_key_exists('HTTP_IF_NONE_MATCH', $_SERVER)) ? $_SERVER['HTTP_IF_NONE_MATCH'] : null; - if ($if_none_match && $this->_hasEtag($etag, $if_none_match)) { - header('HTTP/1.1 304 Not Modified'); - // Better way to do this? - exit(0); + if ($if_none_match) { + // If this check fails, ignore the if-modified-since below. + $checked = true; + if ($this->_hasEtag($etag, $if_none_match)) { + header('HTTP/1.1 304 Not Modified'); + // Better way to do this? + exit(0); + } } } - if ($lm && array_key_exists('HTTP_IF_MODIFIED_SINCE', $_SERVER)) { + if (!$checked && $lm && array_key_exists('HTTP_IF_MODIFIED_SINCE', $_SERVER)) { $if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE']; $ims = strtotime($if_modified_since); if ($lm <= $ims) { diff --git a/lib/util.php b/lib/util.php index 6d2e99b2ae..e0457140e2 100644 --- a/lib/util.php +++ b/lib/util.php @@ -494,6 +494,29 @@ function common_is_real_login() return common_logged_in() && $_SESSION['real_login']; } +/** + * Get a hash portion for HTTP caching Etags and such including + * info on the current user's session. If login/logout state changes, + * or we've changed accounts, or we've renamed the current user, + * we'll get a new hash value. + * + * This should not be considered secure information. + * + * @param User $user (optional; uses common_current_user() if left out) + * @return string + */ +function common_user_cache_hash($user=false) +{ + if ($user === false) { + $user = common_current_user(); + } + if ($user) { + return crc32($user->id . ':' . $user->nickname); + } else { + return '0'; + } +} + // get canonical version of nickname for comparison function common_canonical_nickname($nickname) { diff --git a/plugins/Autocomplete/autocomplete.php b/plugins/Autocomplete/autocomplete.php index 5a010572f6..a4e2d9baa4 100644 --- a/plugins/Autocomplete/autocomplete.php +++ b/plugins/Autocomplete/autocomplete.php @@ -79,6 +79,7 @@ class AutocompleteAction extends Action function etag() { return '"' . implode(':', array($this->arg('action'), + common_user_cache_hash(), crc32($this->arg('q')), //the actual string can have funny characters in we don't want showing up in the etag $this->arg('limit'), $this->lastModified())) . '"'; From 521daf5562051d0cc319c35a0dceaae3e0fd49b7 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 20 Sep 2010 15:57:46 -0700 Subject: [PATCH 69/76] Ticket #2327: fixing block to remove the blocking user's subscription to the blockee if present; also cleaning up inbox delivery to apply the block checks more consistently, instead of just to group posts. --- classes/Notice.php | 33 ++++++++++++++++++++------------- classes/User.php | 3 +++ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index f1b012465b..13b322828b 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -753,8 +753,15 @@ class Notice extends Memcached_DataObject } /** - * @param $groups array of Group *objects* - * @param $recipients array of profile *ids* + * Pull up a full list of local recipients who will be getting + * this notice in their inbox. Results will be cached, so don't + * change the input data wily-nilly! + * + * @param array $groups optional list of Group objects; + * if left empty, will be loaded from group_inbox records + * @param array $recipient optional list of reply profile ids + * if left empty, will be loaded from reply records + * @return array associating recipient user IDs with an inbox source constant */ function whoGets($groups=null, $recipients=null) { @@ -787,27 +794,27 @@ class Notice extends Memcached_DataObject $ni[$id] = NOTICE_INBOX_SOURCE_SUB; } - $profile = $this->getProfile(); - foreach ($groups as $group) { $users = $group->getUserMembers(); foreach ($users as $id) { if (!array_key_exists($id, $ni)) { - $user = User::staticGet('id', $id); - if (!$user->hasBlocked($profile)) { - $ni[$id] = NOTICE_INBOX_SOURCE_GROUP; - } + $ni[$id] = NOTICE_INBOX_SOURCE_GROUP; } } } foreach ($recipients as $recipient) { - if (!array_key_exists($recipient, $ni)) { - $recipientUser = User::staticGet('id', $recipient); - if (!empty($recipientUser)) { - $ni[$recipient] = NOTICE_INBOX_SOURCE_REPLY; - } + $ni[$recipient] = NOTICE_INBOX_SOURCE_REPLY; + } + } + + // Exclude any deleted, non-local, or blocking recipients. + $profile = $this->getProfile(); + foreach ($ni as $id => $source) { + $user = User::staticGet('id', $id); + if (empty($user) || $user->hasBlocked($profile)) { + unset($ni[$id]); } } diff --git a/classes/User.php b/classes/User.php index 8033229c4b..4c25ee3d97 100644 --- a/classes/User.php +++ b/classes/User.php @@ -552,6 +552,9 @@ class User extends Memcached_DataObject if (Subscription::exists($other, $self)) { Subscription::cancel($other, $self); } + if (Subscription::exists($self, $other)) { + Subscription::cancel($self, $other); + } $block->query('COMMIT'); From f9e04993dd965ba0bbf812742ee17f900c541be0 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 20 Sep 2010 16:26:50 -0700 Subject: [PATCH 70/76] Bump up HTTP timeout for OStatus remote-tests.php to 60 seconds; when running without queues and with only bcmath, salmon key generation is absurdly slow. --- plugins/OStatus/tests/remote-tests.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/OStatus/tests/remote-tests.php b/plugins/OStatus/tests/remote-tests.php index c2c9a5d97b..64c60a8a4c 100644 --- a/plugins/OStatus/tests/remote-tests.php +++ b/plugins/OStatus/tests/remote-tests.php @@ -4,6 +4,8 @@ if (php_sapi_name() != 'cli') { die('not for web'); } +define('TIMEOUT', 60); // ssslllloowwwww salmon if queues are off + define('INSTALLDIR', dirname(dirname(dirname(dirname(__FILE__))))); set_include_path(INSTALLDIR . '/extlib' . PATH_SEPARATOR . get_include_path()); @@ -188,7 +190,7 @@ class SNTestClient extends TestBase { $url = $this->basepath . '/' . $path; - $http = new HTTP_Request2($url, 'POST'); + $http = new HTTP_Request2($url, 'POST', array('timeout' => TIMEOUT)); if ($auth) { $http->setAuth($this->username, $this->password, HTTP_Request2::AUTH_BASIC); } @@ -215,7 +217,7 @@ class SNTestClient extends TestBase protected function web($path, $form, $params=array()) { $url = $this->basepath . '/' . $path; - $http = new HTTP_Request2($url, 'GET'); + $http = new HTTP_Request2($url, 'GET', array('timeout' => TIMEOUT)); $response = $http->send(); $dom = $this->checkWeb($url, 'GET', $response); From 24bb6feba708d68764a35a4209760be712a8221a Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 20 Sep 2010 16:39:51 -0700 Subject: [PATCH 71/76] Clean up notice spew from accessing member variables of null when opening the add/edit oauth application form --- lib/applicationeditform.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/applicationeditform.php b/lib/applicationeditform.php index f126b84ae3..224b6eaa1b 100644 --- a/lib/applicationeditform.php +++ b/lib/applicationeditform.php @@ -256,8 +256,9 @@ class ApplicationEditForm extends Form // Default to Browser - if ($this->application->type == Oauth_application::$browser - || empty($this->application->type)) { + if (empty($this->application) + || empty($this->application->type) + || $this->application->type == Oauth_application::$browser) { $attrs['checked'] = 'checked'; } @@ -274,7 +275,7 @@ class ApplicationEditForm extends Form 'class' => 'radio', 'value' => Oauth_application::$desktop); - if ($this->application->type == Oauth_application::$desktop) { + if (!empty($this->application) && $this->application->type == Oauth_application::$desktop) { $attrs['checked'] = 'checked'; } @@ -298,8 +299,9 @@ class ApplicationEditForm extends Form // default to read-only access - if ($this->application->access_type & Oauth_application::$readAccess - || empty($this->application->access_type)) { + if (empty($this->application) + || empty($this->application->access_type) + || $this->application->access_type & Oauth_application::$readAccess) { $attrs['checked'] = 'checked'; } @@ -316,7 +318,8 @@ class ApplicationEditForm extends Form 'class' => 'radio', 'value' => 'rw'); - if ($this->application->access_type & Oauth_application::$readAccess + if (!empty($this->application) + && $this->application->access_type & Oauth_application::$readAccess && $this->application->access_type & Oauth_application::$writeAccess ) { $attrs['checked'] = 'checked'; From a47e66409488dac8ff3e59f97a5b0fb496ec4115 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 20 Sep 2010 16:43:00 -0700 Subject: [PATCH 72/76] Fix for #2419: There is no function maxDescription in Oauth_application class (broke the 'description too long' error message when editing oauth app registrations) --- actions/editapplication.php | 2 +- actions/newapplication.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/editapplication.php b/actions/editapplication.php index 64cf0a5745..b25457069c 100644 --- a/actions/editapplication.php +++ b/actions/editapplication.php @@ -188,7 +188,7 @@ class EditApplicationAction extends OwnerDesignAction } elseif (Oauth_application::descriptionTooLong($description)) { $this->showForm(sprintf( _('Description is too long (max %d chars).'), - Oauth_application::maxDescription())); + Oauth_application::maxDesc())); return; } elseif (mb_strlen($source_url) > 255) { $this->showForm(_('Source URL is too long.')); diff --git a/actions/newapplication.php b/actions/newapplication.php index 0f819b3499..8b150c3151 100644 --- a/actions/newapplication.php +++ b/actions/newapplication.php @@ -170,7 +170,7 @@ class NewApplicationAction extends OwnerDesignAction } elseif (Oauth_application::descriptionTooLong($description)) { $this->showForm(sprintf( _('Description is too long (max %d chars).'), - Oauth_application::maxDescription())); + Oauth_application::maxDesc())); return; } elseif (empty($source_url)) { $this->showForm(_('Source URL is required.')); From aef42e2f65d67db0c27521a69d15675515c9a80c Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 20 Sep 2010 16:52:22 -0700 Subject: [PATCH 73/76] Don't spew a notice warning to output while processing logging for PEAR DB errors --- lib/util.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/util.php b/lib/util.php index e0457140e2..dc853f657b 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1480,7 +1480,12 @@ function common_log_db_error(&$object, $verb, $filename=null) { $objstr = common_log_objstring($object); $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError'); - common_log(LOG_ERR, $last_error->message . '(' . $verb . ' on ' . $objstr . ')', $filename); + if (is_object($last_error)) { + $msg = $last_error->message; + } else { + $msg = 'Unknown error (' . var_export($last_error, true) . ')'; + } + common_log(LOG_ERR, $msg . '(' . $verb . ' on ' . $objstr . ')', $filename); } function common_log_objstring(&$object) From 85bf20d95afeadd682584e595df9157ad853a3ed Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 20 Sep 2010 16:57:07 -0700 Subject: [PATCH 74/76] Fix error when editing OAuth app registration and only changing the icon. --- actions/editapplication.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/actions/editapplication.php b/actions/editapplication.php index b25457069c..477bcd6f0b 100644 --- a/actions/editapplication.php +++ b/actions/editapplication.php @@ -253,7 +253,10 @@ class EditApplicationAction extends OwnerDesignAction $result = $this->app->update($orig); - if (!$result) { + // Note: 0 means no rows changed, which can happen if the only + // thing we changed was the icon, since it's not altered until + // the next step. + if ($result === false) { common_log_db_error($this->app, 'UPDATE', __FILE__); $this->serverError(_('Could not update application.')); } From 28b06864fbb5a14e4a1b06803461b4022682dac6 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 20 Sep 2010 17:37:21 -0700 Subject: [PATCH 75/76] Fix for #2227: 'view profile designs' and other default-on options are initially mis-set to off due to caching at account creation --- classes/User.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/classes/User.php b/classes/User.php index 4c25ee3d97..080e338fe7 100644 --- a/classes/User.php +++ b/classes/User.php @@ -255,6 +255,19 @@ class User extends Memcached_DataObject $user->inboxed = 1; + // Set default-on options here, otherwise they'll be disabled + // initially for sites using caching, since the initial encache + // doesn't know about the defaults in the database. + $user->emailnotifysub = 1; + $user->emailnotifyfav = 1; + $user->emailnotifynudge = 1; + $user->emailnotifymsg = 1; + $user->emailnotifyattn = 1; + $user->emailmicroid = 1; + $user->emailpost = 1; + $user->jabbermicroid = 1; + $user->viewdesigns = 1; + $user->created = common_sql_now(); if (Event::handle('StartUserRegister', array(&$user, &$profile))) { From d342899677d208d7e300b29ad3a8d053e4c6f704 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 20 Sep 2010 18:07:19 -0700 Subject: [PATCH 76/76] Fix #2323: typo on oauth connections page --- actions/oauthconnectionssettings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php index 8a206d7101..1fa70662fc 100644 --- a/actions/oauthconnectionssettings.php +++ b/actions/oauthconnectionssettings.php @@ -80,7 +80,7 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction function getInstructions() { - return _('You have allowed the following applications to access you account.'); + return _('You have allowed the following applications to access your account.'); } /**