Re: [sisyphus] I: Sisyphus-20080211 i586 unmets: +1682 -14 (1730/214)]

[ruslandh <hihin@yandex.ru>]

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

В сообщении от Tuesday 12 February 2008 14:40:34 Grigory Batalov написал(а):
> On Tue, 12 Feb 2008 08:32:18 +0300, Хихин Руслан wrote:
В общем с таким патчем собирается :


-- 
С Уважением Хихин Руслан.

[-- Attachment #2: meld-1.1.4-trans.patch --]
[-- Type: text/x-diff, Size: 3687 bytes --]

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"