r275 - in trunk/vim: debian upstream/patches

Matthijs Mohlmann active2-guest at costa.debian.org
Fri Jul 29 09:53:03 UTC 2005


Author: active2-guest
Date: 2005-07-29 09:53:02 +0000 (Fri, 29 Jul 2005)
New Revision: 275

Added:
   trunk/vim/upstream/patches/6.3.086
Modified:
   trunk/vim/debian/README
   trunk/vim/debian/changelog
Log:
 * New upstream patch


Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README	2005-07-28 16:18:55 UTC (rev 274)
+++ trunk/vim/debian/README	2005-07-29 09:53:02 UTC (rev 275)
@@ -110,3 +110,4 @@
   5053  6.3.083  VMS: add function keys to vt320 termcap entry
   6773  6.3.084  (extra) Cygwin: update src makefile and add src/po makefile
   3408  6.3.085  crash in syntax highlighting
+ 10618  6.3.086  (extra) Russian translation has a few mistakes

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-07-28 16:18:55 UTC (rev 274)
+++ trunk/vim/debian/changelog	2005-07-29 09:53:02 UTC (rev 275)
@@ -1,3 +1,9 @@
+vim (1:6.3-086+1) unstable; urgency=low
+
+  * New upstream patch (086), see README.gz for details.
+
+ -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Fri, 29 Jul 2005 11:51:08 +0200
+
 vim (1:6.3-085+1) unstable; urgency=high
 
   * New upstream patches (079 to 085), see README.gz for details.

Added: trunk/vim/upstream/patches/6.3.086
===================================================================
--- trunk/vim/upstream/patches/6.3.086	2005-07-28 16:18:55 UTC (rev 274)
+++ trunk/vim/upstream/patches/6.3.086	2005-07-29 09:53:02 UTC (rev 275)
@@ -0,0 +1,355 @@
+To: vim-dev at vim.org
+Subject: Patch 6.3.086 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.086 (extra)
+Problem:    Can't produce message translation file with msgfmt that checks
+	    printf strings.
+Solution:   Fix the Russian translation.
+Files:	    src/po/ru.po, src/po/ru.cp1251.po
+
+
+*** ../vim-6.3.085/src/po/ru.po	Wed Jun  9 14:56:24 2004
+--- src/po/ru.po	Fri Jul 29 09:51:52 2005
+***************
+*** 9,18 ****
+  #
+  msgid ""
+  msgstr ""
+! "Project-Id-Version: Vim 6.3a\n"
+  "Report-Msgid-Bugs-To: \n"
+! "POT-Creation-Date: 2004-05-10 21:37+0400\n"
+! "PO-Revision-Date: 2004-05-10 21:37+0400\n"
+  "Last-Translator: vassily ragosin <vrr at users.sourceforge.net>\n"
+  "Language-Team: vassily ragosin <vrr at users.sourceforge.net>\n"
+  "MIME-Version: 1.0\n"
+--- 9,18 ----
+  #
+  msgid ""
+  msgstr ""
+! "Project-Id-Version: Vim 6.3.15\n"
+  "Report-Msgid-Bugs-To: \n"
+! "POT-Creation-Date: 2004-08-06 09:06+0400\n"
+! "PO-Revision-Date: 2004-08-06 09:06+0400\n"
+  "Last-Translator: vassily ragosin <vrr at users.sourceforge.net>\n"
+  "Language-Team: vassily ragosin <vrr at users.sourceforge.net>\n"
+  "MIME-Version: 1.0\n"
+***************
+*** 880,889 ****
+  msgid "E670: Mix of help file encodings within a language: %s"
+  msgstr "E670: æÁÊÌÙ ÓÐÒÁ×ËÉ ÉÓÐÏÌØÚÕÀÔ ÒÁÚÎÙÅ ËÏÄÉÒÏ×ËÉ ÄÌÑ ÏÄÎÏÇÏ ÑÚÙËÁ: %s"
+  
+! #: ex_cmds.c:5445
+  #, c-format
+! msgid "E154: Duplicate tag \"%s\" in file %s"
+! msgstr "E154: ðÏ×ÔÏÒÑÀÝÁÑÓÑ ÍÅÔËÁ \"%s\" × ÆÁÊÌÅ %s"
+  
+  #: ex_cmds.c:5557
+  #, c-format
+--- 880,889 ----
+  msgid "E670: Mix of help file encodings within a language: %s"
+  msgstr "E670: æÁÊÌÙ ÓÐÒÁ×ËÉ ÉÓÐÏÌØÚÕÀÔ ÒÁÚÎÙÅ ËÏÄÉÒÏ×ËÉ ÄÌÑ ÏÄÎÏÇÏ ÑÚÙËÁ: %s"
+  
+! #: ex_cmds.c:5492
+  #, c-format
+! msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+! msgstr "E154: ðÏ×ÔÏÒÑÀÝÁÑÓÑ ÍÅÔËÁ \"%s\" × ÆÁÊÌÅ %s/%s"
+  
+  #: ex_cmds.c:5557
+  #, c-format
+***************
+*** 1236,1245 ****
+  msgid "E173: 1 more file to edit"
+  msgstr "E173: 1 ÆÁÊÌ ÏÖÉÄÁÅÔ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ."
+  
+! #: ex_docmd.c:4581
+  #, c-format
+  msgid "E173: %ld more files to edit"
+! msgstr "E173: åÓÔØ ÎÅÏÔÒÅÄÁËÔÉÒÏ×ÁÎÎÙÅ ÆÁÊÌÙ (%d)."
+  
+  #: ex_docmd.c:4676
+  msgid "E174: Command already exists: add ! to replace it"
+--- 1236,1245 ----
+  msgid "E173: 1 more file to edit"
+  msgstr "E173: 1 ÆÁÊÌ ÏÖÉÄÁÅÔ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ."
+  
+! #: ex_docmd.c:4584
+  #, c-format
+  msgid "E173: %ld more files to edit"
+! msgstr "E173: åÓÔØ ÎÅÏÔÒÅÄÁËÔÉÒÏ×ÁÎÎÙÅ ÆÁÊÌÙ (%ld)."
+  
+  #: ex_docmd.c:4676
+  msgid "E174: Command already exists: add ! to replace it"
+***************
+*** 2303,2314 ****
+  "\n"
+  "ïÔÐÒÁ×ËÁ ÓÏÏÂÝÅÎÉÑ ÄÌÑ ÕÎÉÞÔÏÖÅÎÉÑ ÐÒÏÃÅÓÓÁ-ÐÏÔÏÍËÁ.\n"
+  
+! #: gui_w32.c:829
+  #, c-format
+  msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+  msgstr "E243: ðÁÒÁÍÅÔÒ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ: \"-%s\"; ÉÓÐÏÌØÚÕÊÔÅ ×ÅÒÓÉÀ OLE."
+  
+! #: gui_w48.c:2090
+  msgid "Find string (use '\\\\' to find  a '\\')"
+  msgstr "ðÏÉÓË ÓÔÒÏËÉ (ÉÓÐÏÌØÚÕÊÔÅ '\\\\' ÄÌÑ ÐÏÉÓËÁ '\\')"
+  
+--- 2303,2323 ----
+  "\n"
+  "ïÔÐÒÁ×ËÁ ÓÏÏÂÝÅÎÉÑ ÄÌÑ ÕÎÉÞÔÏÖÅÎÉÑ ÐÒÏÃÅÓÓÁ-ÐÏÔÏÍËÁ.\n"
+  
+! #: gui_w32.c:839
+! #, c-format
+! msgid "E671: Cannot find window title \"%s\""
+! msgstr "E671: îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÚÁÇÏÌÏ×ÏË ÏËÎÁ \"%s\""
+! 
+! #: gui_w32.c:847
+  #, c-format
+  msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+  msgstr "E243: ðÁÒÁÍÅÔÒ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ: \"-%s\"; ÉÓÐÏÌØÚÕÊÔÅ ×ÅÒÓÉÀ OLE."
+  
+! #: gui_w32.c:1100
+! msgid "E672: Unable to open window inside MDI application"
+! msgstr "E672: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÏËÎÏ ×ÎÕÔÒÉ ÐÒÉÌÏÖÅÎÉÑ MDI"
+! 
+! #: gui_w48.c:2163
+  msgid "Find string (use '\\\\' to find  a '\\')"
+  msgstr "ðÏÉÓË ÓÔÒÏËÉ (ÉÓÐÏÌØÚÕÊÔÅ '\\\\' ÄÌÑ ÐÏÉÓËÁ '\\')"
+  
+***************
+*** 2353,2358 ****
+--- 2362,2368 ----
+  msgstr "Font1: %s\n"
+  
+  #: gui_x11.c:2184
++ #, c-format
+  msgid "Font%ld width is not twice that of font0\n"
+  msgstr "ûÉÒÉÎÁ ÛÒÉÆÔÁ font%ld ÄÏÌÖÎÁ ÂÙÔØ ×Ä×ÏÅ ÂÏÌØÛÅ ÛÉÒÉÎÙ ÛÒÉÆÔÁ font0\n"
+  
+***************
+*** 2437,2443 ****
+  #: if_cscope.c:589
+  #, c-format
+  msgid "E262: error reading cscope connection %ld"
+! msgstr "E262: ÏÛÉÂËÁ ÐÏÌÕÞÅÎÉÑ ÉÎÆÏÒÍÁÃÉÉ ÏÔ ÓÏÅÄÉÎÅÎÉÑ cscope %d"
+  
+  #: if_cscope.c:694
+  msgid "E561: unknown cscope search type"
+--- 2447,2453 ----
+  #: if_cscope.c:589
+  #, c-format
+  msgid "E262: error reading cscope connection %ld"
+! msgstr "E262: ÏÛÉÂËÁ ÐÏÌÕÞÅÎÉÑ ÉÎÆÏÒÍÁÃÉÉ ÏÔ ÓÏÅÄÉÎÅÎÉÑ cscope %ld"
+  
+  #: if_cscope.c:694
+  msgid "E561: unknown cscope search type"
+***************
+*** 2515,2521 ****
+  #: if_cscope.c:1458
+  #, c-format
+  msgid "cscope connection %s closed"
+! msgstr "ÓÏÅÄÉÎÅÎÉÅ Ó cscope ÚÁËÒÙÔÏ"
+  
+  #. should not reach here
+  #: if_cscope.c:1598
+--- 2525,2531 ----
+  #: if_cscope.c:1458
+  #, c-format
+  msgid "cscope connection %s closed"
+! msgstr "ÓÏÅÄÉÎÅÎÉÅ %s Ó cscope ÚÁËÒÙÔÏ"
+  
+  #. should not reach here
+  #: if_cscope.c:1598
+***************
+*** 6654,6658 ****
+  msgid "E463: Region is guarded, cannot modify"
+  msgstr "E463: îÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÏÈÒÁÎÑÅÍÕÀ ÏÂÌÁÓÔØ"
+  
+- #~ msgid "\"\n"
+- #~ msgstr "\"\n"
+--- 6664,6666 ----
+*** ../vim-6.3.085/src/po/ru.cp1251.po	Wed Jun  9 14:56:25 2004
+--- src/po/ru.cp1251.po	Fri Jul 29 09:51:58 2005
+***************
+*** 9,18 ****
+  #
+  msgid ""
+  msgstr ""
+! "Project-Id-Version: Vim 6.3a\n"
+  "Report-Msgid-Bugs-To: \n"
+! "POT-Creation-Date: 2004-05-10 21:37+0400\n"
+! "PO-Revision-Date: 2004-05-10 21:37+0400\n"
+  "Last-Translator: vassily ragosin <vrr at users.sourceforge.net>\n"
+  "Language-Team: vassily ragosin <vrr at users.sourceforge.net>\n"
+  "MIME-Version: 1.0\n"
+--- 9,18 ----
+  #
+  msgid ""
+  msgstr ""
+! "Project-Id-Version: Vim 6.3.15\n"
+  "Report-Msgid-Bugs-To: \n"
+! "POT-Creation-Date: 2004-08-06 09:06+0400\n"
+! "PO-Revision-Date: 2004-08-06 09:06+0400\n"
+  "Last-Translator: vassily ragosin <vrr at users.sourceforge.net>\n"
+  "Language-Team: vassily ragosin <vrr at users.sourceforge.net>\n"
+  "MIME-Version: 1.0\n"
+***************
+*** 880,889 ****
+  msgid "E670: Mix of help file encodings within a language: %s"
+  msgstr "E670: Ôàéëû ñïðàâêè èñïîëüçóþò ðàçíûå êîäèðîâêè äëÿ îäíîãî ÿçûêà: %s"
+  
+! #: ex_cmds.c:5445
+  #, c-format
+! msgid "E154: Duplicate tag \"%s\" in file %s"
+! msgstr "E154: Ïîâòîðÿþùàÿñÿ ìåòêà \"%s\" â ôàéëå %s"
+  
+  #: ex_cmds.c:5557
+  #, c-format
+--- 880,889 ----
+  msgid "E670: Mix of help file encodings within a language: %s"
+  msgstr "E670: Ôàéëû ñïðàâêè èñïîëüçóþò ðàçíûå êîäèðîâêè äëÿ îäíîãî ÿçûêà: %s"
+  
+! #: ex_cmds.c:5492
+  #, c-format
+! msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+! msgstr "E154: Ïîâòîðÿþùàÿñÿ ìåòêà \"%s\" â ôàéëå %s/%s"
+  
+  #: ex_cmds.c:5557
+  #, c-format
+***************
+*** 1236,1245 ****
+  msgid "E173: 1 more file to edit"
+  msgstr "E173: 1 ôàéë îæèäàåò ðåäàêòèðîâàíèÿ."
+  
+! #: ex_docmd.c:4581
+  #, c-format
+  msgid "E173: %ld more files to edit"
+! msgstr "E173: Åñòü íåîòðåäàêòèðîâàííûå ôàéëû (%d)."
+  
+  #: ex_docmd.c:4676
+  msgid "E174: Command already exists: add ! to replace it"
+--- 1236,1245 ----
+  msgid "E173: 1 more file to edit"
+  msgstr "E173: 1 ôàéë îæèäàåò ðåäàêòèðîâàíèÿ."
+  
+! #: ex_docmd.c:4584
+  #, c-format
+  msgid "E173: %ld more files to edit"
+! msgstr "E173: Åñòü íåîòðåäàêòèðîâàííûå ôàéëû (%ld)."
+  
+  #: ex_docmd.c:4676
+  msgid "E174: Command already exists: add ! to replace it"
+***************
+*** 2303,2314 ****
+  "\n"
+  "Îòïðàâêà ñîîáùåíèÿ äëÿ óíè÷òîæåíèÿ ïðîöåññà-ïîòîìêà.\n"
+  
+! #: gui_w32.c:829
+  #, c-format
+  msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+  msgstr "E243: Ïàðàìåòð íå ïîääåðæèâàåòñÿ: \"-%s\"; èñïîëüçóéòå âåðñèþ OLE."
+  
+! #: gui_w48.c:2090
+  msgid "Find string (use '\\\\' to find  a '\\')"
+  msgstr "Ïîèñê ñòðîêè (èñïîëüçóéòå '\\\\' äëÿ ïîèñêà '\\')"
+  
+--- 2303,2323 ----
+  "\n"
+  "Îòïðàâêà ñîîáùåíèÿ äëÿ óíè÷òîæåíèÿ ïðîöåññà-ïîòîìêà.\n"
+  
+! #: gui_w32.c:839
+! #, c-format
+! msgid "E671: Cannot find window title \"%s\""
+! msgstr "E671: Íåâîçìîæíî íàéòè çàãîëîâîê îêíà \"%s\""
+! 
+! #: gui_w32.c:847
+  #, c-format
+  msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+  msgstr "E243: Ïàðàìåòð íå ïîääåðæèâàåòñÿ: \"-%s\"; èñïîëüçóéòå âåðñèþ OLE."
+  
+! #: gui_w32.c:1100
+! msgid "E672: Unable to open window inside MDI application"
+! msgstr "E672: Íåâîçìîæíî îòêðûòü îêíî âíóòðè ïðèëîæåíèÿ MDI"
+! 
+! #: gui_w48.c:2163
+  msgid "Find string (use '\\\\' to find  a '\\')"
+  msgstr "Ïîèñê ñòðîêè (èñïîëüçóéòå '\\\\' äëÿ ïîèñêà '\\')"
+  
+***************
+*** 2353,2358 ****
+--- 2362,2368 ----
+  msgstr "Font1: %s\n"
+  
+  #: gui_x11.c:2184
++ #, c-format
+  msgid "Font%ld width is not twice that of font0\n"
+  msgstr "Øèðèíà øðèôòà font%ld äîëæíà áûòü âäâîå áîëüøå øèðèíû øðèôòà font0\n"
+  
+***************
+*** 2437,2443 ****
+  #: if_cscope.c:589
+  #, c-format
+  msgid "E262: error reading cscope connection %ld"
+! msgstr "E262: îøèáêà ïîëó÷åíèÿ èíôîðìàöèè îò ñîåäèíåíèÿ cscope %d"
+  
+  #: if_cscope.c:694
+  msgid "E561: unknown cscope search type"
+--- 2447,2453 ----
+  #: if_cscope.c:589
+  #, c-format
+  msgid "E262: error reading cscope connection %ld"
+! msgstr "E262: îøèáêà ïîëó÷åíèÿ èíôîðìàöèè îò ñîåäèíåíèÿ cscope %ld"
+  
+  #: if_cscope.c:694
+  msgid "E561: unknown cscope search type"
+***************
+*** 2515,2521 ****
+  #: if_cscope.c:1458
+  #, c-format
+  msgid "cscope connection %s closed"
+! msgstr "ñîåäèíåíèå ñ cscope çàêðûòî"
+  
+  #. should not reach here
+  #: if_cscope.c:1598
+--- 2525,2531 ----
+  #: if_cscope.c:1458
+  #, c-format
+  msgid "cscope connection %s closed"
+! msgstr "ñîåäèíåíèå %s ñ cscope çàêðûòî"
+  
+  #. should not reach here
+  #: if_cscope.c:1598
+***************
+*** 6654,6658 ****
+  msgid "E463: Region is guarded, cannot modify"
+  msgstr "E463: Íåâîçìîæíî èçìåíèòü îõðàíÿåìóþ îáëàñòü"
+  
+- #~ msgid "\"\n"
+- #~ msgstr "\"\n"
+--- 6664,6666 ----
+*** ../vim-6.3.085/src/version.c	Sun Jul 24 19:43:13 2005
+--- src/version.c	Fri Jul 29 09:53:51 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     86,
+  /**/
+
+-- 
+DENNIS: Oh, very nice. King, eh!  I expect you've got a palace and fine
+        clothes and courtiers and plenty of food.  And how d'you get that?  By
+        exploiting the workers! By hanging on to outdated imperialist dogma
+        which perpetuates the social and economic differences in our society!
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///




More information about the pkg-vim-maintainers mailing list