Re: Czech translation needs fixups

2005-10-04 Thread Jindrich Novy
Hello Leonard,

On Mon, 2005-10-03 at 23:05 +0200, Leonard den Ottolander wrote:
 Sorry, but this doesn't patch cleanly against HEAD. Please supply a
 clean patch.

Ok, just decided to translate the Czech po completely. The attached
patch contains the complete Czech translation with the fixed duplicated
keyboard shortcuts.

Jindrich

-- 
Jindrich Novy [EMAIL PROTECTED], http://people.redhat.com/jnovy/
(o_   _o)
//\  The worst evil in the world is refusal to think. //\
V_/_ _\_V

--- mc/po/cs.po.orig	2005-08-23 12:45:28.0 +0200
+++ mc/po/cs.po	2005-10-04 13:46:41.0 +0200
@@ -5,6 +5,7 @@
 # Michal Svec [EMAIL PROTECTED] (Michal ©vec), 2000.
 # Stanislav Brabec [EMAIL PROTECTED], 2001, 2002.
 # Miloslav Trmac [EMAIL PROTECTED], 2003.
+# Jindrich Novy [EMAIL PROTECTED], 2005.
 #
 msgid 
 msgstr 
@@ -12,49 +13,41 @@ msgstr 
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2005-08-23 10:06+0200\n
 PO-Revision-Date: 2003-01-22 18:29+0100\n
-Last-Translator: Miloslav Trmac [EMAIL PROTECTED]\n
+Last-Translator: Jindrich Novy [EMAIL PROTECTED]\n
 Language-Team: Czech [EMAIL PROTECTED]\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=ISO-8859-2\n
 Content-Transfer-Encoding: 8-bit\n
 
-#, fuzzy
 msgid  Choose syntax highlighting 
-msgstr zvýraznìní syntaXe
+msgstr Vyber zvýraznìní syntaXe
 
-#, fuzzy
 msgid  Auto 
-msgstr  O programu 
+msgstr  Auto 
 
 msgid  Reload Current Syntax 
-msgstr 
+msgstr  Nahraj aktuální syntax 
 
-#, fuzzy, c-format
 msgid  Cannot open %s for reading 
-msgstr  Nepodaøilo se otevøít rouru pro ètení: 
+msgstr  Nepodaøilo se otevøít %s pro ètení: 
 
 msgid Error
 msgstr Chyba
 
-#, fuzzy, c-format
 msgid  Error reading from pipe: %s 
-msgstr  Chyba pøi ètení z roury: 
+msgstr  Chyba pøi ètení z roury: %s 
 
-#, fuzzy, c-format
 msgid  Cannot open pipe for reading: %s 
-msgstr  Nepodaøilo se otevøít rouru pro ètení: 
+msgstr  Nepodaøilo se otevøít rouru pro ètení: %s 
 
-#, fuzzy, c-format
 msgid  Cannot get size/permissions for %s 
-msgstr  Nelze zjistit délku/práva k souboru: 
+msgstr  Nelze zjistit délku/práva k souboru %s 
 
-#, fuzzy, c-format
 msgid  %s is not a regular file 
-msgstr  Nelze prohlí¾et: není to normální soubor 
+msgstr  %s není normální soubor 
 
-#, fuzzy, c-format
 msgid  File %s is too large 
-msgstr  Soubor je pøíli¹ velký: 
+msgstr  Soubor %s je pøíli¹ velký 
 
 msgid Macro recursion is too deep
 msgstr Rekurze maker je pøíli¹ hluboká
@@ -98,7 +91,6 @@ msgstr Varování
 msgid  A file already exists with this name. 
 msgstr  Soubor tohoto jména ji¾ existuje. 
 
-#, fuzzy
 msgid Overwrite
 msgstr Pøepsat
 
@@ -148,7 +140,6 @@ msgstr 
  Tento text byl zmìnìn, ale zmìny nebyly ulo¾eny. \n
  Pokraèováním se zmìny ztratí. 
 
-#, fuzzy
 msgid Continue
 msgstr Pokraèovat
 
@@ -219,9 +210,8 @@ msgstr  ©patný regulární výraz, nebo sc
 msgid  Error in replacement format string. 
 msgstr  Chyba ve formátu nahrazovaného textu. 
 
-#, fuzzy
 msgid  Replacement too long. 
-msgstr  Zadejte náhradní text:
+msgstr  Náhradní text je pøíli¹ dlouhý. 
 
 #, c-format
 msgid  %ld replacements made. 
@@ -240,7 +230,6 @@ msgstr Konec
 msgid  File was modified, Save with exit? 
 msgstr  Soubor byl zmìnìn, ulo¾it pøi odchodu? 
 
-#, fuzzy
 msgid Cancel quit
 msgstr Zru¹it odchod
 
@@ -250,12 +239,11 @@ msgstr Ano
 msgid No
 msgstr Ne
 
-#, fuzzy
 msgid  Error 
-msgstr Chyba
+msgstr  Chyba 
 
 msgid  This function is not implemented. 
-msgstr 
+msgstr  Tato funkce není implementována. 
 
 msgid  Copy to clipboard 
 msgstr  Zkopírovat do schránky 
@@ -303,19 +291,16 @@ msgid  Sort returned non-zero: 
 msgstr  sort vrátil neskoèil dobøe: 
 
 msgid Paste output of external command
-msgstr 
+msgstr Vlo¾ výstup externího pøíkazu
 
-#, fuzzy
 msgid Enter shell command(s):
-msgstr  Zadejte oznaèení príkazu: 
+msgstr Zadejte shellové pøíkaz(y):
 
-#, fuzzy
 msgid External command
-msgstr Jiný pøíkaz
+msgstr Externí pøíkaz
 
-#, fuzzy
 msgid Cannot execute command
-msgstr  Chyba pøi spou¹tìní príkazu sort 
+msgstr Nemohu spustit pøíkaz
 
 msgid Error creating script:
 msgstr Chyba pøi vytváøení skriptu:
@@ -368,15 +353,18 @@ msgid 
 User: %s\n
 Process ID: %d
 msgstr 
+Soubor \%s\ je ji¾ editován\n
+U¾ivatel: %s\n
+Èíslo procesu: %d
 
 msgid File locked
-msgstr 
+msgstr Soubor zamèen
 
 msgid Grab lock
-msgstr 
+msgstr Pøevzít zámek
 
 msgid Ignore lock
-msgstr 
+msgstr Ignorovat zámek
 
 msgid  About 
 msgstr  O programu 
@@ -436,13 +424,13 @@ msgid Toggle Mark   F3
 msgstr Pøehodit znaèky F3
 
 msgid Mark ColumnsS-F3
-msgstr Znaèit sloupcovì  S-F3
+msgstr zNaèit sloupcovì  S-F3
 
 msgid Toggle ins/overw Ins
 msgstr Vkládání/PøepisIns
 
 msgid Copy  F5
-msgstr Kopírovat   F5
+msgstr kOpírovat   F5
 
 msgid Move  F6
 msgstr pøEsunout   F6
@@ -475,22 +463,22 @@ msgid Go to matching bracket   M-b
 msgstr 

Q_()

2005-10-04 Thread Egmont Koblinger
Hi,

There's been a discussion here a few months ago how to make the same English
text translated differently in different contexts. It was important e.g. for
the texts of the bottom bar whose translations have to fit in 6 characters.

It seems to me that this wasn't fully implemented. E.g. there's only one
'msgid Search' string in the .pot file. This is displayed at more places,
e.g. for F7 in the viewer's bottom bar, as well as in the title of the
dialogue window brought up by pressing F7. Currently the Hungarian
translation is Keresés which is Search as a noun. This doesn't fit in
its cell on the bottom row, so it looks stupid. Another possibility is to
use the word Keres which is a verb (he searches) which fits the given
field but sounds a little bit sillier. The perfect solution would be to use
Keres in the button bar due to the size limit, but Keresés in the
dialogue window title.

I don't know how that thread ended and I cannot find it now, but I found the
Q_() and g_strip_context() functions in glib (what already we use anyway) so
it seems to me that they're the best (and most standard) choice we could
stick to.

Their description is here:
http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html

So basically the following could be used in mc's source:
  x = Q_(bottombar|Search);
  y = Q_(verb|Search);
  z = Q_(noun|Search);
  etc...

and .po files could look like this:
  msgid bottombar|Search
  msgstr Keres

  msgid noun|Search
  msgstr Keresés
  ...

Q_() calls g_strip_context() so it takes care to remove the text up to the
first | character if the string is not yet translated (the translation is
the same original string.) However, g_strip_context() should manually be
called on N_()-like strings.


These functions/macros are only available from glib 2.4, so currently we
would need to test for their presence and use an own implementation if older
glib is being used, but this shouldn't be a problem, as implementing these
functions is a trivial job, and as we know it from the flames of last week,
there are some autoconf gurus also who can implement autodetection. :-)

I think that using such a standard interface (even if it's a new one and we
need temporary hacks to support older glib) is a perfect way to go, and will
be even much better if one day in the far-far future we can drop support for
glib  2.4.

If you like this idea, I can send patch to mc to introduce this feature,
except for the autoconf part. But maybe autoconf magic isn't needed at all,
since Q_() is a macro, a simple #ifdef Q_ will do it in mc's source.



-- 
Egmont
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel


Re: Czech translation needs fixups

2005-10-04 Thread Pavel Roskin
Hi, Jindrich!

On Tue, 2005-10-04 at 14:35 +0200, Jindrich Novy wrote:

 Ok, just decided to translate the Czech po completely. The attached
 patch contains the complete Czech translation with the fixed duplicated
 keyboard shortcuts.

Applied, merged, committed.  Thank you!

After merging with the current mc.pot, we have:
981 translated messages, 5 fuzzy translations, 3 untranslated messages.

It would be great if you translate the new plural forms.  Finally, the
translation of M bytes in N files will be perfect in every language.
It wasn't perfect even in English - you could have 1 bytes in 2 files.

-- 
Regards,
Pavel Roskin

___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel


[PATCH] backward searching off-by-one indexing error

2005-10-04 Thread Jindrich Novy
Hello mc-devel,

there's an error while backward searching in mcview.

To reproduce:
1) echo -e foo\nbar\nbar\n  /tmp/sample.tmp
2) mcedit /tmp/sample.tmp
3) regexp search by '/' - type bar
4) press 'n' for the next occurence
5) backward search '?' and press enter (bar is prefilled)

Results:
You see that the line on the top of the screen is shrunk (one character
is missing).

Reference:
 http://bugzilla.redhat.com/169823

Jindrich

-- 
Jindrich Novy [EMAIL PROTECTED], http://people.redhat.com/jnovy/
(o_   _o)
//\  The worst evil in the world is refusal to think. //\
V_/_ _\_V

--- mc/src/view.c.searchfix	2005-09-01 22:49:17.0 +0200
+++ mc/src/view.c	2005-10-04 17:08:39.0 +0200
@@ -2396,7 +2396,7 @@ search (WView *view, char *text,
 	if (view-direction == 1)
 	t += forward_line_start;
 	else
-	t = reverse_line_start ? reverse_line_start + 3 : 0;
+	t = reverse_line_start ? reverse_line_start + 2 : 0;
 	view-search_start += t;
 
 	if (t != beginning) {
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel


Re: Q_()

2005-10-04 Thread Pavel Roskin
Hello!

On Tue, 2005-10-04 at 15:36 +0200, Egmont Koblinger wrote:
 Hi,
 
 There's been a discussion here a few months ago how to make the same English
 text translated differently in different contexts. It was important e.g. for
 the texts of the bottom bar whose translations have to fit in 6 characters.
 
 It seems to me that this wasn't fully implemented.

Agreed.

 I don't know how that thread ended and I cannot find it now, but I found the
 Q_() and g_strip_context() functions in glib (what already we use anyway) so
 it seems to me that they're the best (and most standard) choice we could
 stick to.

mc uses gettext_ui(), which is equivalent to Q_.

 These functions/macros are only available from glib 2.4, so currently we
 would need to test for their presence and use an own implementation if older
 glib is being used, but this shouldn't be a problem, as implementing these
 functions is a trivial job, and as we know it from the flames of last week,
 there are some autoconf gurus also who can implement autodetection. :-)

I don't think autodetection is needed.  All that's needed is a
replacement Q_() implementation in src/glibcompat.c.

 I think that using such a standard interface (even if it's a new one and we
 need temporary hacks to support older glib) is a perfect way to go, and will
 be even much better if one day in the far-far future we can drop support for
 glib  2.4.
 
 If you like this idea, I can send patch to mc to introduce this feature,
 except for the autoconf part. But maybe autoconf magic isn't needed at all,
 since Q_() is a macro, a simple #ifdef Q_ will do it in mc's source.

Correct.

I've committed the Q_() support.  Fixing the translation is left for
you.

-- 
Regards,
Pavel Roskin

___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel


prOmpt on replace

2005-10-04 Thread Leonard den Ottolander
Hi,

I'd like to fix the hotkey in the subject to Prompt on replace as the
O is a duplicate with the O from Ok. If I do not fix the strings
in the .po files as well will this lead to untranslated strings?

Leonard.

-- 
mount -t life -o ro /dev/dna /genetic/research


___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel


Re: prOmpt on replace

2005-10-04 Thread Pavel Roskin
On Tue, 2005-10-04 at 22:28 +0200, Leonard den Ottolander wrote:
 Hi,
 
 I'd like to fix the hotkey in the subject to Prompt on replace as the
 O is a duplicate with the O from Ok. If I do not fix the strings
 in the .po files as well will this lead to untranslated strings?

Yes, it will.  When changing an English message without changing its
sense, please update the translations.

-- 
Regards,
Pavel Roskin

___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel


Re: [PATCH] backward searching off-by-one indexing error

2005-10-04 Thread Leonard den Ottolander
Hi Jindrich,

On Tue, 2005-10-04 at 17:25 +0200, Jindrich Novy wrote:
 there's an error while backward searching in mcview.

Committed. Thanks.

Leonard.

-- 
mount -t life -o ro /dev/dna /genetic/research


___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel