summaryrefslogtreecommitdiff
path: root/locale/statusnet.pot
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-08-13 14:33:41 -0700
committerEvan Prodromou <evan@status.net>2010-08-13 14:33:41 -0700
commit718317542940a8976f2c6f2a9ea09a04f2f00ca6 (patch)
tree2bae1e1b0ce628101453b83c7e4ddcce59b43c62 /locale/statusnet.pot
parent9f0715a9935966f3ec483bccc476d5baf3324b3c (diff)
parent029aa0c61c9942c0688fd3dc9aa2893311543db1 (diff)
Merge branch 'master' into 1.0.x
Diffstat (limited to 'locale/statusnet.pot')
-rw-r--r--locale/statusnet.pot26
1 files changed, 13 insertions, 13 deletions
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 961810055..822d4fcf8 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-08-03 13:21+0000\n"
+"POT-Creation-Date: 2010-08-11 10:48+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"
@@ -763,7 +763,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
msgid "Delete"
msgstr ""
@@ -1036,7 +1036,7 @@ msgid "Do not delete this notice"
msgstr ""
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
msgid "Delete this notice"
msgstr ""
@@ -3310,7 +3310,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr ""
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
msgid "Repeated"
msgstr ""
@@ -4679,21 +4679,21 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1614
+#: classes/Notice.php:1746
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6071,7 +6071,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
msgid "from"
msgstr ""
@@ -6225,23 +6225,23 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:568
msgid "in context"
msgstr ""
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
msgid "Repeated by"
msgstr ""
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
msgid "Notice repeated"
msgstr ""