From 9bc1a22fa93760c6eae4a4fa6797e9ea72f7ada1 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 9 Apr 2010 23:30:08 +0200
Subject: [PATCH] Localisation updates for !StatusNet from !translatewiki.net
!sntrans
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
---
locale/af/LC_MESSAGES/statusnet.po | 240 ++++++++++-------
locale/ar/LC_MESSAGES/statusnet.po | 228 +++++++++-------
locale/arz/LC_MESSAGES/statusnet.po | 228 +++++++++-------
locale/bg/LC_MESSAGES/statusnet.po | 232 +++++++++-------
locale/br/LC_MESSAGES/statusnet.po | 230 +++++++++-------
locale/ca/LC_MESSAGES/statusnet.po | 233 +++++++++-------
locale/cs/LC_MESSAGES/statusnet.po | 232 +++++++++-------
locale/de/LC_MESSAGES/statusnet.po | 235 ++++++++++-------
locale/el/LC_MESSAGES/statusnet.po | 230 +++++++++-------
locale/en_GB/LC_MESSAGES/statusnet.po | 228 +++++++++-------
locale/es/LC_MESSAGES/statusnet.po | 230 +++++++++-------
locale/fa/LC_MESSAGES/statusnet.po | 262 ++++++++++--------
locale/fi/LC_MESSAGES/statusnet.po | 236 ++++++++++-------
locale/fr/LC_MESSAGES/statusnet.po | 232 +++++++++-------
locale/ga/LC_MESSAGES/statusnet.po | 232 +++++++++-------
locale/gl/LC_MESSAGES/statusnet.po | 367 +++++++++++++++-----------
locale/he/LC_MESSAGES/statusnet.po | 231 +++++++++-------
locale/hsb/LC_MESSAGES/statusnet.po | 230 +++++++++-------
locale/ia/LC_MESSAGES/statusnet.po | 233 +++++++++-------
locale/is/LC_MESSAGES/statusnet.po | 231 +++++++++-------
locale/it/LC_MESSAGES/statusnet.po | 232 +++++++++-------
locale/ja/LC_MESSAGES/statusnet.po | 232 +++++++++-------
locale/ko/LC_MESSAGES/statusnet.po | 233 +++++++++-------
locale/mk/LC_MESSAGES/statusnet.po | 233 +++++++++-------
locale/nb/LC_MESSAGES/statusnet.po | 233 +++++++++-------
locale/nl/LC_MESSAGES/statusnet.po | 232 +++++++++-------
locale/nn/LC_MESSAGES/statusnet.po | 233 +++++++++-------
locale/pl/LC_MESSAGES/statusnet.po | 233 +++++++++-------
locale/pt/LC_MESSAGES/statusnet.po | 233 +++++++++-------
locale/pt_BR/LC_MESSAGES/statusnet.po | 233 +++++++++-------
locale/ru/LC_MESSAGES/statusnet.po | 233 +++++++++-------
locale/statusnet.pot | 222 +++++++++-------
locale/sv/LC_MESSAGES/statusnet.po | 233 +++++++++-------
locale/te/LC_MESSAGES/statusnet.po | 236 ++++++++++-------
locale/tr/LC_MESSAGES/statusnet.po | 232 +++++++++-------
locale/uk/LC_MESSAGES/statusnet.po | 233 +++++++++-------
locale/vi/LC_MESSAGES/statusnet.po | 232 +++++++++-------
locale/zh_CN/LC_MESSAGES/statusnet.po | 233 +++++++++-------
locale/zh_TW/LC_MESSAGES/statusnet.po | 230 +++++++++-------
39 files changed, 5369 insertions(+), 3842 deletions(-)
diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index 361118c626..1b328e6f39 100644
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-06 22:53+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:04+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:26:32+0000\n"
"Language-Team: Afrikaans\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: af\n"
"X-Message-Group: out-statusnet\n"
@@ -750,7 +750,7 @@ msgid "Preview"
msgstr "Voorskou"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Skrap"
@@ -790,7 +790,7 @@ msgstr "Die avatar is verwyder."
msgid "You already blocked that user."
msgstr "U het reeds die gebruiker geblokkeer."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Blokkeer gebruiker"
@@ -803,7 +803,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Nee"
@@ -813,11 +813,11 @@ msgstr "Moenie hierdie gebruiker blokkeer nie"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Blokkeer hierdie gebruiker"
@@ -865,8 +865,10 @@ msgstr "Deblokkeer"
msgid "Unblock this user"
msgstr "Deblokkeer hierdie gebruiker"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Stuur aan "
#: actions/confirmaddress.php:75
@@ -936,7 +938,7 @@ msgstr "U is nie die eienaar van hierdie applikasie nie."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr ""
@@ -972,7 +974,7 @@ msgstr "Nie aangeteken nie."
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
-msgstr ""
+msgstr "Hierdie kennisgewing kan nie verwyder word nie."
#: actions/deletenotice.php:103
msgid ""
@@ -992,9 +994,9 @@ msgstr "Is u seker u wil hierdie kennisgewing verwyder?"
msgid "Do not delete this notice"
msgstr "Moenie hierdie kennisgewing verwyder nie"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
-msgstr ""
+msgstr "Verwyder hierdie kennisgewing"
#: actions/deleteuser.php:67
msgid "You cannot delete users."
@@ -1391,7 +1393,7 @@ msgstr ""
#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
-msgstr ""
+msgstr "Dit is die verkeerde IM-adres."
#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
@@ -1418,7 +1420,7 @@ msgstr "Kon nie gebruikersdata opdateer nie."
#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
-msgstr ""
+msgstr "Inkomende e-posadres is verwyder."
#: actions/emailsettings.php:481 actions/smssettings.php:555
msgid "New incoming email address added."
@@ -1467,7 +1469,7 @@ msgstr ""
#: lib/personalgroupnav.php:115
#, php-format
msgid "%s's favorite notices"
-msgstr ""
+msgstr "%s se gunsteling kennisgewings"
#: actions/favoritesrss.php:115
#, php-format
@@ -1590,11 +1592,11 @@ msgstr ""
msgid "User is not a member of group."
msgstr ""
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Blok gebruiker toegang tot die groep"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1602,15 +1604,15 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr ""
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Blok hierdie gebruiker van hierdie groep"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1685,19 +1687,19 @@ msgstr ""
msgid "Admin"
msgstr "Administrateur"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Blokkeer"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Maak Admin"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Maak hierdie gebruiker 'n administrateur"
@@ -1949,12 +1951,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Stuur"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr ""
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2254,15 +2258,19 @@ msgstr ""
msgid "%1$s's status on %2$s"
msgstr "Status van %1$s op %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, php-format
+msgid "content type %s not supported"
msgstr ""
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Slegs "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -2941,7 +2949,7 @@ msgstr ""
msgid "Registration successful"
msgstr "Die registrasie is voltooi"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registreer"
@@ -2993,20 +3001,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr ""
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr ""
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
+#, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3025,7 +3026,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3100,7 +3101,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr ""
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Herhalend"
@@ -4342,11 +4343,11 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4638,23 +4639,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Alle "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "Lisensie."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "Na"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Voor"
@@ -4942,12 +4941,14 @@ msgstr ""
msgid "Fullname: %s"
msgstr "Volle naam: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Ligging: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Tuisblad: %s"
@@ -5386,11 +5387,13 @@ msgstr ""
msgid "Sign up for a new account"
msgstr ""
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr ""
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5407,12 +5410,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 ""
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5427,17 +5432,20 @@ msgid ""
"Change your email address or notification options at %8$s\n"
msgstr ""
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "Beskrywing: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5450,21 +5458,31 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s status"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "SMS-bevestiging"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr ""
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5480,12 +5498,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Nuwe privaat boodskap vanaf %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5504,12 +5524,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5530,12 +5552,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5548,6 +5580,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -5710,23 +5754,23 @@ msgstr "W"
msgid "at"
msgstr "op"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "in konteks"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Herhaal deur"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Antwoord"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr ""
@@ -5832,11 +5876,7 @@ msgstr "Daaglikse gemiddelde"
msgid "All groups"
msgstr "Alle groepe"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr ""
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -5860,6 +5900,10 @@ msgstr "Uitgelig"
msgid "Popular"
msgstr "Gewild"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr ""
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr ""
@@ -6050,47 +6094,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "'n paar sekondes gelede"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "ongeveer 'n minuut gelede"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minute gelede"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "ongeveer 'n uur gelede"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur gelede"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "ongeveer een dag gelede"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dae gelede"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "ongeveer een maand gelede"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maande gelede"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 5588b8ad3d..bcf833a424 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:08+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:26:35+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
@@ -746,7 +746,7 @@ msgid "Preview"
msgstr "Ù
عاÙÙØ©"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "اØØ°Ù"
@@ -786,7 +786,7 @@ msgstr "ØÙذ٠اÙØ£Ùتار."
msgid "You already blocked that user."
msgstr "ÙÙد Ù
Ùعت Ù
سبÙا Ùذا اÙÙ
ستخدÙ
."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "اÙ
Ùع اÙÙ
ستخدÙ
"
@@ -799,7 +799,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Ùا"
@@ -809,11 +809,11 @@ msgstr "Ùا تÙ
Ùع Ùذا اÙÙ
ستخدÙ
"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "ÙعÙ
"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "اÙ
Ùع Ùذا اÙÙ
ستخدÙ
"
@@ -861,9 +861,11 @@ msgstr "Ø£Ùغ٠اÙÙ
Ùع"
msgid "Unblock this user"
msgstr "Ø£Ùغ٠Ù
Ùع Ùذا اÙÙ
ستخدÙ
"
-#: actions/bookmarklet.php:50
-msgid "Post to "
-msgstr ""
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
+msgstr "Ù
جÙ
Ùعات %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -932,7 +934,7 @@ msgstr "Ø£Ùت Ùست Ù
اÙÙ Ùذا اÙتطبÙÙ."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr ""
@@ -988,7 +990,7 @@ msgstr "Ø£Ù
تأÙد Ù
٠أÙ٠ترÙد ØØ°Ù Ùذا اÙإشعارØ"
msgid "Do not delete this notice"
msgstr "Ùا تØØ°Ù Ùذا اÙإشعار"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "اØØ°Ù Ùذا اÙإشعار"
@@ -1589,11 +1591,11 @@ msgstr ""
msgid "User is not a member of group."
msgstr "اÙÙ
ستخدÙ
ÙÙس عضÙÙا Ù٠اÙÙ
جÙ
Ùعة."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "اÙ
Ùع اÙÙ
ستخدÙ
Ù
٠اÙÙ
جÙ
Ùعة"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1601,15 +1603,15 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Ùا تÙ
Ùع Ùذا اÙÙ
ستخدÙ
Ù
Ù Ùذ٠اÙÙ
جÙ
Ùعة"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "اÙ
Ùع Ùذا اÙÙ
ستخدÙ
Ù
Ù Ùذ٠اÙÙ
جÙ
Ùعة"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr "خطأ ÙÙ Ùاعدة اÙبÙاÙات أثÙاء Ù
Ùع اÙÙ
ستخدÙ
Ù
٠اÙÙ
جÙ
Ùعة."
@@ -1684,19 +1686,19 @@ msgstr "ÙائÙ
Ø© بÙ
ستخدÙ
Ù Ùذ٠اÙÙ
جÙ
Ùعة."
msgid "Admin"
msgstr "إدارÙ"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "اÙ
Ùع"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "اجع٠اÙÙ
ستخدÙ
إدارÙÙا Ù٠اÙÙ
جÙ
Ùعة"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "اجع٠Ùذا اÙÙ
ستخدÙ
إدارÙÙا"
@@ -1954,12 +1956,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "أرسÙ"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr ""
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2263,15 +2267,19 @@ msgstr ""
msgid "%1$s's status on %2$s"
msgstr "ØاÙØ© %1$s ÙÙ ÙÙÙ
%2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "ÙÙع اÙÙ
ØتÙÙ "
-#: actions/oembed.php:160
-msgid "Only "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "ÙÙس Ùس٠بÙاÙات Ù
دعÙÙ
."
@@ -2959,7 +2967,7 @@ msgstr "Ø¹Ø°Ø±Ø§Ø Ø±Ù
ز دعÙØ© غÙر صاÙØ."
msgid "Registration successful"
msgstr "ÙØ¬Ø Ø§ÙتسجÙÙ"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "سجÙÙ"
@@ -3011,20 +3019,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr ""
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "ÙصÙص٠ÙÙ
ÙÙات٠Ù
تاØØ© تØت رخصة "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "اÙÙ
شاع اÙÙ
بدع Ùسبة اÙÙ
Ùص٠إÙÙ Ù
ؤÙÙÙ 3.0"
-
-#: actions/register.php:497
+#, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3043,7 +3044,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3118,7 +3119,7 @@ msgstr "Ùا ÙÙ
ÙÙ٠تÙرار Ù
ÙاØظت٠اÙشخصÙØ©."
msgid "You already repeated that notice."
msgstr "Ø£Ùت Ùررت Ùذ٠اÙÙ
ÙاØظة باÙÙعÙ."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Ù
Ùرر"
@@ -4389,12 +4390,12 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Ù
Ø´ÙÙØ© أثÙاء ØÙظ اÙإشعار."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Ù
Ø´ÙÙØ© أثÙاء ØÙظ اÙإشعار."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر ت٠@%1$s %2$s"
@@ -4695,23 +4696,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
-#: lib/action.php:855
-msgid "license."
-msgstr "اÙرخصة."
-
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "بعد"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "ÙبÙ"
@@ -5003,12 +5002,14 @@ msgstr "%s تر٠اÙÙ
جÙ
Ùعة %s"
msgid "Fullname: %s"
msgstr "اÙاسÙ
اÙÙاÙ
Ù: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "اÙÙ
ÙÙع: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "اÙصÙØØ© اÙرئÙسÙØ©: %s"
@@ -5497,11 +5498,13 @@ msgstr "ÙÙج باسÙ
Ù
ستخدÙ
ÙÙÙÙ
ة سر"
msgid "Sign up for a new account"
msgstr "سجÙÙ ØسابÙا جدÙدÙا"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "تأÙÙد عÙÙا٠اÙبرÙد اÙØ¥ÙÙترÙÙÙ"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5530,12 +5533,14 @@ msgstr ""
"Ø´ÙرÙا عÙ٠اÙÙÙت اÙذ٠أÙ
ضÙتÙØ \n"
"%s\n"
-#: lib/mail.php:240
+#. 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 ÙستÙ
ع اÙآ٠إÙ٠إشعارات٠عÙÙ %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5560,17 +5565,20 @@ msgstr ""
"----\n"
"غÙÙر Ø®Ùارات اÙبرÙد اÙØ¥ÙÙترÙÙÙ ÙاÙإشعار ÙÙ %8$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "اÙسÙرة: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "عÙÙا٠برÙد Ø¥ÙÙترÙÙ٠جدÙد ÙÙإرسا٠إÙÙ %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5583,21 +5591,31 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "ØاÙØ© %s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "تأÙÙد اÙرساÙØ© اÙÙصÙرة"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr ""
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "ÙÙد ÙبÙÙ %s"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5613,12 +5631,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "رساÙØ© خاصة جدÙدة Ù
Ù %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5637,12 +5657,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "ÙÙد أضا٠%s (@%s) إشعار٠إÙÙ Ù
ÙضÙاتÙ"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5663,12 +5685,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "ÙÙد أرس٠%s (@%s) إشعارÙا Ø¥ÙÙÙ"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5681,6 +5713,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -5843,23 +5887,23 @@ msgstr "غ"
msgid "at"
msgstr "ÙÙ"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "Ù٠اÙسÙاÙ"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Ù
Ùرر بÙاسطة"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "رÙد عÙÙ Ùذا اÙإشعار"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "رÙد"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "اÙإشعار Ù
Ùرر"
@@ -5965,11 +6009,7 @@ msgstr "اÙÙ
ÙعدÙ٠اÙÙÙÙ
Ù"
msgid "All groups"
msgstr "Ù٠اÙÙ
جÙ
Ùعات"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "Ùا Ù
دخÙات رجÙع Ø¥ÙÙ."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -5993,6 +6033,10 @@ msgstr "Ù
ÙختارÙÙ"
msgid "Popular"
msgstr "Ù
ØبÙبة"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "Ùا Ù
دخÙات رجÙع Ø¥ÙÙ."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "أأÙرÙر Ùذا اÙإشعارØÙ"
@@ -6184,47 +6228,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "Ù
راÙب"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "Ùب٠ÙØظات ÙÙÙÙØ©"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "Ùب٠دÙÙÙØ© تÙرÙبÙا"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "Ùب٠ساعة تÙرÙبÙا"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "Ùب٠ÙÙÙ
تÙرÙبا"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "Ùب٠شÙر تÙرÙبÙا"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr "Ùب٠سÙØ© تÙرÙبÙا"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index e327309d7a..8116964895 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:11+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:26:39+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 (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: out-statusnet\n"
@@ -752,7 +752,7 @@ msgid "Preview"
msgstr "عاÙÙ"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "اØØ°Ù"
@@ -793,7 +793,7 @@ msgstr "ØÙذ٠اÙØ£Ùتار."
msgid "You already blocked that user."
msgstr "ÙÙد Ù
Ùعت Ù
سبÙا Ùذا اÙÙ
ستخدÙ
."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "اÙ
Ùع اÙÙ
ستخدÙ
"
@@ -806,7 +806,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Ùا"
@@ -816,11 +816,11 @@ msgstr "Ùا تÙ
Ùع Ùذا اÙÙ
ستخدÙ
"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "ÙعÙ
"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "اÙ
Ùع Ùذا اÙÙ
ستخدÙ
"
@@ -868,9 +868,11 @@ msgstr "Ø£Ùغ٠اÙÙ
Ùع"
msgid "Unblock this user"
msgstr "Ø£Ùغ٠Ù
Ùع Ùذا اÙÙ
ستخدÙ
"
-#: actions/bookmarklet.php:50
-msgid "Post to "
-msgstr ""
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
+msgstr "Ù
جÙ
Ùعات %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -941,7 +943,7 @@ msgstr "اÙت Ù
Ø´ بتÙ
Ù٠اÙapplication دÙ."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr ""
@@ -1000,7 +1002,7 @@ msgstr "Ø£Ù
تأÙد Ù
٠أÙ٠ترÙد ØØ°Ù Ùذا اÙإشعارØ"
msgid "Do not delete this notice"
msgstr "Ùا تØØ°Ù Ùذا اÙإشعار"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "اØØ°Ù Ùذا اÙإشعار"
@@ -1602,11 +1604,11 @@ msgstr ""
msgid "User is not a member of group."
msgstr "اÙÙ
ستخدÙ
ÙÙس عضÙÙا Ù٠اÙÙ
جÙ
ÙعÙ."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "اÙ
Ùع اÙÙ
ستخدÙ
Ù
٠اÙÙ
جÙ
Ùعة"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1614,15 +1616,15 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Ùا تÙ
Ùع Ùذا اÙÙ
ستخدÙ
Ù
Ù Ùذ٠اÙÙ
جÙ
Ùعة"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "اÙ
Ùع Ùذا اÙÙ
ستخدÙ
Ù
Ù Ùذ٠اÙÙ
جÙ
Ùعة"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr "خطأ ÙÙ Ùاعد٠اÙبÙاÙات أثÙاء Ù
Ùع اÙÙ
ستخدÙ
Ù
٠اÙÙ
جÙ
ÙعÙ."
@@ -1697,19 +1699,19 @@ msgstr "ÙائÙ
٠بÙ
ستخدÙ
Ù Ùذ٠اÙÙ
جÙ
ÙعÙ."
msgid "Admin"
msgstr "إدارÙ"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "اÙ
Ùع"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "اجع٠Ùذا اÙÙ
ستخدÙ
إدارÙÙا"
@@ -1962,12 +1964,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "أرسÙ"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr ""
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2269,15 +2273,19 @@ msgstr ""
msgid "%1$s's status on %2$s"
msgstr ""
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "ÙÙع اÙÙ
ØتÙÙ "
-#: actions/oembed.php:160
-msgid "Only "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr " Ù
Ø´ ÙظاÙ
بÙاÙات Ù
دعÙÙ
."
@@ -2962,7 +2970,7 @@ msgstr "Ø¹Ø°Ø±Ø§Ø Ø±Ù
ز دعÙ٠غÙر صاÙØ."
msgid "Registration successful"
msgstr "ÙØ¬Ø Ø§ÙتسجÙÙ"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "سجÙÙ"
@@ -3014,20 +3022,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr ""
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "ÙصÙص٠ÙÙ
ÙÙات٠Ù
تاØ٠تØت رخص٠"
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "اÙÙ
شاع اÙÙ
بدع Ùسب٠اÙÙ
Ùص٠إÙÙ Ù
ؤÙÙÙ 3.0"
-
-#: actions/register.php:497
+#, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3046,7 +3047,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3121,7 +3122,7 @@ msgstr "Ù
ا ÙÙÙعش تÙرر اÙÙ
ÙاØظ٠بتاعتÙ."
msgid "You already repeated that notice."
msgstr "اÙت عÙدت اÙÙ
ÙاØظ٠د٠ÙعÙا."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Ù
Ùرر"
@@ -4384,12 +4385,12 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Ù
Ø´ÙÙ٠أثÙاء ØÙظ اÙإشعار."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Ù
Ø´ÙÙ٠أثÙاء ØÙظ اÙإشعار."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر ت٠@%1$s %2$s"
@@ -4706,23 +4707,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
-#: lib/action.php:855
-msgid "license."
-msgstr "اÙرخصÙ."
-
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "بعد"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "ÙبÙ"
@@ -5020,12 +5019,14 @@ msgstr "%s ساب اÙجرÙÙ¾ %s"
msgid "Fullname: %s"
msgstr "اÙاسÙ
اÙÙاÙ
Ù: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "اÙÙ
ÙÙع: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "اÙصÙØ٠اÙرئÙسÙØ©: %s"
@@ -5476,11 +5477,13 @@ msgstr ""
msgid "Sign up for a new account"
msgstr ""
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "تأÙÙد عÙÙا٠اÙبرÙد اÙØ¥ÙÙترÙÙÙ"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5497,12 +5500,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 ""
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5517,17 +5522,20 @@ msgid ""
"Change your email address or notification options at %8$s\n"
msgstr ""
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "ع٠ÙÙسÙ: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5540,21 +5548,31 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "ØاÙÙ %s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr ""
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5570,12 +5588,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "رساÙ٠خاص٠جدÙد٠Ù
Ù %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5594,12 +5614,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5620,12 +5642,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5638,6 +5670,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -5801,23 +5845,23 @@ msgstr "غ"
msgid "at"
msgstr "ÙÙ"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "Ù٠اÙسÙاÙ"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Ù
تÙرر Ù
Ù"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "رÙد عÙÙ Ùذا اÙإشعار"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "رÙد"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "اÙإشعار Ù
Ùرر"
@@ -5923,11 +5967,7 @@ msgstr ""
msgid "All groups"
msgstr "Ù٠اÙÙ
جÙ
Ùعات"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "Ùا Ù
دخÙات رجÙع Ø¥ÙÙ."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -5951,6 +5991,10 @@ msgstr "Ù
ÙختارÙÙ"
msgid "Popular"
msgstr "Ù
Ø´ÙÙرة"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "Ùا Ù
دخÙات رجÙع Ø¥ÙÙ."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Ùرر Ùذا اÙإشعارØ"
@@ -6143,47 +6187,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "Ùب٠ÙØظات ÙÙÙÙØ©"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "Ùب٠دÙÙÙ٠تÙرÙبÙا"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "Ùب٠ساع٠تÙرÙبÙا"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "Ùب٠ÙÙÙ
تÙرÙبا"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "Ùب٠شÙر تÙرÙبÙا"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr "Ùب٠سÙ٠تÙرÙبÙا"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index eea55216a8..9480e8d6da 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:14+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:26:42+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: out-statusnet\n"
@@ -756,7 +756,7 @@ msgid "Preview"
msgstr "ÐÑеглед"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "ÐзÑÑиване"
@@ -796,7 +796,7 @@ msgstr "ÐваÑаÑÑÑ Ðµ изÑÑиÑ."
msgid "You already blocked that user."
msgstr "ÐеÑе ÑÑе блокиÑали Ñози поÑÑебиÑел."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "ÐлокиÑане на поÑÑебиÑелÑ"
@@ -809,7 +809,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Ðе"
@@ -819,11 +819,11 @@ msgstr "Ðа не Ñе блокиÑа Ñози поÑÑебиÑел"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Ðа"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "ÐлокиÑане на поÑÑебиÑелÑ"
@@ -872,9 +872,10 @@ msgstr "РазблокиÑане"
msgid "Unblock this user"
msgstr "РазблокиÑане на Ñози поÑÑебиÑел"
-#: actions/bookmarklet.php:50
-#, fuzzy
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Снимка"
#: actions/confirmaddress.php:75
@@ -947,7 +948,7 @@ msgstr "Ðе ÑленÑваÑе в Ñази гÑÑпа."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "ÐмаÑе пÑоблем ÑÑÑ ÑеÑиÑÑа ви в ÑайÑа."
@@ -1006,7 +1007,7 @@ msgstr "ÐаиÑÑина ли иÑкаÑе да изÑÑиеÑе Ñази бел
msgid "Do not delete this notice"
msgstr "Ðа не Ñе изÑÑива бележкаÑа"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "ÐзÑÑиване на бележкаÑа"
@@ -1631,12 +1632,12 @@ msgstr "ÐоÑÑебиÑелÑÑ Ð²ÐµÑе е блокиÑан за гÑÑпаÑ
msgid "User is not a member of group."
msgstr "ÐоÑÑебиÑелÑÑ Ð½Ðµ ÑленÑва в гÑÑпаÑа."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
#, fuzzy
msgid "Block user from group"
msgstr "ÐлокиÑане на поÑÑебиÑелÑ"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1644,17 +1645,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
#, fuzzy
msgid "Do not block this user from this group"
msgstr "СпиÑÑк Ñ Ð¿Ð¾ÑÑебиÑелиÑе в Ñази гÑÑпа."
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
#, fuzzy
msgid "Block this user from this group"
msgstr "СпиÑÑк Ñ Ð¿Ð¾ÑÑебиÑелиÑе в Ñази гÑÑпа."
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1734,20 +1735,20 @@ msgstr "СпиÑÑк Ñ Ð¿Ð¾ÑÑебиÑелиÑе в Ñази гÑÑпа."
msgid "Admin"
msgstr "ÐаÑÑÑойки"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "ÐлокиÑане"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
#, fuzzy
msgid "Make user an admin of the group"
msgstr "Ðа да ÑедакÑиÑаÑе гÑÑпаÑа, ÑÑÑбва да ÑÑе й админиÑÑÑаÑоÑ."
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr ""
@@ -2019,12 +2020,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "ÐÑаÑи"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s ви кани да ползваÑе заедно %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2366,15 +2369,19 @@ msgstr "ÐележкаÑа нÑма пÑоÑил"
msgid "%1$s's status on %2$s"
msgstr "Ðележка на %1$s Ð¾Ñ %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "вид ÑÑдÑÑжание "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Само "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "ÐеподдÑÑжан ÑоÑÐ¼Ð°Ñ Ð½Ð° данниÑе"
@@ -3069,7 +3076,7 @@ msgstr "ÐÑеÑка в кода за поÑвÑÑждение."
msgid "Registration successful"
msgstr "ÐапиÑванеÑо е ÑÑпеÑно."
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "РегиÑÑÑиÑане"
@@ -3123,21 +3130,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Ðо-дÑлго име, за пÑедпоÑиÑане \"иÑÑинÑкоÑо\" ви име."
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "ТекÑÑовеÑе и ÑайловиÑе ми Ñа доÑÑÑпни под "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "ÐÑиейÑив ÐомÑÐ½Ñ ÐÑизнание 3.0"
-
-#: actions/register.php:497
-#, fuzzy
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr " оÑвен Ñези лиÑни данни: паÑола, е-поÑа, меÑинджÑÑ, ÑелеÑон."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3170,7 +3169,7 @@ msgstr ""
"ÐлагодаÑим, Ñе Ñе вклÑÑиÑ
Ñе в ÑайÑа и дано ползванеÑо на ÑÑлÑгаÑа ви ноÑи "
"Ñамо пÑиÑÑни мигове!"
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3253,7 +3252,7 @@ msgstr "Ðе можеÑе да повÑаÑÑÑе ÑобÑÑвена бележ
msgid "You already repeated that notice."
msgstr "ÐеÑе ÑÑе повÑоÑили Ñази бележка."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "ÐовÑоÑено"
@@ -4558,12 +4557,12 @@ msgstr "ÐабÑанено ви е да пÑбликÑваÑе бележки в
msgid "Problem saving notice."
msgstr "ÐÑоблем пÑи запиÑване на бележкаÑа."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "ÐÑоблем пÑи запиÑване на бележкаÑа."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4881,23 +4880,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "ÐÑиÑки "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "лиÑенз."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "СÑÑаниÑане"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "След"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "ÐÑеди"
@@ -5206,12 +5203,14 @@ msgstr "%s напÑÑна гÑÑпаÑа %s"
msgid "Fullname: %s"
msgstr "ÐÑлно име: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "ÐеÑÑоположение: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "ÐомаÑна ÑÑÑаниÑа: %s"
@@ -5660,11 +5659,13 @@ msgstr "ÐÑ
од Ñ Ð¸Ð¼Ðµ и паÑола"
msgid "Sign up for a new account"
msgstr "СÑздаване на нова ÑмеÑка"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "ÐоÑвÑÑждаване адÑеÑа на е-поÑа"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5681,12 +5682,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 веÑе полÑÑава бележкиÑе ви в %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5711,17 +5714,20 @@ msgstr ""
"----\n"
"Ðоже да ÑмениÑе адÑеÑа и наÑÑÑойкиÑе за ÑведомÑване по е-поÑа на %8$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "ÐиогÑаÑиÑ: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Ðов адÑÐµÑ Ð½Ð° е-поÑа за пÑбликÑÑване в %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5734,21 +5740,31 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "СÑÑÑоÑние на %s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "ÐоÑвÑÑждение за SMS"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "ÐÑаква Ñе поÑвÑÑждение за Ñози ÑелеÑонен номеÑ."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "ÐобÑÑнаÑи ÑÑе Ð¾Ñ %s"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5764,12 +5780,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Ðово лиÑно ÑÑобÑение Ð¾Ñ %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5788,12 +5806,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) оÑбелÑза бележкаÑа ви каÑо лÑбима"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5814,12 +5834,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5832,6 +5862,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -5998,23 +6040,23 @@ msgstr "Ð"
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "в конÑекÑÑ"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "ÐовÑоÑено оÑ"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "ÐÑговаÑÑне на Ñази бележка"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "ÐÑговоÑ"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "ÐележкаÑа е повÑоÑена."
@@ -6123,11 +6165,7 @@ msgstr ""
msgid "All groups"
msgstr "ÐÑиÑки гÑÑпи"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "ÐипÑÐ²Ð°Ñ Ð°ÑгÑменÑи return-to."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6151,6 +6189,10 @@ msgstr "ÐзбÑано"
msgid "Popular"
msgstr "ÐопÑлÑÑно"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "ÐипÑÐ²Ð°Ñ Ð°ÑгÑменÑи return-to."
+
#: lib/repeatform.php:107
#, fuzzy
msgid "Repeat this notice?"
@@ -6348,47 +6390,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "ÐодеÑаÑоÑ"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "пÑеди нÑколко ÑекÑнди"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "пÑеди около минÑÑа"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "пÑеди около %d минÑÑи"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "пÑеди около ÑаÑ"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "пÑеди около %d ÑаÑа"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "пÑеди около ден"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "пÑеди около %d дни"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "пÑеди около меÑеÑ"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "пÑеди около %d меÑеÑа"
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr "пÑеди около година"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index f635197145..69c672558b 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:17+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:26:45+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: out-statusnet\n"
@@ -745,7 +745,7 @@ msgid "Preview"
msgstr "Rakwelet"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Diverkañ"
@@ -785,7 +785,7 @@ msgstr "Dilammet eo bet an Avatar."
msgid "You already blocked that user."
msgstr "Stanket o peus dija an implijer-mañ."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Stankañ an implijer-mañ"
@@ -798,7 +798,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Ket"
@@ -808,11 +808,11 @@ msgstr "Arabat stankañ an implijer-mañ"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Ya"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Stankañ an implijer-mañ"
@@ -861,8 +861,10 @@ msgstr "Distankañ"
msgid "Unblock this user"
msgstr "Distankañ an implijer-mañ"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Postañ war "
#: actions/confirmaddress.php:75
@@ -932,7 +934,7 @@ msgstr "N'oc'h ket perc'henn ar poellad-se."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h."
@@ -988,7 +990,7 @@ msgstr "Ha sur oc'h ho peus c'hoant dilemel an ali-mañ ?"
msgid "Do not delete this notice"
msgstr "Arabat dilemel an ali-mañ"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Dilemel an ali-mañ"
@@ -1586,11 +1588,11 @@ msgstr "An implijer-mañ a zo stanket dija eus ar strollad."
msgid "User is not a member of group."
msgstr "N'eo ket an implijer-mañ ezel eus ur strollad."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Stankañ an implijer-mañ eus ar strollad"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1598,15 +1600,15 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Arabat stankañ an implijer-mañ eus ar strollad."
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Stankañ an implijer-mañ eus ar strollad-se"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1681,19 +1683,19 @@ msgstr "Roll an implijerien enrollet er strollad-mañ."
msgid "Admin"
msgstr "Merañ"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Stankañ"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "Lakaat an implijer da vezañ ur merour eus ar strollad"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Lakaat ur merour"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Lakaat an implijer-mañ da verour"
@@ -1949,12 +1951,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Kas"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s a bed ac'hanoc'h d'en em enskrivañ war %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2264,15 +2268,19 @@ msgstr "N'en deus ket an ali a profil"
msgid "%1$s's status on %2$s"
msgstr "Statud %1$s war %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "seurt an danvez "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Hepken "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -2951,7 +2959,7 @@ msgstr "Digarezit, kod pedadenn direizh."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Krouiñ ur gont"
@@ -3003,20 +3011,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr ""
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Deroadenn 3.0"
-
-#: actions/register.php:497
+#, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3035,7 +3036,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3110,7 +3111,7 @@ msgstr "Ne c'helloc'h ket adkemer ho ali deoc'h."
msgid "You already repeated that notice."
msgstr "Adkemeret o peus dija an ali-mañ."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Adlavaret"
@@ -4358,11 +4359,11 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4655,23 +4656,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Pep tra "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "aotre implijout."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Pajennadur"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "War-lerc'h"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Kent"
@@ -4959,12 +4958,14 @@ msgstr "%s {{Gender:.|en|he}} deus kuitaet ar strollad %s"
msgid "Fullname: %s"
msgstr "Anv klok : %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Lec'hiadur : %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Lec'hienn Web : %s"
@@ -5406,11 +5407,13 @@ msgstr ""
msgid "Sign up for a new account"
msgstr "Digeriñ ur gont nevez"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr ""
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5427,12 +5430,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 ""
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5447,17 +5452,20 @@ msgid ""
"Change your email address or notification options at %8$s\n"
msgstr ""
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr ""
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5470,21 +5478,31 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "Statud %s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr ""
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5500,12 +5518,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Kemenadenn personel nevez a-berzh %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5524,12 +5544,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5550,12 +5572,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5568,6 +5600,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -5730,23 +5774,23 @@ msgstr "K"
msgid "at"
msgstr "e"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "en amdro"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Adkemeret gant"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Respont d'an ali-mañ"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Respont"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Ali adkemeret"
@@ -5852,11 +5896,7 @@ msgstr "Keidenn pemdeziek"
msgid "All groups"
msgstr "An holl strolladoù"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr ""
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -5880,6 +5920,10 @@ msgstr ""
msgid "Popular"
msgstr "Poblek"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr ""
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Adkregiñ gant an ali-mañ ?"
@@ -6071,47 +6115,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "Habasker"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "un nebeud eilennoù zo"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "1 vunutenn zo well-wazh"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "%d munutenn zo well-wazh"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "1 eurvezh zo well-wazh"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "%d eurvezh zo well-wazh"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "1 devezh zo well-wazh"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "%d devezh zo well-wazh"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "miz zo well-wazh"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "%d miz zo well-wazh"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 bf6bd9175d..296011994d 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:21+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:26:48+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: out-statusnet\n"
@@ -779,7 +779,7 @@ msgid "Preview"
msgstr "Vista prèvia"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Suprimeix"
@@ -822,7 +822,7 @@ msgstr "S'ha suprimit l'avatar."
msgid "You already blocked that user."
msgstr "Ja heu blocat l'usuari."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Usuari bloquejat."
@@ -835,7 +835,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "No"
@@ -845,11 +845,11 @@ msgstr "No bloquis l'usuari"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "SÃ"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquejar aquest usuari"
@@ -898,8 +898,10 @@ msgstr "Desbloca"
msgid "Unblock this user"
msgstr "Desbloca l'usuari"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Envia a "
#: actions/confirmaddress.php:75
@@ -973,7 +975,7 @@ msgstr "No sou un membre del grup."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Ha ocorregut algun problema amb la teva sessió."
@@ -1036,7 +1038,7 @@ msgstr "N'estàs segur que vols eliminar aquesta notificació?"
msgid "Do not delete this notice"
msgstr "No es pot esborrar la notificació."
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Eliminar aquesta nota"
@@ -1665,11 +1667,11 @@ msgstr "Un usuari t'ha bloquejat."
msgid "User is not a member of group."
msgstr "L'usuari no és membre del grup."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Bloca l'usuari del grup"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, fuzzy, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1679,15 +1681,15 @@ msgstr ""
"Esteu segur que voleu blocar l'usuari «%s» del grup «%s»? Se suprimiran del "
"grup, i no podran enviar-hi res ni subscriure-s'hi en el futur."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "No bloquis l'usuari del grup"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Bloca l'usuari del grup"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr "S'ha produït un error en la base de dades en blocar l'usuari del grup."
@@ -1766,19 +1768,19 @@ msgstr "La llista dels usuaris d'aquest grup."
msgid "Admin"
msgstr "Admin"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Bloca"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "Fes l'usuari un administrador del grup"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Fes-lo administrador"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Fes l'usuari administrador"
@@ -2054,12 +2056,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Envia"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, fuzzy, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s t'ha convidat us ha convidat a unir-te al grup %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2404,15 +2408,19 @@ msgstr "AvÃs sense perfil"
msgid "%1$s's status on %2$s"
msgstr "estat de %1$s a %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "tipus de contingut "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Només "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Format de data no suportat."
@@ -3122,7 +3130,7 @@ msgstr "El codi d'invitació no és và lid."
msgid "Registration successful"
msgstr "Registre satisfactori"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registre"
@@ -3178,23 +3186,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Nom llarg, preferiblement el teu nom \"real\""
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "El meu text i els meus fitxers estan disponibles sota "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Atribució 3.0"
-
-#: actions/register.php:497
-#, fuzzy
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
"excepte les següents dades privades: contrasenya, adreça de correu "
"electrònic, adreça de missatgeria instantà nia, número de telèfon."
-#: actions/register.php:538
+#: actions/register.php:542
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3225,7 +3225,7 @@ msgstr ""
"\n"
"Grà cies per registrar-te i esperem que gaudeixis d'aquest servei."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3313,7 +3313,7 @@ msgstr "No pots registrar-te si no estàs d'acord amb la llicència."
msgid "You already repeated that notice."
msgstr "Ja heu blocat l'usuari."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Repetit"
@@ -4638,12 +4638,12 @@ msgstr "Ha estat bandejat de publicar notificacions en aquest lloc."
msgid "Problem saving notice."
msgstr "Problema en guardar l'avÃs."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problema en guardar l'avÃs."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4963,23 +4963,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Tot "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "llicència."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Paginació"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "Posteriors"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Anteriors"
@@ -5285,12 +5283,14 @@ msgstr "%s ha abandonat el grup %s"
msgid "Fullname: %s"
msgstr "Nom complet: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Localització: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "PÃ gina web: %s"
@@ -5738,11 +5738,13 @@ msgstr "Accedir amb el nom d'usuari i contrasenya"
msgid "Sign up for a new account"
msgstr "Crear nou compte"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Confirmació de l'adreça de correu electrònic"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5759,12 +5761,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 ara està escoltant els teus avisos a %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5785,19 +5789,22 @@ msgstr ""
"Atentament,\n"
"%4$s.\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
"Biografia: %s\n"
"\n"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Nou correu electrònic per publicar a %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5818,21 +5825,31 @@ msgstr ""
"Sincerament teus,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s estat"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "Confirmació SMS"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Esperant confirmació per aquest número de telèfon."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "Has estat reclamat per %s"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5848,12 +5865,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Nou missatge privat de %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5872,12 +5891,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s ha afegit la teva nota com a favorita"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5898,12 +5919,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5916,6 +5947,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -6083,23 +6126,23 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "en context"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Repetit per"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "respondre a aquesta nota"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Respon"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "Notificació publicada"
@@ -6208,12 +6251,7 @@ msgstr ""
msgid "All groups"
msgstr "Tots els grups"
-#: lib/profileformaction.php:123
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "No argument de la id."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "Mètode no implementat"
@@ -6237,6 +6275,11 @@ msgstr "Destacat"
msgid "Popular"
msgstr "Popular"
+#: lib/redirectingaction.php:94
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "No argument de la id."
+
#: lib/repeatform.php:107
#, fuzzy
msgid "Repeat this notice?"
@@ -6434,47 +6477,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "Modera"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "fa pocs segons"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "fa un minut"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "fa %d minuts"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "fa una hora"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "fa %d hores"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "fa un dia"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "fa %d dies"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "fa un mes"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "fa %d mesos"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 f61ff5cc89..00ed134a50 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:24+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:26:52+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: out-statusnet\n"
@@ -777,7 +777,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Odstranit"
@@ -819,7 +819,7 @@ msgstr "Avatar smazán."
msgid "You already blocked that user."
msgstr "Již jste pÅihlášen"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "Žádný takový uživatel."
@@ -833,7 +833,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Ne"
@@ -844,11 +844,11 @@ msgstr "Žádný takový uživatel."
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Ano"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Zablokovat tohoto uživatele"
@@ -899,9 +899,11 @@ msgstr ""
msgid "Unblock this user"
msgstr "Žádný takový uživatel."
-#: actions/bookmarklet.php:50
-msgid "Post to "
-msgstr ""
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
+msgstr "OdpovÄdi na %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -975,7 +977,7 @@ msgstr "Neodeslal jste nám profil"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr ""
@@ -1035,7 +1037,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "Žádné takové oznámenÃ."
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Odstranit toto oznámenÃ"
@@ -1669,12 +1671,12 @@ msgstr "Uživatel nemá profil."
msgid "User is not a member of group."
msgstr "Neodeslal jste nám profil"
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
#, fuzzy
msgid "Block user from group"
msgstr "Žádný takový uživatel."
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1682,17 +1684,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
#, fuzzy
msgid "Do not block this user from this group"
msgstr "Nelze pÅesmÄrovat na server: %s"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
#, fuzzy
msgid "Block this user from this group"
msgstr "Žádný takový uživatel."
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1773,19 +1775,19 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr ""
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr ""
@@ -2056,12 +2058,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Odeslat"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr ""
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2373,16 +2377,19 @@ msgstr "SdÄlenà nemá profil"
msgid "%1$s's status on %2$s"
msgstr "%1 statusů na %2"
-#: actions/oembed.php:157
-#, fuzzy
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "PÅipojit"
-#: actions/oembed.php:160
-msgid "Only "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -3094,7 +3101,7 @@ msgstr "Chyba v ovÄÅovacÃm kódu"
msgid "Registration successful"
msgstr "Registrace úspÄÅ¡ná"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrovat"
@@ -3146,23 +3153,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr ""
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Mé texty a soubory jsou k dispozici pod"
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
-#, fuzzy
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
" až na tyto privátnà data: heslo, emailová adresa, IM adresa, telefonnà "
"ÄÃslo."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3181,7 +3180,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3265,7 +3264,7 @@ msgstr "Nemůžete se registrovat, pokud nesouhlasÃte s licencÃ."
msgid "You already repeated that notice."
msgstr "Již jste pÅihlášen"
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "VytvoÅit"
@@ -4577,12 +4576,12 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Problém pÅi ukládánà sdÄlenÃ"
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problém pÅi ukládánà sdÄlenÃ"
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4905,24 +4904,22 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr ""
-
-#: lib/action.php:855
-msgid "license."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1165
#, fuzzy
msgid "After"
msgstr "« NovÄjÅ¡Ã"
-#: lib/action.php:1171
+#: lib/action.php:1173
#, fuzzy
msgid "Before"
msgstr "Staršà »"
@@ -5231,12 +5228,14 @@ msgstr "%1 statusů na %2"
msgid "Fullname: %s"
msgstr "Celé jméno"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5699,11 +5698,13 @@ msgstr "Neplatné jméno nebo heslo"
msgid "Sign up for a new account"
msgstr "VytvoÅit nový úÄet"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Potvrzenà emailové adresy"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5720,12 +5721,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 od teÄ naslouchá tvým sdÄlenÃm v %2"
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5746,17 +5749,20 @@ msgstr ""
"S úctou váš,\n"
"%4$s.\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "O mÄ"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5769,21 +5775,31 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr ""
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr ""
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5799,12 +5815,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5823,12 +5841,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1 od teÄ naslouchá tvým sdÄlenÃm v %2"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5849,12 +5869,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5867,6 +5897,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -6036,26 +6078,26 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "Žádný obsah!"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "VytvoÅit"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
#, fuzzy
msgid "Reply"
msgstr "odpovÄÄ"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "SdÄlenÃ"
@@ -6163,12 +6205,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:123
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "Žádný takový dokument."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6193,6 +6230,11 @@ msgstr ""
msgid "Popular"
msgstr "Hledánà lidÃ"
+#: lib/redirectingaction.php:94
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "Žádný takový dokument."
+
#: lib/repeatform.php:107
#, fuzzy
msgid "Repeat this notice?"
@@ -6394,47 +6436,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "pÅed pár sekundami"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "asi pÅed minutou"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "asi pÅed %d minutami"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "asi pÅed hodinou"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "asi pÅed %d hodinami"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "asi pÅede dnem"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "pÅed %d dny"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "asi pÅed mÄsÃcem"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "asi pÅed %d mesÃci"
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr "asi pÅed rokem"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 17c12aa108..babee17fd3 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -15,12 +15,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:27+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:26:55+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: out-statusnet\n"
@@ -776,7 +776,7 @@ msgid "Preview"
msgstr "Vorschau"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Löschen"
@@ -817,7 +817,7 @@ msgstr "Avatar gelöscht."
msgid "You already blocked that user."
msgstr "Du hast diesen Benutzer bereits blockiert."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Benutzer blockieren"
@@ -833,7 +833,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Nein"
@@ -843,11 +843,11 @@ msgstr "Diesen Benutzer freigeben"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Diesen Benutzer blockieren"
@@ -895,8 +895,10 @@ msgstr "Freigeben"
msgid "Unblock this user"
msgstr "Diesen Benutzer freigeben"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Versenden an "
#: actions/confirmaddress.php:75
@@ -966,7 +968,7 @@ msgstr "Du bist Besitzer dieses Programms"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Es gab ein Problem mit deinem Sessiontoken."
@@ -1026,7 +1028,7 @@ msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?"
msgid "Do not delete this notice"
msgstr "Diese Nachricht nicht löschen"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Nachricht löschen"
@@ -1644,11 +1646,11 @@ msgstr "Dieser Nutzer ist bereits von der Gruppe gesperrt"
msgid "User is not a member of group."
msgstr "Nutzer ist kein Mitglied dieser Gruppe."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Benutzerzugang zu der Gruppe blockieren"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1660,15 +1662,15 @@ msgstr ""
"abschicken und wird auch in Zukunft dieser Gruppe nicht mehr beitreten "
"können."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Diesen Benutzerzugang nicht für diese Gruppe blockieren."
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Diesen Nutzer von der Gruppe sperren"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr "Datenbank Fehler beim Versuch den Nutzer aus der Gruppe zu blockieren."
@@ -1747,19 +1749,19 @@ msgstr "Liste der Benutzer in dieser Gruppe."
msgid "Admin"
msgstr "Admin"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Blockieren"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "Benutzer zu einem Admin dieser Gruppe ernennen"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Zum Admin ernennen"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Diesen Benutzer zu einem Admin ernennen"
@@ -2046,12 +2048,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Senden"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s hat Dich eingeladen, auch bei %2$s mitzumachen."
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2396,15 +2400,19 @@ msgstr "Nachricht hat kein Profil"
msgid "%1$s's status on %2$s"
msgstr "%1$s Status auf %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "Content-Typ "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Nur "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Kein unterstütztes Datenformat."
@@ -3116,7 +3124,7 @@ msgstr "Entschuldigung, ungültiger Bestätigungscode."
msgid "Registration successful"
msgstr "Registrierung erfolgreich"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrieren"
@@ -3175,22 +3183,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Längerer Name, bevorzugt dein âechterâ Name"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Meine Texte und Daten sind verfügbar unter"
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Namensnennung 3.0"
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
"auÃer folgende private Daten: Passwort, E-Mail-Adresse, IM-Adresse und "
"Telefonnummer."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3223,7 +3224,7 @@ msgstr ""
"\n"
"Danke für deine Anmeldung, wir hoffen das dir der Service gefällt."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3305,7 +3306,7 @@ msgstr "Du kannst deine eigene Nachricht nicht wiederholen."
msgid "You already repeated that notice."
msgstr "Nachricht bereits wiederholt"
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Wiederholt"
@@ -4649,11 +4650,11 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Problem bei Speichern der Nachricht."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr "Problem bei Speichern der Nachricht."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4955,23 +4956,21 @@ msgstr ""
"Urheberrecht von Inhalt und Daten liegt bei den Beteiligten. Alle Rechte "
"vorbehalten."
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Alle "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "Lizenz."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Seitenerstellung"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "Später"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Vorher"
@@ -5264,12 +5263,14 @@ msgstr "%s hat die Gruppe %s verlassen"
msgid "Fullname: %s"
msgstr "Vollständiger Name: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Standort: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Homepage: %s"
@@ -5753,11 +5754,13 @@ msgstr "Mit Nutzernamen und Passwort anmelden"
msgid "Sign up for a new account"
msgstr "Registriere ein neues Nutzerkonto"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Bestätigung der E-Mail-Adresse"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5787,12 +5790,14 @@ msgstr ""
"Vielen Dank!\n"
"%s\n"
-#: lib/mail.php:240
+#. 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 hat deine Nachrichten auf %2$s abonniert."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5818,17 +5823,20 @@ msgstr ""
"Du kannst Deine E-Mail-Adresse und die Benachrichtigungseinstellungen auf %8"
"$s ändern.\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "Biografie: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Neue E-Mail-Adresse um auf %s zu schreiben"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5849,21 +5857,31 @@ msgstr ""
"Viele GrüÃe,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s Status"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "SMS-Konfiguration"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Warte auf die Bestätigung dieser Telefonnummer."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "Du wurdest von %s angestupst"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5890,12 +5908,14 @@ msgstr ""
"Mit freundlichen GrüÃen,\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Neue private Nachricht von %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5928,12 +5948,14 @@ msgstr ""
"Mit freundlichen GrüÃen,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) hat deine Nachricht als Favorit gespeichert"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5964,13 +5986,23 @@ msgstr ""
"GruÃ,\n"
"%6$s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
"%s (@%s) hat dir eine Nachricht gesendet um deine Aufmerksamkeit zu erlangen"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5983,18 +6015,19 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
-msgstr ""
-"%1$s (@%9$s) hat dir gerade eine Mitteilung auf %2$s gesendet (eine '@-"
-"Antwort').\n"
+"%5$sYou can reply back here:\n"
"\n"
-"Die Mitteilung ist:\n"
+"\t%6$s\n"
"\n"
-"%3$s\n"
+"The list of all @-replies for you here:\n"
"\n"
-"Sie lautet:\n"
+"%7$s\n"
"\n"
-"%4$s\n"
+"Faithfully yours,\n"
+"%2$s\n"
"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6167,23 +6200,23 @@ msgstr "W"
msgid "at"
msgstr "in"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "im Zusammenhang"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Wiederholt von"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Auf diese Nachricht antworten"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Antworten"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Nachricht wiederholt"
@@ -6289,12 +6322,7 @@ msgstr "Tagesdurchschnitt"
msgid "All groups"
msgstr "Alle Gruppen"
-#: lib/profileformaction.php:123
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "Kein id Argument."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "Nicht unterstützte Methode."
@@ -6318,6 +6346,11 @@ msgstr "Beliebte Benutzer"
msgid "Popular"
msgstr "Beliebte Beiträge"
+#: lib/redirectingaction.php:94
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "Kein id Argument."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Diese Nachricht wiederholen?"
@@ -6508,47 +6541,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "vor wenigen Sekunden"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "vor einer Minute"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "vor %d Minuten"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "vor einer Stunde"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "vor %d Stunden"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "vor einem Tag"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "vor %d Tagen"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "vor einem Monat"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "vor %d Monaten"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 cd1052add1..fadc69bb54 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:29+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:26:58+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
"X-Message-Group: out-statusnet\n"
@@ -762,7 +762,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "ÎιαγÏαÏή"
@@ -804,7 +804,7 @@ msgstr "ΡÏ
θμίÏÎµÎ¹Ï OpenID"
msgid "You already blocked that user."
msgstr "ÎδÏ
ναμία διαγÏαÏÎ®Ï Î±Ï
ÏÎ¿Ï ÏοÏ
μηνÏμαÏοÏ."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr ""
@@ -817,7 +817,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "ÎÏι"
@@ -828,11 +828,11 @@ msgstr "ÎδÏ
ναμία διαγÏαÏÎ®Ï Î±Ï
ÏÎ¿Ï ÏοÏ
μηνÏμαÏοÏ
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Îαι"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr ""
@@ -881,9 +881,11 @@ msgstr ""
msgid "Unblock this user"
msgstr ""
-#: actions/bookmarklet.php:50
-msgid "Post to "
-msgstr ""
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
+msgstr "Î¿Î¼Î¬Î´ÎµÏ ÏοÏ
ÏÏήÏÏη %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -956,7 +958,7 @@ msgstr "ÎÎ¼Î¬Î´ÎµÏ Î¼Îµ Ïα ÏεÏιÏÏÏÏεÏα μÎλη"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr ""
@@ -1017,7 +1019,7 @@ msgstr "ÎίÏαι ÏίγοÏ
ÏÎ¿Ï ÏÏι Î¸ÎµÏ Î½Î± διαγÏάÏÎµÎ¹Ï Î±Ï
msgid "Do not delete this notice"
msgstr "ÎδÏ
ναμία διαγÏαÏÎ®Ï Î±Ï
ÏÎ¿Ï ÏοÏ
μηνÏμαÏοÏ."
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr ""
@@ -1644,11 +1646,11 @@ msgstr ""
msgid "User is not a member of group."
msgstr ""
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr ""
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1656,15 +1658,15 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr ""
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr ""
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1742,20 +1744,20 @@ msgstr ""
msgid "Admin"
msgstr "ÎιαÏειÏιÏÏήÏ"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr ""
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
#, fuzzy
msgid "Make Admin"
msgstr "ÎιαÏειÏιÏÏήÏ"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr ""
@@ -2016,12 +2018,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr ""
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr ""
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2330,16 +2334,19 @@ msgstr ""
msgid "%1$s's status on %2$s"
msgstr ""
-#: actions/oembed.php:157
-#, fuzzy
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "ΣÏνδεÏη"
-#: actions/oembed.php:160
-msgid "Only "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -3041,7 +3048,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -3093,23 +3100,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr ""
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr ""
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
-#, fuzzy
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
"εκÏÏÏ Î±ÏÏ Ïα ÎµÎ¾Î®Ï ÏÏοÏÏÏικά δεδομÎνα: κÏδικÏÏ ÏÏÏÏβαÏηÏ, διεÏθÏ
νÏη email, "
"διεÏθÏ
νÏη IM, ÏηλεÏÏÎ½Î¹ÎºÏ Î½Î¿ÏμεÏο."
-#: actions/register.php:538
+#: actions/register.php:542
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3143,7 +3142,7 @@ msgstr ""
"ÎÏ
ÏαÏιÏÏοÏμε ÏοÏ
εγγÏάÏÎ·ÎºÎµÏ ÎºÎ±Î¹ εÏ
ÏÏμαÏÏε να ÏεÏάÏÎµÎ¹Ï ÎºÎ±Î»Î¬ με Ïην Ï
ÏηÏεÏία "
"μαÏ."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3224,7 +3223,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr "ÎδÏ
ναμία διαγÏαÏÎ®Ï Î±Ï
ÏÎ¿Ï ÏοÏ
μηνÏμαÏοÏ."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "ÎημιοÏ
Ïγία"
@@ -4503,11 +4502,11 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4820,23 +4819,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr ""
-
-#: lib/action.php:855
-msgid "license."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr ""
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr ""
@@ -5137,12 +5134,14 @@ msgstr "Î¿Î¼Î¬Î´ÎµÏ ÏÏν ÏÏηÏÏÏν %s"
msgid "Fullname: %s"
msgstr "ÎνομαÏεÏÏνÏ
μο"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5589,11 +5588,13 @@ msgstr "ΣÏνδεÏη με Ïνομα ÏÏήÏÏη και κÏδικÏ"
msgid "Sign up for a new account"
msgstr "ÎγγÏαÏή για Îνα νÎο λογαÏιαÏμÏ"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "ÎÏιβεβαίÏÏη διεÏθÏ
νÏÎ·Ï email"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5610,12 +5611,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 ""
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5630,19 +5633,22 @@ msgid ""
"Change your email address or notification options at %8$s\n"
msgstr ""
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
"ÎιογÏαÏικÏ: %s\n"
"\n"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5655,21 +5661,31 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "ÎαÏάÏÏαÏη ÏοÏ
/ÏÎ·Ï %s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "ÎναμÎνÏνÏÎ±Ï ÎµÏιβεβαίÏÏη Ï' αÏ
ÏÏ Ïο νοÏμεÏο ÏηλεÏÏνοÏ
."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5685,12 +5701,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5709,12 +5727,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5735,12 +5755,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5753,6 +5783,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -5918,23 +5960,23 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr ""
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "ÎÏαναλαμβάνεÏαι αÏÏ"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "ΡÏ
θμίÏÎµÎ¹Ï OpenID"
@@ -6042,11 +6084,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr ""
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6070,6 +6108,10 @@ msgstr "Î ÏοÏεινÏμενα"
msgid "Popular"
msgstr "ÎημοÏιλή"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr ""
+
#: lib/repeatform.php:107
#, fuzzy
msgid "Repeat this notice?"
@@ -6267,47 +6309,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "ΣÏ
νÏονιÏÏήÏ"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr ""
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr ""
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1064
+#: lib/util.php:1071
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 f7887cab42..c84e1d647e 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:32+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:01+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 (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
@@ -763,7 +763,7 @@ msgid "Preview"
msgstr "Preview"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Delete"
@@ -804,7 +804,7 @@ msgstr "Avatar deleted."
msgid "You already blocked that user."
msgstr "You already blocked that user."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Block user"
@@ -820,7 +820,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "No"
@@ -830,11 +830,11 @@ msgstr "Do not block this user"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Yes"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Block this user"
@@ -882,8 +882,10 @@ msgstr "Unblock"
msgid "Unblock this user"
msgstr "Unblock this user"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Post to "
#: actions/confirmaddress.php:75
@@ -953,7 +955,7 @@ msgstr "You are not the owner of this application."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "There was a problem with your session token."
@@ -1014,7 +1016,7 @@ msgstr "Are you sure you want to delete this notice?"
msgid "Do not delete this notice"
msgstr "Do not delete this notice"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Delete this notice"
@@ -1628,11 +1630,11 @@ msgstr "User is already blocked from group."
msgid "User is not a member of group."
msgstr "User is not a member of group."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Block user from group"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1643,15 +1645,15 @@ msgstr ""
"will be removed from the group, unable to post and unable to subscribe to "
"the group in the future."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Do not block this user from this group"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Block this user from this group"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr "Database error blocking user from group."
@@ -1729,19 +1731,19 @@ msgstr "A list of the users in this group."
msgid "Admin"
msgstr "Admin"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Block"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "Make user an admin of the group"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Make admin"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Make this user an admin"
@@ -2014,12 +2016,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Send"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s has invited you to join them on %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2357,15 +2361,19 @@ msgstr "Notice has no profile"
msgid "%1$s's status on %2$s"
msgstr "%1$s's status on %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "content type "
-#: actions/oembed.php:160
-msgid "Only "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Not a supported data format."
@@ -3060,7 +3068,7 @@ msgstr "Sorry, invalid invitation code."
msgid "Registration successful"
msgstr "Registration successful"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Register"
@@ -3112,22 +3120,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Longer name, preferably your \"real\" name"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "My text and files are available under "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
" except this private data: password, email address, IM address, and phone "
"number."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3160,7 +3161,7 @@ msgstr ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3240,7 +3241,7 @@ msgstr "You can't repeat your own notice."
msgid "You already repeated that notice."
msgstr "You already repeated that notice."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Repeated"
@@ -4555,11 +4556,11 @@ msgstr "You are banned from posting notices on this site."
msgid "Problem saving notice."
msgstr "Problem saving notice."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr "Problem saving group inbox."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4875,23 +4876,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "All "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "licence."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "After"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Before"
@@ -5183,12 +5182,14 @@ msgstr "%s left group %s"
msgid "Fullname: %s"
msgstr "Fullname: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Location: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Homepage: %s"
@@ -5630,11 +5631,13 @@ msgstr "Login with a username and password"
msgid "Sign up for a new account"
msgstr "Sign up for a new account"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "E-mail address confirmation"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5651,12 +5654,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 is now listening to your notices on %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5681,17 +5686,20 @@ msgstr ""
"----\n"
"Change your email address or notification options at %8$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "Bio: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "New e-mail address for posting to %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5712,21 +5720,31 @@ msgstr ""
"Faithfully yours,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s status"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "SMS confirmation"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Awaiting confirmation on this phone number."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "You've been nudged by %s"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5742,12 +5760,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "New private message from %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5766,12 +5786,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) added your notice as a favorite"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5792,12 +5814,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5810,6 +5842,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -5972,23 +6016,23 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "in context"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Repeated by"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Reply to this notice"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Reply"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Notice repeated"
@@ -6094,11 +6138,7 @@ msgstr ""
msgid "All groups"
msgstr "All groups"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "No return-to arguments."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6122,6 +6162,10 @@ msgstr "Featured"
msgid "Popular"
msgstr "Popular"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "No return-to arguments."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Repeat this notice?"
@@ -6314,47 +6358,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "a few seconds ago"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "about a minute ago"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "about %d minutes ago"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "about an hour ago"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "about %d hours ago"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "about a day ago"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "about %d days ago"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "about a month ago"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "about %d months ago"
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr "about a year ago"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 95f37a4b88..39b85e68d6 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -13,12 +13,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-06 22:53+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:36+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:04+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: out-statusnet\n"
@@ -770,7 +770,7 @@ msgid "Preview"
msgstr "Vista previa"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Borrar"
@@ -810,7 +810,7 @@ msgstr "Imagen borrada."
msgid "You already blocked that user."
msgstr "Ya has bloqueado a este usuario."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear usuario."
@@ -826,7 +826,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "No"
@@ -836,11 +836,11 @@ msgstr "No bloquear a este usuario"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "SÃ"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuario."
@@ -889,8 +889,10 @@ msgstr "Desbloquear"
msgid "Unblock this user"
msgstr "Desbloquear este usuario"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Mensaje a "
#: actions/confirmaddress.php:75
@@ -960,7 +962,7 @@ msgstr "No eres el propietario de esta aplicación."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Hubo problemas con tu clave de sesión."
@@ -1021,7 +1023,7 @@ msgstr "¿Estás seguro de que quieres eliminar este aviso?"
msgid "Do not delete this notice"
msgstr "No eliminar este mensaje"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Borrar este aviso"
@@ -1637,11 +1639,11 @@ msgstr "Usuario ya está bloqueado del grupo."
msgid "User is not a member of group."
msgstr "Usuario no es miembro del grupo"
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Bloquear usuario de grupo"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1652,15 +1654,15 @@ msgstr ""
"eliminará del grupo y no podrá publicar ni suscribirse al grupo en lo "
"sucesivo."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "No bloquear este usuario de este grupo"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Bloquear este usuario de este grupo"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
"Se ha producido un error en la base de datos al bloquear el usuario del "
@@ -1741,19 +1743,19 @@ msgstr "Lista de los usuarios en este grupo."
msgid "Admin"
msgstr "Admin"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Bloquear"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "Convertir al usuario en administrador del grupo"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Convertir en administrador"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Convertir a este usuario en administrador"
@@ -2033,12 +2035,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Enviar"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s te ha invitado a que te unas con el/ellos en %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2383,15 +2387,19 @@ msgstr "Aviso sin perfil"
msgid "%1$s's status on %2$s"
msgstr "estado de %1$s en %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "tipo de contenido "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Sólo "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "No es un formato de dato soportado"
@@ -3104,7 +3112,7 @@ msgstr "El código de invitación no es válido."
msgid "Registration successful"
msgstr "Registro exitoso."
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrarse"
@@ -3161,22 +3169,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Nombre más largo, preferiblemente tu nombre \"real\""
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Mi texto y archivos están disponibles bajo"
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Reconocimiento 3.0"
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
"con excepción de esta información privada: contraseña, dirección de correo "
"electrónico, dirección de mensajerÃa instantánea y número de teléfono."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3209,7 +3210,7 @@ msgstr ""
"\n"
"¡Gracias por apuntarte! Esperamos que disfrutes usando este servicio."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3292,7 +3293,7 @@ msgstr "No puedes repetir tus propios mensajes."
msgid "You already repeated that notice."
msgstr "Ya has repetido este mensaje."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Repetido"
@@ -4632,11 +4633,11 @@ msgstr "Tienes prohibido publicar avisos en este sitio."
msgid "Problem saving notice."
msgstr "Hubo un problema al guardar el aviso."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr "Hubo un problema al guarda la bandeja de entrada del grupo."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4937,23 +4938,21 @@ msgstr ""
"Derechos de autor de contenido y datos por los colaboradores. Todos los "
"derechos reservados."
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Todo"
-
-#: lib/action.php:855
-msgid "license."
-msgstr "Licencia."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Paginación"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "Después"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Antes"
@@ -5251,12 +5250,14 @@ msgstr "%s dejó grupo %s"
msgid "Fullname: %s"
msgstr "Nombre completo: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Lugar: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Página de inicio: %s"
@@ -5704,11 +5705,13 @@ msgstr "Ingresar con un nombre de usuario y contraseña."
msgid "Sign up for a new account"
msgstr "Registrarse para una nueva cuenta"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Confirmación de correo electrónico"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5725,12 +5728,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 ahora está escuchando tus avisos en %2$s"
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5751,17 +5756,20 @@ msgstr ""
"Atentamente,\n"
"%4$s.\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "Bio: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Nueva dirección de correo para postear a %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5782,21 +5790,31 @@ msgstr ""
"Attentamente, \n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "estado de %s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "SMS confirmación"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Esperando confirmación de este número de teléfono."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "%s te mandó un zumbido "
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5823,12 +5841,14 @@ msgstr ""
"Un cordial saludo,\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Nuevo mensaje privado de %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5847,12 +5867,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) agregó tu aviso como un favorito"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5873,12 +5895,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5891,6 +5923,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -6060,23 +6104,23 @@ msgstr "W"
msgid "at"
msgstr "en"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "en contexto"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Repetido por"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Responder este aviso."
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Aviso repetido"
@@ -6182,11 +6226,7 @@ msgstr "Promedio diario"
msgid "All groups"
msgstr "Todos los grupos"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "No hay respuesta a los argumentos."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "Método no implementado."
@@ -6210,6 +6250,10 @@ msgstr "Destacado"
msgid "Popular"
msgstr "Popular"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "No hay respuesta a los argumentos."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Responder este aviso?"
@@ -6403,47 +6447,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderador"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "hace unos segundos"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "hace un minuto"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "hace %d minutos"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "hace una hora"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "hace %d horas"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "hace un dÃa"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "hace %d dÃas"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "hace un mes"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "hace %d meses"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 c1c8ba0fee..643cf3d284 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:45+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:14+0000\n"
"Last-Translator: Ahmad Sufi Mahmudi\n"
"Language-Team: Persian\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Language-Code: fa\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
#. TRANS: Page title
@@ -31,15 +31,13 @@ msgstr "دسترسÛ"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
-#, fuzzy
msgid "Site access settings"
-msgstr "تÙظÛÙ
ات دÛگر"
+msgstr "تÙظÛÙ
ات دسترسÛ"
#. TRANS: Form legend for registration form.
#: actions/accessadminpanel.php:161
-#, fuzzy
msgid "Registration"
-msgstr "ثبت ÙاÙ
"
+msgstr "ثبتâÙاÙ
"
#. TRANS: Checkbox instructions for admin setting "Private"
#: actions/accessadminpanel.php:165
@@ -48,7 +46,6 @@ msgstr ""
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
-#, fuzzy
msgctxt "LABEL"
msgid "Private"
msgstr "خصÙصÛ"
@@ -75,15 +72,13 @@ msgstr "Ù
سدÙد"
#. TRANS: Title / tooltip for button to save access settings in site admin panel
#: actions/accessadminpanel.php:202
-#, fuzzy
msgid "Save access settings"
-msgstr "تÙظÛÙ
ات ÚÙرÙ"
+msgstr "ذخÛرÙâÛ ØªÙظÛÙ
ات دسترسÛ"
#: actions/accessadminpanel.php:203
-#, fuzzy
msgctxt "BUTTON"
msgid "Save"
-msgstr "ذخÛرÙâکردÙ"
+msgstr "ذخÛرÙ"
#. TRANS: Server error when page not found (404)
#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
@@ -166,13 +161,13 @@ msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
#: actions/all.php:142
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-"اÙÙÛÙ Ú©Ø³Û Ø¨Ø§Ø´Ûد ک٠در [اÛÙ Ù
ÙضÙع](%%%%action.newnotice%%%%?status_textarea=%"
-"s) Ù¾ÛاÙ
Ù
ÛâÙرستد."
+"Ù
ÛâتÙاÙÛد از صÙØÙâÛ Ø´Ø®ØµÛâاش ب٠ا٠[سÙÙÙ
Ù](../%2$s) بزÙÛد Ûا [ÚÛØ²Û Ø¨ÙÙÛسÛد](%%%%"
+"action.newnotice%%%%?status_textarea=%3$s) تا تÙج٠ا٠را جذب Ú©ÙÛد."
#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
#, php-format
@@ -340,18 +335,16 @@ msgid "No status found with that ID."
msgstr "ÙÛÚ ÙضعÛØªÛ Ø¨Ø§ Ø¢Ù Ø´Ùاس٠پÛدا Ùشد."
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
-msgstr "اÛÙ ÙضعÛت درØا٠Øاضر ÛÚ© ÙضعÛت Ù
Ùرد عÙاÙ٠است!"
+msgstr "اÛÙ Ù¾ÛغاÙ
را Ù¾ÛØ´âتر ب٠عÙاÛÙ Ø®Ùد اضاÙ٠کردÙâاÛد"
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "ÙÙ
ÛâتÙا٠ÙضعÛت را Ù
ÙردعÙاÙ٠کرد."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
-msgstr "اÛÙ ÙضعÛت ÛÚ© ÙضعÛت Ù
ÙردعÙاÙÙ ÙÛست!"
+msgstr "اÛÙ Ù¾ÛغاÙ
جز٠عÙاÛÙ Ø´Ù
ا ÙÛست"
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -371,9 +364,8 @@ msgid "Could not unfollow user: User not found."
msgstr "ÙÙ
ÛâتÙا٠کاربر را دÙبا٠Ùکرد: کاربر ÛاÙت Ùشد."
#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
msgid "You cannot unfollow yourself."
-msgstr "ÙÙ
ÛâتÙاÙÛد Ø®Ùدتا٠را دÙبا٠ÙÚ©ÙÛد!"
+msgstr "ÙÙ
ÛâتÙاÙÛد Ø®Ùدتا٠را دÙبا٠کÙÛد."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
@@ -468,7 +460,7 @@ msgid "You have been blocked from that group by the admin."
msgstr "Ø¯Ø³ØªØ±Ø³Û Ø´Ù
ا ب٠گرÙ٠تÙسط Ù
دÛر Ø¢Ù Ù
ØدÙد شد٠است."
#: actions/apigroupjoin.php:138 actions/joingroup.php:134
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "عضÙÛت %s در گرÙÙ %s Ùا Ù
ÙÙ٠بÙد."
@@ -477,7 +469,7 @@ msgid "You are not a member of this group."
msgstr "Ø´Ù
ا ÛÚ© عض٠اÛ٠گرÙÙ ÙÛستÛد."
#: actions/apigroupleave.php:124 actions/leavegroup.php:129
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "خارج شد٠%s از گرÙÙ %s Ùا Ù
ÙÙ٠بÙد"
@@ -765,7 +757,7 @@ msgid "Preview"
msgstr "Ù¾ÛØ´âÙÙ
اÛØ´"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "ØØ°Ù"
@@ -806,7 +798,7 @@ msgstr "ÚÙر٠پاک شد."
msgid "You already blocked that user."
msgstr "Ø´Ù
ا ÙÙ
اکÙÙ٠آ٠کاربر را Ù
سدÙد کرد٠اÛد."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Ù
سدÙد کرد٠کاربر"
@@ -823,7 +815,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Ø®Ûر"
@@ -833,11 +825,11 @@ msgstr "کاربر را Ù
سدÙد ÙÚ©Ù"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "بÙÙ"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "کاربر را Ù
سدÙد Ú©Ù"
@@ -885,8 +877,10 @@ msgstr "آزاد سازÛ"
msgid "Unblock this user"
msgstr "آزاد Ø³Ø§Ø²Û Ú©Ø§Ø±Ø¨Ø±"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "ارسا٠ب٠"
#: actions/confirmaddress.php:75
@@ -960,7 +954,7 @@ msgstr "Ø´Ù
ا ÛÚ© عض٠اÛ٠گرÙÙ ÙÛستÛد."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr ""
@@ -1024,7 +1018,7 @@ msgstr "Ø¢Ûا اطÙ
ÛÙا٠دارÛد Ú©Ù Ù
ÛâØ®ÙاÙÛد اÛÙ Ù¾Ûا
msgid "Do not delete this notice"
msgstr "اÛÙ Ù¾ÛاÙ
را پاک ÙÚ©Ù"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "اÛÙ Ù¾ÛاÙ
را پاک Ú©Ù"
@@ -1648,11 +1642,11 @@ msgstr "ÙÙ
اکÙÙÙ Ø¯Ø³ØªØ±Ø³Û Ú©Ø§Ø±Ø¨Ø± ب٠گرÙÙ Ù
سدÙد شدÙ
msgid "User is not a member of group."
msgstr "کاربر عض٠گرÙÙ ÙÛست."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Ø¯Ø³ØªØ±Ø³Û Ú©Ø§Ø±Ø¨Ø± ب٠گرÙ٠را Ù
سدÙد Ú©Ù"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, fuzzy, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1660,15 +1654,15 @@ msgid ""
"the group in the future."
msgstr "Ø¢Ûا Ù
Ø·Ù
ئ٠ÙستÛد Ù
ÛâØ®ÙاÙÛد Ø¯Ø³ØªØ±Ø³Û Â»%s« را ب٠گرÙ٠»%s« Ù
سدÙد Ú©ÙÛدØ"
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Ø¯Ø³ØªØ±Ø³Û Ú©Ø§Ø±Ø¨Ø± ب٠گرÙ٠را Ù
سدÙد ÙÚ©Ù"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Ø¯Ø³ØªØ±Ø³Û Ú©Ø§Ø±Ø¨Ø± را ب٠گرÙÙ Ù
سدÙد Ú©Ù"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr "اشکا٠پاÛگا٠داد٠در Ù
سدÙد کرد٠کاربر"
@@ -1744,19 +1738,19 @@ msgstr "ÛÚ© ÙÙرست از کاربرا٠در اÛ٠گرÙÙ"
msgid "Admin"
msgstr "Ù
دÛر"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "بازداشتÙ"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "کاربر ÛÚ© Ù
دÛر گرÙÙ Ø´Ùد"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Ù
دÛر Ø´Ùد"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "اÛ٠کاربر ÛÚ© Ù
دÛر Ø´Ùد"
@@ -2032,12 +2026,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "ÙرستادÙ"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s Ø´Ù
ا را دعÙت کرد٠است ک٠در %2$s ب٠آÙâÙا بپÛÙÙدÛد."
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2357,15 +2353,19 @@ msgstr "اب٠خبر ذخÛØ±Ù Ø§Û Ùدارد ."
msgid "%1$s's status on %2$s"
msgstr "ÙضعÛت %1$s در %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "ÙÙع Ù
ØتÙا "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr " ÙÙØ·"
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "ÛÚ© ÙاÙب دادÙ٠پشتÛباÙÛâشد٠ÙÛست."
@@ -3060,7 +3060,7 @@ msgstr "با عرض تاسÙØ Ú©Ø¯ دعÙت Ùا Ù
عتبر است."
msgid "Registration successful"
msgstr "ثبت ÙاÙ
با Ù
ÙÙÙÛت اÙجاÙ
شد."
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "ثبت ÙاÙ
"
@@ -3112,22 +3112,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "ÙاÙ
بÙÙد ØªØ±Ø Ø¨Ù Ø·Ùر بÙتر ÙاÙ
ÙاÙعÛتاÙ"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr ""
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
"ب٠استثÙØ§Û Ø§ÛÙ Ø¯Ø§Ø¯Ù Û Ù
ØرÙ
اÙÙ : Ú©ÙÙ
Ù Û Ø¹Ø¨ÙØ±Ø Ø¢Ø¯Ø±Ø³ اÛÙ
ÛÙØ Ø¢Ø¯Ø±Ø³ IMØ Ù Ø´Ù
ار٠"
"تÙÙÙ."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3146,7 +3139,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3223,7 +3216,7 @@ msgstr "Ø´Ù
ا ÙÙ
Û ØªÙاÙÛد Ø¢Ú¯ÙÛ Ø®Ùدتا٠را تکرار Ú©ÙÛ
msgid "You already repeated that notice."
msgstr "Ø´Ù
ا ÙبÙا آ٠آگÙÛ Ø±Ø§ تکرار کردÛد."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr ""
@@ -4508,12 +4501,12 @@ msgstr "Ø´Ù
ا از Ùرستاد٠پست در اÛ٠ساÛت Ù
ردÙد شدÛ
msgid "Problem saving notice."
msgstr "Ù
شک٠در ذخÛر٠کرد٠آگÙÛ."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Ù
شک٠در ذخÛر٠کرد٠آگÙÛ."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4824,23 +4817,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "ÙÙ
Ù "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "Ù
جÙز."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "صÙØ٠بÙدÙ"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "بعد از"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Ùب٠از"
@@ -5143,12 +5134,14 @@ msgstr "%s گرÙÙ %s را ترک کرد."
msgid "Fullname: %s"
msgstr "ÙاÙ
کاÙ
Ù : %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Ù
ÙÙعÛت : %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "صÙØ٠خاÙÚ¯Û : %s"
@@ -5591,11 +5584,13 @@ msgstr "Ùارد شد٠با ÛÚ© ÙاÙ
Ú©Ø§Ø±Ø¨Ø±Û Ù Ú©ÙÙ
Ù Û Ø¹Ø¨Ùر"
msgid "Sign up for a new account"
msgstr "عضÙÛت Ø¨Ø±Ø§Û Øساب Ú©Ø§Ø±Ø¨Ø±Û Ø¬Ø¯Ûد"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "تاÛÛدÛÙ Û Ø¢Ø¯Ø±Ø³ اÛÙ
ÛÙ"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5612,12 +5607,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 "%2$s از ØاÙا ب٠خبر ÙØ§Û Ø´Ù
ا Ú¯ÙØ´ Ù
Ûد٠%1$s"
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5632,17 +5629,20 @@ msgid ""
"Change your email address or notification options at %8$s\n"
msgstr ""
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "Ù
ÙÙعÛت : %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "%s ادرس اÛÙ
Û٠جدÛد براÛ"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5661,21 +5661,31 @@ msgstr ""
", ازرÙÛ ÙÙØ§Ø¯Ø§Ø±Û Ø®Ùد Ø´Ù
ا \n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "ÙضعÛت %s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "تاÛÛد Ù¾ÛاÙ
Ú©"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Ù
Ùتظر تاÛÛدÛÙ Ø¨Ø±Ø§Û Ø§ÛÙ Ø´Ù
ار٠تÙÙÙ."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5691,12 +5701,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5715,12 +5727,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr " خبر Ø´Ù
ا را ب٠عÙاÛÙ Ø®Ùد اضاÙ٠کرد %s (@%s)"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5741,12 +5755,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "ب٠تÙج٠شÙ
ا ÛÚ© خبر Ùرستاد٠شد٠%s (@%s)"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5759,6 +5783,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -5926,23 +5962,23 @@ msgstr ""
msgid "at"
msgstr "در"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "در زÙ
ÛÙÙ"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "تکرار از"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "ب٠اÛ٠آگÙÛ Ø¬Ùاب دÙÛد"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "جÙاب دادÙ"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Ø¢Ú¯ÙÛ ØªÚ©Ø±Ø§Ø± شد"
@@ -6048,11 +6084,7 @@ msgstr ""
msgid "All groups"
msgstr "تÙ
اÙ
گرÙÙâÙا"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr ""
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6076,6 +6108,10 @@ msgstr "خصÙصÛت"
msgid "Popular"
msgstr "Ù
ØبÙب"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr ""
+
#: lib/repeatform.php:107
#, fuzzy
msgid "Repeat this notice?"
@@ -6268,47 +6304,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "ÚÙد ثاÙÛÙ Ù¾ÛØ´"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "ØدÙد ÛÚ© دÙÛÙÙ Ù¾ÛØ´"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "ØدÙد %d دÙÛÙÙ Ù¾ÛØ´"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "ØدÙد ÛÚ© ساعت Ù¾ÛØ´"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "ØدÙد %d ساعت Ù¾ÛØ´"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "ØدÙد ÛÚ© رÙز Ù¾ÛØ´"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "ØدÙد %d رÙز Ù¾ÛØ´"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "ØدÙد ÛÚ© Ù
ا٠پÛØ´"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "ØدÙد %d Ù
ا٠پÛØ´"
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr "ØدÙد ÛÚ© سا٠پÛØ´"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 0e3224b360..911eae9e4c 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:42+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:11+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: out-statusnet\n"
@@ -782,7 +782,7 @@ msgid "Preview"
msgstr "Esikatselu"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Poista"
@@ -824,7 +824,7 @@ msgstr "Kuva poistettu."
msgid "You already blocked that user."
msgstr "Sinä olet jo estänyt tämän käyttäjän."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Estä käyttäjä"
@@ -837,7 +837,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Ei"
@@ -847,11 +847,11 @@ msgstr "Ãlä estä tätä käyttäjää"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Kyllä"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Estä tämä käyttäjä"
@@ -899,9 +899,10 @@ msgstr "Poista esto"
msgid "Unblock this user"
msgstr "Poista esto tältä käyttäjältä"
-#: actions/bookmarklet.php:50
-#, fuzzy
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Kuva"
#: actions/confirmaddress.php:75
@@ -976,7 +977,7 @@ msgstr "Sinä et kuulu tähän ryhmään."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Istuntoavaimesi kanssa oli ongelma."
@@ -1037,7 +1038,7 @@ msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
msgid "Do not delete this notice"
msgstr "Ãlä poista tätä päivitystä"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Poista tämä päivitys"
@@ -1678,11 +1679,11 @@ msgstr "Käyttäjä on asettanut eston sinulle."
msgid "User is not a member of group."
msgstr "Käyttäjä ei kuulu tähän ryhmään."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Estä käyttäjä ryhmästä"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1690,15 +1691,15 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Ãlä estä tätä käyttäjää tästä ryhmästä"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1776,19 +1777,19 @@ msgstr "Lista ryhmän käyttäjistä."
msgid "Admin"
msgstr "Ylläpito"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Estä"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "Tee tästä käyttäjästä ylläpitäjä"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Tee ylläpitäjäksi"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Tee tästä käyttäjästä ylläpitäjä"
@@ -2066,12 +2067,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Lähetä"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s on kutsunut sinut liittymään palveluun %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2419,16 +2422,19 @@ msgstr "Päivitykselle ei ole profiilia"
msgid "%1$s's status on %2$s"
msgstr "Käyttäjän %1$s päivitys %2$s"
-#: actions/oembed.php:157
-#, fuzzy
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "Yhdistä"
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Vain "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Tuo ei ole tuettu tietomuoto."
@@ -3147,7 +3153,7 @@ msgstr "Virheellinen kutsukoodin."
msgid "Registration successful"
msgstr "Rekisteröityminen onnistui"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Rekisteröidy"
@@ -3203,24 +3209,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Pitempi nimi, mieluiten oikea nimesi"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr ""
-"Minun tekstini ja tiedostoni ovat käytettävissä seuraavan lisenssin "
-"mukaisesti "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
"poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, "
"puhelinnumero."
-#: actions/register.php:538
+#: actions/register.php:542
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3253,7 +3250,7 @@ msgstr ""
"\n"
"Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3342,7 +3339,7 @@ msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
msgid "You already repeated that notice."
msgstr "Sinä olet jo estänyt tämän käyttäjän."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "Luotu"
@@ -4679,12 +4676,12 @@ msgstr "Päivityksesi tähän palveluun on estetty."
msgid "Problem saving notice."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5007,23 +5004,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Kaikki "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "lisenssi."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Sivutus"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "Myöhemmin"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Aiemmin"
@@ -5335,12 +5330,14 @@ msgstr "%s erosi ryhmästä %s"
msgid "Fullname: %s"
msgstr "Koko nimi: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Kotipaikka: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Kotisivu: %s"
@@ -5797,11 +5794,13 @@ msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla"
msgid "Sign up for a new account"
msgstr "Luo uusi käyttäjätili"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Sähköpostiosoitteen vahvistus"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5818,12 +5817,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 seuraa nyt päivityksiäsi palvelussa %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5848,19 +5849,22 @@ msgstr ""
"----\n"
"Voit vaihtaa sähköpostiosoitetta tai ilmoitusasetuksiasi %8$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
"Tietoja: %s\n"
"\n"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5881,21 +5885,31 @@ msgstr ""
"Terveisin,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s päivitys"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "SMS vahvistus"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Odotetaan vahvistusta tälle puhelinnumerolle."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "%s tönäisi sinua"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5911,12 +5925,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Uusi yksityisviesti käyttäjältä %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5935,12 +5951,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s lisäsi päivityksesi suosikkeihinsa"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5961,12 +5979,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5979,6 +6007,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -6147,25 +6187,25 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "Ei sisältöä!"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "Luotu"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Vastaa tähän päivitykseen"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Vastaus"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "Päivitys on poistettu."
@@ -6275,12 +6315,7 @@ msgstr ""
msgid "All groups"
msgstr "Kaikki ryhmät"
-#: lib/profileformaction.php:123
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "Ei id parametria."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6304,6 +6339,11 @@ msgstr "Esittelyssä"
msgid "Popular"
msgstr "Suosituimmat"
+#: lib/redirectingaction.php:94
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "Ei id parametria."
+
#: lib/repeatform.php:107
#, fuzzy
msgid "Repeat this notice?"
@@ -6508,47 +6548,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "muutama sekunti sitten"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "noin minuutti sitten"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "noin %d minuuttia sitten"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "noin tunti sitten"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "noin %d tuntia sitten"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "noin päivä sitten"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "noin %d päivää sitten"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "noin kuukausi sitten"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "noin %d kuukautta sitten"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 19a386abd3..e0b56a40bc 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -14,12 +14,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-06 22:53+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:48+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:17+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: out-statusnet\n"
@@ -780,7 +780,7 @@ msgid "Preview"
msgstr "Aperçu"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Supprimer"
@@ -820,7 +820,7 @@ msgstr "Avatar supprimé."
msgid "You already blocked that user."
msgstr "Vous avez déjà bloqué cet utilisateur."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquer cet utilisateur"
@@ -836,7 +836,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Non"
@@ -846,11 +846,11 @@ msgstr "Ne pas bloquer cet utilisateur"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Oui"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquer cet utilisateur"
@@ -898,8 +898,10 @@ msgstr "Débloquer"
msgid "Unblock this user"
msgstr "Débloquer cet utilisateur"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Poster sur "
#: actions/confirmaddress.php:75
@@ -969,7 +971,7 @@ msgstr "Vous nâêtes pas le propriétaire de cette application."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Un problème est survenu avec votre jeton de session."
@@ -1030,7 +1032,7 @@ msgstr "Voulez-vous vraiment supprimer cet avis ?"
msgid "Do not delete this notice"
msgstr "Ne pas supprimer cet avis"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Supprimer cet avis"
@@ -1644,11 +1646,11 @@ msgstr "Cet utilisateur est déjà bloqué pour le groupe."
msgid "User is not a member of group."
msgstr "Lâutilisateur nâest pas membre du groupe."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Bloquer cet utilisateur du groupe"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1659,15 +1661,15 @@ msgstr ""
"seront supprimés du groupe ; il leur sera interdit dây poster et de sây "
"abonner à lâavenir."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Ne pas bloquer cet utilisateur pour ce groupe"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Bloquer cet utilisateur de de groupe"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
"Erreur de la base de données lors du blocage de lâutilisateur du groupe."
@@ -1747,19 +1749,19 @@ msgstr "Liste des utilisateurs inscrits à ce groupe."
msgid "Admin"
msgstr "Administrer"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Bloquer"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "Faire de cet utilisateur un administrateur du groupe"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Faire un administrateur"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Faire de cet utilisateur un administrateur"
@@ -2046,12 +2048,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Envoyer"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s vous invite à vous inscrire sur %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2404,15 +2408,19 @@ msgstr "Lâavis nâa pas de profil"
msgid "%1$s's status on %2$s"
msgstr "Statut de %1$s sur %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "type de contenu "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Seulement "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Format de données non supporté."
@@ -3125,7 +3133,7 @@ msgstr "Désolé, code dâinvitation invalide."
msgid "Registration successful"
msgstr "Compte créé avec succès"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Créer un compte"
@@ -3182,22 +3190,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Nom plus long, votre \"vrai\" nom de préférence"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Mes textes et mes fichiers sont disponibles sous"
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Paternité 3.0"
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
" à lâexception de ces données personnelles : mot de passe, adresse e-mail, "
"adresse de messagerie instantanée, numéro de téléphone."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3231,7 +3232,7 @@ msgstr ""
"Merci pour votre inscription ! Nous vous souhaitons dâapprécier notre "
"service."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3313,7 +3314,7 @@ msgstr "Vous ne pouvez pas reprendre votre propre avis."
msgid "You already repeated that notice."
msgstr "Vous avez déjà repris cet avis."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Repris"
@@ -4668,11 +4669,11 @@ msgstr "Il vous est interdit de poster des avis sur ce site."
msgid "Problem saving notice."
msgstr "Problème lors de lâenregistrement de lâavis."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr "Problème lors de lâenregistrement de la boîte de réception du groupe."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4973,23 +4974,21 @@ msgstr ""
"Le contenu et les données sont sous le droit dâauteur du contributeur. Tous "
"droits réservés."
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Tous "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "licence."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "Après"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Avant"
@@ -5286,12 +5285,14 @@ msgstr "%s a quitté le groupe %s"
msgid "Fullname: %s"
msgstr "Nom complet : %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Emplacement : %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Site Web : %s"
@@ -5785,11 +5786,13 @@ msgstr "Ouvrez une session avec un identifiant et un mot de passe"
msgid "Sign up for a new account"
msgstr "Créer un nouveau compte"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Confirmation de lâadresse courriel"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5819,12 +5822,14 @@ msgstr ""
"Merci de votre attention,\n"
"%s\n"
-#: lib/mail.php:240
+#. 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 suit maintenant vos avis sur %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5849,17 +5854,20 @@ msgstr ""
"----\n"
"Changez votre adresse de courriel ou vos options de notification sur %8$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "Bio : %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Nouvelle adresse courriel pour poster dans %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5880,21 +5888,31 @@ msgstr ""
"Cordialement,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "Statut de %s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "Confirmation SMS"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Numéro de téléphone en attente de confirmation."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "Vous avez reçu un clin dâÅil de %s"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5921,12 +5939,14 @@ msgstr ""
"Bien à vous,\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Nouveau message personnel de %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5959,12 +5979,14 @@ msgstr ""
"Bien à vous,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) a ajouté un de vos avis à ses favoris"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6002,12 +6024,22 @@ msgstr ""
"Cordialement,\n"
"%6$s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) vous a envoyé un avis"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6020,17 +6052,19 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
-msgstr ""
-"%1$s (@%9$s) vient de vous envoyer un avis (une réponse « @ ») sur %2$s.\n"
+"%5$sYou can reply back here:\n"
"\n"
-"Lâavis est là :\n"
+"\t%6$s\n"
"\n"
-"\t%3$s\n"
+"The list of all @-replies for you here:\n"
"\n"
-"Il dit :\n"
+"%7$s\n"
"\n"
-"\t%4$s\n"
+"Faithfully yours,\n"
+"%2$s\n"
"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6201,23 +6235,23 @@ msgstr "O"
msgid "at"
msgstr "chez"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "dans le contexte"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Repris par"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Répondre à cet avis"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Répondre"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Avis repris"
@@ -6323,11 +6357,7 @@ msgstr "Moyenne journalière"
msgid "All groups"
msgstr "Tous les groupes"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "Aucun argument de retour."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "Méthode non implémentée."
@@ -6351,6 +6381,10 @@ msgstr "En vedette"
msgid "Popular"
msgstr "Populaires"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "Aucun argument de retour."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Reprendre cet avis ?"
@@ -6541,47 +6575,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "Modérateur"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "il y a quelques secondes"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "il y a 1 minute"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "il y a %d minutes"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "il y a 1 heure"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "il y a %d heures"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "il y a 1 jour"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "il y a %d jours"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "il y a 1 mois"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "il y a %d mois"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 c21298a8e6..b101350c2b 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:51+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:21+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: out-statusnet\n"
@@ -782,7 +782,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
#, fuzzy
msgid "Delete"
msgstr "eliminar"
@@ -826,7 +826,7 @@ msgstr "Avatar actualizado."
msgid "You already blocked that user."
msgstr "Xa bloqueaches a este usuario."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear usuario"
@@ -842,7 +842,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "No"
@@ -853,11 +853,11 @@ msgstr "Bloquear usuario"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Si"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Bloquear usuario"
@@ -909,9 +909,10 @@ msgstr "Desbloquear"
msgid "Unblock this user"
msgstr "Bloquear usuario"
-#: actions/bookmarklet.php:50
-#, fuzzy
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "ChÃos dende SMS"
#: actions/confirmaddress.php:75
@@ -986,7 +987,7 @@ msgstr "Non estás suscrito a ese perfil"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
@@ -1050,7 +1051,7 @@ msgstr "Estas seguro que queres eliminar este chÃo?"
msgid "Do not delete this notice"
msgstr "Non se pode eliminar este chÃos."
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
#, fuzzy
msgid "Delete this notice"
msgstr "Eliminar chÃo"
@@ -1704,12 +1705,12 @@ msgstr "O usuario bloqueoute."
msgid "User is not a member of group."
msgstr "%1s non é unha orixe fiable."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
#, fuzzy
msgid "Block user from group"
msgstr "Bloquear usuario"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, fuzzy, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1720,15 +1721,15 @@ msgstr ""
"do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a "
"ser notificado de ningunha resposta-@ del."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr ""
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr ""
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1810,19 +1811,19 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Bloquear"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr ""
@@ -2098,12 +2099,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Enviar"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s invitoute a unirse a él en %2$s."
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2450,16 +2453,19 @@ msgstr "O chÃo non ten perfil"
msgid "%1$s's status on %2$s"
msgstr "Estado de %1$s en %2$s"
-#: actions/oembed.php:157
-#, fuzzy
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "Conectar"
-#: actions/oembed.php:160
-msgid "Only "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Non é un formato de datos soportado."
@@ -3186,7 +3192,7 @@ msgstr "Acounteceu un erro co código de confirmación."
msgid "Registration successful"
msgstr "Xa estas rexistrado!!"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Rexistrar"
@@ -3245,23 +3251,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Nome máis longo, preferiblemente o teu nome \"real\""
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "O meu texto e arquivos están dispoñibles baixo licenza "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
-#, fuzzy
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
" agás esta informción privada: contrasinal, dirección de correo electrónico, "
"dirección IM, número de teléfono."
-#: actions/register.php:538
+#: actions/register.php:542
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3293,7 +3291,7 @@ msgstr ""
"\n"
"Grazas por rexistrarte e esperamos que laretexes moito."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3382,7 +3380,7 @@ msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
msgid "You already repeated that notice."
msgstr "Xa bloqueaches a este usuario."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "Crear"
@@ -4735,12 +4733,12 @@ msgstr "Tes restrinxido o envio de chÃos neste sitio."
msgid "Problem saving notice."
msgstr "Aconteceu un erro ó gardar o chÃo."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Aconteceu un erro ó gardar o chÃo."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5065,25 +5063,22 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-#, fuzzy
-msgid "All "
-msgstr "Todos"
-
-#: lib/action.php:855
-msgid "license."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1165
#, fuzzy
msgid "After"
msgstr "« Despois"
-#: lib/action.php:1171
+#: lib/action.php:1173
#, fuzzy
msgid "Before"
msgstr "Antes »"
@@ -5400,12 +5395,14 @@ msgstr "%s / Favoritos dende %s"
msgid "Fullname: %s"
msgstr "Nome completo: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Ubicación: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Páxina persoal: %s"
@@ -5906,11 +5903,13 @@ msgstr "Accede co teu nome de usuario e contrasinal."
msgid "Sign up for a new account"
msgstr "Crear nova conta"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Confirmar correo electrónico"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5939,12 +5938,14 @@ msgstr ""
"Grazas polo teu tempo, \n"
"%s\n"
-#: lib/mail.php:240
+#. 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 está a escoitar os teus chÃos %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5965,17 +5966,20 @@ msgstr ""
"Atentamente todo seu,\n"
"%4$s.\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "Ubicación: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Nova dirección de email para posterar en %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5996,21 +6000,31 @@ msgstr ""
"Sempre teu...,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "Estado de %s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "Confirmación de SMS"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Agardando a confirmación neste número de teléfono."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "%s douche un toque"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6036,12 +6050,14 @@ msgstr ""
"With kind regards,\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "%s enviouche unha nova mensaxe privada"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6074,12 +6090,14 @@ msgstr ""
"With kind regards,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s gustoulle o teu chÃo"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, fuzzy, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6112,12 +6130,22 @@ msgstr ""
"Fielmente teu,\n"
"%5$s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6130,6 +6158,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -6301,27 +6341,27 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "Sen contido!"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "Crear"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
#, fuzzy
msgid "Reply to this notice"
msgstr "Non se pode eliminar este chÃos."
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
#, fuzzy
msgid "Reply"
msgstr "contestar"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "ChÃo publicado"
@@ -6436,12 +6476,7 @@ msgstr ""
msgid "All groups"
msgstr "Tódalas etiquetas"
-#: lib/profileformaction.php:123
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "Non hai argumento id."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6466,6 +6501,11 @@ msgstr "Destacado"
msgid "Popular"
msgstr "Popular"
+#: lib/redirectingaction.php:94
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "Non hai argumento id."
+
#: lib/repeatform.php:107
#, fuzzy
msgid "Repeat this notice?"
@@ -6677,47 +6717,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "fai uns segundos"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "fai un minuto"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "fai %d minutos"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "fai unha hora"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "fai %d horas"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "fai un dÃa"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "fai %d dÃas"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "fai un mes"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "fai %d meses"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 4476df821e..e5a3cd6dd9 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-06 22:53+0000\n"
-"PO-Revision-Date: 2010-04-08 23:24:51+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:24+0000\n"
"Language-Team: Galician\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: gl\n"
"X-Message-Group: out-statusnet\n"
@@ -769,7 +769,7 @@ msgid "Preview"
msgstr "Vista previa"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Borrar"
@@ -809,7 +809,7 @@ msgstr "Borrouse o avatar."
msgid "You already blocked that user."
msgstr "Xa bloqueou ese usuario."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear o usuario"
@@ -825,7 +825,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Non"
@@ -835,11 +835,11 @@ msgstr "Non bloquear este usuario"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Si"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuario"
@@ -887,8 +887,10 @@ msgstr "Desbloquear"
msgid "Unblock this user"
msgstr "Desbloquear este usuario"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Publicar en "
#: actions/confirmaddress.php:75
@@ -958,7 +960,7 @@ msgstr "Non é o dono desa aplicación."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Houbo un problema co seu pase."
@@ -1019,7 +1021,7 @@ msgstr "Está seguro de querer borrar esta nota?"
msgid "Do not delete this notice"
msgstr "Non borrar esta nota"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Borrar esta nota"
@@ -1508,7 +1510,7 @@ msgid ""
"notice to your favorites!"
msgstr ""
"Por que non [rexistrar unha conta](%%action.register%%) e ser o primeiro en "
-"engadir unha nota aos seus favoritos?!"
+"engadir unha nota aos seus favoritos?"
#: actions/favoritesrss.php:111 actions/showfavorites.php:77
#: lib/personalgroupnav.php:115
@@ -1637,11 +1639,11 @@ msgstr "O usuario xa está excluÃdo do grupo."
msgid "User is not a member of group."
msgstr "O usuario non pertence ao grupo."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "ExcluÃr do grupo ao usuario"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1652,15 +1654,15 @@ msgstr ""
"do grupo, sen a posibilidade de publicar nada nel nin volver subscribirse a "
"el no futuro."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Non excluÃr deste grupo a este usuario"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "ExcluÃr deste grupo a este usuario"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr "Houbo un erro na base de datos ao excluÃr do grupo ao usuario."
@@ -1739,19 +1741,19 @@ msgstr "Unha lista dos usuarios pertencentes a este grupo."
msgid "Admin"
msgstr "Administrador"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "ExcluÃr"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "Converter ao usuario en administrador do grupo"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Converter en administrador"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Converter a este usuario en administrador"
@@ -1870,7 +1872,8 @@ msgid ""
"message with further instructions. (Did you add %s to your buddy list?)"
msgstr ""
"Agardando pola confirmación deste enderezo. Busque na cúa conta de Jabber/"
-"GTalk unha mensaxe con máis instrucións. (Engadiu %s á súa lista de amigos?)"
+"GTalk unha mensaxe con máis instrucións. (Engadiu a %s á súa lista de "
+"amigos?)"
#: actions/imsettings.php:124
msgid "IM address"
@@ -1882,13 +1885,13 @@ msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-"Enderezo de Jabber ou GTalk, coma «nomedousuario@example.org». Asegúrese "
+"Enderezo de Jabber ou GTalk, coma \"nomedeusuario@example.org\". Asegúrese "
"primeiro de engadir a %s á súa lista de amigos no seu cliente de mensaxerÃa "
"instantánea ou en GTalk."
#: actions/imsettings.php:143
msgid "Send me notices through Jabber/GTalk."
-msgstr "Enviarme as notas mediante Jabber ou GTalk."
+msgstr "Enviádeme as notas mediante Jabber ou GTalk."
#: actions/imsettings.php:148
msgid "Post a notice when my Jabber/GTalk status changes."
@@ -1897,7 +1900,7 @@ msgstr "Publicar unha nota cando cambie o meu estado en Jabber ou GTalk."
#: actions/imsettings.php:153
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-"Enviarme as respostas mediante Jabber ou GTalk da xente á que non estou "
+"Enviádeme as respostas mediante Jabber ou GTalk da xente á que non estou "
"subscrita."
#: actions/imsettings.php:159
@@ -1906,7 +1909,7 @@ msgstr "Publicar unha MicroID para o meu enderezo de Jabber ou GTalk."
#: actions/imsettings.php:285
msgid "No Jabber ID."
-msgstr "Non hai unha ID de Jabber."
+msgstr "Non existe ningunha ID de Jabber."
#: actions/imsettings.php:292
msgid "Cannot normalize that Jabber ID"
@@ -1986,7 +1989,8 @@ msgstr "%1$s (%2$s)"
#: actions/invite.php:136
msgid ""
"These people are already users and you were automatically subscribed to them:"
-msgstr "Estas persoas xa son usuarios e suscribÃuselle automaticamente a elas:"
+msgstr ""
+"Estas persoas xa son usuarios e subscribÃuselle automaticamente a elas:"
#: actions/invite.php:144
msgid "Invitation(s) sent to the following people:"
@@ -2029,12 +2033,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Enviar"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s convidouno a unirse a el en %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2066,11 +2072,11 @@ msgid ""
msgstr ""
"%1$s convidouno a unirse a el en %2$s (%3$s).\n"
"\n"
-"%2$s é un servizo de âmicro-bloggingâ que lle permite estar ao dÃa coas "
-"persoas que coñece e coas que lle interesen.\n"
+"%2$s é un servizo de microblogging que lle permite estar ao dÃa coas persoas "
+"que coñece e coas que lle interesen.\n"
"\n"
-"Tamén pode compartir novas persoais, pensamentos, ou a súa vida en liña con "
-"outros coñecidos. Tamén está moi ben para coñecer a xente con intereses "
+"Tamén pode compartir novas persoais, pensamentos ou a súa vida en liña con "
+"outros coñecidos. Tamén está moi ben para coñecer xente con intereses "
"similares aos seus.\n"
"\n"
"%1$s dixo:\n"
@@ -2086,7 +2092,7 @@ msgstr ""
"\n"
"%6$s\n"
"\n"
-"Se non pode ignorar esta mensaxe. Grazas polo seu tempo.\n"
+"Se non, pode ignorar esta mensaxe. Grazas polo seu tempo.\n"
"\n"
"Cordialmente, %2$s\n"
@@ -2140,7 +2146,7 @@ msgstr "Identificarse no sitio"
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
-msgstr "Lembrarme"
+msgstr "Lembrádeme"
#: actions/login.php:237 actions/register.php:480
msgid "Automatically login in the future; not for shared computers!"
@@ -2177,12 +2183,12 @@ msgstr ""
#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "%1$s xa é administrador do grupo «%2$s»."
+msgstr "%1$s xa é administrador do grupo \"%2$s\"."
#: actions/makeadmin.php:133
#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "Non se pudi obter o rexistro de pertenza de %1$s ao grupo %2$s."
+msgstr "Non se puido obter o rexistro de pertenza de %1$s ao grupo %2$s."
#: actions/makeadmin.php:146
#, php-format
@@ -2207,7 +2213,7 @@ msgstr "Utilice o seguinte formulario para rexistrar unha aplicación nova."
#: actions/newapplication.php:176
msgid "Source URL is required."
-msgstr "PrecÃsase do URL fonte."
+msgstr "NecesÃtase o URL de orixe."
#: actions/newapplication.php:258 actions/newapplication.php:267
msgid "Could not create application."
@@ -2250,7 +2256,7 @@ msgstr "Enviouse a mensaxe"
#: actions/newmessage.php:185
#, php-format
msgid "Direct message to %s sent."
-msgstr "Enviouse a mensaxe directa a %s,"
+msgstr "Enviouse a mensaxe directa a %s."
#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
@@ -2280,7 +2286,7 @@ msgstr "Busca de texto"
#: actions/noticesearch.php:91
#, php-format
msgid "Search results for \"%1$s\" on %2$s"
-msgstr "Resultados da busca de «%1$s» en %2$s"
+msgstr "Resultados da busca de \"%1$s\" en %2$s"
#: actions/noticesearch.php:121
#, php-format
@@ -2297,19 +2303,18 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-"Que lle parece [rexistrar unha conta](%%%%action.register%%%%) e ser o "
-"primeiro en [publicar sobre este tema](%%%%action.newnotice%%%%?"
-"status_textarea=%s)?"
+"Por que non [rexistrar unha conta](%%%%action.register%%%%) e ser o primeiro "
+"en [publicar sobre este tema](%%%%action.newnotice%%%%?status_textarea=%s)?"
#: actions/noticesearchrss.php:96
#, php-format
msgid "Updates with \"%s\""
-msgstr "Actualizacións con «%s»"
+msgstr "Actualizacións con \"%s\""
#: actions/noticesearchrss.php:98
#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Actualizacións que conteñen os termos «%1$s» en %2$s."
+msgstr "Actualizacións que conteñen o termo \"%1$s\" en %2$s!"
#: actions/nudge.php:85
msgid ""
@@ -2367,7 +2372,7 @@ msgstr "Non autorizou o acceso á súa conta para ningunha aplicación."
#: actions/oauthconnectionssettings.php:211
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-"os desenvolvedores poden editar a configuración de rexistro das dúas "
+"Os desenvolvedores poden editar a configuración de rexistro das súas "
"aplicacións "
#: actions/oembed.php:79 actions/shownotice.php:100
@@ -2379,15 +2384,19 @@ msgstr "Non hai perfil para a nota"
msgid "%1$s's status on %2$s"
msgstr "Estado de %1$s en %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "tipo de contido "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Só "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Non se soporta ese formato de datos."
@@ -2414,7 +2423,7 @@ msgstr " (servizo gratuÃto)"
#: actions/othersettings.php:116
msgid "Shorten URLs with"
-msgstr "Abreviar os URLs con"
+msgstr "Abreviar os enderezos URL con"
#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
@@ -2431,12 +2440,12 @@ msgstr "Amosar ou agochar os deseños do perfil."
#: actions/othersettings.php:153
msgid "URL shortening service is too long (max 50 chars)."
msgstr ""
-"O servizo de abreviación de URLs é longo de máis (o lÃmite está en 50 "
-"caracteres)."
+"O servizo de abreviación de enderezos URL é longo de máis (o lÃmite está en "
+"50 caracteres)."
#: actions/otp.php:69
msgid "No user ID specified."
-msgstr "Non se especificou unha ID de usuario."
+msgstr "Non se especificou ningunha ID de usuario."
#: actions/otp.php:83
msgid "No login token specified."
@@ -2457,12 +2466,12 @@ msgstr "O pase caducou."
#: actions/outbox.php:58
#, php-format
msgid "Outbox for %1$s - page %2$d"
-msgstr "Caixa de saÃda para %1$s - páxina %2$d"
+msgstr "Caixa de saÃda de %1$s - páxina %2$d"
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
-msgstr "Caixa de saÃda para %s"
+msgstr "Caixa de saÃda de %s"
#: actions/outbox.php:116
msgid "This is your outbox, which lists private messages you have sent."
@@ -2520,7 +2529,7 @@ msgstr "O contrasinal anterior non é correcto"
#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
-msgstr "Houbo un eror ao gardar o usuario. Incorrecto."
+msgstr "Houbo un erro ao gardar o usuario. Incorrecto."
#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
@@ -2537,7 +2546,7 @@ msgstr "Rutas"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site."
-msgstr "Configuración do servidor e as rutas para este sitio StatusNet."
+msgstr "Configuración do servidor e das rutas para este sitio StatusNet."
#: actions/pathsadminpanel.php:157
#, php-format
@@ -2593,11 +2602,11 @@ msgstr "Ruta do directorio das traducións"
#: actions/pathsadminpanel.php:250
msgid "Fancy URLs"
-msgstr "URLs agradables"
+msgstr "Enderezos URL agradables"
#: actions/pathsadminpanel.php:252
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr "Utilizar URLs agradables (mellores de ler ou lembrar)?"
+msgstr "Quere utilizar enderezos URL agradables (mellores de ler e lembrar)?"
#: actions/pathsadminpanel.php:259
msgid "Theme"
@@ -2625,7 +2634,7 @@ msgstr "Servidor de avatares"
#: actions/pathsadminpanel.php:288
msgid "Avatar path"
-msgstr "Ruta ao avatar"
+msgstr "Ruta do avatar"
#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
@@ -2641,7 +2650,7 @@ msgstr "Servidor de fondos"
#: actions/pathsadminpanel.php:309
msgid "Background path"
-msgstr "Ruta ao fondo"
+msgstr "Ruta do fondo"
#: actions/pathsadminpanel.php:313
msgid "Background directory"
@@ -2673,7 +2682,7 @@ msgstr "Cando utilizar SSL"
#: actions/pathsadminpanel.php:335
msgid "SSL server"
-msgstr "Servidor SSl"
+msgstr "Servidor SSL"
#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
@@ -2704,7 +2713,7 @@ msgstr "A etiqueta de persoa non é correcta: %s"
#: actions/peopletag.php:142
#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Usuarios autoetiquetados con %1$s - páxina %2$d"
+msgstr "Usuarios etiquetados por si mesmos con %1$s - páxina %2$d"
#: actions/postnotice.php:95
msgid "Invalid notice content"
@@ -2713,7 +2722,8 @@ msgstr "O contido da nota é incorrecto"
#: actions/postnotice.php:101
#, php-format
msgid "Notice license â%1$sâ is not compatible with site license â%2$sâ."
-msgstr "A licenza â%1$sâ da nota non é compatible coa licenza â%2$sâ do sitio."
+msgstr ""
+"A licenza \"%1$s\" da nota non é compatible coa licenza \"%2$s\" do sitio."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2822,7 +2832,7 @@ msgstr "A biografÃa é longa de máis (o lÃmite son %d caracteres)."
#: actions/profilesettings.php:235 actions/siteadminpanel.php:151
msgid "Timezone not selected."
-msgstr "Non se escolleu un fuso horario."
+msgstr "Non se escolleu ningún fuso horario."
#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
@@ -2831,58 +2841,58 @@ msgstr "A lingua é longa de máis (o lÃmite é de 50 caracteres)."
#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
-msgstr "Etiqueta incorrecta: «%s»"
+msgstr "Etiqueta incorrecta: \"%s\""
#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
-msgstr ""
+msgstr "Non se puido actualizar o usuario para subscribirse automaticamente."
#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
-msgstr ""
+msgstr "Non se puideron gardar as preferencias de lugar."
#: actions/profilesettings.php:375
msgid "Couldn't save profile."
-msgstr ""
+msgstr "Non se puido gardar o perfil."
#: actions/profilesettings.php:383
msgid "Couldn't save tags."
-msgstr ""
+msgstr "Non se puideron gardar as etiquetas."
#. TRANS: Message after successful saving of administrative settings.
#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
msgid "Settings saved."
-msgstr ""
+msgstr "Gardouse a configuración."
#: actions/public.php:83
#, php-format
msgid "Beyond the page limit (%s)"
-msgstr ""
+msgstr "Alén do lÃmite da páxina (%s)"
#: actions/public.php:92
msgid "Could not retrieve public stream."
-msgstr ""
+msgstr "Non se puido obter o fluxo público."
#: actions/public.php:130
#, php-format
msgid "Public timeline, page %d"
-msgstr ""
+msgstr "Liña do tempo pública, páxina %d"
#: actions/public.php:132 lib/publicgroupnav.php:79
msgid "Public timeline"
-msgstr ""
+msgstr "Liña do tempo pública"
#: actions/public.php:160
msgid "Public Stream Feed (RSS 1.0)"
-msgstr ""
+msgstr "Fonte de novas no fluxo público (RSS 1.0)"
#: actions/public.php:164
msgid "Public Stream Feed (RSS 2.0)"
-msgstr ""
+msgstr "Fonte de novas no fluxo público (RSS 2.0)"
#: actions/public.php:168
msgid "Public Stream Feed (Atom)"
-msgstr ""
+msgstr "Fonte de novas no fluxo público (Atom)"
#: actions/public.php:188
#, php-format
@@ -2890,16 +2900,20 @@ msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
+"Esta é a liña do tempo pública para %%site.name%% pero ninguén publicou nada "
+"aÃnda."
#: actions/public.php:191
msgid "Be the first to post!"
-msgstr ""
+msgstr "Sexa o primeiro en publicar!"
#: actions/public.php:195
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
+"Por que non [rexistrar unha conta](%%action.register%%) e ser o primeiro en "
+"publicar?"
#: actions/public.php:242
#, php-format
@@ -2909,6 +2923,11 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
+"Isto é %%site.name%%, un servizo de [microblogging](http://en.wikipedia.org/"
+"wiki/Microblogging) baseado na ferramenta de software libre [StatusNet]"
+"(http://status.net/). [Ãnase agora](%%action.register%%) para compartir "
+"notas persoais cos amigos, a familia e os compañeiros! ([Ler máis](%%doc.help"
+"%%))"
#: actions/public.php:247
#, php-format
@@ -2917,10 +2936,13 @@ msgid ""
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
+"Isto é %%site.name%%, un servizo de [microblogging](http://en.wikipedia.org/"
+"wiki/Microblogging) baseado na ferramenta de software libre [StatusNet]"
+"(http://status.net/)."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
-msgstr ""
+msgstr "Nube de etiquetas públicas"
#: actions/publictagcloud.php:63
#, php-format
@@ -3079,7 +3101,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -3131,20 +3153,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr ""
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr ""
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
+#, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3163,7 +3178,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3238,7 +3253,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr ""
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr ""
@@ -4480,11 +4495,11 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4776,23 +4791,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr ""
-
-#: lib/action.php:855
-msgid "license."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr ""
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr ""
@@ -5080,12 +5093,14 @@ msgstr ""
msgid "Fullname: %s"
msgstr ""
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5208,33 +5223,30 @@ msgid "You are not subscribed to anyone."
msgstr ""
#: lib/command.php:754
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "You are subscribed to this person:"
-msgstr[1] "You are subscribed to these people:"
+msgstr[0] "Vostede está subscrito a esta persoa:"
+msgstr[1] "Vostede está subscrito a estas persoas:"
#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr ""
#: lib/command.php:776
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
-msgstr[0] "This person is subscribed to you:"
-msgstr[1] "These people are subscribed to you:"
+msgstr[0] "Esta persoa está subscrita a vostede:"
+msgstr[1] "Estas persoas están subscritas a vostede:"
#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr ""
#: lib/command.php:798
-#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
-msgstr[0] "You are a member of this group:"
-msgstr[1] "You are a member of these groups:"
+msgstr[0] "Vostede pertence a este grupo:"
+msgstr[1] "Vostede pertence a estes grupos:"
#: lib/command.php:812
msgid ""
@@ -5527,11 +5539,13 @@ msgstr ""
msgid "Sign up for a new account"
msgstr ""
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr ""
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5548,12 +5562,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 ""
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5568,17 +5584,20 @@ msgid ""
"Change your email address or notification options at %8$s\n"
msgstr ""
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr ""
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5591,21 +5610,31 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr ""
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr ""
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5621,12 +5650,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5645,12 +5676,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5671,12 +5704,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5689,6 +5732,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -5851,23 +5906,23 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr ""
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr ""
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr ""
@@ -5973,11 +6028,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr ""
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6001,6 +6052,10 @@ msgstr ""
msgid "Popular"
msgstr ""
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr ""
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr ""
@@ -6191,47 +6246,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr ""
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr ""
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr ""
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 97aed1f2c9..ed50d6c6e3 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:55+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:27+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
"X-Message-Group: out-statusnet\n"
@@ -774,7 +774,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
#, fuzzy
msgid "Delete"
msgstr "××ק"
@@ -818,7 +818,7 @@ msgstr "×ת××× × ×¢×××× ×."
msgid "You already blocked that user."
msgstr "××ר × ×× ×¡×ª ××ער×ת!"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "××× ×שת×ש ×××."
@@ -832,7 +832,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "××"
@@ -843,11 +843,11 @@ msgstr "××× ×שת×ש ×××."
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "××"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "××× ×שת×ש ×××."
@@ -899,9 +899,11 @@ msgstr ""
msgid "Unblock this user"
msgstr "××× ×שת×ש ×××."
-#: actions/bookmarklet.php:50
-msgid "Post to "
-msgstr ""
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
+msgstr "ת×××ת ×¢××ר %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -975,7 +977,7 @@ msgstr "×× ×©××× × ×××× × ×ת ×פר×פ×× ×××"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr ""
@@ -1035,7 +1037,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "××× ××××¢× ×××."
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr ""
@@ -1676,12 +1678,12 @@ msgstr "××שת×ש ××× ×¤×¨×פ××."
msgid "User is not a member of group."
msgstr "×× ×©××× × ×××× × ×ת ×פר×פ×× ×××"
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
#, fuzzy
msgid "Block user from group"
msgstr "××× ×שת×ש ×××."
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1689,17 +1691,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
#, fuzzy
msgid "Do not block this user from this group"
msgstr "× ×ש×× ×××¤× ×× ×שרת: %s"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
#, fuzzy
msgid "Block this user from this group"
msgstr "××× ×שת×ש ×××."
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1781,19 +1783,19 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr ""
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr ""
@@ -2064,12 +2066,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "ש××"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr ""
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2381,16 +2385,19 @@ msgstr "×××××¢× ××× ×¤×¨×פ××"
msgid "%1$s's status on %2$s"
msgstr "×ס×××ס ×©× %1$s ×-%2$s "
-#: actions/oembed.php:157
-#, fuzzy
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "×ת××ר"
-#: actions/oembed.php:160
-msgid "Only "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -3100,7 +3107,7 @@ msgstr "ש×××× ×××ש×ר ×ק××."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "××רש×"
@@ -3152,20 +3159,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr ""
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "××קס××× ××ק×צ×× ×©×× ××פצ×× ×ª×ת רש×××"
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
+#, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3184,7 +3184,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3268,7 +3268,7 @@ msgstr "×× × ××ª× ××××¨×©× ××× ×ס××× ×רש×××"
msgid "You already repeated that notice."
msgstr "××ר × ×× ×¡×ª ××ער×ת!"
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "צ×ר"
@@ -4579,12 +4579,12 @@ msgstr ""
msgid "Problem saving notice."
msgstr "××¢×× ×ש××רת ×××××¢×."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "××¢×× ×ש××רת ×××××¢×."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4907,24 +4907,22 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr ""
-
-#: lib/action.php:855
-msgid "license."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1165
#, fuzzy
msgid "After"
msgstr "<< ××ר×"
-#: lib/action.php:1171
+#: lib/action.php:1173
#, fuzzy
msgid "Before"
msgstr "××¤× × >>"
@@ -5233,12 +5231,14 @@ msgstr "×ס×××ס ×©× %1$s ×-%2$s "
msgid "Fullname: %s"
msgstr "×©× ×××"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5700,11 +5700,13 @@ msgstr "×©× ××שת×ש ×× ×ס×ס×× ×× ××ק×××"
msgid "Sign up for a new account"
msgstr "צ×ר ×ש××× ××ש"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr ""
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5721,12 +5723,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 ×עת ××××× ×××××¢×ת ש×× ×-%2$s"
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5746,17 +5750,20 @@ msgstr ""
" ש××,\n"
" %4$s.\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "××××ת: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5769,21 +5776,31 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr ""
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr ""
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5799,12 +5816,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5823,12 +5842,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1$s ×עת ××××× ×××××¢×ת ש×× ×-%2$s"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5849,12 +5870,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5867,6 +5898,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -6036,26 +6079,26 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "××× ×ª×××!"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "צ×ר"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
#, fuzzy
msgid "Reply"
msgstr "×××"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "××××¢×ת"
@@ -6165,12 +6208,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:123
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "××× ×ס×× ×××."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6195,6 +6233,11 @@ msgstr ""
msgid "Popular"
msgstr "×× ×©××"
+#: lib/redirectingaction.php:94
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "××× ×ס×× ×××."
+
#: lib/repeatform.php:107
#, fuzzy
msgid "Repeat this notice?"
@@ -6399,47 +6442,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "××¤× × ×ספר ×©× ××ת"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "××¤× × ××ק×"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "××¤× × ×-%d ×ק×ת"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "××¤× × ×שע×"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "××¤× × ×-%d שע×ת"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "××¤× × ××××"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "××¤× × ×-%d ××××"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "××¤× × ××××ש"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "××¤× × ×-%d ×××ש××"
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr "××¤× × ××©× ×"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index fa2896d12a..882e9ac36b 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:08:59+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:30+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hsb\n"
"X-Message-Group: out-statusnet\n"
@@ -744,7 +744,7 @@ msgid "Preview"
msgstr "PÅehlad"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "ZniÄiÄ"
@@ -784,7 +784,7 @@ msgstr "Awatar zniÄeny."
msgid "You already blocked that user."
msgstr "Sy tutoho wužiwarja hižo zablokowaÅ."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Wužiwarja blokowaÄ"
@@ -797,7 +797,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "NÄ"
@@ -807,11 +807,11 @@ msgstr "Tutoho wužiwarja njeblokowaÄ"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Haj"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Tutoho wužiwarja blokowaÄ"
@@ -859,9 +859,11 @@ msgstr ""
msgid "Unblock this user"
msgstr ""
-#: actions/bookmarklet.php:50
-msgid "Post to "
-msgstr ""
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
+msgstr "skupiny na %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -930,7 +932,7 @@ msgstr "Njejsy wobsedźer tuteje aplikacije."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr ""
@@ -986,7 +988,7 @@ msgstr "ChceÅ¡ woprawdźe tutu zdźÄlenku wuÅ¡mórnyÄ?"
msgid "Do not delete this notice"
msgstr "Tutu zdźÄlenku njewuÅ¡mórnyÄ"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Tutu zdźÄlenku wuÅ¡mórnyÄ"
@@ -1585,11 +1587,11 @@ msgstr "Wužiwar je hižo za skupinu zablokowany."
msgid "User is not a member of group."
msgstr "Wužiwar njeje ÄÅon skupiny."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Wužiwarja za skupinu blokowaÄ"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1597,15 +1599,15 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Tutoho wužiwarja za tutu skupinu blokowaÄ"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Tutoho wužiwarja za tutu skupinu blokowaÄ"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1682,19 +1684,19 @@ msgstr "LisÄina wužiwarjow w tutej skupinje."
msgid "Admin"
msgstr "Administrator"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "BlokowaÄ"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Tutoho wužiwarja k administratorej ÄiniÄ"
@@ -1948,12 +1950,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "PósÅaÄ"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr ""
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2253,15 +2257,19 @@ msgstr "ZdźÄlenka nima profil"
msgid "%1$s's status on %2$s"
msgstr ""
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, php-format
+msgid "content type %s not supported"
msgstr ""
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Jenož "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Njeje podpÄrany datowy format."
@@ -2941,7 +2949,7 @@ msgstr "Wodaj, njepÅaÄiwy pÅeproÅ¡enski kod."
msgid "Registration successful"
msgstr "Registrowanje wuspÄÅ¡ne"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "RegistrowaÄ"
@@ -2993,20 +3001,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "DlÄÅ¡e mjeno, wosebje twoje \"woprawdźite\" mjeno"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Mój tekst a moje dataje steja k dispoziciji pod "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Attribution 3.0"
-
-#: actions/register.php:497
+#, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3025,7 +3026,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3100,7 +3101,7 @@ msgstr "NjemóžeÅ¡ swójsku zdźÄlenku wospjetowaÄ."
msgid "You already repeated that notice."
msgstr "Sy tutu zdźÄlenku hižo wospjetowaÅ."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Wospjetowany"
@@ -4342,11 +4343,11 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4638,23 +4639,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr ""
-
-#: lib/action.php:855
-msgid "license."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr ""
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr ""
@@ -4942,12 +4941,14 @@ msgstr "%s je skupinu %s wopuÅ¡ÄiÅ"
msgid "Fullname: %s"
msgstr "DospoÅne mjeno: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "MÄstno: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5392,11 +5393,13 @@ msgstr "PÅizjewjenje z wužiwarskim mjenom a hesÅom"
msgid "Sign up for a new account"
msgstr "Nowe konto registrowaÄ"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "WobkruÄenje e-mejloweje adresy"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5413,12 +5416,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 ""
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5433,17 +5438,20 @@ msgid ""
"Change your email address or notification options at %8$s\n"
msgstr ""
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "Biografija: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5456,21 +5464,31 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr ""
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "SMS-wobkruÄenje"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr ""
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5486,12 +5504,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Nowa priwatna powÄsÄ wot %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5510,12 +5530,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) je twoju zdźÄlenku jako faworit pÅidaÅ"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5536,12 +5558,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5554,6 +5586,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -5716,23 +5760,23 @@ msgstr "Z"
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr ""
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Wospjetowany wot"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Na tutu zdźÄlenku wotmoÅwiÄ"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "WotmoÅwiÄ"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "ZdźÄlenka wospjetowana"
@@ -5838,11 +5882,7 @@ msgstr ""
msgid "All groups"
msgstr "WÅ¡Ä skupiny"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "Žane wróÄenske argumenty."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -5866,6 +5906,10 @@ msgstr ""
msgid "Popular"
msgstr "Woblubowany"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "Žane wróÄenske argumenty."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Tutu zdźÄlenku wospjetowaÄ?"
@@ -6056,47 +6100,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "pÅed nÄÅ¡to sekundami"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "pÅed nÄhdźe jednej mjeÅÅ¡inu"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "pÅed %d mjeÅÅ¡inami"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "pÅed nÄhdźe jednej hodźinu"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "pÅed nÄhdźe %d hodźinami"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "pÅed nÄhdźe jednym dnjom"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "pÅed nÄhdźe %d dnjemi"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "pÅed nÄhdźe jednym mÄsacom"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "pÅed nÄhdźe %d mÄsacami"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 e449469434..79a0f893e8 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:09:03+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:33+0000\n"
"Language-Team: Interlingua\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: out-statusnet\n"
@@ -766,7 +766,7 @@ msgid "Preview"
msgstr "Previsualisation"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Deler"
@@ -806,7 +806,7 @@ msgstr "Avatar delite."
msgid "You already blocked that user."
msgstr "Tu ha ja blocate iste usator."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Blocar usator"
@@ -822,7 +822,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "No"
@@ -832,11 +832,11 @@ msgstr "Non blocar iste usator"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Si"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Blocar iste usator"
@@ -884,8 +884,10 @@ msgstr "Disblocar"
msgid "Unblock this user"
msgstr "Disblocar iste usator"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Publicar in "
#: actions/confirmaddress.php:75
@@ -955,7 +957,7 @@ msgstr "Tu non es le proprietario de iste application."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Il habeva un problema con tu indicio de session."
@@ -1016,7 +1018,7 @@ msgstr "Es tu secur de voler deler iste nota?"
msgid "Do not delete this notice"
msgstr "Non deler iste nota"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Deler iste nota"
@@ -1629,11 +1631,11 @@ msgstr "Le usator es ja blocate del gruppo."
msgid "User is not a member of group."
msgstr "Le usator non es membro del gruppo."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Blocar usator del gruppo"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1644,15 +1646,15 @@ msgstr ""
"essera removite del gruppo, non potera publicar messages, e non potera "
"subscriber se al gruppo in le futuro."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Non blocar iste usator de iste gruppo"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Blocar iste usator de iste gruppo"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr "Error del base de datos al blocar le usator del gruppo."
@@ -1731,19 +1733,19 @@ msgstr "Un lista de usatores in iste gruppo."
msgid "Admin"
msgstr "Administrator"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Blocar"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "Facer le usator administrator del gruppo"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Facer administrator"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Facer iste usator administrator"
@@ -2024,12 +2026,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Inviar"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s te ha invitate a accompaniar le/la in %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2375,15 +2379,19 @@ msgstr "Le nota ha nulle profilo"
msgid "%1$s's status on %2$s"
msgstr "Le stato de %1$s in %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "typo de contento "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Solmente "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Formato de datos non supportate."
@@ -3089,7 +3097,7 @@ msgstr "Pardono, le codice de invitation es invalide."
msgid "Registration successful"
msgstr "Registration succedite"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Crear conto"
@@ -3145,22 +3153,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Nomine plus longe, preferibilemente tu nomine \"real\""
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Mi texto e files es disponibile sub le licentia "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Attribution 3.0"
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
" excepte iste datos private: contrasigno, adresse de e-mail, adresse de "
"messageria instantanee, numero de telephono."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3192,7 +3193,7 @@ msgstr ""
"\n"
"Gratias pro inscriber te, e nos spera que iste servicio te place."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3275,7 +3276,7 @@ msgstr "Tu non pote repeter tu proprie nota."
msgid "You already repeated that notice."
msgstr "Tu ha ja repetite iste nota."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Repetite"
@@ -4613,11 +4614,11 @@ msgstr "Il te es prohibite publicar notas in iste sito."
msgid "Problem saving notice."
msgstr "Problema salveguardar nota."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr "Problema salveguardar le cassa de entrata del gruppo."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4915,23 +4916,21 @@ msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Contento e datos sub copyright del contributores. Tote le derectos reservate."
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Totes "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "licentia."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "Post"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Ante"
@@ -5230,12 +5229,14 @@ msgstr "%s quitava le gruppo %s"
msgid "Fullname: %s"
msgstr "Nomine complete: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Loco: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Pagina personal: %s"
@@ -5720,11 +5721,13 @@ msgstr "Aperir session con nomine de usator e contrasigno"
msgid "Sign up for a new account"
msgstr "Crear un nove conto"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Confirmation del adresse de e-mail"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5753,12 +5756,14 @@ msgstr ""
"Gratias pro tu attention,\n"
"%s\n"
-#: lib/mail.php:240
+#. 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 seque ora tu notas in %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5783,17 +5788,20 @@ msgstr ""
"----\n"
"Cambia tu adresse de e-mail o optiones de notification a %8$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "Bio: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Nove adresse de e-mail pro publicar in %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5814,21 +5822,31 @@ msgstr ""
"Cordialmente,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "Stato de %s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "Confirmation SMS"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Iste numero de telephono attende confirmation."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "%s te ha pulsate"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5855,12 +5873,14 @@ msgstr ""
"Con salutes cordial,\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Nove message private de %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5893,12 +5913,14 @@ msgstr ""
"Con salutes cordial,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) ha addite tu nota como favorite"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5936,12 +5958,22 @@ msgstr ""
"Cordialmente,\n"
"%6$s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) ha inviate un nota a tu attention"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5954,18 +5986,19 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
-msgstr ""
-"%1$s (@%9$s) inviava ante un momento un nota a tu attention (un 'responsa "
-"@') in %2$s.\n"
+"%5$sYou can reply back here:\n"
"\n"
-"Le nota es hic:\n"
+"\t%6$s\n"
"\n"
-"%3$s\n"
+"The list of all @-replies for you here:\n"
"\n"
-"Le texto:\n"
+"%7$s\n"
"\n"
-"%4$s\n"
+"Faithfully yours,\n"
+"%2$s\n"
"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6136,23 +6169,23 @@ msgstr "W"
msgid "at"
msgstr "a"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "in contexto"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Repetite per"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Responder a iste nota"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Nota repetite"
@@ -6258,11 +6291,7 @@ msgstr "Media de cata die"
msgid "All groups"
msgstr "Tote le gruppos"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "Nulle parametro return-to."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "Methodo non implementate."
@@ -6286,6 +6315,10 @@ msgstr "In evidentia"
msgid "Popular"
msgstr "Popular"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "Nulle parametro return-to."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Repeter iste nota?"
@@ -6476,47 +6509,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "alcun secundas retro"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "circa un minuta retro"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minutas retro"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "circa un hora retro"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "circa %d horas retro"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "circa un die retro"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "circa %d dies retro"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "circa un mense retro"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "circa %d menses retro"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 532f83c61b..a99f7d058e 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:09:06+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:36+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: out-statusnet\n"
@@ -772,7 +772,7 @@ msgid "Preview"
msgstr "Forsýn"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Eyða"
@@ -815,7 +815,7 @@ msgstr ""
msgid "You already blocked that user."
msgstr "Ãú hefur nú þegar lokað á þennan notanda."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Loka á notanda"
@@ -828,7 +828,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Nei"
@@ -839,11 +839,11 @@ msgstr "Opna á þennan notanda"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Já"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Loka á þennan notanda"
@@ -891,9 +891,10 @@ msgstr "Opna"
msgid "Unblock this user"
msgstr "Opna á þennan notanda"
-#: actions/bookmarklet.php:50
-#, fuzzy
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Ljósmynd"
#: actions/confirmaddress.php:75
@@ -968,7 +969,7 @@ msgstr "Ãú ert ekki meðlimur à þessum hópi."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Ãað komu upp vandamál varðandi setutókann þinn."
@@ -1027,7 +1028,7 @@ msgstr "Ertu viss um að þú viljir eyða þessu babli?"
msgid "Do not delete this notice"
msgstr ""
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Eyða þessu babli"
@@ -1666,11 +1667,11 @@ msgstr ""
msgid "User is not a member of group."
msgstr ""
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr ""
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1678,15 +1679,15 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr ""
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr ""
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1763,19 +1764,19 @@ msgstr "Listi yfir notendur à þessum hóp."
msgid "Admin"
msgstr "Stjórnandi"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Loka"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr ""
@@ -2049,12 +2050,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Senda"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s hefur boðið þér að slást à hópinn með þeim á %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2402,15 +2405,19 @@ msgstr "Babl hefur enga persónulega sÃðu"
msgid "%1$s's status on %2$s"
msgstr "Staða %1$s á %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, php-format
+msgid "content type %s not supported"
msgstr ""
-#: actions/oembed.php:160
-msgid "Only "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Enginn stuðningur við gagnasnið."
@@ -3124,7 +3131,7 @@ msgstr ""
msgid "Registration successful"
msgstr "Nýskráning tókst"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Nýskrá"
@@ -3178,20 +3185,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Lengra nafn, ákjósalegast að það sé \"rétta\" nafnið þitt"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Textinn og skrárnar mÃnar eru aðgengilegar undir "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
+#, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:538
+#: actions/register.php:542
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3224,7 +3224,7 @@ msgstr ""
"\n"
"Takk fyrir að skrá þig og við vonum að þú njótir þjónustunnar."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3314,7 +3314,7 @@ msgstr "Ãú getur ekki nýskráð þig nema þú samþykkir leyfið."
msgid "You already repeated that notice."
msgstr "Ãú hefur nú þegar lokað á þennan notanda."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "à sviðsljósinu"
@@ -4628,12 +4628,12 @@ msgstr "Ãað hefur verið lagt bann við babli frá þér á þessari sÃðu."
msgid "Problem saving notice."
msgstr "Vandamál komu upp við að vista babl."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Vandamál komu upp við að vista babl."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4956,23 +4956,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Allt "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "leyfi."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Uppröðun"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "Eftir"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Ãður"
@@ -5282,12 +5280,14 @@ msgstr "%s gekk úr hópnum %s"
msgid "Fullname: %s"
msgstr "Fullt nafn: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Staðsetning: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "HeimasÃða: %s"
@@ -5741,11 +5741,13 @@ msgstr "Skráðu þig inn með notendanafni og lykilorði"
msgid "Sign up for a new account"
msgstr "Búðu til nýjan aðgang"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Staðfesting tölvupóstfangs"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5762,12 +5764,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 er að hlusta á bablið þitt á %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5782,19 +5786,22 @@ msgid ""
"Change your email address or notification options at %8$s\n"
msgstr ""
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
"Lýsing: %s\n"
"\n"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Nýtt tölvupóstfang til að senda á %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5815,21 +5822,31 @@ msgstr ""
"Með kærri kveðju,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "Staða %s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "SMS staðfesting"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Býð eftir staðfestingu varðandi þetta sÃmanúmer."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "%s ýtti við þér"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5845,12 +5862,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Ný persónuleg skilaboð frá %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5869,12 +5888,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s heldur upp á babl frá þér"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5895,12 +5916,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5913,6 +5944,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -6081,24 +6124,24 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr ""
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "à sviðsljósinu"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Svara þessu babli"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Svara"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "Babl sent inn"
@@ -6207,12 +6250,7 @@ msgstr ""
msgid "All groups"
msgstr "Allir hópar"
-#: lib/profileformaction.php:123
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "Ekkert einkenni gefið upp."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6236,6 +6274,11 @@ msgstr "à sviðsljósinu"
msgid "Popular"
msgstr "Vinsælt"
+#: lib/redirectingaction.php:94
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "Ekkert einkenni gefið upp."
+
#: lib/repeatform.php:107
#, fuzzy
msgid "Repeat this notice?"
@@ -6435,47 +6478,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "fyrir nokkrum sekúndum"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "fyrir um einni mÃnútu sÃðan"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "fyrir um %d mÃnútum sÃðan"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "fyrir um einum klukkutÃma sÃðan"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "fyrir um %d klukkutÃmum sÃðan"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "fyrir um einum degi sÃðan"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "fyrir um %d dögum sÃðan"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "fyrir um einum mánuði sÃðan"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "fyrir um %d mánuðum sÃðan"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 7b57b1cbdd..2e850a167e 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:09:09+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:39+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: out-statusnet\n"
@@ -767,7 +767,7 @@ msgid "Preview"
msgstr "Anteprima"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Elimina"
@@ -807,7 +807,7 @@ msgstr "Immagine eliminata."
msgid "You already blocked that user."
msgstr "Hai già bloccato quell'utente."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Blocca utente"
@@ -823,7 +823,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "No"
@@ -833,11 +833,11 @@ msgstr "Non bloccare questo utente"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Sì"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Blocca questo utente"
@@ -885,8 +885,10 @@ msgstr "Sblocca"
msgid "Unblock this user"
msgstr "Sblocca questo utente"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Invia a "
#: actions/confirmaddress.php:75
@@ -956,7 +958,7 @@ msgstr "Questa applicazione non è di tua proprietà ."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Si è verificato un problema con il tuo token di sessione."
@@ -1016,7 +1018,7 @@ msgstr "Vuoi eliminare questo messaggio?"
msgid "Do not delete this notice"
msgstr "Non eliminare il messaggio"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Elimina questo messaggio"
@@ -1633,11 +1635,11 @@ msgstr "L'utente è già bloccato dal gruppo."
msgid "User is not a member of group."
msgstr "L'utente non fa parte del gruppo."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Blocca l'utente dal gruppo"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1648,15 +1650,15 @@ msgstr ""
"dal gruppo, non potrà più inviare messaggi e non potrà più iscriversi al "
"gruppo."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Non bloccare l'utente da questo gruppo"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Blocca l'utente da questo gruppo"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr "Errore del database nel bloccare l'utente dal gruppo."
@@ -1735,19 +1737,19 @@ msgstr "Un elenco degli utenti in questo gruppo."
msgid "Admin"
msgstr "Amministra"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Blocca"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "Rende l'utente amministratore del gruppo"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Rendi amm."
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Rende questo utente un amministratore"
@@ -2027,12 +2029,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Invia"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "Hai ricevuto un invito per seguire %1$s su %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2373,15 +2377,19 @@ msgstr "Il messaggio non ha un profilo"
msgid "%1$s's status on %2$s"
msgstr "Stato di %1$s su %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "tipo di contenuto "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Solo "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Non è un formato di dati supportato."
@@ -3087,7 +3095,7 @@ msgstr "Codice di invito non valido."
msgid "Registration successful"
msgstr "Registrazione riuscita"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrati"
@@ -3143,22 +3151,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "I miei testi e file sono disponibili nei termini della licenza "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Attribution 3.0"
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
" a eccezione di questi dati personali: password, indirizzo email, indirizzo "
"messaggistica istantanea e numero di telefono."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3192,7 +3193,7 @@ msgstr ""
"Grazie per la tua iscrizione e speriamo tu possa divertiti usando questo "
"servizio."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3275,7 +3276,7 @@ msgstr "Non puoi ripetere i tuoi stessi messaggi."
msgid "You already repeated that notice."
msgstr "Hai già ripetuto quel messaggio."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Ripetuti"
@@ -4613,11 +4614,11 @@ msgstr "Ti è proibito inviare messaggi su questo sito."
msgid "Problem saving notice."
msgstr "Problema nel salvare il messaggio."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr "Problema nel salvare la casella della posta del gruppo."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4917,23 +4918,21 @@ msgstr ""
"I contenuti e i dati sono forniti dai collaboratori. Tutti i diritti "
"riservati."
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Tutti "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "licenza."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Paginazione"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "Successivi"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Precedenti"
@@ -5229,12 +5228,14 @@ msgstr "%1$s ha lasciato il gruppo %2$s"
msgid "Fullname: %s"
msgstr "Nome completo: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Posizione: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Pagina web: %s"
@@ -5722,11 +5723,13 @@ msgstr "Accedi con nome utente e password"
msgid "Sign up for a new account"
msgstr "Iscriviti per un nuovo account"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Conferma indirizzo email"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5756,12 +5759,14 @@ msgstr ""
"Grazie per il tuo tempo, \n"
"%s\n"
-#: lib/mail.php:240
+#. 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 sta ora seguendo i tuoi messaggi su %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5786,17 +5791,20 @@ msgstr ""
"----\n"
"Modifica il tuo indirizzo email o le opzioni di notifica presso %8$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "Biografia: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Nuovo indirizzo email per inviare messaggi a %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5817,21 +5825,31 @@ msgstr ""
"Cordiali saluti,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "stato di %s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "Conferma SMS"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "In attesa della conferma per questo numero di telefono."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "%s ti ha richiamato"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5858,12 +5876,14 @@ msgstr ""
"Cordiali saluti,\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Nuovo messaggio privato da %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5896,12 +5916,14 @@ msgstr ""
"Cordiali saluti,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5939,12 +5961,22 @@ msgstr ""
"Cordiali saluti,\n"
"%6$s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) ti ha inviato un messaggio"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5957,17 +5989,19 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
-msgstr ""
-"%1$s (@%9$s) ti ha appena inviato un messaggio (una \"@-riposta\") su %2$s.\n"
+"%5$sYou can reply back here:\n"
"\n"
-"Il messaggio si trova qui:\n"
+"\t%6$s\n"
"\n"
-"\t%3$s\n"
+"The list of all @-replies for you here:\n"
"\n"
-"E dice:\n"
+"%7$s\n"
"\n"
-"\t%4$s\n"
+"Faithfully yours,\n"
+"%2$s\n"
"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6137,23 +6171,23 @@ msgstr "O"
msgid "at"
msgstr "presso"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "in una discussione"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Ripetuto da"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Rispondi a questo messaggio"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Rispondi"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Messaggio ripetuto"
@@ -6259,11 +6293,7 @@ msgstr "Media giornaliera"
msgid "All groups"
msgstr "Tutti i gruppi"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "Nessun argomento return-to."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "Metodo non implementato"
@@ -6287,6 +6317,10 @@ msgstr "In evidenza"
msgid "Popular"
msgstr "Famosi"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "Nessun argomento return-to."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Ripetere questo messaggio?"
@@ -6477,47 +6511,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderatore"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "pochi secondi fa"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "circa un minuto fa"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minuti fa"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "circa un'ora fa"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "circa %d ore fa"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "circa un giorno fa"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "circa %d giorni fa"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "circa un mese fa"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "circa %d mesi fa"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 40fda1fa55..e51c465f50 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:09:13+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:42+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
@@ -761,7 +761,7 @@ msgid "Preview"
msgstr "ãã¬ãã¥ã¼"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "åé¤"
@@ -802,7 +802,7 @@ msgstr "ã¢ãã¿ã¼ãåé¤ããã¾ããã"
msgid "You already blocked that user."
msgstr "ãã®ã¦ã¼ã¶ã¯ãã§ã«ãããã¯æ¸ã¿ã§ãã"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "ã¦ã¼ã¶ããããã¯"
@@ -819,7 +819,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "No"
@@ -829,11 +829,11 @@ msgstr "ãã®ã¦ã¼ã¶ãã¢ã³ãããã¯ãã"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Yes"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "ãã®ã¦ã¼ã¶ããããã¯ãã"
@@ -881,8 +881,10 @@ msgstr "ã¢ã³ãããã¯"
msgid "Unblock this user"
msgstr "ãã®ã¦ã¼ã¶ãã¢ã³ãããã¯ãã"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "æ稿"
#: actions/confirmaddress.php:75
@@ -952,7 +954,7 @@ msgstr "ãã®ã¢ããªã±ã¼ã·ã§ã³ã®ãªã¼ãã¼ã§ã¯ããã¾ããã"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "ããªãã®ã»ãã·ã§ã³ãã¼ã¯ã³ã«é¢ããåé¡ãããã¾ããã"
@@ -1013,7 +1015,7 @@ msgstr "æ¬å½ã«ãã®ã¤ã¶ãããåé¤ãã¾ããï¼"
msgid "Do not delete this notice"
msgstr "ãã®ã¤ã¶ãããåé¤ã§ãã¾ããã"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "ãã®ã¤ã¶ãããåé¤"
@@ -1633,11 +1635,11 @@ msgstr "ã¦ã¼ã¶ã¯ãã§ã«ã°ã«ã¼ããããããã¯ããã¦ãã¾ãã
msgid "User is not a member of group."
msgstr "ã¦ã¼ã¶ã¯ã°ã«ã¼ãã®ã¡ã³ãã¼ã§ã¯ããã¾ããã"
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "ã°ã«ã¼ãããã¦ã¼ã¶ããããã¯"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1647,15 +1649,15 @@ msgstr ""
"æ¬å½ã«ã¦ã¼ã¶ %1$s ãã°ã«ã¼ã %2$s ãããããã¯ãã¾ãã? å½¼ãã¯ã°ã«ã¼ãããå"
"é¤ããããæ稿ã§ããªããã°ã«ã¼ãããã©ãã¼ã§ããªããªãã¾ãã"
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "ãã®ã°ã«ã¼ããããã®ã¦ã¼ã¶ããããã¯ããªã"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "ãã®ã°ã«ã¼ããããã®ã¦ã¼ã¶ããããã¯"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr "ã°ã«ã¼ãããã®ãããã¯ã¦ã¼ã¶ã®ãã¼ã¿ãã¼ã¹ã¨ã©ã¼"
@@ -1734,19 +1736,19 @@ msgstr "ãã®ã°ã«ã¼ãã®ã¦ã¼ã¶ã®ãªã¹ãã"
msgid "Admin"
msgstr "管çè
"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "ãããã¯"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "ã¦ã¼ã¶ãã°ã«ã¼ãã®ç®¡çè
ã«ãã"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "管çè
ã«ãã"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "ãã®ã¦ã¼ã¶ã管çè
ã«ãã"
@@ -2026,12 +2028,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "æ稿"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s ãããªãã %2$s ã¸æå¾
ãã¾ãã"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2372,15 +2376,19 @@ msgstr "ã¤ã¶ããã«ã¯ãããã¡ã¤ã«ã¯ããã¾ããã"
msgid "%1$s's status on %2$s"
msgstr "%2$s ã«ããã %1$ ã®ã¹ãã¼ã¿ã¹"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "å
å®¹ç¨®å¥ "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "ã ã "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "ãµãã¼ãããã¦ããªããã¼ã¿å½¢å¼ã"
@@ -3085,7 +3093,7 @@ msgstr "ãã¿ã¾ãããä¸æ£ãªæå¾
ã³ã¼ãã"
msgid "Registration successful"
msgstr "ç»é²æå"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "ç»é²"
@@ -3140,20 +3148,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "é·ãåå"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "次ã®ä¸ã§ããã¹ãåã³ãã¡ã¤ã«ãå©ç¨å¯è½ "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr "å人æ
å ±ãé¤ã: ãã¹ã¯ã¼ããã¡ã¼ã«ã¢ãã¬ã¹ãIMã¢ãã¬ã¹ãé»è©±çªå·"
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3186,7 +3187,7 @@ msgstr ""
"åå ãã¦ãã ãã£ã¦ãããã¨ããããã¾ããç§ãã¡ã¯ããªãããã®ãµã¼ãã¹ã楽ãã"
"ã§ä½¿ã£ã¦ããããã¨ãé¡ã£ã¦ãã¾ãã"
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3270,7 +3271,7 @@ msgstr "èªåã®ã¤ã¶ããã¯ç¹°ãè¿ãã¾ããã"
msgid "You already repeated that notice."
msgstr "ãã§ã«ãã®ã¤ã¶ãããç¹°ãè¿ãã¦ãã¾ãã"
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "ç¹°ãè¿ããã"
@@ -4615,11 +4616,11 @@ msgstr "ããªãã¯ãã®ãµã¤ãã§ã¤ã¶ãããæ稿ããã®ãç¦æ¢ã
msgid "Problem saving notice."
msgstr "ã¤ã¶ãããä¿åããéã«åé¡ãçºçãã¾ããã"
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr "ã°ã«ã¼ãåä¿¡ç®±ãä¿åããéã«åé¡ãçºçãã¾ããã"
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4936,23 +4937,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "å
¨ã¦ "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "ã©ã¤ã»ã³ã¹ã"
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "ãã¼ã¸å"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "<<å¾"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "å>>"
@@ -5251,12 +5250,14 @@ msgstr "%s ã¯ã°ã«ã¼ã %s ã«æ®ãã¾ããã"
msgid "Fullname: %s"
msgstr "ãã«ãã¼ã ï¼ %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "å ´æ: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "ãã¼ã ãã¼ã¸: %s"
@@ -5697,11 +5698,13 @@ msgstr "ã¦ã¼ã¶åã¨ãã¹ã¯ã¼ãã§ãã°ã¤ã³"
msgid "Sign up for a new account"
msgstr "æ°ããã¢ã«ã¦ã³ãã§ãµã¤ã³ã¢ãã"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "ã¡ã¼ã«ã¢ãã¬ã¹ç¢ºèª"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5730,12 +5733,14 @@ msgstr ""
"ãããã¨ããããã¾ãã\n"
"%s\n"
-#: lib/mail.php:240
+#. 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 㯠%2$s ã§ããªãã®ã¤ã¶ãããèãã¦ãã¾ãã"
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5760,17 +5765,20 @@ msgstr ""
"----\n"
"%8$s ã§ã¡ã¼ã«ã¢ãã¬ã¹ãéç¥ãªãã·ã§ã³ãå¤ãã¦ãã ããã\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "èªå·±ç´¹ä»: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "%s ã¸æ稿ã®ããã®æ°ããã¡ã¼ã«ã¢ãã¬ã¹"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, fuzzy, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5791,21 +5799,31 @@ msgstr ""
"å¿ å®ã§ãããããªãã®ãã®ã\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s ã®ç¶æ
"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "SMS確èª"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "ãã®é»è©±çªå·ã¯ç¢ºèªå¾
ã¡ã§ãã"
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "ããªã㯠%s ã«åå³ããã¦ãã¾ã"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, fuzzy, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5832,12 +5850,14 @@ msgstr ""
"æ¬å
·\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "%s ããã®æ°ãããã©ã¤ãã¼ãã¡ãã»ã¼ã¸"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, fuzzy, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5870,12 +5890,14 @@ msgstr ""
"æ¬å
·\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) ã¯ãæ°ã«å
¥ãã¨ãã¦ããªãã®ã¤ã¶ãããå ãã¾ãã"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, fuzzy, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5913,12 +5935,22 @@ msgstr ""
"å¿ å®ã§ãããããªãã®ãã®ã\n"
"%6%s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) ã¯ããªãå®ã¦ã«ã¤ã¶ãããéãã¾ãã"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5931,17 +5963,19 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
-msgstr ""
-"%1$s (@%9$s) ã¯ããªãå®ã¦ã«(@-è¿ä¿¡) %2$s ã§ã¤ã¶ãããéãã¾ããã\n"
+"%5$sYou can reply back here:\n"
"\n"
-"ã¤ã¶ããã¯ãã:\n"
+"\t%6$s\n"
"\n"
-"%3$s\n"
+"The list of all @-replies for you here:\n"
"\n"
-"ãããèªã:\n"
+"%7$s\n"
"\n"
-"%4$s\n"
+"Faithfully yours,\n"
+"%2$s\n"
"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6119,23 +6153,23 @@ msgstr "西"
msgid "at"
msgstr "at"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr ""
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr ""
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "ãã®ã¤ã¶ããã¸è¿ä¿¡"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "è¿ä¿¡"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "ã¤ã¶ãããç¹°ãè¿ãã¾ãã"
@@ -6241,11 +6275,7 @@ msgstr ""
msgid "All groups"
msgstr "å
¨ã¦ã®ã°ã«ã¼ã"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "return-to å¼æ°ãããã¾ããã"
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "æªå®è£
ã®ã¡ã½ããã"
@@ -6269,6 +6299,10 @@ msgstr "ãã£ã¼ãã£ã¼ããã"
msgid "Popular"
msgstr "人æ°"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "return-to å¼æ°ãããã¾ããã"
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "ãã®ã¤ã¶ãããç¹°ãè¿ãã¾ãã?"
@@ -6463,47 +6497,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "管ç"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "æ°ç§å"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "ç´ 1 åå"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "ç´ %d åå"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "ç´ 1 æéå"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "ç´ %d æéå"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "ç´ 1 æ¥å"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "ç´ %d æ¥å"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "ç´ 1 ãµæå"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "ç´ %d ãµæå"
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr "ç´ 1 å¹´å"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 55d5c3645b..d16e80aa27 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:09:19+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:45+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: out-statusnet\n"
@@ -752,7 +752,7 @@ msgid "Preview"
msgstr "미리보기"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "ìì "
@@ -793,7 +793,7 @@ msgstr "ìë°íê° ìì ëììµëë¤."
msgid "You already blocked that user."
msgstr "ì´ë¯¸ ì°¨ë¨ë ì´ì©ìì
ëë¤."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "ì¬ì©ì를 ì°¨ë¨í©ëë¤."
@@ -808,7 +808,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "ìëì¤"
@@ -818,11 +818,11 @@ msgstr "ì´ì©ì를 ì°¨ë¨íì§ ìëë¤."
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "ë¤, ë§ìµëë¤."
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "ì´ ì¬ì©ì ì°¨ë¨í기"
@@ -871,9 +871,10 @@ msgstr "ì°¨ë¨í´ì "
msgid "Unblock this user"
msgstr "ì´ ì¬ì©ì를 ì°¨ë¨í´ì í©ëë¤."
-#: actions/bookmarklet.php:50
-#, fuzzy
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "ì¬ì§"
#: actions/confirmaddress.php:75
@@ -947,7 +948,7 @@ msgstr "ë¹ì ì í´ë¹ 그룹ì 멤ë²ê° ìëëë¤."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "ë¹ì ì ì¸ì
í í°ê´ë ¨ 문ì ê° ììµëë¤."
@@ -1009,7 +1010,7 @@ msgstr "ì ë§ë¡ íµì§ë¥¼ ìì íìê² ìµëê¹?"
msgid "Do not delete this notice"
msgstr "ì´ íµì§ë¥¼ ì§ì¸ ì ììµëë¤."
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "ì´ ê²ìê¸ ìì í기"
@@ -1642,12 +1643,12 @@ msgstr "íìì´ ë¹ì ì ì°¨ë¨í´ììµëë¤."
msgid "User is not a member of group."
msgstr "ë¹ì ì í´ë¹ 그룹ì 멤ë²ê° ìëëë¤."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
#, fuzzy
msgid "Block user from group"
msgstr "ì¬ì©ì를 ì°¨ë¨í©ëë¤."
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1655,17 +1656,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
#, fuzzy
msgid "Do not block this user from this group"
msgstr "ì´ ê·¸ë£¹ì íì리ì¤í¸"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
#, fuzzy
msgid "Block this user from this group"
msgstr "ì´ ê·¸ë£¹ì íì리ì¤í¸"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1745,21 +1746,21 @@ msgstr "ì´ ê·¸ë£¹ì íì리ì¤í¸"
msgid "Admin"
msgstr "ê´ë¦¬ì"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "ì°¨ë¨í기"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
#, fuzzy
msgid "Make user an admin of the group"
msgstr "ê´ë¦¬ìë§ ê·¸ë£¹ì í¸ì§í ì ììµëë¤."
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
#, fuzzy
msgid "Make Admin"
msgstr "ê´ë¦¬ì"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "ì´ ì´ì©ì를 ê´ë¦¬ìë¡ ë§ë¦"
@@ -2029,12 +2030,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "ë³´ë´ê¸°"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$sëì´ ê·í를 %2$sì ì´ëíììµëë¤."
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2372,16 +2375,19 @@ msgstr "íµì§ì íë¡íì´ ììµëë¤."
msgid "%1$s's status on %2$s"
msgstr "%1$sì ìí (%2$sìì)"
-#: actions/oembed.php:157
-#, fuzzy
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "ì°ê²°"
-#: actions/oembed.php:160
-msgid "Only "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "ì§ìíë íìì ë°ì´í°ê° ìëëë¤."
@@ -3093,7 +3099,7 @@ msgstr "íì¸ ì½ë ì¤ë¥"
msgid "Registration successful"
msgstr "íì ê°ì
ì´ ì±ê³µì ì
ëë¤."
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "íìê°ì
"
@@ -3147,21 +3153,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "ëì± ê¸´ ì´ë¦ì ì구í©ëë¤."
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "ëì ê¸ê³¼ íì¼ì ë¼ì´ì ì¤ë ë¤ìê³¼ ê°ìµëë¤ "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
-#, fuzzy
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr "ë¤ì ê°ì¸ì ë³´ ì ì¸: ë¹ë° ë²í¸, ë©ì¼ 주ì, ë©ì ì 주ì, ì í ë²í¸"
-#: actions/register.php:538
+#: actions/register.php:542
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3194,7 +3192,7 @@ msgstr ""
"\n"
"ë¤ì íë² ê°ì
íì ê²ì íìíë©´ì ì¦ê±°ì´ ìë¹ì¤ê° ëì
¨ì¼ë©´ í©ëë¤."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3281,7 +3279,7 @@ msgstr "ìì ì ê¸ì ì¬ì ì¡í ì ììµëë¤."
msgid "You already repeated that notice."
msgstr "ë¹ì ì ì´ë¯¸ ì´ ì¬ì©ì를 ì°¨ë¨íê³ ììµëë¤."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "ì¬ì ì¡ë¨"
@@ -4603,12 +4601,12 @@ msgstr "ì´ ì¬ì´í¸ì ê²ìê¸ í¬ì¤í
ì¼ë¡ë¶í° ë¹ì ì ê¸ì§ëì
msgid "Problem saving notice."
msgstr "íµì§ë¥¼ ì ì¥íëë° ë¬¸ì ê° ë°ìíìµëë¤."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "íµì§ë¥¼ ì ì¥íëë° ë¬¸ì ê° ë°ìíìµëë¤."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4929,23 +4927,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "모ë ê²"
-
-#: lib/action.php:855
-msgid "license."
-msgstr "ë¼ì´ì ì¤"
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "íì´ì§ì"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "ë· íì´ì§"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "ì íì´ì§"
@@ -5257,12 +5253,14 @@ msgstr "%sê° ê·¸ë£¹%s를 ë ë¬ìµëë¤."
msgid "Fullname: %s"
msgstr "ì ì²´ì´ë¦: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "ìì¹: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "ííì´ì§: %s"
@@ -5714,11 +5712,13 @@ msgstr "ì¬ì©ì ì´ë¦ê³¼ ë¹ë°ë²í¸ë¡ ë¡ê·¸ì¸"
msgid "Sign up for a new account"
msgstr "ì ê³ì ì ìí íìê°ì
"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "ì´ë©ì¼ 주ì íì¸ì"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5735,12 +5735,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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ëì´ ê·íì ì림 ë©ìì§ë¥¼ %2$sìì ë£ê³ ììµëë¤."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5759,19 +5761,22 @@ msgstr ""
"\n"
"ê·¸ë¼ ì´ë§,%4$s.\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
"ìê°: %s\n"
"\n"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "%sì í¬ì¤í
í ìë¡ì´ ì´ë©ì¼ 주ì"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5786,21 +5791,31 @@ msgstr ""
"í¬ì¤í
주ìë %1$sì
ëë¤.ì ë©ìì§ë¥¼ ë±ë¡íë ¤ë©´ %2$ 주ìë¡ ì´ë©ì¼ì ë³´ë´ìì"
"ì¤.ì´ë©ì¼ ì¬ì©ë²ì %3$s íì´ì§ë¥¼ ë³´ììì¤.ìë
í,%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s ìí"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "SMS ì¸ì¦"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "ì´ ì í ë²í¸ë ì¸ì¦ ë기ì¤ì
ëë¤."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "%s ì¬ì©ìê° ì°ë¬ ë´¤ìµëë¤."
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5816,12 +5831,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "%së¡ë¶í° ìë¡ì´ ë¹ë° ë©ìì§ê° ëì°©íììµëë¤."
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5840,12 +5857,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%sëì´ ë¹ì ì ê²ìê¸ì ì¢ìíë ê¸ë¡ ì¶ê°íìµëë¤."
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5866,12 +5885,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5884,6 +5913,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -6052,25 +6093,25 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "ë´ì©ì´ ììµëë¤!"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "ìì±"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "ì´ ê²ìê¸ì ëí´ ëµì¥í기"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "ëµì¥í기"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "ê²ìê¸ì´ ë±ë¡ëììµëë¤."
@@ -6180,12 +6221,7 @@ msgstr ""
msgid "All groups"
msgstr "모ë 그룹"
-#: lib/profileformaction.php:123
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "id ì¸ìê° ììµëë¤."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6209,6 +6245,11 @@ msgstr "í¼ì³ë§ë¨"
msgid "Popular"
msgstr "ì¸ê¸°ìë"
+#: lib/redirectingaction.php:94
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "id ì¸ìê° ììµëë¤."
+
#: lib/repeatform.php:107
#, fuzzy
msgid "Repeat this notice?"
@@ -6413,47 +6454,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "ëª ì´ ì "
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "1ë¶ ì "
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "%dë¶ ì "
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "1ìê° ì "
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "%dìê° ì "
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "í루 ì "
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "%dì¼ ì "
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "1ë¬ ì "
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "%dë¬ ì "
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr "1ë
ì "
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 3e5167464d..d7094dc021 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-06 22:53+0000\n"
-"PO-Revision-Date: 2010-04-08 23:09:23+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:49+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: out-statusnet\n"
@@ -769,7 +769,7 @@ msgid "Preview"
msgstr "ÐÑеглед"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "ÐÑиÑи"
@@ -809,7 +809,7 @@ msgstr "ÐваÑаÑÐ¾Ñ Ðµ избÑиÑан."
msgid "You already blocked that user."
msgstr "ÐеÑе го имаÑе блокиÑано ÑÐ¾Ñ ÐºÐ¾ÑиÑник."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "ÐлокиÑÐ°Ñ ÐºÐ¾ÑиÑник"
@@ -826,7 +826,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Ðе"
@@ -836,11 +836,11 @@ msgstr "Ðе го блокиÑÐ°Ñ ÐºÐ¾ÑиÑников"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Ðа"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "ÐлокиÑÐ°Ñ Ð³Ð¾ коÑиÑников"
@@ -888,8 +888,10 @@ msgstr "ÐдблокиÑаÑ"
msgid "Unblock this user"
msgstr "ÐдблокиÑÐ°Ñ Ð³Ð¾ Ð¾Ð²Ð¾Ñ ÐºÐ¾ÑÑник"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "ÐбÑави во "
#: actions/confirmaddress.php:75
@@ -959,7 +961,7 @@ msgstr "Ðе ÑÑе ÑопÑÑвеник на Ð¾Ð²Ð¾Ñ Ð¿ÑогÑам."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Се поÑави пÑоблем Ñо ÐаÑÐ¸Ð¾Ñ ÑеÑиÑки жеÑон."
@@ -1020,7 +1022,7 @@ msgstr "Ðали ÑÑе ÑигÑÑни дека ÑакаÑе да Ñа избÑ
msgid "Do not delete this notice"
msgstr "Ðе Ñа бÑиÑи оваа забелеÑка"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "ÐÑиÑи Ñа оваа забелеÑка"
@@ -1636,11 +1638,11 @@ msgstr "ÐоÑиÑÐ½Ð¸ÐºÐ¾Ñ Ðµ веÑе блокиÑан од оваа гÑÑп
msgid "User is not a member of group."
msgstr "ÐоÑиÑÐ½Ð¸ÐºÐ¾Ñ Ð½Ðµ ÑленÑва во гÑÑпаÑа."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "ÐлокиÑÐ°Ñ ÐºÐ¾ÑиÑник од гÑÑпа"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1651,15 +1653,15 @@ msgstr ""
"$sâ? ÐоÑиÑÐ½Ð¸ÐºÐ¾Ñ Ñе биде оÑÑÑÑÐ°Ð½ÐµÑ Ð¾Ð´ гÑÑпаÑа, и во иднина нема да може да "
"обÑавÑва во Ñаа гÑÑпа и да Ñе пÑеÑплаÑа на неа."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Ðе го блокиÑÐ°Ñ Ð¾Ð²Ð¾Ñ ÐºÐ¾ÑиÑник од оваа гÑÑпа"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "ÐлокиÑÐ°Ñ Ð³Ð¾ Ð¾Ð²Ð¾Ñ ÐºÐ¾ÑиÑник од оваа гÑÑпа"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
"Се поÑави гÑеÑка во базаÑа наподаÑоÑи пÑи блокиÑаÑеÑо на коÑиÑÐ½Ð¸ÐºÐ¾Ñ Ð¾Ð´ "
@@ -1740,19 +1742,19 @@ msgstr "ÐиÑÑа на коÑиÑниÑиÑе на овааг гÑÑпа."
msgid "Admin"
msgstr "ÐдминиÑÑÑаÑоÑ"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "ÐлокиÑаÑ"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "ÐапÑави го коÑиÑÐ½Ð¸ÐºÐ¾Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑаÑÐ¾Ñ Ð½Ð° гÑÑпаÑа"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "ÐапÑави го/Ñа админиÑÑÑаÑоÑ"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "ÐапÑави го коÑиÑÐ½Ð¸ÐºÐ¾Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑаÑоÑ"
@@ -2034,12 +2036,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "ÐÑпÑаÑи"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s ве покани да Ñе пÑидÑÑжиÑе на %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2383,15 +2387,19 @@ msgstr "ÐабелеÑкаÑа нема пÑоÑил"
msgid "%1$s's status on %2$s"
msgstr "%1$s ÑÑаÑÑÑ Ð½Ð° %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "Ñип на ÑодÑжини "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Само "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Ðва не е поддÑжан ÑоÑÐ¼Ð°Ñ Ð½Ð° подаÑоÑека."
@@ -3102,7 +3110,7 @@ msgstr "Ðалиме, неважеÑки код за поканаÑа."
msgid "Registration successful"
msgstr "РегиÑÑÑаÑиÑаÑа е ÑÑпеÑна"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "РегиÑÑÑиÑÐ°Ñ Ñе"
@@ -3158,22 +3166,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Ðодолго име, по можноÑÑ ÐаÑеÑо виÑÑинÑко име и пÑезиме"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "ÐоÑÐ¾Ñ ÑекÑÑ Ð¸ подаÑоÑеки Ñе доÑÑапни под "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Ðаведи Ð¸Ð·Ð²Ð¾Ñ 3.0"
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
" оÑвен овие пÑиваÑни подаÑоÑи: лозинка, е-поÑÑа, IM-адÑеÑа и ÑелеÑонÑки "
"бÑоÑ."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3207,7 +3208,7 @@ msgstr ""
"Ðи благодаÑиме ÑÑо Ñе заÑленивÑе и Ðи пожелÑваме пÑиÑаÑни мигови Ñо оваа "
"ÑлÑжба."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3290,7 +3291,7 @@ msgstr "Ðе можеÑе да повÑоÑÑваÑе ÑопÑÑвена заб
msgid "You already repeated that notice."
msgstr "ÐеÑе Ñа имаÑе повÑоÑено Ñаа забелеÑка."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "ÐовÑоÑено"
@@ -4635,11 +4636,11 @@ msgstr "ÐабÑанеÑо Ðи е да обÑавÑваÑе забелеÑки
msgid "Problem saving notice."
msgstr "ÐÑоблем во заÑÑвÑваÑеÑо на белеÑкаÑа."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr "ÐÑоблем пÑи заÑÑвÑваÑеÑо на гÑÑпноÑо пÑиемно ÑандаÑе."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4941,23 +4942,21 @@ msgstr ""
"ÐвÑоÑÑкиÑе пÑава на ÑодÑжинаÑа и подаÑоÑиÑе им пÑипаÑÐ°Ð°Ñ Ð½Ð° ÑÑеÑниÑиÑе. СиÑе "
"пÑава задÑжани."
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "СиÑе "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "лиÑенÑа."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "ÐÑелом на ÑÑÑаниÑи"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "Ðо"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "ÐÑед"
@@ -5251,12 +5250,14 @@ msgstr "%s Ñа напÑÑÑи гÑÑпаÑа %s"
msgid "Fullname: %s"
msgstr "Ðме и пÑезиме: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "ÐокаÑиÑа: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "ÐомаÑна ÑÑÑаниÑа: %s"
@@ -5741,11 +5742,13 @@ msgstr "ÐаÑава Ñо коÑиÑниÑко име и лозинка"
msgid "Sign up for a new account"
msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ Ð½Ð¾Ð²Ð° ÑмеÑка"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "ÐоÑвÑдÑваÑе на адÑеÑаÑа"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5775,12 +5778,14 @@ msgstr ""
"Ðи благодаÑиме за поÑÑоÑеноÑо вÑеме, \n"
"%s\n"
-#: lib/mail.php:240
+#. 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 Ñега ги Ñледи ÐаÑиÑе забелеÑки на %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5806,17 +5811,20 @@ msgstr ""
"ÐзменеÑе Ñи Ñа е-поÑÑенÑкаÑа адÑеÑа или ги нагодÑваÑаÑа за извеÑÑÑваÑа на %8"
"$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "ÐиогÑаÑиÑа: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Ðова е-поÑÑенÑка адÑеÑа за обÑавÑваÑе на %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5837,21 +5845,31 @@ msgstr ""
"Со иÑкÑена поÑиÑ,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "СÑаÑÑÑ Ð½Ð° %s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "ÐоÑвÑда за СÐС"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "ÐÑекÑвам поÑвÑда за Ð¾Ð²Ð¾Ñ ÑелеÑонÑки бÑоÑ."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "%s Ðе подбÑÑна"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5878,12 +5896,14 @@ msgstr ""
"Со поÑиÑ,\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Ðова пÑиваÑна поÑака од %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5916,12 +5936,14 @@ msgstr ""
"Со поÑиÑ,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) додаде ÐаÑа забелеÑка како омилена"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5959,12 +5981,22 @@ msgstr ""
"Со иÑкÑена поÑиÑ,\n"
"%6$s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) Ðи иÑпÑаÑи забелеÑка ÑÑо Ñака да Ñа пÑоÑиÑаÑе"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5977,18 +6009,19 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
-msgstr ""
-"%1$s (@%9$s) ÑÑоÑÑÐºÑ Ðи иÑпÑаÑи забелеÑка ÑÑо Ñака да Ñа видиÑе (â@-"
-"одговоÑâ) на %2$s.\n"
+"%5$sYou can reply back here:\n"
"\n"
-"ÐабелеÑкаÑа Ñе Ñа наÑдеÑе ÑÑка:\n"
+"\t%6$s\n"
"\n"
-"%3$s\n"
+"The list of all @-replies for you here:\n"
"\n"
-"ÐлаÑи:\n"
+"%7$s\n"
"\n"
-"%4$s\n"
+"Faithfully yours,\n"
+"%2$s\n"
"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6161,23 +6194,23 @@ msgstr "Ð"
msgid "at"
msgstr "во"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "во конÑекÑÑ"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "ÐовÑоÑено од"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "ÐдговоÑи на забелеÑкава"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "ÐдговоÑ"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "ÐабелеÑкаÑа е повÑоÑена"
@@ -6283,11 +6316,7 @@ msgstr "Ðневен пÑоÑек"
msgid "All groups"
msgstr "СиÑе гÑÑпи"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "Ðема return-to аÑгÑменÑи."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "ÐеимплеменÑиÑан меÑод."
@@ -6311,6 +6340,10 @@ msgstr "ÐзбÑани"
msgid "Popular"
msgstr "ÐопÑлаÑно"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "Ðема return-to аÑгÑменÑи."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Ðа Ñа повÑоÑам белеÑкава?"
@@ -6501,47 +6534,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "ÐодеÑаÑоÑ"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "пÑед Ð½ÐµÐºÐ¾Ð»ÐºÑ ÑекÑнди"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "пÑед една минÑÑа"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "пÑед %d минÑÑи"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "пÑед еден ÑаÑ"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "пÑед %d ÑаÑа"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "пÑед еден ден"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "пÑед %d денови"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "пÑед еден меÑеÑ"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "пÑед %d меÑеÑа"
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr "пÑед една година"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index d9c7adf0a4..fdb079aff9 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:09:26+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:52+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 (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: out-statusnet\n"
@@ -758,7 +758,7 @@ msgid "Preview"
msgstr "Forhåndsvis"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Slett"
@@ -798,7 +798,7 @@ msgstr "Avatar slettet."
msgid "You already blocked that user."
msgstr "Du har allerede blokkert den brukeren."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Blokker brukeren"
@@ -814,7 +814,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Nei"
@@ -824,11 +824,11 @@ msgstr "Ikke blokker denne brukeren"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Blokker denne brukeren"
@@ -876,8 +876,10 @@ msgstr "Opphev blokkering"
msgid "Unblock this user"
msgstr "Opphev blokkering av denne brukeren"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Post til "
#: actions/confirmaddress.php:75
@@ -947,7 +949,7 @@ msgstr "Du er ikke eieren av dette programmet."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr ""
@@ -1008,7 +1010,7 @@ msgstr "Er du sikker på at du vil slette denne notisen?"
msgid "Do not delete this notice"
msgstr "Ikke slett denne notisen"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Slett denne notisen"
@@ -1619,11 +1621,11 @@ msgstr "Bruker er allerede blokkert fra gruppe."
msgid "User is not a member of group."
msgstr "Bruker er ikke et medlem av gruppa."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Blokker bruker fra gruppe"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1631,15 +1633,15 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Ikke blokker denne brukeren fra denne gruppa"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Blokker denne brukeren fra denne gruppen"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1715,19 +1717,19 @@ msgstr "En liste over brukerne i denne gruppen."
msgid "Admin"
msgstr "Administrator"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Blokkér"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "Gjør brukeren til en administrator for gruppen"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Gjør til administrator"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Gjør denne brukeren til administrator"
@@ -1993,12 +1995,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Send"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s har invitert deg til %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2326,15 +2330,19 @@ msgstr ""
msgid "%1$s's status on %2$s"
msgstr "%1$s sin status på %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "innholdstype "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Bare "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Ikke et støttet dataformat."
@@ -3025,7 +3033,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -3078,22 +3086,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Lengre navn, helst ditt \"ekte\" navn"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Teksten og filene mine er tilgjengelig under "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Navngivelse 3.0"
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
" utenom disse private dataene: passord, e-postadresse, lynmeldingsadresse "
"og telefonnummer."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3126,7 +3127,7 @@ msgstr ""
"\n"
"Takk for at du registrerte deg og vi håper du kommer til å like tjenesten."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3205,7 +3206,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr "Du er allerede logget inn!"
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Gjentatt"
@@ -4497,11 +4498,11 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Problem ved lagring av notis."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr "Problem ved lagring av gruppeinnboks."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4800,23 +4801,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Alle "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "lisens."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "Etter"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Før"
@@ -5110,12 +5109,14 @@ msgstr "%s forlot gruppen %s"
msgid "Fullname: %s"
msgstr "Fullt navn: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Posisjon: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Hjemmeside: %s"
@@ -5561,11 +5562,13 @@ msgstr "Logg inn med brukernavn og passord"
msgid "Sign up for a new account"
msgstr "Registrer deg for en ny konto"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Bekreftelse av e-postadresse"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5594,12 +5597,14 @@ msgstr ""
"Takk for tiden din,\n"
"%s\n"
-#: lib/mail.php:240
+#. 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 lytter nå til dine notiser på %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5624,17 +5629,20 @@ msgstr ""
"----\n"
"Endre e-postadressen din eller dine varslingsvalg på %8$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "Biografi: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Ny e-postadresse for posting til %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5655,21 +5663,31 @@ msgstr ""
"Vennlig hilsen,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s status"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "SMS-bekreftelse"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Venter på bekreftelse for dette telefonnummeret."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "Du har blitt knuffet av %s"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5696,12 +5714,14 @@ msgstr ""
"Med vennlig hilsen,\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Ny privat melding fra %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5734,12 +5754,14 @@ msgstr ""
"Med vennlig hilsen,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s /@%s) la din notis til som en favoritt"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5776,12 +5798,22 @@ msgstr ""
"Vennlig hilsen,\n"
"%6$s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) sendte en notis for din oppmerksomhet"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5794,18 +5826,19 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
-msgstr ""
-"%1$s (@%9$s) sendte deg akkurat en notis for din oppmerksomhet (et '@-svar') "
-"på %2$s.\n"
+"%5$sYou can reply back here:\n"
"\n"
-"Notisen er her:\n"
+"\t%6$s\n"
"\n"
-"%3$s\n"
+"The list of all @-replies for you here:\n"
"\n"
-"Den lyder:\n"
+"%7$s\n"
"\n"
-"%4$s\n"
+"Faithfully yours,\n"
+"%2$s\n"
"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -5972,23 +6005,23 @@ msgstr "V"
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr ""
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Repetert av"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Svar på denne notisen"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Svar"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Notis repetert"
@@ -6094,11 +6127,7 @@ msgstr ""
msgid "All groups"
msgstr "Alle grupper"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr ""
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "Ikke-implementert metode."
@@ -6123,6 +6152,10 @@ msgstr ""
msgid "Popular"
msgstr ""
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr ""
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Repeter denne notisen?"
@@ -6318,47 +6351,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "noen få sekunder siden"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "omtrent ett minutt siden"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "omtrent %d minutter siden"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "omtrent én time siden"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "omtrent %d timer siden"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "omtrent én dag siden"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "omtrent %d dager siden"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "omtrent én måned siden"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "omtrent %d måneder siden"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 93638f0720..d5303d5eba 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-06 22:53+0000\n"
-"PO-Revision-Date: 2010-04-08 23:09:32+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:59+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: out-statusnet\n"
@@ -778,7 +778,7 @@ msgid "Preview"
msgstr "Voorvertoning"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Verwijderen"
@@ -819,7 +819,7 @@ msgstr "De avatar is verwijderd."
msgid "You already blocked that user."
msgstr "U hebt deze gebruiker reeds geblokkeerd."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Gebruiker blokkeren"
@@ -835,7 +835,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Nee"
@@ -845,11 +845,11 @@ msgstr "Gebruiker niet blokkeren"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Deze gebruiker blokkeren"
@@ -897,8 +897,10 @@ msgstr "Deblokkeer"
msgid "Unblock this user"
msgstr "Deblokkeer deze gebruiker."
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Verzenden naar "
#: actions/confirmaddress.php:75
@@ -968,7 +970,7 @@ msgstr "U bent niet de eigenaar van deze applicatie."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Er is een probleem met uw sessietoken."
@@ -1029,7 +1031,7 @@ msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?"
msgid "Do not delete this notice"
msgstr "Deze mededeling niet verwijderen"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Deze mededeling verwijderen"
@@ -1650,11 +1652,11 @@ msgstr "Deze gebruiker is al de toegang tot de groep ontzegd."
msgid "User is not a member of group."
msgstr "De gebruiker is geen lid van de groep."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Gebruiker toegang tot de groep blokkeren"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1665,15 +1667,15 @@ msgstr ""
"gebruiker wordt dan uit de groep verwijderd, kan er geen berichten meer "
"plaatsen en kan zich in de toekomst ook niet meer op de groep abonneren."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Deze gebruiker niet de toegang tot deze groep ontzeggen"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Deze gebruiker de toegang tot deze groep ontzeggen"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
"Er is een databasefout opgetreden bij het uitsluiten van de gebruiker van de "
@@ -1754,19 +1756,19 @@ msgstr "Ledenlijst van deze groep"
msgid "Admin"
msgstr "Beheerder"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Blokkeren"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "Deze gebruiker groepsbeheerder maken"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Beheerder maken"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Deze gebruiker beheerder maken"
@@ -2050,12 +2052,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Verzenden"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s heeft u uitgenodigd voor %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2402,15 +2406,19 @@ msgstr "Mededeling heeft geen profiel"
msgid "%1$s's status on %2$s"
msgstr "Status van %1$s op %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "inhoudstype "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Alleen "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Geen ondersteund gegevensformaat."
@@ -3125,7 +3133,7 @@ msgstr "Sorry. De uitnodigingscode is ongeldig."
msgid "Registration successful"
msgstr "De registratie is voltooid"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registreren"
@@ -3179,22 +3187,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Een langere naam, mogelijk uw echte naam"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Mijn teksten en bestanden zijn beschikbaar onder "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Naamsvermelding 3.0"
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
" behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, "
"telefoonnummer."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3228,7 +3229,7 @@ msgstr ""
"Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u "
"ervan verwacht."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3311,7 +3312,7 @@ msgstr "U kunt uw eigen mededeling niet herhalen."
msgid "You already repeated that notice."
msgstr "U hent die mededeling al herhaald."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Herhaald"
@@ -4671,13 +4672,13 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr ""
"Er is een probleem opgetreden bij het opslaan van het Postvak IN van de "
"groep."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4979,23 +4980,21 @@ msgstr ""
"Auteursrechten op inhoud en gegevens rusten bij de respectievelijke "
"gebruikers. Alle rechten voorbehouden."
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Alle "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "licentie."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "Later"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Eerder"
@@ -5290,12 +5289,14 @@ msgstr "%s heeft de groep %s verlaten"
msgid "Fullname: %s"
msgstr "Volledige naam: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Locatie: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Thuispagina: %s"
@@ -5788,11 +5789,13 @@ msgstr "Aanmelden met gebruikersnaam en wachtwoord"
msgid "Sign up for a new account"
msgstr "Nieuwe gebruiker aanmaken"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "E-mailadresbevestiging"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5822,12 +5825,14 @@ msgstr ""
"Dank u wel voor uw tijd.\n"
"%s\n"
-#: lib/mail.php:240
+#. 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 volgt nu uw berichten %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5852,17 +5857,20 @@ msgstr ""
"----\n"
"Wijzig uw e-mailadres of instellingen op %8$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "Beschrijving: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Nieuw e-mailadres om e-mail te versturen aan %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5883,21 +5891,31 @@ msgstr ""
"Met vriendelijke groet,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s status"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "SMS-bevestiging"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Er wordt gewacht op bevestiging van dit telefoonnummer."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "%s heeft u gepord"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5925,12 +5943,14 @@ msgstr ""
"Met vriendelijke groet,\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "U hebt een nieuw privébericht van %s."
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5964,12 +5984,14 @@ msgstr ""
"Met vriendelijke groet,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) heeft uw mededeling als favoriet toegevoegd"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6007,12 +6029,22 @@ msgstr ""
"Met vriendelijke groet,\n"
"%6$s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) heeft u een mededeling gestuurd"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6025,17 +6057,19 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
-msgstr ""
-"%1$s (@%9$s) heeft u een bericht gezonden (een antwoord met \"@\") op %2$s.\n"
+"%5$sYou can reply back here:\n"
"\n"
-"De mededeling staat hier:\n"
+"\t%6$s\n"
"\n"
-"%3$s\n"
+"The list of all @-replies for you here:\n"
"\n"
-"De inhoud is:\n"
+"%7$s\n"
"\n"
-"%4$s\n"
+"Faithfully yours,\n"
+"%2$s\n"
"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6207,23 +6241,23 @@ msgstr "W"
msgid "at"
msgstr "op"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "in context"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Herhaald door"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Op deze mededeling antwoorden"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Antwoorden"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Mededeling herhaald"
@@ -6330,11 +6364,7 @@ msgstr "Dagelijks gemiddelde"
msgid "All groups"
msgstr "Alle groepen"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "Er zijn geen \"terug naar\"-parameters opgegeven."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "Methode niet geïmplementeerd."
@@ -6358,6 +6388,10 @@ msgstr "Uitgelicht"
msgid "Popular"
msgstr "Populair"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "Er zijn geen \"terug naar\"-parameters opgegeven."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Deze mededeling herhalen?"
@@ -6548,47 +6582,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "een paar seconden geleden"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "ongeveer een minuut geleden"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minuten geleden"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "ongeveer een uur geleden"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur geleden"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "ongeveer een dag geleden"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dagen geleden"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "ongeveer een maand geleden"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maanden geleden"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 70073c52b2..c25317b394 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:09:29+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:27:56+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 (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: out-statusnet\n"
@@ -776,7 +776,7 @@ msgid "Preview"
msgstr "Forhandsvis"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Slett"
@@ -819,7 +819,7 @@ msgstr "Lasta opp brukarbilete."
msgid "You already blocked that user."
msgstr "Du har allereie blokkert denne brukaren."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Blokker brukaren"
@@ -832,7 +832,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Nei"
@@ -843,11 +843,11 @@ msgstr "LÃ¥s opp brukaren"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Jau"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Blokkér denne brukaren"
@@ -897,9 +897,10 @@ msgstr "LÃ¥s opp"
msgid "Unblock this user"
msgstr "LÃ¥s opp brukaren"
-#: actions/bookmarklet.php:50
-#, fuzzy
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Bilete"
#: actions/confirmaddress.php:75
@@ -974,7 +975,7 @@ msgstr "Du er ikkje medlem av den gruppa."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Det var eit problem med sesjons billetten din."
@@ -1037,7 +1038,7 @@ msgstr "Sikker på at du vil sletta notisen?"
msgid "Do not delete this notice"
msgstr "Kan ikkje sletta notisen."
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Slett denne notisen"
@@ -1686,12 +1687,12 @@ msgstr "Brukar har blokkert deg."
msgid "User is not a member of group."
msgstr "Du er ikkje medlem av den gruppa."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
#, fuzzy
msgid "Block user from group"
msgstr "Blokker brukaren"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1699,17 +1700,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
#, fuzzy
msgid "Do not block this user from this group"
msgstr "Ei liste over brukarane i denne gruppa."
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
#, fuzzy
msgid "Block this user from this group"
msgstr "Ei liste over brukarane i denne gruppa."
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1791,21 +1792,21 @@ msgstr "Ei liste over brukarane i denne gruppa."
msgid "Admin"
msgstr "Administrator"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Blokkér"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
#, fuzzy
msgid "Make user an admin of the group"
msgstr "Du må være administrator for å redigere gruppa"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
#, fuzzy
msgid "Make Admin"
msgstr "Administrator"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr ""
@@ -2078,12 +2079,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Send"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s har invitert deg til %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2425,16 +2428,19 @@ msgstr "Notisen har ingen profil"
msgid "%1$s's status on %2$s"
msgstr "%1$s sin status på %2$s"
-#: actions/oembed.php:157
-#, fuzzy
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "Kopla til"
-#: actions/oembed.php:160
-msgid "Only "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Ikkje eit støtta dataformat."
@@ -3149,7 +3155,7 @@ msgstr "Feil med stadfestingskode."
msgid "Registration successful"
msgstr "Registreringa gikk bra"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrér"
@@ -3204,23 +3210,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Teksten og filene mine er tilgjengeleg under "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
-#, fuzzy
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
" unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og "
"telefonnummer."
-#: actions/register.php:538
+#: actions/register.php:542
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3252,7 +3250,7 @@ msgstr ""
"\n"
"Takk for at du blei med, og vi håpar du vil lika tenesta!"
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3341,7 +3339,7 @@ msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
msgid "You already repeated that notice."
msgstr "Du har allereie blokkert denne brukaren."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "Lag"
@@ -4670,12 +4668,12 @@ msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
msgid "Problem saving notice."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4998,23 +4996,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Alle"
-
-#: lib/action.php:855
-msgid "license."
-msgstr "lisens."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "« Etter"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Før »"
@@ -5326,12 +5322,14 @@ msgstr "%s forlot %s gruppa"
msgid "Fullname: %s"
msgstr "Fullt namn: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Stad: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Heimeside: %s"
@@ -5786,11 +5784,13 @@ msgstr "Log inn med brukarnamn og passord."
msgid "Sign up for a new account"
msgstr "Opprett ny konto"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Stadfesting av epostadresse"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5807,12 +5807,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 høyrer no på notisane dine på %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5833,19 +5835,22 @@ msgstr ""
"Beste helsing,\n"
"%4$s.\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
"Bio: %s\n"
"\n"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Ny epostadresse for å oppdatera %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5865,21 +5870,31 @@ msgstr ""
"\n"
"Helsing frå %4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s status"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "SMS bekreftelse"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Ventar på godkjenning for dette telefonnummeret."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "Du har blitt dulta av %s"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5895,12 +5910,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Ny privat melding fra %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5919,12 +5936,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s la til di melding som ein favoritt"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5945,12 +5964,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5963,6 +5992,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -6131,25 +6172,25 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "Ingen innhald."
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "Lag"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Svar på denne notisen"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Svar"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "Melding lagra"
@@ -6259,12 +6300,7 @@ msgstr ""
msgid "All groups"
msgstr "Alle gruppar"
-#: lib/profileformaction.php:123
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "Manglar argumentet ID."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6288,6 +6324,11 @@ msgstr "Framheva"
msgid "Popular"
msgstr "Populære"
+#: lib/redirectingaction.php:94
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "Manglar argumentet ID."
+
#: lib/repeatform.php:107
#, fuzzy
msgid "Repeat this notice?"
@@ -6492,47 +6533,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "eit par sekund sidan"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "omtrent eitt minutt sidan"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "~%d minutt sidan"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "omtrent ein time sidan"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "~%d timar sidan"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "omtrent ein dag sidan"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "~%d dagar sidan"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "omtrent ein månad sidan"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "~%d månadar sidan"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 e464140945..097f8ae446 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-04-06 22:53+0000\n"
-"PO-Revision-Date: 2010-04-08 23:09:36+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:28:02+0000\n"
"Last-Translator: Piotr DrÄ
g <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ 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 (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: out-statusnet\n"
@@ -766,7 +766,7 @@ msgid "Preview"
msgstr "PodglÄ
d"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "UsuÅ"
@@ -806,7 +806,7 @@ msgstr "UsuniÄto awatar."
msgid "You already blocked that user."
msgstr "Użytkownik jest już zablokowany."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Zablokuj użytkownika"
@@ -822,7 +822,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Nie"
@@ -832,11 +832,11 @@ msgstr "Nie blokuj tego użytkownika"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Tak"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Zablokuj tego użytkownika"
@@ -884,8 +884,10 @@ msgstr "Odblokuj"
msgid "Unblock this user"
msgstr "Odblokuj tego użytkownika"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "WyÅlij do "
#: actions/confirmaddress.php:75
@@ -955,7 +957,7 @@ msgstr "Nie jesteÅ wÅaÅcicielem tej aplikacji."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "WystÄ
piÅ problem z tokenem sesji."
@@ -1015,7 +1017,7 @@ msgstr "JesteÅ pewien, że chcesz usunÄ
Ä ten wpis?"
msgid "Do not delete this notice"
msgstr "Nie usuwaj tego wpisu"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "UsuÅ ten wpis"
@@ -1627,11 +1629,11 @@ msgstr "Użytkownik zostaŠjuż zablokowaŠw grupie."
msgid "User is not a member of group."
msgstr "Użytkownik nie jest czÅonkiem grupy."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Zablokuj użytkownika w grupie"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1642,15 +1644,15 @@ msgstr ""
"Zostanie usuniÄty z grupy, nie bÄdzie mógÅ wysyÅaÄ wpisów i subskrybowaÄ "
"grupy w przyszÅoÅci."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Nie blokuj tego użytkownika w tej grupie"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Zablokuj tego użytkownika w tej grupie"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr "BÅÄ
d bazy danych podczas blokowania użytkownika w grupie."
@@ -1725,19 +1727,19 @@ msgstr "Lista użytkowników znajdujÄ
cych siÄ w tej grupie."
msgid "Admin"
msgstr "Administrator"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Zablokuj"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "UczyŠużytkownika administratorem grupy"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "UczyÅ administratorem"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "UczyŠtego użytkownika administratorem"
@@ -2017,12 +2019,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "WyÅlij"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s zapraszajÄ
ciÄ, abyÅ doÅÄ
czyÅ do nich w %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2363,15 +2367,19 @@ msgstr "Wpis nie posiada profilu"
msgid "%1$s's status on %2$s"
msgstr "Stan użytkownika %1$s na %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "typ zawartoÅci "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Tylko "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "To nie jest obsÅugiwany format danych."
@@ -3077,7 +3085,7 @@ msgstr "NieprawidÅowy kod zaproszenia."
msgid "Registration successful"
msgstr "Rejestracja powiodÅa siÄ"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Zarejestruj siÄ"
@@ -3133,22 +3141,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "DÅuższa nazwa, najlepiej twoje \"prawdziwe\" imiÄ i nazwisko"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Moje teksty i pliki sÄ
dostÄpne na "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Uznanie autorstwa 3.0"
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
" poza tymi prywatnymi danymi: hasÅo, adres e-mail, adres komunikatora i "
"numer telefonu."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3181,7 +3182,7 @@ msgstr ""
"DziÄkujemy za zarejestrowanie siÄ i mamy nadziejÄ, że używanie tej usÅugi "
"sprawi ci przyjemnoÅÄ."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3264,7 +3265,7 @@ msgstr "Nie można powtórzyÄ wÅasnego wpisu."
msgid "You already repeated that notice."
msgstr "Już powtórzono ten wpis."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Powtórzono"
@@ -4607,11 +4608,11 @@ msgstr "Zabroniono ci wysyÅania wpisów na tej witrynie."
msgid "Problem saving notice."
msgstr "Problem podczas zapisywania wpisu."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4912,23 +4913,21 @@ msgstr ""
"Prawa autorskie do treÅci i danych sÄ
wÅasnoÅciÄ
wspóÅtwórców. Wszystkie "
"prawa zastrzeżone."
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Wszystko "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "licencja."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Paginacja"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "Później"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "WczeÅniej"
@@ -5224,12 +5223,14 @@ msgstr "Użytkownik %1$s opuÅciÅ grupÄ %2$s"
msgid "Fullname: %s"
msgstr "ImiÄ i nazwisko: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "PoÅożenie: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Strona domowa: %s"
@@ -5719,11 +5720,13 @@ msgstr "Zaloguj siÄ za pomocÄ
nazwy użytkownika i hasÅa"
msgid "Sign up for a new account"
msgstr "ZaÅóż nowe konto"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Potwierdzenie adresu e-mail"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5753,12 +5756,14 @@ msgstr ""
"DziÄkujemy za twój czas, \n"
"%s\n"
-#: lib/mail.php:240
+#. 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 "Użytkownik %1$s obserwuje teraz twoje wpisy na %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5783,17 +5788,20 @@ msgstr ""
"----\n"
"ZmieÅ adres e-mail lub opcje powiadamiania na %8$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "O mnie: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Nowy adres e-mail do wysyÅania do %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5814,21 +5822,31 @@ msgstr ""
"Z poważaniem,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "Stan użytkownika %s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "Potwierdzenie SMS"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Oczekiwanie na potwierdzenie tego numeru telefonu."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "ZostaÅeÅ szturchniÄty przez %s"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5855,12 +5873,14 @@ msgstr ""
"Z poważaniem,\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Nowa prywatna wiadomoÅÄ od użytkownika %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5893,12 +5913,14 @@ msgstr ""
"Z poważaniem,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "Użytkownik %s (@%s) dodaŠtwój wpis jako ulubiony"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5936,12 +5958,22 @@ msgstr ""
"Z poważaniem,\n"
"%6$s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "Użytkownik %s (@%s) wysÅaÅ wpis wymagajÄ
cy twojej uwagi"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5954,18 +5986,19 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
-msgstr ""
-"Użytkownik %1$s (@%9$s) wÅaÅnie wysÅaÅ wpis wymagajÄ
cy twojej uwagi "
-"(odpowiedź \"@\") na %2$s.\n"
+"%5$sYou can reply back here:\n"
"\n"
-"Wpis znajduje siÄ tutaj:\n"
+"\t%6$s\n"
"\n"
-"\t%3$s\n"
+"The list of all @-replies for you here:\n"
"\n"
-"Tekst wpisu:\n"
+"%7$s\n"
"\n"
-"\t%4$s\n"
+"Faithfully yours,\n"
+"%2$s\n"
"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6133,23 +6166,23 @@ msgstr "Zachód"
msgid "at"
msgstr "w"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "w rozmowie"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Powtórzone przez"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Odpowiedz na ten wpis"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Odpowiedz"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Powtórzono wpis"
@@ -6255,11 +6288,7 @@ msgstr "Dziennie Årednio"
msgid "All groups"
msgstr "Wszystkie grupy"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "Brak parametrów powrotu."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "Niezaimplementowana metoda."
@@ -6283,6 +6312,10 @@ msgstr "Znane"
msgid "Popular"
msgstr "Popularne"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "Brak parametrów powrotu."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "PowtórzyÄ ten wpis?"
@@ -6474,47 +6507,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "kilka sekund temu"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "okoÅo minutÄ temu"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "okoÅo %d minut temu"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "okoÅo godzinÄ temu"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "okoÅo %d godzin temu"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "blisko dzieÅ temu"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "okoÅo %d dni temu"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "okoÅo miesiÄ
c temu"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "okoÅo %d miesiÄcy temu"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 7647967b00..84c5d8eff9 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:09:39+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:28:06+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: out-statusnet\n"
@@ -765,7 +765,7 @@ msgid "Preview"
msgstr "Antevisão"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Apagar"
@@ -806,7 +806,7 @@ msgstr "Avatar apagado."
msgid "You already blocked that user."
msgstr "Já bloqueou esse utilizador."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear utilizador"
@@ -822,7 +822,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Não"
@@ -832,11 +832,11 @@ msgstr "Não bloquear este utilizador"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Sim"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este utilizador"
@@ -884,8 +884,10 @@ msgstr "Desbloquear"
msgid "Unblock this user"
msgstr "Desbloquear este utilizador"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Publicar em "
#: actions/confirmaddress.php:75
@@ -959,7 +961,7 @@ msgstr "Não é membro deste grupo."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com a sua sessão."
@@ -1023,7 +1025,7 @@ msgstr "Tem a certeza de que quer apagar esta nota?"
msgid "Do not delete this notice"
msgstr "Não apagar esta nota"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Apagar esta nota"
@@ -1655,11 +1657,11 @@ msgstr "Acesso do utilizador ao grupo já foi bloqueado."
msgid "User is not a member of group."
msgstr "Utilizador não é membro do grupo."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Bloquear acesso do utilizador ao grupo"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1670,15 +1672,15 @@ msgstr ""
"\"%2$s\"? Ele será removido do grupo, impossibilitado de publicar e "
"impossibilitado de subscrever o grupo no futuro."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Não bloquear acesso deste utilizador a este grupo"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Bloquear acesso deste utilizador a este grupo"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr "Erro na base de dados ao bloquear acesso do utilizador ao grupo."
@@ -1757,19 +1759,19 @@ msgstr "Uma lista dos utilizadores neste grupo."
msgid "Admin"
msgstr "Gestor"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Bloquear"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "Tornar utilizador o gestor do grupo"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Tornar Gestor"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Tornar este utilizador um gestor"
@@ -2051,12 +2053,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Enviar"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s convidou-o a juntar-se a ele no %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2403,15 +2407,19 @@ msgstr "Nota não tem perfil"
msgid "%1$s's status on %2$s"
msgstr "Estado de %1$s em %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "tipo de conteúdo "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Apenas "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Formato de dados não suportado."
@@ -3126,7 +3134,7 @@ msgstr "Desculpe, código de convite inválido."
msgid "Registration successful"
msgstr "Registo efectuado"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registar"
@@ -3181,22 +3189,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\""
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Os meus textos e ficheiros são disponibilizados nos termos da "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Atribuição 3.0"
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
" excepto estes dados privados: senha, endereço de correio electrónico, "
"endereço de mensageiro instantâneo, número de telefone."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3229,7 +3230,7 @@ msgstr ""
"\n"
"Obrigado por se ter registado e esperamos que se divirta usando este serviço."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3312,7 +3313,7 @@ msgstr "Não pode repetir a sua própria nota."
msgid "You already repeated that notice."
msgstr "Já repetiu essa nota."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Repetida"
@@ -4670,12 +4671,12 @@ msgstr "Está proibido de publicar notas neste site."
msgid "Problem saving notice."
msgstr "Problema na gravação da nota."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problema na gravação da nota."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4992,23 +4993,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Tudo "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "licença."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Paginação"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "Posteriores"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Anteriores"
@@ -5311,12 +5310,14 @@ msgstr "%s deixou o grupo %s"
msgid "Fullname: %s"
msgstr "Nome completo: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Localidade: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Página pessoal: %s"
@@ -5800,11 +5801,13 @@ msgstr "Iniciar sessão com um nome de utilizador e senha"
msgid "Sign up for a new account"
msgstr "Registar uma conta nova"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Confirmação do endereço electrónico"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5833,12 +5836,14 @@ msgstr ""
"Obrigado pelo tempo que dedicou, \n"
"%s\n"
-#: lib/mail.php:240
+#. 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 está agora a ouvir as suas notas em %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5864,17 +5869,20 @@ msgstr ""
"Altere o seu endereço de correio electrónico ou as opções de notificação em %"
"8$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "Bio: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Novo endereço electrónico para publicar no site %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5895,21 +5903,31 @@ msgstr ""
"Melhores cumprimentos,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "Estado de %s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "Confirmação SMS"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "A aguardar confirmação deste número de telefone."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "%s envia-lhe um toque"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5936,12 +5954,14 @@ msgstr ""
"Graciosamente,\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Nova mensagem privada de %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5974,12 +5994,14 @@ msgstr ""
"Profusos cumprimentos,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) adicionou a sua nota às favoritas."
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6016,12 +6038,22 @@ msgstr ""
"Sinceramente,\n"
"%6$s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) enviou uma nota à sua atenção"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6034,18 +6066,19 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
-msgstr ""
-"%1$s (@%9$s) acaba de enviar uma nota à sua atenção (uma '@-resposta') em %2"
-"$s.\n"
+"%5$sYou can reply back here:\n"
"\n"
-"a nota está aqui:\n"
+"\t%6$s\n"
"\n"
-"%3$s\n"
+"The list of all @-replies for you here:\n"
"\n"
-"E diz:\n"
+"%7$s\n"
"\n"
-"%4$s\n"
+"Faithfully yours,\n"
+"%2$s\n"
"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6216,23 +6249,23 @@ msgstr "O"
msgid "at"
msgstr "coords."
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "no contexto"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Repetida por"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Responder a esta nota"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Nota repetida"
@@ -6338,11 +6371,7 @@ msgstr ""
msgid "All groups"
msgstr "Todos os grupos"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "Sem argumentos return-to."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "Método não implementado."
@@ -6366,6 +6395,10 @@ msgstr "Destaques"
msgid "Popular"
msgstr "Populares"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "Sem argumentos return-to."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Repetir esta nota?"
@@ -6559,47 +6592,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderar"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "há alguns segundos"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "há cerca de um minuto"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "há cerca de %d minutos"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "há cerca de uma hora"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "há cerca de %d horas"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "há cerca de um dia"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "há cerca de %d dias"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "há cerca de um mês"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "há cerca de %d meses"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 f509d5082b..7099211787 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:09:43+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:28: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 (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: out-statusnet\n"
@@ -772,7 +772,7 @@ msgid "Preview"
msgstr "Visualização"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Excluir"
@@ -812,7 +812,7 @@ msgstr "O avatar foi excluÃdo."
msgid "You already blocked that user."
msgstr "Você já bloqueou esse usuário."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear usuário"
@@ -829,7 +829,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Não"
@@ -839,11 +839,11 @@ msgstr "Não bloquear este usuário"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Sim"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuário"
@@ -891,8 +891,10 @@ msgstr "Desbloquear"
msgid "Unblock this user"
msgstr "Desbloquear este usuário"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Enviar para "
#: actions/confirmaddress.php:75
@@ -962,7 +964,7 @@ msgstr "Você não é o dono desta aplicação."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com o seu token de sessão."
@@ -1023,7 +1025,7 @@ msgstr "Tem certeza que deseja excluir esta mensagem?"
msgid "Do not delete this notice"
msgstr "Não excluir esta mensagem."
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Excluir esta mensagem"
@@ -1641,11 +1643,11 @@ msgstr "O usuário já está bloqueado no grupo."
msgid "User is not a member of group."
msgstr "O usuário não é um membro do grupo"
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Bloquear o usuário no grupo"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1656,15 +1658,15 @@ msgstr ""
"será removido do grupo e impossibilitado de publicar e de se juntar ao grupo "
"futuramente."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Não bloquear este usuário neste grupo"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Bloquear este usuário neste grupo"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
"Ocorreu um erro no banco de dados ao tentar bloquear o usuário no grupo."
@@ -1744,19 +1746,19 @@ msgstr "Uma lista dos usuários deste grupo."
msgid "Admin"
msgstr "Admin"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Bloquear"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "Tornar o usuário um administrador do grupo"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Tornar administrador"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Torna este usuário um administrador"
@@ -2038,12 +2040,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Enviar"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s convidou você para se juntar a %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2391,15 +2395,19 @@ msgstr "A mensagem não está associada a nenhum perfil"
msgid "%1$s's status on %2$s"
msgstr "Mensagem de %1$s no %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "tipo de conteúdo "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Apenas "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Não é um formato de dados suportado."
@@ -3111,7 +3119,7 @@ msgstr "Desculpe, mas o código do convite é inválido."
msgid "Registration successful"
msgstr "Registro realizado com sucesso"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrar-se"
@@ -3166,22 +3174,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Nome completo, de preferência seu nome \"real\""
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Meus textos e arquivos estão disponÃveis sob "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Attribution 3.0"
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
" exceto estes dados particulares: senha, endereço de e-mail, endereço de MI "
"e número de telefone."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3214,7 +3215,7 @@ msgstr ""
"\n"
"Obrigado por se registrar e esperamos que você aproveite o serviço."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3296,7 +3297,7 @@ msgstr "Você não pode repetir sua própria mensagem."
msgid "You already repeated that notice."
msgstr "Você já repetiu essa mensagem."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Repetida"
@@ -4637,11 +4638,11 @@ msgstr "Você está proibido de publicar mensagens neste site."
msgid "Problem saving notice."
msgstr "Problema no salvamento da mensagem."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr "Problema no salvamento das mensagens recebidas do grupo."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4940,23 +4941,21 @@ msgstr ""
"Conteúdo e dados licenciados pelos colaboradores. Todos os direitos "
"reservados."
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Todas "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "licença."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Paginação"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "Próximo"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Anterior"
@@ -5254,12 +5253,14 @@ msgstr "%s deixou o grupo %s"
msgid "Fullname: %s"
msgstr "Nome completo: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Localização: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Site: %s"
@@ -5747,11 +5748,13 @@ msgstr "Autentique-se com um nome de usuário e uma senha"
msgid "Sign up for a new account"
msgstr "Cadastre-se para uma nova conta"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Confirmação do endereço de e-mail"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5780,12 +5783,14 @@ msgstr ""
"Obrigado pela sua atenção, \n"
"%s\n"
-#: lib/mail.php:240
+#. 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 agora está acompanhando suas mensagens no %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5810,17 +5815,20 @@ msgstr ""
"----\n"
"Altere seu endereço de e-mail e suas opções de notificação em %8$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "Descrição: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Novo endereço de e-mail para publicar no %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5841,21 +5849,31 @@ msgstr ""
"Atenciosamente,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "Mensagem de %s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "Confirmação de SMS"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Aguardando a confirmação deste número de telefone."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "Você teve a atenção chamada por %s"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5882,12 +5900,14 @@ msgstr ""
"Atenciosamente,\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Nova mensagem particular de %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5920,12 +5940,14 @@ msgstr ""
"Atenciosamente,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) marcou sua mensagem como favorita"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5962,12 +5984,22 @@ msgstr ""
"Atenciosamente,\n"
"%6$s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) enviou uma mensagem citando você"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5980,18 +6012,19 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
-msgstr ""
-"%1$s (@%9$s) acabou de enviar uma mensagem citando você ('@usuário') no %2"
-"$s.\n"
+"%5$sYou can reply back here:\n"
"\n"
-"A mensagem está aqui:\n"
+"\t%6$s\n"
"\n"
-"\t%3$s\n"
+"The list of all @-replies for you here:\n"
"\n"
-"Está escrito:\n"
+"%7$s\n"
"\n"
-"\t%4$s\n"
+"Faithfully yours,\n"
+"%2$s\n"
"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6164,23 +6197,23 @@ msgstr "O"
msgid "at"
msgstr "em"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "no contexto"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Repetida por"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Responder a esta mensagem"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Mensagem repetida"
@@ -6286,11 +6319,7 @@ msgstr "Média diária"
msgid "All groups"
msgstr "Todos os grupos"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "Sem argumentos return-to."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "Método não implementado."
@@ -6314,6 +6343,10 @@ msgstr "Em destaque"
msgid "Popular"
msgstr "Popular"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "Sem argumentos return-to."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Repetir esta mensagem?"
@@ -6504,47 +6537,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderador"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "alguns segundos atrás"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "cerca de 1 minuto atrás"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "cerca de %d minutos atrás"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "cerca de 1 hora atrás"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "cerca de %d horas atrás"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "cerca de 1 dia atrás"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "cerca de %d dias atrás"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "cerca de 1 mês atrás"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "cerca de %d meses atrás"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 b1c52551fb..b4fdd52810 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-06 22:53+0000\n"
-"PO-Revision-Date: 2010-04-08 23:09:49+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:28:18+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
@@ -769,7 +769,7 @@ msgid "Preview"
msgstr "ÐÑоÑмоÑÑ"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "УдалиÑÑ"
@@ -809,7 +809,7 @@ msgstr "ÐваÑаÑа Ñдалена."
msgid "You already blocked that user."
msgstr "ÐÑ Ñже заблокиÑовали ÑÑого полÑзоваÑелÑ."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "ÐаблокиÑоваÑÑ Ð¿Ð¾Ð»ÑзоваÑелÑ."
@@ -825,7 +825,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "ÐеÑ"
@@ -835,11 +835,11 @@ msgstr "Ðе блокиÑоваÑÑ ÑÑого полÑзоваÑелÑ"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Ðа"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "ÐаблокиÑоваÑÑ Ð¿Ð¾Ð»ÑзоваÑелÑ."
@@ -887,8 +887,10 @@ msgstr "РазблокиÑоваÑÑ"
msgid "Unblock this user"
msgstr "РазблокиÑоваÑÑ Ð¿Ð¾Ð»ÑзоваÑелÑ."
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "ÐÑпÑавиÑÑ Ð² "
#: actions/confirmaddress.php:75
@@ -958,7 +960,7 @@ msgstr "ÐÑ Ð½Ðµ ÑвлÑеÑеÑÑ Ð²Ð»Ð°Ð´ÐµÐ»ÑÑем ÑÑого пÑило
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "ÐÑоблема Ñ ÐаÑей ÑеÑÑией. ÐопÑобÑйÑе еÑÑ Ñаз, пожалÑйÑÑа."
@@ -1019,7 +1021,7 @@ msgstr "ÐÑ ÑвеÑенÑ, ÑÑо Ñ
оÑиÑе ÑдалиÑÑ ÑÑÑ Ð·Ð°Ð¿Ð¸
msgid "Do not delete this notice"
msgstr "Ðе ÑдалÑÑÑ ÑÑÑ Ð·Ð°Ð¿Ð¸ÑÑ"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "УдалиÑÑ ÑÑÑ Ð·Ð°Ð¿Ð¸ÑÑ"
@@ -1642,11 +1644,11 @@ msgstr "ÐолÑзоваÑÐµÐ»Ñ Ñже заблокиÑован из гÑÑпп
msgid "User is not a member of group."
msgstr "ÐолÑзоваÑÐµÐ»Ñ Ð½Ðµ ÑвлÑеÑÑÑ Ñленом ÑÑой гÑÑппÑ."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "ÐаблокиÑоваÑÑ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ Ð¸Ð· гÑÑппÑ."
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1657,15 +1659,15 @@ msgstr ""
"ÐолÑзоваÑÐµÐ»Ñ Ð±ÑÐ´ÐµÑ ÑдалÑн из гÑÑÐ¿Ð¿Ñ Ð±ÐµÐ· возможноÑÑи оÑпÑавлÑÑÑ Ð¸ "
"подпиÑÑваÑÑÑÑ Ð½Ð° гÑÑÐ¿Ð¿Ñ Ð² бÑдÑÑем."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Ðе блокиÑоваÑÑ ÑÑого полÑзоваÑÐµÐ»Ñ Ð¸Ð· ÑÑой гÑÑппÑ"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "ÐаблокиÑоваÑÑ ÑÑого полÑзоваÑÐµÐ»Ñ Ð¸Ð· ÑÑой гÑÑппÑ"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr "ÐÑибка Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ
пÑи блокиÑовании полÑзоваÑÐµÐ»Ñ Ð¸Ð· гÑÑппÑ."
@@ -1744,19 +1746,19 @@ msgstr "СпиÑок полÑзоваÑелей, ÑвлÑÑÑиÑ
ÑÑ Ñлена
msgid "Admin"
msgstr "ÐаÑÑÑойки"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "ÐлокиÑоваÑÑ"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "СделаÑÑ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑаÑоÑом гÑÑппÑ"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "СделаÑÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑаÑоÑом"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "СделаÑÑ ÑÑого полÑзоваÑÐµÐ»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑаÑоÑом"
@@ -2038,12 +2040,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "ÐÑпÑавиÑÑ"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s пÑиглаÑил Ð²Ð°Ñ Ð¿ÑиÑоединиÑÑÑÑ Ðº Ð½ÐµÐ¼Ñ Ð½Ð° %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2382,15 +2386,19 @@ msgstr "ÐапиÑÑ Ð±ÐµÐ· пÑоÑилÑ"
msgid "%1$s's status on %2$s"
msgstr "СÑаÑÑÑ %1$s на %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "Ñип ÑодеÑжимого "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "ТолÑко "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "ÐеподдеÑживаемÑй ÑоÑÐ¼Ð°Ñ Ð´Ð°Ð½Ð½ÑÑ
."
@@ -3093,7 +3101,7 @@ msgstr "ÐзвиниÑе, невеÑнÑй пÑиглаÑиÑелÑнÑй код
msgid "Registration successful"
msgstr "РегиÑÑÑаÑÐ¸Ñ ÑÑпеÑна!"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "РегиÑÑÑаÑиÑ"
@@ -3152,22 +3160,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Ðолное имÑ, пÑедпоÑÑиÑелÑно ÐаÑе наÑÑоÑÑее имÑ"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Ðои ÑекÑÑÑ Ð¸ ÑÐ°Ð¹Ð»Ñ Ð½Ð°Ñ
одÑÑÑÑ Ð¿Ð¾Ð´ лиÑензией"
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Attribution 3.0"
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
", за иÑклÑÑением моей лиÑной инÑоÑмаÑии: паÑолÑ, поÑÑÑ, меÑÑенджеÑа и номеÑа "
"ÑелеÑона."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3201,7 +3202,7 @@ msgstr ""
"СпаÑибо за Ñо, ÑÑо пÑиÑоединилиÑÑ Ðº нам, надеемÑÑ, ÑÑо Ð²Ñ Ð¿Ð¾Ð»ÑÑиÑе "
"ÑдоволÑÑÑвие Ð¾Ñ Ð¸ÑполÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑеÑвиÑа!"
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3280,7 +3281,7 @@ msgstr "ÐÑ Ð½Ðµ можеÑе повÑоÑиÑÑ ÑобÑÑвеннÑÑ Ð·Ð°Ð¿
msgid "You already repeated that notice."
msgstr "ÐÑ Ñже повÑоÑили ÑÑÑ Ð·Ð°Ð¿Ð¸ÑÑ."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "ÐовÑоÑено"
@@ -4624,11 +4625,11 @@ msgstr "Ðам запÑеÑено поÑÑиÑÑÑÑ Ð½Ð° ÑÑом ÑайÑе (
msgid "Problem saving notice."
msgstr "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ñ ÑоÑ
Ñанением запиÑи."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ñ ÑоÑ
Ñанением вÑ
одÑÑиÑ
ÑообÑений гÑÑппÑ."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4929,23 +4930,21 @@ msgstr ""
"ÐвÑоÑÑкие пÑава на ÑодеÑжание и даннÑе пÑÐ¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð°Ñ ÑазÑабоÑÑикам. ÐÑе пÑава "
"заÑиÑенÑ."
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "All "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "license."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Разбиение на ÑÑÑаниÑÑ"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "СÑда"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "ТÑда"
@@ -5241,12 +5240,14 @@ msgstr "%1$s покинÑл гÑÑÐ¿Ð¿Ñ %2$s"
msgid "Fullname: %s"
msgstr "Ðолное имÑ: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "ÐеÑÑоÑаÑположение: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "ÐомаÑнÑÑ ÑÑÑаниÑа: %s"
@@ -5732,11 +5733,13 @@ msgstr "ÐойÑи Ñ Ð²Ð°Ñим ником и паÑолем."
msgid "Sign up for a new account"
msgstr "СоздаÑÑ Ð½Ð¾Ð²Ñй аккаÑнÑ"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "ÐодÑвеÑждение ÑлекÑÑонного адÑеÑа"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5766,12 +5769,14 @@ msgstr ""
"ÐлагодаÑим за поÑÑаÑенное вÑемÑ, \n"
"%s\n"
-#: lib/mail.php:240
+#. 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 ÑепеÑÑ ÑÐ»ÐµÐ´Ð¸Ñ Ð·Ð° ваÑими запиÑÑми на %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5796,17 +5801,20 @@ msgstr ""
"----\n"
"ÐзмениÑе email-адÑÐµÑ Ð¸ наÑÑÑойки Ñведомлений на %8$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "ÐиогÑаÑиÑ: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "ÐовÑй ÑлекÑÑоннÑй адÑÐµÑ Ð´Ð»Ñ Ð¿Ð¾ÑÑинга %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5827,21 +5835,31 @@ msgstr ""
"ÐÑкÑенне ÐаÑ,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s ÑÑаÑÑÑ"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "ÐодÑвеÑждение СÐС"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Рожидании подÑвеÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ номеÑа ÑелеÑона."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "ÐÐ°Ñ Â«Ð¿Ð¾Ð´ÑолкнÑл» полÑзоваÑÐµÐ»Ñ %s"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5868,12 +5886,14 @@ msgstr ""
"С Ñважением,\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Ðовое пÑиваÑное ÑообÑение Ð¾Ñ %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5906,12 +5926,14 @@ msgstr ""
"С Ñважением,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) добавил ваÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð² ÑиÑло ÑвоиÑ
лÑбимÑÑ
"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5948,12 +5970,22 @@ msgstr ""
"С Ñважением,\n"
"%6$s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) оÑпÑавил запиÑÑ Ð´Ð»Ñ Ð²Ð°Ñего вниманиÑ"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5966,18 +5998,19 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
-msgstr ""
-"%1$s (@%9$s) ÑолÑко ÑÑо оÑпÑавил запиÑÑ Ð´Ð»Ñ Ð²Ð°Ñего Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ñ («@-оÑвеÑ») на %2"
-"$s.\n"
+"%5$sYou can reply back here:\n"
"\n"
-"ТекÑÑ Ð·Ð°Ð¿Ð¸Ñи:\n"
+"\t%6$s\n"
"\n"
-"%3$s\n"
+"The list of all @-replies for you here:\n"
"\n"
-"Ðно ÑодеÑжиÑ:\n"
+"%7$s\n"
"\n"
-"%4$s\n"
+"Faithfully yours,\n"
+"%2$s\n"
"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6147,23 +6180,23 @@ msgstr "з. д."
msgid "at"
msgstr "на"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "в конÑекÑÑе"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "ÐовÑоÑено"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "ÐÑвеÑиÑÑ Ð½Ð° ÑÑÑ Ð·Ð°Ð¿Ð¸ÑÑ"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "ÐÑвеÑиÑÑ"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "ÐапиÑÑ Ð¿Ð¾Ð²ÑоÑена"
@@ -6269,11 +6302,7 @@ msgstr "СÑеднеÑÑÑоÑнаÑ"
msgid "All groups"
msgstr "ÐÑе гÑÑппÑ"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "ÐÐµÑ Ð°ÑгÑменÑа return-to."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "ÐеÑеализованнÑй меÑод."
@@ -6297,6 +6326,10 @@ msgstr "ÐÑобÑе"
msgid "Popular"
msgstr "ÐопÑлÑÑное"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "ÐÐµÑ Ð°ÑгÑменÑа return-to."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "ÐовÑоÑиÑÑ ÑÑÑ Ð·Ð°Ð¿Ð¸ÑÑ?"
@@ -6487,47 +6520,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "ÐодеÑаÑоÑ"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "паÑÑ ÑекÑнд назад"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "около минÑÑÑ Ð½Ð°Ð·Ð°Ð´"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "около %d минÑÑ(Ñ) назад"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "около ÑаÑа назад"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "около %d ÑаÑа(ов) назад"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "около Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "около %d днÑ(ей) назад"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "около меÑÑÑа назад"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "около %d меÑÑÑа(ев) назад"
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr "около года назад"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 53b593d232..baef4d7bee 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-04-08 23:24+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -739,7 +739,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr ""
@@ -779,7 +779,7 @@ msgstr ""
msgid "You already blocked that user."
msgstr ""
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr ""
@@ -792,7 +792,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr ""
@@ -802,11 +802,11 @@ msgstr ""
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr ""
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr ""
@@ -854,8 +854,10 @@ msgstr ""
msgid "Unblock this user"
msgstr ""
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, php-format
+msgid "Post to %s"
msgstr ""
#: actions/confirmaddress.php:75
@@ -925,7 +927,7 @@ msgstr ""
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr ""
@@ -981,7 +983,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr ""
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr ""
@@ -1579,11 +1581,11 @@ msgstr ""
msgid "User is not a member of group."
msgstr ""
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr ""
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1591,15 +1593,15 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr ""
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr ""
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1674,19 +1676,19 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr ""
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr ""
@@ -1938,12 +1940,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr ""
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr ""
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2243,15 +2247,19 @@ msgstr ""
msgid "%1$s's status on %2$s"
msgstr ""
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, php-format
+msgid "content type %s not supported"
msgstr ""
-#: actions/oembed.php:160
-msgid "Only "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -2930,7 +2938,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -2982,20 +2990,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr ""
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr ""
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
+#, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3014,7 +3015,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3089,7 +3090,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr ""
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr ""
@@ -4331,11 +4332,11 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4627,23 +4628,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr ""
-
-#: lib/action.php:855
-msgid "license."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr ""
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr ""
@@ -4931,12 +4930,14 @@ msgstr ""
msgid "Fullname: %s"
msgstr ""
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5375,11 +5376,13 @@ msgstr ""
msgid "Sign up for a new account"
msgstr ""
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr ""
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5396,12 +5399,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 ""
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5416,17 +5421,20 @@ msgid ""
"Change your email address or notification options at %8$s\n"
msgstr ""
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr ""
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5439,21 +5447,31 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr ""
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr ""
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5469,12 +5487,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5493,12 +5513,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5519,12 +5541,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5537,6 +5569,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -5699,23 +5743,23 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr ""
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr ""
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr ""
@@ -5821,11 +5865,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr ""
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -5849,6 +5889,10 @@ msgstr ""
msgid "Popular"
msgstr ""
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr ""
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr ""
@@ -6039,47 +6083,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr ""
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr ""
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 1686d62f49..e736c8a186 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-06 22:53+0000\n"
-"PO-Revision-Date: 2010-04-08 23:09:52+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:28:21+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: out-statusnet\n"
@@ -757,7 +757,7 @@ msgid "Preview"
msgstr "Förhandsgranska"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Ta bort"
@@ -797,7 +797,7 @@ msgstr "Avatar borttagen."
msgid "You already blocked that user."
msgstr "Du har redan blockerat denna användare."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "Blockera användare"
@@ -813,7 +813,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Nej"
@@ -823,11 +823,11 @@ msgstr "Blockera inte denna användare"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "Blockera denna användare"
@@ -876,8 +876,10 @@ msgstr "Häv blockering"
msgid "Unblock this user"
msgstr "Häv blockering av denna användare"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "Posta till "
#: actions/confirmaddress.php:75
@@ -947,7 +949,7 @@ msgstr "Du är inte ägaren av denna applikation."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Det var ett problem med din sessions-token."
@@ -1008,7 +1010,7 @@ msgstr "Ãr du säker pÃ¥ att du vill ta bort denna notis?"
msgid "Do not delete this notice"
msgstr "Ta inte bort denna notis"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Ta bort denna notis"
@@ -1622,11 +1624,11 @@ msgstr "Användaren är redan blockerad från grupp."
msgid "User is not a member of group."
msgstr "Användare är inte en gruppmedlem."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "Blockera användare från grupp"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1637,15 +1639,15 @@ msgstr ""
"\"? De kommer bli borttagna från gruppen, inte kunna skriva till och inte "
"kunna prenumerera på gruppen i framtiden."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Blockera inte denna användare från denna grupp"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "Blockera denna användare från denna grupp"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr "Databasfel vid blockering av användare från grupp."
@@ -1723,19 +1725,19 @@ msgstr "En lista av användarna i denna grupp."
msgid "Admin"
msgstr "Administratör"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Blockera"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "Gör användare till en administratör för gruppen"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "Gör till administratör"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "Gör denna användare till administratör"
@@ -2016,12 +2018,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Skicka"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s har bjudit in dig att gå med dem på %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2362,15 +2366,19 @@ msgstr "Notisen har ingen profil"
msgid "%1$s's status on %2$s"
msgstr "%1$ss status den %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "innehållstyp "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "Bara "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Ett dataformat som inte stödjs"
@@ -3076,7 +3084,7 @@ msgstr "Tyvärr, ogiltig inbjudningskod."
msgid "Registration successful"
msgstr "Registreringen genomförd"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrera"
@@ -3134,22 +3142,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Min text och mina filer är tillgängliga under "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Erkännande 3.0"
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
"med undantag av den här privata datan: lösenord, e-postadress, IM-adress, "
"telefonnummer."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3182,7 +3183,7 @@ msgstr ""
"Tack för att du anmält dig och vi hoppas att du kommer tycka om att använda "
"denna tjänst."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3265,7 +3266,7 @@ msgstr "Du kan inte upprepa din egna notis."
msgid "You already repeated that notice."
msgstr "Du har redan upprepat denna notis."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Upprepad"
@@ -4602,11 +4603,11 @@ msgstr "Du är utestängd från att posta notiser på denna webbplats."
msgid "Problem saving notice."
msgstr "Problem med att spara notis."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr "Problem med att spara gruppinkorg."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4904,23 +4905,21 @@ msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Innehåll och data copyright av medarbetare. Alla rättigheter reserverade."
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "Alla "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "licens."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "Numrering av sidor"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "Senare"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Tidigare"
@@ -5215,12 +5214,14 @@ msgstr "%s lämnade grupp %s"
msgid "Fullname: %s"
msgstr "Fullständigt namn: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Plats: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Hemsida: %s"
@@ -5702,11 +5703,13 @@ msgstr "Logga in med ett användarnamn och lösenord"
msgid "Sign up for a new account"
msgstr "Registrera dig för ett nytt konto"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "E-postadressbekräftelse"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5735,12 +5738,14 @@ msgstr ""
"Tack för din tid, \n"
"%s\n"
-#: lib/mail.php:240
+#. 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 lyssnar nu på dina notiser på %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5765,17 +5770,20 @@ msgstr ""
"----\n"
"Ãndra din e-postadress eller notiferingsinställningar pÃ¥ %8$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "Biografi: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Ny e-postadress för att skicka till %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5796,21 +5804,31 @@ msgstr ""
"Med vänliga hälsningar,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s status"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "SMS-bekräftelse"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Väntar bekräftelse för detta telefonnummer."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "Du har blivit knuffad av %s"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5837,12 +5855,14 @@ msgstr ""
"Med vänliga hälsningar,\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Nytt privat meddelande från %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5875,12 +5895,14 @@ msgstr ""
"Med vänliga hälsningar,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) lade till din notis som en favorit"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5917,12 +5939,22 @@ msgstr ""
"Med vänliga hälsningar,\n"
"%6$s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) skickade en notis för din uppmärksamhet"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5935,18 +5967,19 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
-msgstr ""
-"%1$s (@%9$s) skickade precis en notis för din uppmärksamhet (ett '@-svar') "
-"på %2$s.\n"
+"%5$sYou can reply back here:\n"
"\n"
-"Notisen är här:\n"
+"\t%6$s\n"
"\n"
-"%3$s\n"
+"The list of all @-replies for you here:\n"
"\n"
-"Den lyder:\n"
+"%7$s\n"
"\n"
-"%4$s\n"
+"Faithfully yours,\n"
+"%2$s\n"
"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6117,23 +6150,23 @@ msgstr "V"
msgid "at"
msgstr "på"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "i sammanhang"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Upprepad av"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Svara på denna notis"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Svara"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Notis upprepad"
@@ -6239,11 +6272,7 @@ msgstr "Dagligt genomsnitt"
msgid "All groups"
msgstr "Alla grupper"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "Inga \"return-to\"-argument."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "Inte implementerad metod."
@@ -6267,6 +6296,10 @@ msgstr "Profilerade"
msgid "Popular"
msgstr "Populärt"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "Inga \"return-to\"-argument."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Upprepa denna notis?"
@@ -6457,47 +6490,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "ett par sekunder sedan"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "för nån minut sedan"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "för %d minuter sedan"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "för en timma sedan"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "för %d timmar sedan"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "för en dag sedan"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "för %d dagar sedan"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "för en månad sedan"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "för %d månader sedan"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 838c40a7d0..37ffdc223b 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-06 22:53+0000\n"
-"PO-Revision-Date: 2010-04-08 23:09:56+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:28:26+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: out-statusnet\n"
@@ -753,7 +753,7 @@ msgid "Preview"
msgstr "à°®à±à°¨à±à°à±à°ªà±"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "à°¤à±à°²à°à°¿à°à°à±"
@@ -794,7 +794,7 @@ msgstr "à°
వతారానà±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°¾à°."
msgid "You already blocked that user."
msgstr "à°®à±à°°à± à°à°ªà±à°ªà°à°¿à°à± ఠవాడà±à°à°°à°¿à°¨à°¿ నిరà±à°§à°¿à°à°à°¾à°°à±."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "వాడà±à°à°°à°¿à°¨à°¿ నిరà±à°§à°¿à°à°à±"
@@ -809,7 +809,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "à°à°¾à°¦à±"
@@ -819,11 +819,11 @@ msgstr "ఠవాడà±à°à°°à°¿à°¨à°¿ నిరà±à°§à°¿à°à°à°à±"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "à°
à°µà±à°¨à±"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "ఠవాడà±à°à°°à°¿à°¨à°¿ నిరà±à°§à°¿à°à°à±"
@@ -873,9 +873,11 @@ msgstr ""
msgid "Unblock this user"
msgstr "à°
à°à±à°µà°à°à°¿ వాడà±à°à°°à°¿ à°²à±à°°à±."
-#: actions/bookmarklet.php:50
-msgid "Post to "
-msgstr ""
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
+msgstr "%s పౠà°à±à°à°ªà±à°²à±"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -944,7 +946,7 @@ msgstr "à°®à±à°°à± à° à°à°ªà°à°°à°£à° à°¯à±à°à±à° à°¯à°à°®à°¾à°¨à°¿
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr ""
@@ -1002,7 +1004,7 @@ msgstr "à°®à±à°°à± నిà°à°à°à°¾à°¨à± à° à°¨à±à°à±à°¸à±à°¨à°¿ à°¤
msgid "Do not delete this notice"
msgstr "à° à°¨à±à°à±à°¸à±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°à±"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "à° à°¨à±à°à±à°¸à±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à±"
@@ -1607,11 +1609,11 @@ msgstr "వాడà±à°à°°à°¿à°¨à°¿ à°à°ªà±à°ªà°à°¿à°à± à°à±à°à°ªà±à°¨
msgid "User is not a member of group."
msgstr "వాడà±à°à°°à°¿ à° à°à±à°à°ªà±à°²à± à°¸à°à±à°¯à±à°²à± à°à°¾à°¦à±."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "వాడà±à°à°°à°¿à°¨à°¿ à°à±à°à°ªà± à°¨à±à°à°¡à°¿ నిరà±à°§à°¿à°à°à±"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1621,15 +1623,15 @@ msgstr ""
"నిà°à°à°à°¾à°¨à± వాడà±à°à°°à°¿ \"%1$s\"ని \"%2$s\" à°à±à°à°ªà± à°¨à±à°à°¡à°¿ నిరà±à°§à°¿à°à°à°¾à°²à°¨à±à°à±à°à°à±à°¨à±à°¨à°¾à°°à°¾? వారిని à°à±à°à°ªà± à°¨à±à°à°¡à°¿ "
"à°¤à±à°²à°à°¿à°¸à±à°¤à°¾à°, à°à° à°à°µà°¿à°·à±à°¯à°¤à±à°¤à±à°²à± వారౠà°à±à°à°ªà±à°²à± à°ªà±à°°à°à±à°°à°¿à°à°à°²à±à°°à±, మరియౠà°à±à°à°ªà±à°à°¿ à°à°à°¦à°¾à°à±à°°à°²à±à°°à±."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "ఠవాడà±à°à°°à°¿à°¨à°¿ à° à°à±à°à°ªà± à°¨à±à°à°¡à°¿ నిరà±à°§à°¿à°à°à°à±"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "à° à°à±à°à°ªà±à°¨à±à°à°¡à°¿ ఠవాడà±à°à°°à°¿à°¨à°¿ నిరà±à°§à°¿à°à°à±"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1707,19 +1709,19 @@ msgstr "à° à°à±à°à°ªà±à°²à± వాడà±à°à°°à±à°²à± à°à°¾à°¬à°¿à°¤à°¾
msgid "Admin"
msgstr "నిరà±à°µà°¾à°¹à°à±à°²à±"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "నిరà±à°§à°¿à°à°à±"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "వాడà±à°à°°à°¿à°¨à°¿ à°à±à°à°ªà±à°à°¿ à°à° నిరà±à°µà°¾à°¹à°à±à°¨à°¿à°à°¾ à°à±à°¯à°¿"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "నిరà±à°µà°¾à°¹à°à±à°¨à±à°¨à°¿ à°à±à°¯à°¿"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "ఠవాడà±à°à°°à°¿à°¨à°¿ నిరà±à°µà°¾à°¹à°à±à°¨à±à°¨à°¿ à°à±à°¯à°¿"
@@ -1980,12 +1982,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "à°ªà°à°ªà°¿à°à°à±"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%2$sలౠà°à±à°°à°®à°¨à°¿ %1$s మిమà±à°®à°²à±à°¨à°¿ à°à°¹à±à°µà°¾à°¨à°¿à°à°à°¾à°°à±"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2295,15 +2299,19 @@ msgstr ""
msgid "%1$s's status on %2$s"
msgstr "%2$sలౠ%1$s à°¯à±à°à±à° à°¸à±à°¥à°¿à°¤à°¿"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "విషయ à°°à°à° "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "మాతà±à°°à°®à± "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -3002,7 +3010,7 @@ msgstr "à°à±à°·à°®à°¿à°à°à°à°¡à°¿, తపà±à°ªà± à°à°¹à±à°µà°¾à°¨ à°¸
msgid "Registration successful"
msgstr "నమà±à°¦à± విà°à°¯à°µà°à°¤à°"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "నమà±à°¦à±"
@@ -3054,20 +3062,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "à°ªà±à°¡à±à°à°¾à°à°¿ à°ªà±à°°à±, మౠ\"à°
సలà±\" à°ªà±à°°à±à°¤à± à°®à°à°à°¿à°¦à°¿"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "నా పాఠà±à°¯à° మరియౠఫà±à°³à±à°³à± à°²à°à±à°¯à°®à°¯à±à°¯à± à°²à±à°¸à±à°¨à±à°¸à± "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "à°à±à°°à°¿à°¯à±à°à°¿à°µà± à°à°¾à°®à°¨à±à°¸à± à°
à°à±à°°à°¿à°¬à±à°¯à±à°·à°¨à± 3.0"
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr " à° à°
à°à°¤à°°à°à°à°¿à° à°à±à°à°à±à°à°¾ తపà±à°ª: à°¸à°à°à±à°¤à°ªà°¦à°, à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾, IM à°à°¿à°°à±à°¨à°¾à°®à°¾, మరియౠఫà±à°¨à± à°¨à°à°¬à°°à±."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3098,7 +3099,7 @@ msgstr ""
"\n"
"నమà±à°¦à±à°à±à°¸à±à°à±à°¨à±à°¨à°à°¦à±à°à± à°à±à°¤à°à±à°à°¤à°²à± మరియౠఠసà±à°µà°¨à°¿ à°à°ªà°¯à±à°à°¿à°¸à±à°¤à± à°®à±à°°à± à°à°¨à°à°¦à°¿à°¸à±à°¤à°¾à°°à°¨à°¿ à°®à±à° à°à°¶à°¿à°¸à±à°¤à±à°¨à±à°¨à°¾à°."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3180,7 +3181,7 @@ msgstr "మౠనà±à°à±à°¸à±à°¨à°¿ à°®à±à°°à± à°ªà±à°¨à°°à°¾à°µà±à°¤à°¿
msgid "You already repeated that notice."
msgstr "à°®à±à°°à± à°à°ªà±à°ªà°à°¿à°à± à° à°¨à±à°à±à°¸à±à°¨à°¿ à°ªà±à°¨à°°à°¾à°µà±à°¤à°¿à°à°à°¾à°°à±."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "à°¸à±à°·à±à°à°¿à°¤à°"
@@ -4455,12 +4456,12 @@ msgstr "à° à°¸à±à°à±à°²à± à°¨à±à°à±à°¸à±à°²à± రాయడఠనà±
msgid "Problem saving notice."
msgstr "à°¸à°à°¦à±à°¶à°¾à°¨à±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°à°¡à°à°²à± à°ªà±à°°à°ªà°¾à°à±."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "à°¸à°à°¦à±à°¶à°¾à°¨à±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°à°¡à°à°²à± à°ªà±à°°à°ªà°¾à°à±."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4767,23 +4768,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "à°
à°¨à±à°¨à± "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "à°²à±à°¸à±à°¨à±à°¸à±."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "à°ªà±à°à±à°à°°à°£"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "తరà±à°µà°¾à°¤"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "à°à°à°¤à°à±à°°à°¿à°¤à°"
@@ -5087,12 +5086,14 @@ msgstr "%2$s à°à±à°à°ªà± à°¨à±à°à°¡à°¿ %1$s à°µà±à°¦à±à°²à°¿à°à°¾à°°à±
msgid "Fullname: %s"
msgstr "à°ªà±à°°à±à°¤à°¿à°ªà±à°°à±: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "à°ªà±à°°à°¾à°à°¤à°: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "à°¹à±à°à°ªà±à°à±: %s"
@@ -5540,11 +5541,13 @@ msgstr "వాడà±à°à°°à°¿à°ªà±à°°à± మరియౠసà°à°à±à°¤à°ªà°¦
msgid "Sign up for a new account"
msgstr "à°à±à°¤à±à°¤ à°à°¾à°¤à°¾ à°¸à±à°·à±à°à°¿à°à°à±à°à±à°à°¡à°¿"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾ నిరà±à°§à°¾à°°à°£"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5561,12 +5564,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 à°à°ªà±à°ªà±à°¡à± %2$sలౠమౠనà±à°à±à°¸à±à°²à°¨à°¿ విà°à°à±à°¨à±à°¨à°¾à°°à±."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5591,17 +5596,20 @@ msgstr ""
"----\n"
"మౠà°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾à°¨à°¿ à°²à±à°¦à°¾ à°à°®à°¨à°¿à°à°ªà±à°² à°à°à°ªà°¿à°à°²à°¨à± %8$s వదà±à°¦ మారà±à°à±à°à±à°à°¡à°¿\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "à°¸à±à°µà°ªà°°à°¿à°à°¯à°: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5614,21 +5622,31 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s à°¸à±à°¥à°¿à°¤à°¿"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "SMS నిరà±à°§à°¾à°°à°£"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "à° à°«à±à°¨à± à°¨à°à°¬à°°à± à°¯à±à°à±à° నిరà±à°§à°¾à°°à°£à°à± à°µà±à°à°¿à°µà±à°à°¦à°¿."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5644,12 +5662,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "%s à°¨à±à°à°¡à°¿ à°à±à°¤à±à°¤ à°
à°à°¤à°°à°à°à°¿à° à°¸à°à°¦à±à°¶à°"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5682,12 +5702,14 @@ msgstr ""
"à°¶à±à°à°¾à°à°¾à°à°à±à°·à°²à°¤à±,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5708,12 +5730,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) à°®à±à°à± à°à° à°¨à±à°à±à°¸à±à°¨à°¿ à°ªà°à°ªà°¿à°à°à°¾à°°à±"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5726,17 +5758,19 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
-msgstr ""
-"%1$s (@%9$s) %2$sలౠమà±à°à± ('@-à°¸à±à°ªà°à°¦à°¨') à°à° à°¨à±à°à±à°¸à±à°¨à°¿ à°ªà°à°ªà°¿à°à°à°¾à°°à± .\n"
+"%5$sYou can reply back here:\n"
"\n"
-"à° à°¨à±à°à±à°¸à± à°à°à±à°à°¡:\n"
+"\t%6$s\n"
"\n"
-"%3$s\n"
+"The list of all @-replies for you here:\n"
"\n"
-"à°à°¦à± పాఠà±à°¯à°:\n"
+"%7$s\n"
"\n"
-"%4$s\n"
+"Faithfully yours,\n"
+"%2$s\n"
"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -5904,24 +5938,24 @@ msgstr "à°ª"
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "à°¸à°à°¦à°°à±à°à°à°²à±"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "à°¸à±à°·à±à°à°¿à°¤à°"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "à° à°¨à±à°à±à°¸à±à°ªà± à°¸à±à°ªà°à°¦à°¿à°à°à°à°¡à°¿"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "à°¸à±à°ªà°à°¦à°¿à°à°à°à°¡à°¿"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "à°¨à±à°à±à°¸à±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°¾à°."
@@ -6030,12 +6064,7 @@ msgstr ""
msgid "All groups"
msgstr "à°
à°¨à±à°¨à°¿ à°à±à°à°ªà±à°²à±"
-#: lib/profileformaction.php:123
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "à°
à°à±à°µà°à°à°¿ పతà±à°°à°®à±à°®à± à°²à±à°¦à±."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6059,6 +6088,11 @@ msgstr "విశà±à°·à°"
msgid "Popular"
msgstr "à°ªà±à°°à°¾à°à±à°°à±à°¯à°"
+#: lib/redirectingaction.php:94
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "à°
à°à±à°µà°à°à°¿ పతà±à°°à°®à±à°®à± à°²à±à°¦à±."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "à° à°¨à±à°à±à°¸à±à°¨à°¿ à°ªà±à°¨à°°à°¾à°µà±à°¤à°¿à°à°à°¾à°²à°¾?"
@@ -6255,47 +6289,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "సమనà±à°µà°¯à°à°°à±à°¤"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "à°à±à°¨à±à°¨à°¿ à°à±à°·à°£à°¾à°² à°à±à°°à°¿à°¤à°"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "ఠనిమిషఠà°à±à°°à°¿à°¤à°"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "%d నిమిషాల à°à±à°°à°¿à°¤à°"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "à°à° à°à°à° à°à±à°°à°¿à°¤à°"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "%d à°à°à°à°² à°à±à°°à°¿à°¤à°"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "à° à°°à±à°à± à°à±à°°à°¿à°¤à°"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "%d à°°à±à°à±à°² à°à±à°°à°¿à°¤à°"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "à° à°¨à±à°² à°à±à°°à°¿à°¤à°"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "%d à°¨à±à°²à°² à°à±à°°à°¿à°¤à°"
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr "à°à° à°¸à°à°µà°¤à±à°¸à°°à° à°à±à°°à°¿à°¤à°"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 73571c19bf..de350a0dc5 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:09:59+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:28:29+0000\n"
"Language-Team: Turkish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: out-statusnet\n"
@@ -780,7 +780,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr ""
@@ -823,7 +823,7 @@ msgstr "Avatar güncellendi."
msgid "You already blocked that user."
msgstr "Zaten giriŠyapmıŠdurumdasıznız!"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "Böyle bir kullanıcı yok."
@@ -837,7 +837,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr ""
@@ -848,11 +848,11 @@ msgstr "Böyle bir kullanıcı yok."
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr ""
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Böyle bir kullanıcı yok."
@@ -904,9 +904,11 @@ msgstr ""
msgid "Unblock this user"
msgstr "Böyle bir kullanıcı yok."
-#: actions/bookmarklet.php:50
-msgid "Post to "
-msgstr ""
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
+msgstr "%s için cevaplar"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -980,7 +982,7 @@ msgstr "Bize o profili yollamadınız"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr ""
@@ -1040,7 +1042,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "Böyle bir durum mesajı yok."
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr ""
@@ -1678,12 +1680,12 @@ msgstr "Kullanıcının profili yok."
msgid "User is not a member of group."
msgstr "Bize o profili yollamadınız"
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
#, fuzzy
msgid "Block user from group"
msgstr "Böyle bir kullanıcı yok."
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1691,17 +1693,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
#, fuzzy
msgid "Do not block this user from this group"
msgstr "Sunucuya yönlendirme yapılamadı: %s"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
#, fuzzy
msgid "Block this user from this group"
msgstr "Böyle bir kullanıcı yok."
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1782,19 +1784,19 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr ""
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr ""
@@ -2067,12 +2069,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Gönder"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr ""
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2387,16 +2391,19 @@ msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
msgid "%1$s's status on %2$s"
msgstr "%1$s'in %2$s'deki durum mesajları "
-#: actions/oembed.php:157
-#, fuzzy
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "BaÄlan"
-#: actions/oembed.php:160
-msgid "Only "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -3112,7 +3119,7 @@ msgstr "Onay kodu hatası."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "Kayıt"
@@ -3165,23 +3172,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr ""
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Durum mesajlarim ve dosyalarim Åu lisans ile korunmaktadır: "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
-#, fuzzy
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
"bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
"numarası."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3200,7 +3199,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3280,7 +3279,7 @@ msgstr "EÄer lisansı kabul etmezseniz kayıt olamazsınız."
msgid "You already repeated that notice."
msgstr "Zaten giriŠyapmıŠdurumdasıznız!"
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "Yarat"
@@ -4585,12 +4584,12 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Durum mesajını kaydederken hata oluÅtu."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Durum mesajını kaydederken hata oluÅtu."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4913,24 +4912,22 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr ""
-
-#: lib/action.php:855
-msgid "license."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1165
#, fuzzy
msgid "After"
msgstr "« Sonra"
-#: lib/action.php:1171
+#: lib/action.php:1173
#, fuzzy
msgid "Before"
msgstr "Ãnce »"
@@ -5241,12 +5238,14 @@ msgstr "%1$s'in %2$s'deki durum mesajları "
msgid "Fullname: %s"
msgstr "Tam Ä°sim"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5708,11 +5707,13 @@ msgstr "Geçersiz kullanıcı adı veya parola."
msgid "Sign up for a new account"
msgstr "Yeni hesap oluÅtur"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Eposta adresi onayı"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5729,12 +5730,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 %2$s'da durumunuzu takip ediyor"
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5755,17 +5758,20 @@ msgstr ""
"Kendisini durumsuz bırakmayın!,\n"
"%4$s.\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "Hakkında"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5778,21 +5784,31 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s durum"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr ""
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5808,12 +5824,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5832,12 +5850,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1$s %2$s'da durumunuzu takip ediyor"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5858,12 +5878,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5876,6 +5906,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -6044,26 +6086,26 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "İçerik yok!"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "Yarat"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
#, fuzzy
msgid "Reply"
msgstr "cevapla"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "Durum mesajları"
@@ -6172,12 +6214,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:123
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "Böyle bir belge yok."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6202,6 +6239,11 @@ msgstr ""
msgid "Popular"
msgstr "KiÅi Arama"
+#: lib/redirectingaction.php:94
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "Böyle bir belge yok."
+
#: lib/repeatform.php:107
#, fuzzy
msgid "Repeat this notice?"
@@ -6404,47 +6446,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "birkaç saniye önce"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "yaklaÅık bir dakika önce"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "yaklaÅık %d dakika önce"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "yaklaÅık bir saat önce"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "yaklaÅık %d saat önce"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "yaklaÅık bir gün önce"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "yaklaÅık %d gün önce"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "yaklaÅık bir ay önce"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "yaklaÅık %d ay önce"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 c03a801f63..094ea46f40 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-06 22:53+0000\n"
-"PO-Revision-Date: 2010-04-08 23:10:03+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:28:32+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: out-statusnet\n"
@@ -767,7 +767,7 @@ msgid "Preview"
msgstr "ÐеÑеглÑд"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "ÐидалиÑи"
@@ -807,7 +807,7 @@ msgstr "ÐваÑаÑÑ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾."
msgid "You already blocked that user."
msgstr "ЦÑого коÑиÑÑÑваÑа вже заблоковано."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
msgid "Block user"
msgstr "ÐлокÑваÑи коÑиÑÑÑваÑа"
@@ -823,7 +823,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "ÐÑ"
@@ -833,11 +833,11 @@ msgstr "Ðе блокÑваÑи ÑÑого коÑиÑÑÑваÑа"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Так"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
msgid "Block this user"
msgstr "ÐлокÑваÑи коÑиÑÑÑваÑа"
@@ -885,8 +885,10 @@ msgstr "РозблокÑваÑи"
msgid "Unblock this user"
msgstr "РозблокÑваÑи ÑÑого коÑиÑÑÑваÑа"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "ÐапиÑаÑи "
#: actions/confirmaddress.php:75
@@ -956,7 +958,7 @@ msgstr "Ðи не Ñ Ð²Ð»Ð°Ñником ÑÑого додаÑкÑ."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr "Ðиникли Ð¿ÐµÐ²Ð½Ñ Ð¿Ñоблеми з Ñокеном поÑоÑÐ½Ð¾Ñ ÑеÑÑÑ."
@@ -1015,7 +1017,7 @@ msgstr "Ðи впевненнÑ, Ñо бажаÑÑе видалиÑи Ñей д
msgid "Do not delete this notice"
msgstr "Ðе видалÑÑи Ñей допиÑ"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "ÐидалиÑи допиÑ"
@@ -1626,11 +1628,11 @@ msgstr "ÐоÑиÑÑÑваÑа заблоковано в ÑÑй гÑÑпÑ."
msgid "User is not a member of group."
msgstr "ÐоÑиÑÑÑÐ²Ð°Ñ Ð½Ðµ Ñ ÑÑаÑником гÑÑпи."
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
msgid "Block user from group"
msgstr "ÐлокÑваÑи коÑиÑÑÑваÑа в гÑÑпÑ"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1641,15 +1643,15 @@ msgstr ""
"позбавлено ÑленÑÑва в гÑÑпÑ, вÑн не зможе ÑÑди пиÑаÑи, Ñ Ð½Ðµ зможе вÑÑÑпиÑи "
"до гÑÑпи знов."
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "Do not block this user from this group"
msgstr "Ðе блокÑваÑи коÑиÑÑÑваÑа в гÑÑпÑ"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
msgid "Block this user from this group"
msgstr "ÐлокÑваÑи коÑиÑÑÑваÑа ÑÑÑÑ Ð³ÑÑпи"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr "Ðиникла помилка пÑи блокÑÐ²Ð°Ð½Ð½Ñ ÐºÐ¾ÑиÑÑÑваÑа в ÑÑй гÑÑпÑ."
@@ -1728,19 +1730,19 @@ msgstr "СпиÑок ÑÑаÑникÑв ÑÑÑÑ Ð³ÑÑпи."
msgid "Admin"
msgstr "ÐдмÑн"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "Ðлок"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr "ÐадаÑи коÑиÑÑÑваÑÐµÐ²Ñ Ð¿Ñава адмÑнÑÑÑÑаÑоÑа"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr "ÐÑобиÑи адмÑном"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr "ÐадаÑи ÑÑÐ¾Ð¼Ñ ÐºÐ¾ÑиÑÑÑваÑÐµÐ²Ñ Ð¿Ñава адмÑнÑÑÑÑаÑоÑа"
@@ -2022,12 +2024,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "ÐадÑÑлаÑи"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s запÑоÑив(ла) ÐÐ°Ñ Ð¿ÑиÑднаÑиÑÑ Ð´Ð¾ нÑого(неÑ) на %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2371,15 +2375,19 @@ msgstr "ÐÐ¾Ð¿Ð¸Ñ Ð½Ðµ Ð¼Ð°Ñ Ð¿ÑоÑÑлÑ"
msgid "%1$s's status on %2$s"
msgstr "%1$s Ð¼Ð°Ñ ÑÑаÑÑÑ Ð½Ð° %2$s"
-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "Ñип змÑÑÑÑ "
-#: actions/oembed.php:160
-msgid "Only "
-msgstr "ÐиÑе "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
+msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Такий ÑоÑÐ¼Ð°Ñ Ð´Ð°Ð½Ð¸Ñ
не пÑдÑÑимÑÑÑÑÑÑ."
@@ -3087,7 +3095,7 @@ msgstr "ÐаÑÑйÑе, помилка Ñ ÐºÐ¾Ð´Ñ Ð·Ð°Ð¿ÑоÑеннÑ."
msgid "Registration successful"
msgstr "РеÑÑÑÑаÑÑÑ ÑÑпÑÑна"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "РеÑÑÑÑаÑÑÑ"
@@ -3143,22 +3151,15 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Ðовне ÑмâÑ, звÑÑно ж ÐаÑе ÑпÑÐ°Ð²Ð¶Ð½Ñ ÑмâÑ :)"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "ÐÐ¾Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñа Ñайли доÑÑÑÐ¿Ð½Ñ Ð¿Ñд "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr "ÐÑÑейÑÑв ÐÐ¾Ð¼Ð¾Ð½Ñ ÐвÑоÑÑÑво 3.0"
-
-#: actions/register.php:497
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr ""
" окÑÑм ÑиÑ
пÑиваÑниÑ
даниÑ
: паÑолÑ, елекÑÑонна адÑеÑа, адÑеÑа IM, ÑелеÑонний "
"номеÑ."
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3191,7 +3192,7 @@ msgstr ""
"ÐÑкÑÑмо, Ñо заÑеÑÑÑÑÑвалиÑÑ Ñ Ð½Ð°Ñ, Ñ, ÑподÑваÑмоÑÑ, Ðам ÑподобаÑÑÑÑÑ Ð½Ð°Ñ "
"ÑеÑвÑÑ."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3272,7 +3273,7 @@ msgstr "Ðи не можеÑе повÑоÑÑваÑи ÑÐ²Ð¾Ñ Ð²Ð»Ð°ÑÐ½Ñ Ð´Ð¾
msgid "You already repeated that notice."
msgstr "Ðи вже повÑоÑили Ñей допиÑ."
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "ÐовÑоÑено"
@@ -4609,11 +4610,11 @@ msgstr "Ðам забоÑонено надÑилаÑи допиÑи до ÑÑо
msgid "Problem saving notice."
msgstr "ÐÑоблема пÑи збеÑÐµÐ¶ÐµÐ½Ð½Ñ Ð´Ð¾Ð¿Ð¸ÑÑ."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
msgid "Problem saving group inbox."
msgstr "ÐÑоблема пÑи збеÑÐµÐ¶ÐµÐ½Ð½Ñ Ð²Ñ
ÑдниÑ
допиÑÑв Ð´Ð»Ñ Ð³ÑÑпи."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4911,23 +4912,21 @@ msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"ÐвÑоÑÑÑÐºÑ Ð¿Ñава на змÑÑÑ Ñ Ð´Ð°Ð½Ñ Ð½Ð°Ð»ÐµÐ¶Ð°ÑÑ ÑозÑобникам. ÐÑÑ Ð¿Ñава заÑ
иÑено."
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "ÐÑÑ "
-
-#: lib/action.php:855
-msgid "license."
-msgstr "лÑÑензÑÑ."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "ÐÑмеÑаÑÑÑ ÑÑоÑÑнок"
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr "ÐпеÑед"
-#: lib/action.php:1171
+#: lib/action.php:1173
msgid "Before"
msgstr "Ðазад"
@@ -5223,12 +5222,14 @@ msgstr "%1$s залиÑив гÑÑÐ¿Ñ %2$s"
msgid "Fullname: %s"
msgstr "Ðовне ÑмâÑ: %s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "РозÑаÑÑваннÑ: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Ðеб-ÑÑоÑÑнка: %s"
@@ -5711,11 +5712,13 @@ msgstr "УвÑйÑи викоÑиÑÑовÑÑÑи ÑмâÑ Ñа паÑолÑ"
msgid "Sign up for a new account"
msgstr "ÐаÑеÑÑÑÑÑваÑи новий акаÑнÑ"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "ÐÑдÑвеÑÐ´Ð¶ÐµÐ½Ð½Ñ ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ñ Ð°Ð´ÑеÑи"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5744,12 +5747,14 @@ msgstr ""
"ÐÑкÑÑмо за ÐÐ°Ñ ÑÐ°Ñ \n"
"%s\n"
-#: lib/mail.php:240
+#. 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 ÑÐµÐ¿ÐµÑ ÑлÑдкÑÑ Ð·Ð° ÐаÑими допиÑами на %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5774,17 +5779,20 @@ msgstr ""
"----\n"
"ÐмÑниÑи елекÑÑÐ¾Ð½Ð½Ñ Ð°Ð´ÑеÑÑ Ð°Ð±Ð¾ Ñмови ÑповÑÑÐµÐ½Ð½Ñ â %8$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
msgstr "ÐÑо Ñебе: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Ðова елекÑÑонна адÑеÑа Ð´Ð»Ñ Ð½Ð°Ð´ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ Ð½Ð° %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5805,21 +5813,31 @@ msgstr ""
"ЩиÑо ÐаÑÑ,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s ÑÑаÑÑÑ"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "ÐÑдÑвеÑÐ´Ð¶ÐµÐ½Ð½Ñ Ð¡ÐС"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "ÐÑÑкÑÐ²Ð°Ð½Ð½Ñ Ð¿ÑдÑвеÑÐ´Ð¶ÐµÐ½Ð½Ñ ÑелеÑонного номеÑа."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "ÐÐ°Ñ ÑпÑобÑвав «ÑозÑÑовÑ
аÑи» %s"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5846,12 +5864,14 @@ msgstr ""
"РнайкÑаÑими побажаннÑми,\n"
"%4$s\n"
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Ðове пÑиваÑне повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð²Ñд %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5884,12 +5904,14 @@ msgstr ""
"РнайкÑаÑими побажаннÑми,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) додав(ла) ÐÐ°Ñ Ð´Ð¾Ð¿Ð¸Ñ Ð¾Ð±ÑаниÑ
"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5926,12 +5948,22 @@ msgstr ""
"ЩиÑо ÐаÑÑ,\n"
"%6$s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) пÑопонÑÑ Ð´Ð¾ ÐаÑÐ¾Ñ Ñваги наÑÑÑпний допиÑ"
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5944,18 +5976,19 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
-msgstr ""
-"%1$s (@%9$s) пÑопонÑÑ Ð´Ð¾ ÐаÑÐ¾Ñ Ñваги наÑÑÑпний Ð´Ð¾Ð¿Ð¸Ñ (Ñе '@-вÑдповÑдÑ') %2"
-"$s.\n"
+"%5$sYou can reply back here:\n"
"\n"
-"ÐÐ¾Ð¿Ð¸Ñ ÑÑÑ:\n"
+"\t%6$s\n"
"\n"
-"\t%3$s\n"
+"The list of all @-replies for you here:\n"
"\n"
-"ТекÑÑ:\n"
+"%7$s\n"
"\n"
-"\t%4$s\n"
+"Faithfully yours,\n"
+"%2$s\n"
"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6126,23 +6159,23 @@ msgstr "ÐаÑ
."
msgid "at"
msgstr "в"
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
msgid "in context"
msgstr "в конÑекÑÑÑ"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "ÐовÑоÑено"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "ÐÑдповÑÑÑи на Ñей допиÑ"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "ÐÑдповÑÑÑи"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "ÐÐ¾Ð¿Ð¸Ñ Ð¿Ð¾Ð²ÑоÑили"
@@ -6248,11 +6281,7 @@ msgstr "СеÑеднÑодобове"
msgid "All groups"
msgstr "ÐÑÑ Ð³ÑÑпи"
-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "ÐÐµÐ¼Ð°Ñ Ð°ÑгÑменÑÑв return-to."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr "ÐеÑод не виконÑÑÑÑÑÑ."
@@ -6276,6 +6305,10 @@ msgstr "ÐоÑÑаÑÑ"
msgid "Popular"
msgstr "ÐопÑлÑÑне"
+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "ÐÐµÐ¼Ð°Ñ Ð°ÑгÑменÑÑв return-to."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "ÐовÑоÑиÑи Ñей допиÑ?"
@@ -6466,47 +6499,47 @@ msgctxt "role"
msgid "Moderator"
msgstr "ÐодеÑаÑоÑ"
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "миÑÑ ÑомÑ"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "Ñ
Ð²Ð¸Ð»Ð¸Ð½Ñ ÑомÑ"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "близÑко %d Ñ
вилин ÑомÑ"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "Ð³Ð¾Ð´Ð¸Ð½Ñ ÑомÑ"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "близÑко %d годин ÑомÑ"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "Ð´ÐµÐ½Ñ ÑомÑ"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "близÑко %d днÑв ÑомÑ"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "мÑÑÑÑÑ ÑомÑ"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "близÑко %d мÑÑÑÑÑв ÑомÑ"
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr "ÑÑк ÑомÑ"
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 7092994ed8..de8d34c6da 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:10:07+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:28:35+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: out-statusnet\n"
@@ -783,7 +783,7 @@ msgid "Preview"
msgstr "Xem trÆ°á»c"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
#, fuzzy
msgid "Delete"
msgstr "Xóa tin nhắn"
@@ -828,7 +828,7 @@ msgstr "Hình Äại diá»n Äã Äược cáºp nháºt."
msgid "You already blocked that user."
msgstr "Bạn Äã theo những ngÆ°á»i nà y:"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "Ban user"
@@ -842,7 +842,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "Không"
@@ -853,11 +853,11 @@ msgstr "Bá» chặn ngÆ°á»i dùng nà y"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "Có"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Ban user"
@@ -908,9 +908,11 @@ msgstr "BỠchặn"
msgid "Unblock this user"
msgstr "Bá» chặn ngÆ°á»i dùng nà y"
-#: actions/bookmarklet.php:50
-msgid "Post to "
-msgstr ""
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
+msgstr "Mã nhóm"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -984,7 +986,7 @@ msgstr "Bạn chÆ°a cáºp nháºt thông tin riêng"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Có lá»i xảy ra khi thao tác. Hãy thá» lại lần nữa."
@@ -1046,7 +1048,7 @@ msgstr "Bạn có chắc chắn là muá»n xóa tin nhắn nà y không?"
msgid "Do not delete this notice"
msgstr "Không thỠxóa tin nhắn nà y."
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
#, fuzzy
msgid "Delete this notice"
msgstr "Xóa tin nhắn"
@@ -1718,12 +1720,12 @@ msgstr "NgÆ°á»i dùng không có thông tin."
msgid "User is not a member of group."
msgstr "Bạn chÆ°a cáºp nháºt thông tin riêng"
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
#, fuzzy
msgid "Block user from group"
msgstr "Ban user"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1731,17 +1733,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
#, fuzzy
msgid "Do not block this user from this group"
msgstr "Không thá» theo bạn nà y: %s Äã có trong danh sách bạn bè của bạn rá»i."
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
#, fuzzy
msgid "Block this user from this group"
msgstr "Ban user"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1825,20 +1827,20 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr ""
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
#, fuzzy
msgid "Make user an admin of the group"
msgstr "Bạn phải ÄÄng nháºp và o má»i có thá» gá»i thÆ° má»i những "
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
#, fuzzy
msgid "Make this user an admin"
msgstr "Kênh mà bạn tham gia"
@@ -2120,12 +2122,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "Gá»i"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s moi ban tham gia vao %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2476,16 +2480,19 @@ msgstr "Tin nhắn không có hỠsơ cá nhân"
msgid "%1$s's status on %2$s"
msgstr "Trạng thái của %1$s và o %2$s"
-#: actions/oembed.php:157
-#, fuzzy
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "Kết ná»i"
-#: actions/oembed.php:160
-msgid "Only "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Không há» trợ Äá»nh dạng dữ liá»u nà y."
@@ -3212,7 +3219,7 @@ msgstr "Lá»i xảy ra vá»i mã xác nháºn."
msgid "Registration successful"
msgstr "ÄÄng ký thà nh công"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "ÄÄng ký"
@@ -3267,21 +3274,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Há» tên Äầy Äủ của bạn, tá»t nhất là tên tháºt của bạn."
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "Ghi chú và các file của tôi Äã có á» phÃa dÆ°á»i"
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
-#, fuzzy
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr " ngoại trừ thông tin riêng: máºt khẩu, email, Äá»a chá» IM, sá» Äiá»n thoại"
-#: actions/register.php:538
+#: actions/register.php:542
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3312,7 +3311,7 @@ msgstr ""
"\n"
"Cảm Æ¡n bạn Äã ÄÄng ký Äá» là thà nh viên và rất mong bạn sẽ thÃch dá»ch vụ nà y."
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3399,7 +3398,7 @@ msgstr "Bạn không thá» ÄÄng ký nếu không Äá»ng ý các Äiá»u kho
msgid "You already repeated that notice."
msgstr "Bạn Äã theo những ngÆ°á»i nà y:"
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "Tạo"
@@ -4738,12 +4737,12 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Có lá»i xảy ra khi lÆ°u tin nhắn."
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Có lá»i xảy ra khi lÆ°u tin nhắn."
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%s (%s)"
@@ -5070,24 +5069,22 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr ""
-
-#: lib/action.php:855
-msgid "license."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1165
#, fuzzy
msgid "After"
msgstr "Sau"
-#: lib/action.php:1171
+#: lib/action.php:1173
#, fuzzy
msgid "Before"
msgstr "TrÆ°á»c"
@@ -5403,12 +5400,14 @@ msgstr "%s và nhóm"
msgid "Fullname: %s"
msgstr "Tên Äầy Äủ"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, fuzzy, php-format
msgid "Location: %s"
msgstr "Thà nh phá»: %s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, fuzzy, php-format
msgid "Homepage: %s"
msgstr "Trang chủ hoặc Blog: %s"
@@ -5880,11 +5879,13 @@ msgstr "Sai tên ÄÄng nháºp hoặc máºt khẩu."
msgid "Sign up for a new account"
msgstr "Tạo tà i khoản má»i"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Xac nhan dia chi email"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, fuzzy, php-format
msgid ""
"Hey, %s.\n"
@@ -5916,12 +5917,14 @@ msgstr ""
"%4$s\n"
"\n"
-#: lib/mail.php:240
+#. 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 Äang theo dõi lÆ°u ý của bạn trên %2$s."
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5942,17 +5945,20 @@ msgstr ""
"NgÆ°á»i bạn trung thà nh của bạn,\n"
"%4$s.\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "Thà nh phá»: %s"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "Dia chi email moi de gui tin nhan den %s"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5973,21 +5979,31 @@ msgstr ""
"Chúc sức khá»e,\n"
"%4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, fuzzy, php-format
msgid "%s status"
msgstr "Trạng thái của %1$s và o %2$s"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "Xác nháºn SMS"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "Äó không phải là sá» Äiá»n thoại của bạn."
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6003,12 +6019,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "Bạn có tin nhắn riêng từ %s"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6041,12 +6059,14 @@ msgstr ""
"Chúc sức khá»e,\n"
"%5$s\n"
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, fuzzy, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6080,12 +6100,22 @@ msgstr ""
"Chúc sức khá»e,\n"
"%5$s\n"
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6098,6 +6128,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -6270,26 +6312,26 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "Không có ná»i dung!"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "Tạo"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
#, fuzzy
msgid "Reply to this notice"
msgstr "Trả lá»i tin nhắn nà y"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Trả lá»i"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "Tin Äã gá»i"
@@ -6403,12 +6445,7 @@ msgstr ""
msgid "All groups"
msgstr "Nhóm"
-#: lib/profileformaction.php:123
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "Không có tà i liá»u nà o."
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6435,6 +6472,11 @@ msgstr ""
msgid "Popular"
msgstr "Tên tà i khoản"
+#: lib/redirectingaction.php:94
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "Không có tà i liá»u nà o."
+
#: lib/repeatform.php:107
#, fuzzy
msgid "Repeat this notice?"
@@ -6646,47 +6688,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "và i giây trÆ°á»c"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "1 phút trÆ°á»c"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "%d phút trÆ°á»c"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "1 giá» trÆ°á»c"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "%d giá» trÆ°á»c"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "1 ngà y trÆ°á»c"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "%d ngà y trÆ°á»c"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "1 tháng trÆ°á»c"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "%d tháng trÆ°á»c"
-#: lib/util.php:1064
+#: lib/util.php:1071
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 19e4232412..178ce7de00 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:10:11+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:28:39+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 (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
@@ -778,7 +778,7 @@ msgid "Preview"
msgstr "é¢è§"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
#, fuzzy
msgid "Delete"
msgstr "å é¤"
@@ -822,7 +822,7 @@ msgstr "头åå·²æ´æ°ã"
msgid "You already blocked that user."
msgstr "æ¨å·²æåé»æ¢è¯¥ç¨æ·ï¼"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "é»æ¢ç¨æ·"
@@ -836,7 +836,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr "å¦"
@@ -847,11 +847,11 @@ msgstr "åæ¶é»æ¢æ¬¡ç¨æ·"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr "æ¯"
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "é»æ¢è¯¥ç¨æ·"
@@ -903,9 +903,10 @@ msgstr "åæ¶é»æ¢"
msgid "Unblock this user"
msgstr "åæ¶é»æ¢æ¬¡ç¨æ·"
-#: actions/bookmarklet.php:50
-#, fuzzy
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "ç¸ç"
#: actions/confirmaddress.php:75
@@ -980,7 +981,7 @@ msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
#, fuzzy
msgid "There was a problem with your session token."
msgstr "ä¼è¯æ è¯æé®é¢ï¼è¯·éè¯ã"
@@ -1042,7 +1043,7 @@ msgstr "ç¡®å®è¦å é¤è¿æ¡æ¶æ¯åï¼"
msgid "Do not delete this notice"
msgstr "æ æ³å é¤éåã"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
#, fuzzy
msgid "Delete this notice"
msgstr "å é¤éå"
@@ -1696,12 +1697,12 @@ msgstr "ç¨æ·æ²¡æ个人信æ¯ã"
msgid "User is not a member of group."
msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
#, fuzzy
msgid "Block user from group"
msgstr "é»æ¢ç¨æ·"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1709,17 +1710,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
#, fuzzy
msgid "Do not block this user from this group"
msgstr "该ç»æåå表ã"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
#, fuzzy
msgid "Block this user from this group"
msgstr "该ç»æåå表ã"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1802,21 +1803,21 @@ msgstr "该ç»æåå表ã"
msgid "Admin"
msgstr "admin管çå"
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr "é»æ¢"
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
#, fuzzy
msgid "Make user an admin of the group"
msgstr "åªæadminæè½ç¼è¾è¿ä¸ªç»"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
#, fuzzy
msgid "Make Admin"
msgstr "admin管çå"
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr ""
@@ -2084,12 +2085,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "åé"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s é请æ¨å å
¥ %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2426,16 +2429,19 @@ msgstr "éå没æå
³è个人信æ¯"
msgid "%1$s's status on %2$s"
msgstr "%1$s ç %2$s ç¶æ"
-#: actions/oembed.php:157
-#, fuzzy
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "è¿æ¥"
-#: actions/oembed.php:160
-msgid "Only "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "ä¸æ¯æçæ°æ®æ ¼å¼ã"
@@ -3150,7 +3156,7 @@ msgstr "éªè¯ç åºéã"
msgid "Registration successful"
msgstr "注åæåã"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "注å"
@@ -3202,21 +3208,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "é¿ååï¼æ好æ¯âå®åâ"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "æçæååæ件éç¨çæææ¹å¼ä¸º"
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
-#, fuzzy
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr "é¤äºéç§å
容ï¼å¯ç ï¼çµåé®ä»¶ï¼å³æ¶é讯å¸å·ï¼çµè¯å·ç ã"
-#: actions/register.php:538
+#: actions/register.php:542
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3247,7 +3245,7 @@ msgstr ""
"\n"
"æè°¢æ¨ç注åï¼å¸ææ¨å欢è¿ä¸ªæå¡ã"
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3333,7 +3331,7 @@ msgstr "æ¨å¿
é¡»åææ¤æææ¹å¯æ³¨åã"
msgid "You already repeated that notice."
msgstr "æ¨å·²æåé»æ¢è¯¥ç¨æ·ï¼"
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "å建"
@@ -4665,12 +4663,12 @@ msgstr "å¨è¿ä¸ªç½ç«ä½ 被ç¦æ¢åå¸æ¶æ¯ã"
msgid "Problem saving notice."
msgstr "ä¿åéåæ¶åºéã"
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "ä¿åéåæ¶åºéã"
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4998,24 +4996,22 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr "å
¨é¨"
-
-#: lib/action.php:855
-msgid "license."
-msgstr "注åè¯"
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr "å页"
-#: lib/action.php:1163
+#: lib/action.php:1165
#, fuzzy
msgid "After"
msgstr "« ä¹å"
-#: lib/action.php:1171
+#: lib/action.php:1173
#, fuzzy
msgid "Before"
msgstr "ä¹å »"
@@ -5328,12 +5324,14 @@ msgstr "%s 离å¼ç¾¤ %s"
msgid "Fullname: %s"
msgstr "å
¨åï¼%s"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "ä½ç½®ï¼%s"
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "主页ï¼%s"
@@ -5797,11 +5795,13 @@ msgstr "è¾å
¥ç¨æ·ååå¯ç 以ç»å½ã"
msgid "Sign up for a new account"
msgstr "å建æ°å¸å·"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "çµåé®ä»¶å°å确认"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5818,12 +5818,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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 å¼å§å
³æ³¨æ¨ç %2$s ä¿¡æ¯ã"
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5843,19 +5845,22 @@ msgstr ""
"\n"
"为æ¨æåç %4$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
"èªä¼ Bio: %s\n"
"\n"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "æ°ççµåé®ä»¶å°åï¼ç¨äºåå¸ %s ä¿¡æ¯"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5875,21 +5880,31 @@ msgstr ""
"\n"
"为æ¨æåç %4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s ç¶æ"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "SMSç信确认"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "çå¾
确认æ¤çµè¯å·ç ã"
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "%s æ¯éå¼å«ä½ "
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5905,12 +5920,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "%s åéäºæ°çç§äººä¿¡æ¯"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5929,12 +5946,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s æ¶èäºæ¨çéå"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5955,12 +5974,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5973,6 +6002,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -6144,27 +6185,27 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "没æå
容ï¼"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "å建"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
#, fuzzy
msgid "Reply to this notice"
msgstr "æ æ³å é¤éåã"
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
#, fuzzy
msgid "Reply"
msgstr "åå¤"
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "æ¶æ¯å·²åå¸ã"
@@ -6276,12 +6317,7 @@ msgstr ""
msgid "All groups"
msgstr "ææç»"
-#: lib/profileformaction.php:123
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "没æè¿ä»½ææ¡£ã"
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6307,6 +6343,11 @@ msgstr "ç¹å¾"
msgid "Popular"
msgstr "ç¨æ·"
+#: lib/redirectingaction.php:94
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "没æè¿ä»½ææ¡£ã"
+
#: lib/repeatform.php:107
#, fuzzy
msgid "Repeat this notice?"
@@ -6518,47 +6559,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr "å ç§å"
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr "ä¸åéå"
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr "%d åéå"
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr "ä¸å°æ¶å"
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr "%d å°æ¶å"
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr "ä¸å¤©å"
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr "%d 天å"
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr "ä¸ä¸ªæå"
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr "%d 个æå"
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr "ä¸å¹´å"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index b6552280a2..0a93ac9800 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 18:54+0000\n"
-"PO-Revision-Date: 2010-04-08 23:10:17+0000\n"
+"POT-Creation-Date: 2010-04-09 21:26+0000\n"
+"PO-Revision-Date: 2010-04-09 21:28:42+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 (r64753); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64832); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hant\n"
"X-Message-Group: out-statusnet\n"
@@ -769,7 +769,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:659
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr ""
@@ -811,7 +811,7 @@ msgstr "æ´æ°å人åå"
msgid "You already blocked that user."
msgstr "ç¡æ¤ä½¿ç¨è
"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "ç¡æ¤ä½¿ç¨è
"
@@ -825,7 +825,7 @@ msgstr ""
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
msgid "No"
msgstr ""
@@ -836,11 +836,11 @@ msgstr "ç¡æ¤ä½¿ç¨è
"
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#: actions/groupblock.php:177 lib/repeatform.php:132
msgid "Yes"
msgstr ""
-#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "ç¡æ¤ä½¿ç¨è
"
@@ -892,8 +892,10 @@ msgstr ""
msgid "Unblock this user"
msgstr "ç¡æ¤ä½¿ç¨è
"
-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, php-format
+msgid "Post to %s"
msgstr ""
#: actions/confirmaddress.php:75
@@ -968,7 +970,7 @@ msgstr "ç¡æ³é£çµå°ä¼ºæå¨:%s"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1219
+#: lib/action.php:1221
msgid "There was a problem with your session token."
msgstr ""
@@ -1028,7 +1030,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "ç¡æ¤éç¥"
-#: actions/deletenotice.php:146 lib/noticelist.php:659
+#: actions/deletenotice.php:146 lib/noticelist.php:648
msgid "Delete this notice"
msgstr ""
@@ -1659,12 +1661,12 @@ msgstr ""
msgid "User is not a member of group."
msgstr ""
-#: actions/groupblock.php:136 actions/groupmembers.php:341
+#: actions/groupblock.php:134 actions/groupmembers.php:356
#, fuzzy
msgid "Block user from group"
msgstr "ç¡æ¤ä½¿ç¨è
"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1672,17 +1674,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#: actions/groupblock.php:176
#, fuzzy
msgid "Do not block this user from this group"
msgstr "ç¡æ³é£çµå°ä¼ºæå¨:%s"
-#: actions/groupblock.php:179
+#: actions/groupblock.php:177
#, fuzzy
msgid "Block this user from this group"
msgstr "ç¡æ¤ä½¿ç¨è
"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:194
msgid "Database error blocking user from group."
msgstr ""
@@ -1761,19 +1763,19 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:373 lib/blockform.php:69
+#: actions/groupmembers.php:388 lib/blockform.php:69
msgid "Block"
msgstr ""
-#: actions/groupmembers.php:468
+#: actions/groupmembers.php:483
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:500
+#: actions/groupmembers.php:515
msgid "Make this user an admin"
msgstr ""
@@ -2033,12 +2035,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr ""
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr ""
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2342,16 +2346,19 @@ msgstr ""
msgid "%1$s's status on %2$s"
msgstr "%1$sççæ
æ¯%2$s"
-#: actions/oembed.php:157
-#, fuzzy
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "content type %s not supported"
msgstr "é£çµ"
-#: actions/oembed.php:160
-msgid "Only "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s urls over plain http please"
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -3049,7 +3056,7 @@ msgstr "確èªç¢¼ç¼çé¯èª¤"
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -3101,21 +3108,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr ""
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr ""
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
-#, fuzzy
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr "ä¸å
å«éäºå人è³æï¼å¯ç¢¼ãé»åä¿¡ç®±ãç·ä¸å³æéä¿¡ç®±ãé»è©±è碼"
-#: actions/register.php:538
+#: actions/register.php:542
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3134,7 +3133,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3212,7 +3211,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr "ç¡æ¤ä½¿ç¨è
"
-#: actions/repeat.php:114 lib/noticelist.php:678
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "æ°å¢"
@@ -4501,12 +4500,12 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:943
+#: classes/Notice.php:964
#, fuzzy
msgid "Problem saving group inbox."
msgstr "å²å使ç¨è
ç¼çé¯èª¤"
-#: classes/Notice.php:1481
+#: classes/Notice.php:1510
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4823,23 +4822,21 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:849
-msgid "All "
-msgstr ""
-
-#: lib/action.php:855
-msgid "license."
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
-#: lib/action.php:1154
+#: lib/action.php:1156
msgid "Pagination"
msgstr ""
-#: lib/action.php:1163
+#: lib/action.php:1165
msgid "After"
msgstr ""
-#: lib/action.php:1171
+#: lib/action.php:1173
#, fuzzy
msgid "Before"
msgstr "ä¹åçå
§å®¹Â»"
@@ -5141,12 +5138,14 @@ msgstr "%1$sççæ
æ¯%2$s"
msgid "Fullname: %s"
msgstr "å
¨å"
-#: lib/command.php:404 lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:404 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:407 lib/mail.php:260
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:407 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5599,11 +5598,13 @@ msgstr "使ç¨è
å稱æå¯ç¢¼ç¡æ"
msgid "Sign up for a new account"
msgstr "æ°å¢å¸³è"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "確èªä¿¡ç®±"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5620,12 +5621,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. 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å¨%2$sæçºä½ çç²çµ²å"
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5647,17 +5650,20 @@ msgstr ""
"%4$s.\n"
"æ¬ä¸ã\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "èªæä»ç´¹"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5670,21 +5676,31 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr ""
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr ""
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5700,12 +5716,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5724,12 +5742,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "ç¾å¨%1$så¨%2$sæçºä½ çç²çµ²å"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5750,12 +5770,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5768,6 +5798,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -5935,25 +5977,25 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:570
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "ç¡å
§å®¹"
-#: lib/noticelist.php:605
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "æ°å¢"
-#: lib/noticelist.php:632
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:633
+#: lib/noticelist.php:622
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:677
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "æ´æ°å人åå"
@@ -6062,12 +6104,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:123
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "ç¡æ¤æ件"
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6091,6 +6128,11 @@ msgstr ""
msgid "Popular"
msgstr ""
+#: lib/redirectingaction.php:94
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "ç¡æ¤æ件"
+
#: lib/repeatform.php:107
#, fuzzy
msgid "Repeat this notice?"
@@ -6291,47 +6333,47 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1046
+#: lib/util.php:1053
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:1048
+#: lib/util.php:1055
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:1050
+#: lib/util.php:1057
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1052
+#: lib/util.php:1059
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:1054
+#: lib/util.php:1061
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1056
+#: lib/util.php:1063
msgid "about a day ago"
msgstr ""
-#: lib/util.php:1058
+#: lib/util.php:1065
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1060
+#: lib/util.php:1067
msgid "about a month ago"
msgstr ""
-#: lib/util.php:1062
+#: lib/util.php:1069
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1064
+#: lib/util.php:1071
msgid "about a year ago"
msgstr ""
--
2.39.5