From 1ca7a35268afbe60b8ec2c4581d01dd8a45948ed Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 17:25:32 -0400 Subject: releasing version 3.20101023 --- po/vi.po | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'po/vi.po') diff --git a/po/vi.po b/po/vi.po index 59f74e881..619509c4c 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\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: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -367,22 +367,26 @@ msgstr "không thể đọc %s: %s" 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 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "lỗi biên dịch %s" -- cgit v1.2.3