Re: [Freeciv-Dev] (PR#23078) 2.1.0 (F1) City & (F3) Player - (Alt-H) S_how conflicts with _Help

2007-11-23 Thread William Allen Simpson

http://bugs.freeciv.org/Ticket/Display.html?id=23078 >

Committed S2_1 revision 14016, with po updates.
Committed S2_2 revision 14017.
Committed trunk revision 14018.



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#23078) 2.1.0 (F1) City & (F3) Player - (Alt-H) S_how conflicts with _Help

2007-11-21 Thread William Allen Simpson

http://bugs.freeciv.org/Ticket/Display.html?id=23078 >

William Allen Simpson wrote:
> Changing those sub-menus to "_List" would actually make some sense, as 
> these manage the columns in the listings.
> 
Hard to tell, but it seems that _List would conflict with _Last, although
I've not been able to find the concurrent/related menus.

So, I picked _Display.  In turn, this required:

  Pro_duction to _Production (matching a lot of other places)

and

  _Popup to _Update

Also, found related lines (always near Popup/Update City):
   "_Goto location"
   "Goto _location"
   "Goto _Location"

Made them all the latter for consistency and to avoid the
_Game/_Government conflict mentioned earlier.

Index: po/cs.po
===
--- po/cs.po(revision 14011)
+++ po/cs.po(working copy)
@@ -10545,7 +10545,8 @@
 msgstr "_Koupit"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "P_rodukce"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10774,7 +10775,8 @@
 msgstr "_Vybrat"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "_Zobrazit"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -10788,7 +10790,8 @@
 msgstr "Města"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "_Samostatné"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -10949,11 +10952,13 @@
 msgstr "Smazat tuto předvolbu?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
-msgstr "_Jít k poloze"
+#, fuzzy
+msgid "Goto _Location"
+msgstr "Jít k po_loze"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "_Ukázat město"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/pt_BR.po
===
--- po/pt_BR.po (revision 14011)
+++ po/pt_BR.po (working copy)
@@ -10263,7 +10263,8 @@
 msgstr "_Comprar"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "Pro_dução"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10494,7 +10495,8 @@
 msgstr "_Selecionar"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "_Mostrar"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -10508,7 +10510,8 @@
 msgstr "Cidades"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "Visuali_zar"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -10667,12 +10670,14 @@
 msgstr "Remover esta pré-definição?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+#, fuzzy
+msgid "Goto _Location"
 msgstr "_Ir para localização"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
-msgstr "_Visualizar Cidade"
+#, fuzzy
+msgid "_Update City"
+msgstr "Visuali_zar Cidade"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
Index: po/es.po
===
--- po/es.po(revision 14011)
+++ po/es.po(working copy)
@@ -10787,7 +10787,8 @@
 msgstr "_Comprar"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "Pro_ducción"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -11015,7 +11016,8 @@
 msgstr "_Seleccionar"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "_Mostrar"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -11029,7 +11031,8 @@
 msgstr "Ciudades"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "_Ventana"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -11186,11 +11189,13 @@
 msgstr "¿Quieres borrar esta configuración?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
-msgstr "_Ir a lugar"
+#, fuzzy
+msgid "Goto _Location"
+msgstr "Ir a _lugar"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "_Ventana de ciudad"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/ko.po
===
--- po/ko.po(revision 14011)
+++ po/ko.po(working copy)
@@ -9701,7 +9701,7 @@
 msgstr ""
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+msgid "_Production"
 msgstr ""
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -9925,7 +9925,7 @@
 msgstr ""
 
 #: 

[Freeciv-Dev] (PR#23078) 2.1.0 (F1) City & (F3) Player - (Alt-H) S_how conflicts with _Help

2007-11-21 Thread William Allen Simpson

http://bugs.freeciv.org/Ticket/Display.html?id=23078 >

Since this seems to be a moment to fix text in 2.1, this is an easy one.  

Changing those sub-menus to "_List" would actually make some sense, as 
these manage the columns in the listings.

Also, looking at gui-gtk-2.0/menu.c, there's a lot of mistakes.  The 
most prominent is main menu "Gover_nment".  This conflicts with F2 
"_Nearest"

Elsewhere in the same file, it's "_Government" (and in win32 
"Gov_ernment").  I don't see how this ever even works (the strings 
will not match)!

For these main menu items, this is not good.  The standard human 
interfaces guideline for both Macs and Windows would be "_Edit" in 
that position (while "_Help" is OK).

An examination of the items under it show that it does in fact edit.  
Change Government is only _one_ item in the list.

I'll make the patch assuming that translators have already selected 
alternatives that do not conflict, and therefore should not be 
disturbed.  I'll add fuzzy.


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev