Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

[quix0rs-gnu-social.git] / locale / en_GB / LC_MESSAGES / statusnet.po

diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 21311c838c548989971abdcdc1783f61997f7c6e..132aaba4d920647365b8662c75960a7d047c27f9 100644 (file)
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2011-04-18 11:21+0000\n"
-"PO-Revision-Date: 2011-04-18 11:24:15+0000\n"
+"POT-Creation-Date: 2011-04-21 18:39+0000\n"
+"PO-Revision-Date: 2011-04-21 18:41:07+0000\n"

 "Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"X-Generator: MediaWiki 1.18alpha (r86294); Translate extension (2011-04-13)\n"
+"X-Generator: MediaWiki 1.18alpha (r86650); Translate extension (2011-04-13)\n"

 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-"X-POT-Import-Date: 2011-04-17 22:40:29+0000\n"
+"X-POT-Import-Date: 2011-04-20 08:40:21+0000\n"

 
 #. TRANS: Database error message.
 #, php-format
 
 #. TRANS: Database error message.
 #, php-format


@@ -3226,67 +3226,6 @@ msgstr "Send"
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s has invited you to join them on %2$s"
 
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s has invited you to join them on %2$s"
 

-#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral
-#. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, %2$s is the
-#. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
-#. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
-#. TRANS: to register with the StatusNet site.
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-

 #. TRANS: Client error displayed when trying to join a group while not logged in.
 msgid "You must be logged in to join a group."
 msgstr "You must be logged in to join a group."
 #. TRANS: Client error displayed when trying to join a group while not logged in.
 msgid "You must be logged in to join a group."
 msgstr "You must be logged in to join a group."


@@ -7071,12 +7010,6 @@ msgstr ""
 msgid "Problem saving group inbox."
 msgstr "Problem saving group inbox."
 
 msgid "Problem saving group inbox."
 msgstr "Problem saving group inbox."
 

-#. TRANS: Server exception thrown when a reply cannot be saved.
-#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#, php-format
-msgid "Could not save reply for %1$d, %2$d."
-msgstr "Could not save reply for %1$d, %2$d."
-

 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #, php-format
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #, php-format


@@ -8758,6 +8691,11 @@ msgstr ""
 msgid "Transport cannot be null."
 msgstr ""
 
 msgid "Transport cannot be null."
 msgstr ""
 

+#. TRANS: Title for inbox tag cloud section.
+msgctxt "TITLE"
+msgid "Trends"
+msgstr ""
+

 #. TRANS: Button text for inviting more users to the StatusNet instance.
 #, fuzzy
 msgctxt "BUTTON"
 #. TRANS: Button text for inviting more users to the StatusNet instance.
 #, fuzzy
 msgctxt "BUTTON"


@@ -9228,12 +9166,12 @@ msgstr ""
 msgid "Cannot get author for activity."
 msgstr ""
 
 msgid "Cannot get author for activity."
 msgstr ""
 

-#. TRANS: Client exception.
+#. TRANS: Client exception thrown when ...

 #, fuzzy
 msgid "Bookmark not posted to this group."
 msgstr "You are not allowed to delete this group."
 
 #, fuzzy
 msgid "Bookmark not posted to this group."
 msgstr "You are not allowed to delete this group."
 

-#. TRANS: Client exception.
+#. TRANS: Client exception when ...

 #, fuzzy
 msgid "Object not posted to this user."
 msgstr "Do not delete this group"
 #, fuzzy
 msgid "Object not posted to this user."
 msgstr "Do not delete this group"


@@ -9242,6 +9180,10 @@ msgstr "Do not delete this group"
 msgid "Do not know how to handle this kind of target."
 msgstr ""
 
 msgid "Do not know how to handle this kind of target."
 msgstr ""
 

+#. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
+msgid "You must implement either adaptNoticeListItem() or showNotice()."
+msgstr ""
+

 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""


@@ -9284,20 +9226,13 @@ msgid ""
 "try again later"
 msgstr ""
 
 "try again later"
 msgstr ""
 

-#. TRANS: Header in notice list.
-#. TRANS: Header for Notices section.
-#, fuzzy
-msgctxt "HEADER"
-msgid "Notices"
-msgstr "Notices"
-

 #. TRANS: Separator in profile addressees list.
 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
 #. TRANS: Start of profile addressees list.
 #. TRANS: Separator in profile addressees list.
 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
 #. TRANS: Start of profile addressees list.

-msgid " â\96¶ "
+msgid " â\96¸ "

 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north.
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north.


@@ -9755,6 +9690,11 @@ msgctxt "MENU"
 msgid "Popular"
 msgstr "Popular"
 
 msgid "Popular"
 msgstr "Popular"
 

+#. TRANS: Title for inbox tag cloud section.
+msgctxt "TITLE"
+msgid "Trending topics"
+msgstr ""
+

 #. TRANS: Client error displayed when return-to was defined without a target.
 msgid "No return-to arguments."
 msgstr "No return-to arguments."
 #. TRANS: Client error displayed when return-to was defined without a target.
 msgid "No return-to arguments."
 msgstr "No return-to arguments."


@@ -10127,6 +10067,12 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "Error opening theme archive."
 
 msgid "Error opening theme archive."
 msgstr "Error opening theme archive."
 

+#. TRANS: Header for Notices section.
+#, fuzzy
+msgctxt "HEADER"
+msgid "Notices"
+msgstr "Notices"
+

 #. TRANS: Link to show replies for a notice.
 #. TRANS: %d is the number of replies to a notice and used for plural.
 #, php-format
 #. TRANS: Link to show replies for a notice.
 #. TRANS: %d is the number of replies to a notice and used for plural.
 #, php-format


@@ -10365,3 +10311,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""

+
+#~ msgid "Could not save reply for %1$d, %2$d."
+#~ msgstr "Could not save reply for %1$d, %2$d."