diff -uNr meld-1.1.4/help/C/GNUmakefile meld-1.1.4-new/help/C/GNUmakefile --- meld-1.1.4/help/C/GNUmakefile 2008-02-12 17:56:42 +0300 +++ meld-1.1.4-new/help/C/GNUmakefile 2008-02-12 17:55:13 +0300 @@ -7,6 +7,7 @@ OMF_NAME := meld-$(LANG).omf OMF_DIR_ := $(DESTDIR)$(sharedir)/omf/meld OMF_STATE:= $(DESTDIR)$(prefix)/var/lib/scrollkeeper +INST_XML:= . .PHONY : all all $(OMF_NAME).install : $(OMF_NAME) diff -uNr meld-1.1.4/help/es/GNUmakefile meld-1.1.4-new/help/es/GNUmakefile --- meld-1.1.4/help/es/GNUmakefile 2006-01-29 00:44:02 +0300 +++ meld-1.1.4-new/help/es/GNUmakefile 2008-02-12 17:55:08 +0300 @@ -7,6 +7,7 @@ OMF_NAME := meld-$(LANG).omf OMF_DIR_ := $(DESTDIR)$(sharedir)/omf/meld OMF_STATE:= $(DESTDIR)$(prefix)/var/lib/scrollkeeper +INST_XML:= . .PHONY : all all $(OMF_NAME).install : $(OMF_NAME) diff -uNr meld-1.1.4/po/hu.po meld-1.1.4-new/po/hu.po --- meld-1.1.4/po/hu.po 2006-02-25 03:19:25 +0300 +++ meld-1.1.4-new/po/hu.po 2008-02-12 17:43:08 +0300 @@ -15,7 +15,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10.2\n" #: ../dirdiff.py:252 ../dirdiff.py:267 diff -uNr meld-1.1.4/po/ja.po meld-1.1.4-new/po/ja.po --- meld-1.1.4/po/ja.po 2006-03-05 14:03:44 +0300 +++ meld-1.1.4-new/po/ja.po 2008-02-12 17:43:08 +0300 @@ -14,7 +14,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../dirdiff.py:252 ../dirdiff.py:267 #, python-format diff -uNr meld-1.1.4/po/ru.po meld-1.1.4-new/po/ru.po --- meld-1.1.4/po/ru.po 2008-02-12 17:56:42 +0300 +++ meld-1.1.4-new/po/ru.po 2008-02-12 17:43:08 +0300 @@ -153,57 +153,57 @@ #, python-format msgid "%i second" msgid_plural "%i seconds" -msgstr[0] "секунда" -msgstr[1] "секунды" -msgstr[2] "секунд" +msgstr[0] "%i секунда" +msgstr[1] "%i секунды" +msgstr[2] "%i секунд" #: dirdiff.py:571 #, python-format msgid "%i minute" msgid_plural "%i minutes" -msgstr[0] "минута" -msgstr[1] "минуты" -msgstr[2] "минут" +msgstr[0] "%i минута" +msgstr[1] "%i минуты" +msgstr[2] "%i минут" #: dirdiff.py:572 #, python-format msgid "%i hour" msgid_plural "%i hours" -msgstr[0] "час" -msgstr[1] "часа" -msgstr[2] "часов" +msgstr[0] "%i час" +msgstr[1] "%i часа" +msgstr[2] "%i часов" #: dirdiff.py:573 #, python-format msgid "%i day" msgid_plural "%i days" -msgstr[0] "день" -msgstr[1] "дня" -msgstr[2] "дней" +msgstr[0] "%i день" +msgstr[1] "%i дня" +msgstr[2] "%i дней" #: dirdiff.py:574 #, python-format msgid "%i week" msgid_plural "%i weeks" -msgstr[0] "неделя" -msgstr[1] "недели" -msgstr[2] "недель" +msgstr[0] "%i неделя" +msgstr[1] "%i недели" +msgstr[2] "%i недель" #: dirdiff.py:575 #, python-format msgid "%i month" msgid_plural "%i months" -msgstr[0] "месяц" -msgstr[1] "месяца" -msgstr[2] "месяцев" +msgstr[0] "%i месяц" +msgstr[1] "%i месяца" +msgstr[2] "%i месяцев" #: dirdiff.py:576 #, python-format msgid "%i year" msgid_plural "%i years" -msgstr[0] "год" -msgstr[1] "года" -msgstr[2] "лет" +msgstr[0] "%i год" +msgstr[1] "%i года" +msgstr[2] "%i лет" #: meldapp.py:145 msgid "label"