diff options
author | Evan Prodromou <evan@status.net> | 2010-01-22 14:19:08 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-01-22 14:19:08 -0500 |
commit | d25bd9b2923606a9e4786e8cab3c1bd384235164 (patch) | |
tree | 1b8a4c1999806d24fd39c72f298c34cfc8bed57f /locale/statusnet.po | |
parent | c8bc598cfd67353f33d7785556374b5d6865a7d9 (diff) | |
parent | 00547ca898733973eea7375152a3cfc83b50ae20 (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'locale/statusnet.po')
-rw-r--r-- | locale/statusnet.po | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/locale/statusnet.po b/locale/statusnet.po index 9c28de802..fedcf6e7b 100644 --- a/locale/statusnet.po +++ b/locale/statusnet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-19 23:52+0000\n" +"POT-Creation-Date: 2010-01-21 22:36+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" @@ -123,7 +123,7 @@ msgstr "" #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 @@ -368,7 +368,7 @@ msgstr "" #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91 +#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 msgid "Group not found!" msgstr "" @@ -1038,7 +1038,7 @@ msgid "No such application." msgstr "" #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1167 +#: actions/showapplication.php:118 lib/action.php:1189 msgid "There was a problem with your session token." msgstr "" @@ -4299,27 +4299,41 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:794 +#: lib/action.php:795 msgid "Site content license" msgstr "" -#: lib/action.php:803 -msgid "All " +#: lib/action.php:800 +#, php-format +msgid "Content and data of %1$s are private and confidential." +msgstr "" + +#: lib/action.php:805 +#, php-format +msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" #: lib/action.php:808 +msgid "Content and data copyright by contributors. All rights reserved." +msgstr "" + +#: lib/action.php:820 +msgid "All " +msgstr "" + +#: lib/action.php:825 msgid "license." msgstr "" -#: lib/action.php:1102 +#: lib/action.php:1124 msgid "Pagination" msgstr "" -#: lib/action.php:1111 +#: lib/action.php:1133 msgid "After" msgstr "" -#: lib/action.php:1119 +#: lib/action.php:1141 msgid "Before" msgstr "" |