diff options
author | Evan Prodromou <evan@status.net> | 2009-11-17 06:25:07 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-11-17 06:25:07 -0500 |
commit | 6a1afda259c5223449f679a64f932e36df5ebe39 (patch) | |
tree | 7d754e8a1b7734c6750ca84b28ba0e93213e0a86 /locale/en_GB/LC_MESSAGES | |
parent | d59af0296070cd868855564a0280e4be2c16410d (diff) | |
parent | 75c00f0054c08c7b49515c849260afbb6913f525 (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
classes/statusnet.ini
Diffstat (limited to 'locale/en_GB/LC_MESSAGES')
-rw-r--r-- | locale/en_GB/LC_MESSAGES/statusnet.mo | bin | 67062 -> 67648 bytes | |||
-rw-r--r-- | locale/en_GB/LC_MESSAGES/statusnet.po | 57 |
2 files changed, 45 insertions, 12 deletions
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo Binary files differindex 7998fbcf0..33531f33c 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.mo +++ b/locale/en_GB/LC_MESSAGES/statusnet.mo diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 27fd82b70..c65fc1c73 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:31+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:18+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -3586,19 +3586,19 @@ msgstr "All " msgid "license." msgstr "licence." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "After" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Before" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "There was a problem with your session token." @@ -3770,13 +3770,46 @@ msgstr "Could not create OpenID from: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "You are not subscribed to that profile." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "You are not subscribed to that profile." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Could not subscribe other to you." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "People subscribed to %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "You are not a member of that group." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "You are not a member of that group." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3806,19 +3839,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 msgid "No configuration file found. " msgstr "No configuration file found" -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Login to the site" |