rpms/mc/devel mc-cstrans.patch, NONE, 1.1 mc-ctrl-t.patch, NONE, 1.1 mc.spec, 1.63, 1.64

[fedora-cvs-commits redhat com]

Author: jnovy

Update of /cvs/dist/rpms/mc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9888

Modified Files:
	mc.spec 
Added Files:
	mc-cstrans.patch mc-ctrl-t.patch 
Log Message:
- fix duplicated keyboard shortcuts in menus for Czech locale (#169734)
- fix ctrl-t page code recoding for Russian locale, thanks to
  Andy Shevchenko (#163594)


mc-cstrans.patch:
 cs.po |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

--- NEW FILE mc-cstrans.patch ---
--- mc-4.6.1/po/cs.po.cstrans	2005-07-23 18:53:26.000000000 +0200
+++ mc-4.6.1/po/cs.po	2005-10-02 17:32:24.000000000 +0200
@@ -5,6 +5,7 @@
 # Michal Svec <rebel penguin cz> (Michal ©vec), 2000.
 # Stanislav Brabec <utx penguin cz>, 2001, 2002.
 # Miloslav Trmac <mitr volny cz>, 2003.
+# Jindrich Novy <jnovy redhat com>, 2005.
 #
 msgid ""
 msgstr ""
@@ -566,7 +567,7 @@ msgstr "&Pøehodit znaèky     F3"
 
 #: edit/editmenu.c:320
 msgid "&Mark Columns    S-F3"
-msgstr "&Znaèit sloupcovì  S-F3"
+msgstr "Z&naèit sloupcovì  S-F3"
 
 #: edit/editmenu.c:322
 msgid "Toggle &ins/overw Ins"
@@ -618,7 +619,7 @@ msgstr "jít na &Párovou závorku       M-
 
 #: edit/editmenu.c:350 edit/editmenu.c:374
 msgid "Insert &literal...       C-q"
-msgstr "vlo¾it &znak...               C-q"
+msgstr "vlo¾it &Znak...               C-q"
 
 #: edit/editmenu.c:352 edit/editmenu.c:376
 msgid "&Refresh screen          C-l"
@@ -626,7 +627,7 @@ msgstr "&Obnovit obrazovku            C-
 
 #: edit/editmenu.c:354 edit/editmenu.c:378
 msgid "&Start record macro      C-r"
-msgstr "zaèít zaznamenávat &Makro     C-r"
+msgstr "z&Aèít zaznamenávat makro     C-r"
 
 #: edit/editmenu.c:355 edit/editmenu.c:379
 msgid "&Finish record macro...  C-r"
@@ -634,11 +635,11 @@ msgstr "&Ukonèit záznam makra...      C-
 
 #: edit/editmenu.c:356
 msgid "&Execute macro...   C-a, KEY"
-msgstr "&Provést makro...       C-a, KLÁV"
+msgstr "provést &Makro...       C-a, KLÁV"
 
 #: edit/editmenu.c:357 edit/editmenu.c:381
 msgid "Delete macr&o...            "
-msgstr "&Smazat makro                    "
+msgstr "smaza&T makro                    "
 
 #: edit/editmenu.c:359 edit/editmenu.c:383
 msgid "Insert &date/time           "
@@ -658,15 +659,15 @@ msgstr "&Setøídit                     M-
 
 #: edit/editmenu.c:364 edit/editmenu.c:388
 msgid "Paste o&utput of...      M-u"
-msgstr ""
+msgstr "vlo¾it &Výstup..."
 
 #: edit/editmenu.c:365 edit/editmenu.c:389
 msgid "E&xternal Formatter      F19"
-msgstr "E&xterní formátovaè           F19"
+msgstr "e&Xterní formátovaè           F19"
 
 #: edit/editmenu.c:366 edit/editmenu.c:390
 msgid "&Mail...                    "
-msgstr "o&Deslat...                      "
+msgstr "od&Eslat...                      "
 
 #: edit/editmenu.c:380
 msgid "&Execute macro... C-x e, KEY"
@@ -2290,9 +2291,8 @@ msgid "&Add current"
 msgstr "pøidat &Tento"
 
 #: src/hotlist.c:126
-#, fuzzy
 msgid "&Refresh"
-msgstr "&Pozpátku"
+msgstr "&Obnovit"
 
 #: src/hotlist.c:127
 msgid "Fr&ee VFSs now"
@@ -2673,7 +2673,7 @@ msgstr "sí»ové spoje&Ní..."
 
 #: src/main.c:810 src/main.c:834
 msgid "FT&P link..."
-msgstr "FT&P spojení..."
+msgstr "F&TP spojení..."
 
 #: src/main.c:811 src/main.c:835
 msgid "S&hell link..."
@@ -2697,7 +2697,7 @@ msgstr "pro&Hlédnout             F3"
 
 #: src/main.c:847
 msgid "Vie&w file...         "
-msgstr "prohlé&Dnout soubor..."
+msgstr "proh&Lédnout soubor..."
 
 #: src/main.c:848
 msgid "&Filtered view     M-!"
@@ -4161,9 +4161,8 @@ msgid "ftpfs: sending user password"
 msgstr "ftpfs: heslo pro anonymní ftp odesláno"
 
 #: vfs/ftpfs.c:478
-#, fuzzy, c-format
 msgid "FTP: Account required for user %s"
-msgstr " FTP: Heslo je vy¾adováno pro "
+msgstr "FTP: Heslo je vy¾adováno pro %s"
 
 #: vfs/ftpfs.c:480
 #, fuzzy

mc-ctrl-t.patch:
 view.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE mc-ctrl-t.patch ---
--- mc-4.6.1/src/view.c.orig	2005-08-31 08:28:40.000000000 -0400
+++ mc-4.6.1/src/view.c	2005-08-31 09:24:09.000000000 -0400
@@ -1085,7 +1085,7 @@ display (WView *view)
             int mblen;
             wchar_t wc;
 #endif /* UTF8 */
-	    c = get_byte (view, from);
+	    c = (unsigned char) get_byte (view, from);
 	    if ((c == '\n') || (col >= width && view->wrap_mode)) {
 		col = frame_shift;
 		row++;
@@ -1116,7 +1116,7 @@ display (WView *view)
                     if (res == mblen)
                         break;
 
-                    mbbuf[mblen] = convert_to_display_c (get_byte (view, from + mblen));
+                    mbbuf[mblen] = convert_to_display_c ((unsigned char) get_byte (view, from + mblen));
                     mblen++;
                 }
 


Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- mc.spec	29 Sep 2005 17:49:11 -0000	1.63
+++ mc.spec	3 Oct 2005 10:49:32 -0000	1.64
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell.
 Name:		mc
 Version:	4.6.1a
-Release:	0.16
+Release:	0.17
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
@@ -24,6 +24,8 @@
 Patch9:		mc-specsyntax.patch
 Patch10:	mc-find.patch
 Patch11:	mc-symcrash.patch
+Patch12:	mc-cstrans.patch
+Patch13:	mc-ctrl-t.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -47,6 +49,8 @@
 %patch9 -p1 -b .specsyntax
 %patch10 -p1 -b .find
 %patch11 -p1 -b .symcrash
+%patch12 -p1 -b .cstrans
+%patch13 -p1 -b .ctrl-t
 
 # convert files in /lib to UTF-8
 pushd lib
@@ -183,6 +187,11 @@
 %dir %{_datadir}/mc
 
 %changelog
+* Mon Oct  2 2005 Jindrich Novy <jnovy redhat com> 4.6.1a-0.17
+- fix duplicated keyboard shortcuts in menus for Czech locale (#169734)
+- fix ctrl-t page code recoding for Russian locale, thanks to
+  Andy Shevchenko (#163594)
+
 * Thu Sep 29 2005 Jindrich Novy <jnovy redhat com> 4.6.1a-0.16
 - fix memory leak in mc-utf8 patch, thanks to Marcin Garski (#169549)
 - fix mc-find patch to support UTF-8, thanks to Victor Abramoff (#169531)