summaryrefslogtreecommitdiff
path: root/locale/en_GB
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-08 13:03:48 +0100
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-08 13:03:48 +0100
commit5c428f8adf5d4686988f371e3de204ac6e70b99a (patch)
treed0f747718dc9e2271ce267b670a19e14ca88881c /locale/en_GB
parent52ab4472b52d31bcb438b537febafb40f25bd683 (diff)
Localisation updates from translatewiki.net
* found some duplication in the large "Commands:" messages. Manually removed from the pot file, and then updated. Have to ask someone if I can just rebuild the complete pot from scratch, or if --join-existing is always needed (and if so, why). File appears to contain at least some dirt.
Diffstat (limited to 'locale/en_GB')
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.mobin96660 -> 96660 bytes
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po110
2 files changed, 30 insertions, 80 deletions
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo
index 19747cad9..ff0e83d81 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.mo
+++ b/locale/en_GB/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index ea42c3986..b8e8c5680 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-07 21:23+0000\n"
-"PO-Revision-Date: 2009-11-07 21:24:52+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:19+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(r58733); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
@@ -487,6 +487,7 @@ msgstr "Avatar"
#: ../actions/avatar.php:113 actions/profilesettings.php:350
#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
msgid "Avatar updated."
msgstr "Avatar updated."
@@ -882,6 +883,7 @@ msgstr "DB error inserting hashtag: %s"
#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
+#: classes/Notice.php:1120
#, php-format
msgid "DB error inserting reply: %s"
msgstr "DB error inserting reply: %s"
@@ -1050,6 +1052,7 @@ msgstr "F.A.Q."
#: ../actions/avatar.php:115 actions/profilesettings.php:352
#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
msgid "Failed updating avatar."
msgstr "Failed updating avatar."
@@ -1885,6 +1888,7 @@ msgstr "Not expecting this response!"
#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
msgid "Not found"
msgstr "Not found"
@@ -2856,6 +2860,7 @@ msgstr "URL of your profile on another compatible microblogging service"
#: actions/twittersettings.php:322 lib/designsettings.php:301
#: actions/emailsettings.php:255 actions/grouplogo.php:319
#: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Unexpected form submission."
@@ -2996,6 +3001,7 @@ msgstr "User being listened to doesn't exist."
#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
msgid "User has no profile."
msgstr "User has no profile."
@@ -3321,7 +3327,8 @@ msgstr "← After"
#: actions/register.php:159 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 actions/login.php:131
-#: actions/register.php:165
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr "There was a problem with your session token. Try again, please."
@@ -4095,13 +4102,13 @@ msgid "There was a problem with your session token. "
msgstr "There was a problem with your session token. "
#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
msgid "Pick a square area of the image to be your avatar"
msgstr "Pick a square area of the image to be your avatar"
#: actions/avatarsettings.php:327 actions/grouplogo.php:384
#: actions/avatarsettings.php:323 actions/grouplogo.php:382
-#: actions/grouplogo.php:377
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
msgid "Lost our file data."
msgstr "Lost our file data."
@@ -5616,7 +5623,7 @@ msgstr "%s and friends"
msgid "You can upload your personal avatar. The maximum file size is %s."
msgstr "You can upload your personal avatar."
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
#, fuzzy
msgid "Avatar deleted."
msgstr "Avatar updated."
@@ -5882,6 +5889,8 @@ msgstr ""
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
#, fuzzy
msgid "No such user!"
msgstr "No such user"
@@ -5941,36 +5950,6 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:392 lib/command.php:385
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - not yet implemented.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -6321,7 +6300,8 @@ msgstr ""
#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
#: lib/designsettings.php:440 lib/designsettings.php:470
#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
-#: lib/designsettings.php:461
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
#, fuzzy
msgid "Couldn't update your design."
msgstr "Couldn't update user."
@@ -6417,7 +6397,9 @@ msgid "Message sent"
msgstr "Message"
#: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6985,10 +6967,12 @@ msgid "Save design"
msgstr ""
#: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
#: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
msgid "Design defaults restored."
msgstr ""
@@ -7200,12 +7184,13 @@ msgid "Unable to handle that much POST data!"
msgstr ""
#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "That's too long. Max notice size is 140 chars."
#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -7528,41 +7513,6 @@ msgstr "Reply to this notice"
msgid "Error saving notice."
msgstr "Problem saving notice."
-#: lib/command.php:587
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-
#: lib/common.php:191
#, fuzzy
msgid "No configuration file found. "
@@ -7680,6 +7630,11 @@ msgstr "Could not create OpenID from: %s"
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "You can upload a logo image for your group."
+
#: lib/command.php:613
msgid ""
"Commands:\n"
@@ -7715,8 +7670,3 @@ msgid ""
"tracks - not yet implemented.\n"
"tracking - not yet implemented.\n"
msgstr ""
-
-#: lib/imagefile.php:75
-#, fuzzy, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr "You can upload a logo image for your group."