From 490e0813c53ce7cff708ae4b6c2805c643f9f005 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Oct 2010 02:44:10 -0400 Subject: releasing version 3.20101019 --- ikiwiki.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ikiwiki.spec') diff --git a/ikiwiki.spec b/ikiwiki.spec index 5cd072750..b2cebc495 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100926 +Version: 3.20101019 Release: 1%{?dist} Summary: A wiki compiler -- cgit v1.2.3 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 --- ikiwiki.spec | 2 +- po/bg.po | 14 +++++++++----- po/cs.po | 15 ++++++++++----- po/da.po | 15 ++++++++++----- po/de.po | 15 ++++++++++----- po/es.po | 15 ++++++++++----- po/fr.po | 15 ++++++++++----- po/gu.po | 14 +++++++++----- po/ikiwiki.pot | 14 +++++++++----- po/it.po | 15 ++++++++++----- po/pl.po | 14 +++++++++----- po/sv.po | 14 +++++++++----- po/tr.po | 14 +++++++++----- po/vi.po | 14 +++++++++----- 14 files changed, 124 insertions(+), 66 deletions(-) (limited to 'ikiwiki.spec') diff --git a/ikiwiki.spec b/ikiwiki.spec index b2cebc495..7653ac671 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20101019 +Version: 3.20101023 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/bg.po b/po/bg.po index 36774cfb2..0d631d812 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\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-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -368,22 +368,26 @@ msgstr "грешка при четене на „%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 "крешка при компилиране на файла %s" diff --git a/po/cs.po b/po/cs.po index c154da695..e4fbe0d11 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,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: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -365,22 +365,27 @@ msgstr "není stránkou" msgid "%s is an attachment, not a page." msgstr "%s není ani příloha, ani stránka." -#: ../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 "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "nejste oprávněni měnit %s" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "nelze zkompilovat %s" diff --git a/po/da.po b/po/da.po index 331654355..49dd1de7e 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20100518\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: 2010-08-27 12:45+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -366,22 +366,27 @@ msgstr "ikke en side" msgid "%s is an attachment, not a page." msgstr "%s er en vedhæftning, ikke en side." -#: ../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 "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "du kan ikke påvirke en fil med modus %s" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "Du har ikke lov til at ændre %s" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "kompilering af %s mislykkedes" diff --git a/po/de.po b/po/de.po index 6159912d0..4bc3fe379 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\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: 2010-03-14 16:09+0530\n" "Last-Translator: Sebastian Kuhnert \n" "Language-Team: German \n" @@ -367,22 +367,27 @@ msgstr "Keine Seite" msgid "%s is an attachment, not a page." msgstr "Seite %s ist ein Anhang und keine Seite." -#: ../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 "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "Sie dürfen %s nicht verändern" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "erzeugen von %s fehlgeschlagen" diff --git a/po/es.po b/po/es.po index a2459007b..e5159d0c6 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\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: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -375,22 +375,27 @@ msgstr "no encuentro páginas coincidentes: %s" msgid "%s is an attachment, not a page." msgstr "la página %s no es modificable" -#: ../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 "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "no puede actuar sobre un archivo con permisos %s" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "No puede cambiar %s" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "ha fallado la compilación del programa %s" diff --git a/po/fr.po b/po/fr.po index c0df34b6a..786889c88 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\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: 2010-10-03 10:42+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -363,22 +363,27 @@ msgstr "Ce n'est pas une page." msgid "%s is an attachment, not a page." msgstr "%s est une pièce jointe, pas une page." -#: ../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 "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "Vous n'êtes pas autorisé à modifier %s" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "Échec de la compilation de %s" diff --git a/po/gu.po b/po/gu.po index b73f51591..32b7c5701 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\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-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -366,22 +366,26 @@ msgstr "વાંચી શકાતી નથી %s: %s" msgid "%s is an attachment, not a page." msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../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 "%s કમ્પાઇલ કરવામાં નિષ્ફળ" 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 \n" "Language-Team: LANGUAGE \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 "" diff --git a/po/it.po b/po/it.po index 657bda7a0..fc5fb5aea 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,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: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -364,22 +364,27 @@ msgstr "non è una pagina" msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../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 "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "non è permesso lavorare su un file in modalità %s" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" -#: ../IkiWiki/Plugin/git.pm:854 +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "non è permesso modificare %s" + +#: ../IkiWiki/Plugin/git.pm:877 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "errore nel compilare %s" diff --git a/po/pl.po b/po/pl.po index 6a9d973be..dc78149f3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\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-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -370,22 +370,26 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "%s is an attachment, not a page." msgstr "Strona %s nie może być edytowana" -#: ../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 "awaria w trakcie kompilowania %s" diff --git a/po/sv.po b/po/sv.po index 1b6d1f2e8..5a2d7b666 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,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-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -367,22 +367,26 @@ msgstr "kan inte läsa %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 "misslyckades med att kompilera %s" diff --git a/po/tr.po b/po/tr.po index aa6884a6f..6b904a945 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\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: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -355,22 +355,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 "" 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