diff options
| author | Joey Hess <joey@kitenet.net> | 2010-10-23 17:25:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-10-23 17:25:32 -0400 |
| commit | 1ca7a35268afbe60b8ec2c4581d01dd8a45948ed (patch) | |
| tree | fb6f8b6613def1aa1efba8dec71c4a61a9f03b69 /po/ikiwiki.pot | |
| parent | 42e97a4a69581c9a2a8198f8149c5feece09cee5 (diff) | |
| download | ikiwiki-1ca7a35268afbe60b8ec2c4581d01dd8a45948ed.tar ikiwiki-1ca7a35268afbe60b8ec2c4581d01dd8a45948ed.tar.gz | |
releasing version 3.20101023
Diffstat (limited to 'po/ikiwiki.pot')
| -rw-r--r-- | po/ikiwiki.pot | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index bca72b108..fa65b6f93 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 16:44-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-0400\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" @@ -359,22 +359,26 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 #: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +msgid "you are not allowed to revert a merge" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:877 #, perl-format msgid "Failed to revert commit %s" msgstr "" |