[Freeciv-Dev] (PR#39895) deterministic borders (part 1)

[William Allen Simpson]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39895 >

After a fair amount of testing, here's my initial re-design of the border
code.  I left much of the old code in place (#ifdef OWNER_SOURCE) for
comparison.  As you can see (or I can supply screen shots), for a game in
progress the code yields *exactly* the same borders.

For new games, the most immediately visible difference is that borders
spring into place around cities as soon as they are built.  This is easier
to explain, and matches civ3-like border expectations.  It will allow
re-enabling (in the future) limits for city workers on border tiles (there
were some old discussions).  The existing behavior, starting with no radius
until the next turn, doesn't work -- starving the cities.

I've some more ideas ready to go.  The player has a list of sites (not yet
implemented) for future civ3-like radar installations.  The vision code is
partly finished, to enable civ3-like vision along the borders.

Note the extensive use of access functions.  This allowed complete removal
and reorganization of various city and tile pointers.  (That's why access
functions are important!)

As a result, the border source information is now kept only in the player
map tiles, instead of the main client/server tiles.  Neatly and cleanly.

I've kept the same network code, so it could be ported back to 2.1 -- but
that would be a lot of extra effort, as 2.1 doesn't have all my access
function cleanup patches.


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 ""
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+msgid "_Display"
 msgstr ""
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -9939,7 +9939,7 @@
 msgstr "도시"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+msgid "_Update"
 msgstr ""
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -10093,11 +10093,11 @@
 msgstr ""
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+msgid "Goto _Location"
 msgstr ""
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+msgid "_Update City"
 msgstr ""
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/en_GB.po
===================================================================
--- po/en_GB.po (revision 14011)
+++ po/en_GB.po (working copy)
@@ -9723,7 +9723,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
@@ -9947,7 +9947,7 @@
 msgstr ""
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+msgid "_Display"
 msgstr ""
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -9961,7 +9961,7 @@
 msgstr ""
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+msgid "_Update"
 msgstr ""
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -10115,11 +10115,11 @@
 msgstr ""
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+msgid "Goto _Location"
 msgstr ""
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+msgid "_Update City"
 msgstr ""
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/no.po
===================================================================
--- po/no.po    (revision 14011)
+++ po/no.po    (working copy)
@@ -10514,7 +10514,8 @@
 msgstr "_Kjøp"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "_Produksjon"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10745,7 +10746,8 @@
 msgstr "_Velg"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "V_is"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -10759,7 +10761,8 @@
 msgstr "Byer"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "Vis _By"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -10920,11 +10923,13 @@
 msgstr "Fjern denne innstillingen?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+#, fuzzy
+msgid "Goto _Location"
 msgstr "_Gå til"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "_Vis by"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/hu.po
===================================================================
--- po/hu.po    (revision 14011)
+++ po/hu.po    (working copy)
@@ -10599,7 +10599,8 @@
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
 #, fuzzy
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "Termelés"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10844,7 +10845,8 @@
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
 #, fuzzy
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "_Megjelenítés..."
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -10858,7 +10860,8 @@
 msgstr "Városok"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "Meg_nyitás"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -11014,11 +11017,12 @@
 msgstr "Töröljem ezt a mintát?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
-msgstr "Menj (_G)"
+msgid "Goto _Location"
+msgstr "Menj (_L)"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "_Városablak felnyitása"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/uk.po
===================================================================
--- po/uk.po    (revision 14011)
+++ po/uk.po    (working copy)
@@ -10459,7 +10459,8 @@
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
 #, fuzzy
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "÷ÉÒÏÂÎÉÃÔ×Ï"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10696,7 +10697,8 @@
 msgstr "ïÂÅÒ¦ÔØ"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "ðÏËÁÚÁÔÉ"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -10710,7 +10712,8 @@
 msgstr "í¦ÓÔÁ"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "ðÏËÁÚÁÔÉ"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -10870,11 +10873,13 @@
 msgstr "÷ÉÄÁÌÉÔÉ ÃÀ ÐÒÅÄÕÓÔÁÎÏ×ËÕ?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+#, fuzzy
+msgid "Goto _Location"
 msgstr "êÔÉ ÄÏ"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "÷¦ÄËÒÉÔÉ Í¦ÓÔÏ"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/ro.po
===================================================================
--- po/ro.po    (revision 14011)
+++ po/ro.po    (working copy)
@@ -10780,7 +10780,8 @@
 msgstr "_Cumpără"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "Pro_ducţie"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -11008,7 +11009,8 @@
 msgstr "_Selectează"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "Ar_ată"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -11022,8 +11024,9 @@
 msgstr "Oraşe"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
-msgstr "_Popup"
+#, fuzzy
+msgid "_Update"
+msgstr "Pop_up"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
 #: client/gui-gtk-2.0/cityrep.c:1250 client/gui-gtk-2.0/cityrep.c:1269
@@ -11180,11 +11183,13 @@
 msgstr "Îndepărtaţi această presetare?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
-msgstr "Mer_gi la locul"
+#, fuzzy
+msgid "Goto _Location"
+msgstr "Mergi la _locul"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "Afişează oraşul"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/ru.po
===================================================================
--- po/ru.po    (revision 14011)
+++ po/ru.po    (working copy)
@@ -10720,7 +10720,8 @@
 msgstr "Купить"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "_Производство"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10948,7 +10949,8 @@
 msgstr "Выбрать"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "_Показывать"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -10962,7 +10964,8 @@
 msgstr "Города"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "_Окно"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -11120,11 +11123,12 @@
 msgstr "Удалить эту установку?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+msgid "Goto _Location"
 msgstr "_Идти к"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "Открыть город"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/el.po
===================================================================
--- po/el.po    (revision 14011)
+++ po/el.po    (working copy)
@@ -10273,7 +10273,8 @@
 msgstr "_Áãüñáóå"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "_ÐáñáãùãÞ"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10501,7 +10502,8 @@
 msgstr "ÅðÝëå_îå"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "Åì_öÜíéóå"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -10515,7 +10517,8 @@
 msgstr "Ðüëåéò"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "¶_íïéîå"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -10674,11 +10677,12 @@
 msgstr "Íá áöáéñåèåß áõôüò ï êõâåñíçôéêüò óôü÷ïò;"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+msgid "Goto _Location"
 msgstr "_ÐÞãáéíå óôçí ôïðïèåóßá"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "_¶íïéîå ðüëç"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/ar.po
===================================================================
--- po/ar.po    (revision 14011)
+++ po/ar.po    (working copy)
@@ -10276,7 +10276,8 @@
 msgstr "_شراء"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "ا_نتاج"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10504,7 +10505,8 @@
 msgstr "ا_ختيار"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "ا_ظهار"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -10519,7 +10521,8 @@
 
 #: client/gui-gtk-2.0/cityrep.c:804
 #, fuzzy
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "قافزة"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -10674,12 +10677,13 @@
 msgstr "هل تريد إزالة هذا التجهيز المسبق?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+msgid "Goto _Location"
 msgstr "الذهاب إلى ال_موقع"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "قافزة المدينة"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/fr.po
===================================================================
--- po/fr.po    (revision 14011)
+++ po/fr.po    (working copy)
@@ -10785,7 +10785,8 @@
 msgstr "A_cheter"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "Pro_duction"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -11013,7 +11014,8 @@
 msgstr "_Sélectionner"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "_Montrer"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -11027,7 +11029,8 @@
 msgstr "Villes"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "D_ialogues"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -11188,11 +11191,13 @@
 msgstr "Supprimer ce pré-réglage ?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
-msgstr "_Aller vers"
+#, fuzzy
+msgid "Goto _Location"
+msgstr "A_ller vers"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "Fenêtre _ville"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/et.po
===================================================================
--- po/et.po    (revision 14011)
+++ po/et.po    (working copy)
@@ -10457,7 +10457,8 @@
 msgstr "_Osta"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "_Toodang"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10685,7 +10686,8 @@
 msgstr "_Vali"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "_Näita"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -10699,7 +10701,8 @@
 msgstr "Linnad"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "V_aata"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -10856,11 +10859,12 @@
 msgstr "Eemalda see mall?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+msgid "Goto _Location"
 msgstr "_Mine sinna"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "_Vaata linna"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/nl.po
===================================================================
--- po/nl.po    (revision 14011)
+++ po/nl.po    (working copy)
@@ -10622,7 +10622,8 @@
 msgstr "_Koop"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "Pro_ductie"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10850,7 +10851,8 @@
 msgstr "Kie_s"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "_Toon..."
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -10864,8 +10866,9 @@
 msgstr "Steden"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
-msgstr "_Popup"
+#, fuzzy
+msgid "_Update"
+msgstr "Pop_up"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
 #: client/gui-gtk-2.0/cityrep.c:1250 client/gui-gtk-2.0/cityrep.c:1269
@@ -11022,12 +11025,14 @@
 msgstr "Deze snelkeuze verwijderen?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
-msgstr "_Ga naar locatie"
+#, fuzzy
+msgid "Goto _Location"
+msgstr "Ga naar _locatie"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
-msgstr "_Popup Stad"
+#, fuzzy
+msgid "_Update City"
+msgstr "Pop_up Stad"
 
 #: 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/pl.po
===================================================================
--- po/pl.po    (revision 14011)
+++ po/pl.po    (working copy)
@@ -10761,7 +10761,8 @@
 msgstr "_Kup"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "Pro_dukcja"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10989,7 +10990,8 @@
 msgstr "_Wybierz"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "Po_każ"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -11003,7 +11005,8 @@
 msgstr "Miasta"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "Wyświetl"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -11161,11 +11164,12 @@
 msgstr "Usunąć ten schemat?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+msgid "Goto _Location"
 msgstr "_Idź do miejsca zdarzenia"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "_Wyświetl miasto"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/it.po
===================================================================
--- po/it.po    (revision 14011)
+++ po/it.po    (working copy)
@@ -10753,7 +10753,8 @@
 msgstr "Co_mpra"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "Pro_duzione"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10983,7 +10984,8 @@
 msgstr "_Seleziona"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "_Mostra"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -10997,7 +10999,8 @@
 msgstr "Città"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "F_inestra"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -11158,11 +11161,12 @@
 msgstr "Elimina questa preselezione?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+msgid "Goto _Location"
 msgstr "_Vai alla posizione"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "_Apri finestra città"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/lt.po
===================================================================
--- po/lt.po    (revision 14011)
+++ po/lt.po    (working copy)
@@ -9672,7 +9672,8 @@
 
 #: client/gui-gtk-2.0/citydlg.c:898
 #: client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "Pro_dukcija"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -9931,7 +9932,8 @@
 
 #: client/gui-gtk-2.0/cityrep.c:706
 #: client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "_Rodyti"
 
 #: client/gui-gtk-2.0/cityrep.c:787
@@ -9952,7 +9954,7 @@
 msgstr "Miestai"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+msgid "_Update"
 msgstr ""
 
 #: client/gui-gtk-2.0/cityrep.c:1210
@@ -10134,12 +10136,12 @@
 msgstr ""
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+msgid "Goto _Location"
 msgstr ""
 
 #: client/gui-gtk-2.0/dialogs.c:200
 #: client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+msgid "_Update City"
 msgstr ""
 
 #: client/gui-gtk-2.0/dialogs.c:256
Index: po/pt.po
===================================================================
--- po/pt.po    (revision 14011)
+++ po/pt.po    (working copy)
@@ -10482,7 +10482,8 @@
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
 #, fuzzy
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "Produção"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10719,7 +10720,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
@@ -10733,7 +10735,8 @@
 msgstr "Cidades"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "_Visualizar"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -10893,11 +10896,13 @@
 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"
+#, fuzzy
+msgid "_Update City"
 msgstr "_Visualizar Cidade"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/ca.po
===================================================================
--- po/ca.po    (revision 14011)
+++ po/ca.po    (working copy)
@@ -10655,7 +10655,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ó"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10883,7 +10884,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
@@ -10897,7 +10899,8 @@
 msgstr "Ciutats"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "_Obrir"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -11055,11 +11058,12 @@
 msgstr "Eliminar aquest prefixat?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+msgid "Goto _Location"
 msgstr "_Anar a ubicació"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "_Obrir ciutat"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/da.po
===================================================================
--- po/da.po    (revision 14011)
+++ po/da.po    (working copy)
@@ -10561,7 +10561,8 @@
 msgstr "_Køb"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "_Produktion"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10789,7 +10790,8 @@
 msgstr "Vælg _S"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "Vis _h"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -10803,7 +10805,8 @@
 msgstr "Byer"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "Vis _By"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -10961,11 +10964,13 @@
 msgstr "Fjern dette forhåndsvalg?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
-msgstr "_GÃ¥ til"
+#, fuzzy
+msgid "Goto _Location"
+msgstr "GÃ¥ ti_l"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "_Vis by"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/tr.po
===================================================================
--- po/tr.po    (revision 14011)
+++ po/tr.po    (working copy)
@@ -10269,7 +10269,8 @@
 msgstr "_Satın Al"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "Üre_tim"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10497,7 +10498,8 @@
 msgstr "_Seç"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "_Göster"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -10511,7 +10513,8 @@
 msgstr "Şehirler"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "Oda_klan"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -10669,11 +10672,12 @@
 msgstr "Hedef şablonu silinsin?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+msgid "Goto _Location"
 msgstr "_Oraya git"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "Ş_ehre Odaklan"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/fa.po
===================================================================
--- po/fa.po    (revision 14011)
+++ po/fa.po    (working copy)
@@ -9760,7 +9760,8 @@
 msgstr "خرید"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "محصول"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -9988,7 +9989,8 @@
 msgstr "انتخاب"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "نشان بده"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -10002,7 +10004,8 @@
 msgstr "شهرها"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "باز کردن"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -10156,11 +10159,11 @@
 msgstr ""
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+msgid "Goto _Location"
 msgstr "برو به مکان"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+msgid "_Update City"
 msgstr ""
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/de.po
===================================================================
--- po/de.po    (revision 14011)
+++ po/de.po    (working copy)
@@ -10675,7 +10675,8 @@
 msgstr "_Kaufen"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "_Produktion"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10903,7 +10904,8 @@
 msgstr "_Wählen"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "_Anzeigen"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -10917,7 +10919,8 @@
 msgstr "Städte"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "_Stadt zeigen"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -11079,11 +11082,12 @@
 msgstr "Soll die Vorgabe entfernt werden?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+msgid "Goto _Location"
 msgstr "_Gehe nach"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "_Stadtschirm anzeigen"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/sv.po
===================================================================
--- po/sv.po    (revision 14011)
+++ po/sv.po    (working copy)
@@ -10588,7 +10588,8 @@
 msgstr "_Köp"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "T_illverkning"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -10817,7 +10818,8 @@
 msgstr "_Välj"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "Vi_sa"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -10831,7 +10833,8 @@
 msgstr "Städer"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "Ö_ppna"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -10989,11 +10992,12 @@
 msgstr "Tag bort detta förvalda värde?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+msgid "Goto _Location"
 msgstr "_GÃ¥ till plats"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "Ö_ppna stad"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/ja.po
===================================================================
--- po/ja.po    (revision 14011)
+++ po/ja.po    (working copy)
@@ -11268,8 +11268,9 @@
 msgstr "買う(_B)"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
-msgstr "生産物(_D)"
+#, fuzzy
+msgid "_Production"
+msgstr "生産物(_P)"
 
 #: client/gui-gtk-2.0/citydlg.c:949
 msgid "_Happiness"
@@ -11504,8 +11505,9 @@
 msgstr "都市の選択(_S)"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
-msgstr "表示設定(_H)..."
+#, fuzzy
+msgid "_Display"
+msgstr "表示設定(_D)..."
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
 #: client/gui-sdl/diplodlg.c:685 client/gui-sdl/optiondlg.c:1800
@@ -11518,8 +11520,9 @@
 msgstr "都市"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
-msgstr "ポップ(_P)"
+#, fuzzy
+msgid "_Update"
+msgstr "ポップ(_U)"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
 #: client/gui-gtk-2.0/cityrep.c:1250 client/gui-gtk-2.0/cityrep.c:1269
@@ -11679,12 +11682,13 @@
 msgstr "このプリセットを削除していいですか?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
-msgstr "現場へ移動(_G)"
+msgid "Goto _Location"
+msgstr "現場へ移動(_L)"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
-msgstr "都市をポップアップ(_P)"
+#, fuzzy
+msgid "_Update City"
+msgstr "都市をポップアップ(_U)"
 
 # XXX J.Lennonのもじりだが…
 # 「カクメイしたいんだって？」
Index: po/he.po
===================================================================
--- po/he.po    (revision 14011)
+++ po/he.po    (working copy)
@@ -9757,7 +9757,8 @@
 msgstr "_קנה"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "_ייצור"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -9985,7 +9986,8 @@
 msgstr "_בחר"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "ה_צג"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -9999,7 +10001,8 @@
 msgstr "ערים"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "חלון _צץ"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -10157,11 +10160,13 @@
 msgstr "הסר ערך קבוע זה?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
-msgstr "_לך למקום"
+#, fuzzy
+msgid "Goto _Location"
+msgstr "לך ל_מקום"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "_הקפץ עיר"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/fi.po
===================================================================
--- po/fi.po    (revision 14011)
+++ po/fi.po    (working copy)
@@ -10787,7 +10787,8 @@
 msgstr "_Osta"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
+#, fuzzy
+msgid "_Production"
 msgstr "_Tuotanto"
 
 #: client/gui-gtk-2.0/citydlg.c:949
@@ -11016,7 +11017,8 @@
 msgstr "Valitse"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
+#, fuzzy
+msgid "_Display"
 msgstr "_Näytä..."
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
@@ -11030,7 +11032,8 @@
 msgstr "Kaupungit"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
+#, fuzzy
+msgid "_Update"
 msgstr "Näytä kaupungin tiedot"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
@@ -11188,11 +11191,12 @@
 msgstr "Poistetaanko tämä malli?"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
+msgid "Goto _Location"
 msgstr "Mene"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
+#, fuzzy
+msgid "_Update City"
 msgstr "Näytä kaupunki"
 
 #: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
Index: po/zh_CN.po
===================================================================
--- po/zh_CN.po (revision 14011)
+++ po/zh_CN.po (working copy)
@@ -10136,8 +10136,9 @@
 msgstr "¹ºÂò(_B)"
 
 #: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:679
-msgid "Pro_duction"
-msgstr "Éú²ú(_D)"
+#, fuzzy
+msgid "_Production"
+msgstr "Éú²ú(_P)"
 
 #: client/gui-gtk-2.0/citydlg.c:949
 msgid "_Happiness"
@@ -10366,8 +10367,9 @@
 msgstr "Ñ¡Ôñ(_S)"
 
 #: client/gui-gtk-2.0/cityrep.c:706 client/gui-gtk-2.0/plrdlg.c:488
-msgid "S_how"
-msgstr "ÏÔʾ(_H)"
+#, fuzzy
+msgid "_Display"
+msgstr "ÏÔʾ(_D)"
 
 #: client/gui-gtk-2.0/cityrep.c:787 client/gui-gtk-2.0/menu.c:790
 #: client/gui-sdl/diplodlg.c:685 client/gui-sdl/optiondlg.c:1800
@@ -10380,8 +10382,9 @@
 msgstr "³ÇÊÐ"
 
 #: client/gui-gtk-2.0/cityrep.c:804
-msgid "_Popup"
-msgstr "µ¯³ö(_P)"
+#, fuzzy
+msgid "_Update"
+msgstr "µ¯³ö(_U)"
 
 #: client/gui-gtk-2.0/cityrep.c:1210 client/gui-gtk-2.0/cityrep.c:1231
 #: client/gui-gtk-2.0/cityrep.c:1250 client/gui-gtk-2.0/cityrep.c:1269
@@ -10541,12 +10544,14 @@
 msgstr "ɾ³ý´ËÔ¤É裿"
 
 #: client/gui-gtk-2.0/dialogs.c:195
-msgid "_Goto location"
-msgstr "Ç°ÍùµØµã(_G)"
+#, fuzzy
+msgid "Goto _Location"
+msgstr "Ç°ÍùµØµã(_L)"
 
 #: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
-msgid "_Popup City"
-msgstr "µ¯³ö³ÇÊжԻ°¿ò(_P)"
+#, fuzzy
+msgid "_Update City"
+msgstr "µ¯³ö³ÇÊжԻ°¿ò(_U)"
 
 #: 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
@@ -11856,6 +11861,7 @@
 msgstr "ÏûÏ¢"
 
 #: client/gui-gtk-2.0/messagewin.c:186
+#, fuzzy
 msgid "Goto _location"
 msgstr "Ç°ÍùλÖÃ(_L)"
 
Index: client/gui-gtk-2.0/gotodlg.c
===================================================================
--- client/gui-gtk-2.0/gotodlg.c        (revision 14011)
+++ client/gui-gtk-2.0/gotodlg.c        (working copy)
@@ -126,7 +126,7 @@
     GTK_RESPONSE_CANCEL,
     _("Air_lift"),
     CMD_AIRLIFT,
-    ("_Goto"),
+    _("_Goto"),
     CMD_GOTO,
     NULL);
   setup_dialog(dshell, toplevel);
Index: client/gui-gtk-2.0/citydlg.c
===================================================================
--- client/gui-gtk-2.0/citydlg.c        (revision 14011)
+++ client/gui-gtk-2.0/citydlg.c        (working copy)
@@ -895,7 +895,7 @@
 *****************************************************************/
 static void create_and_append_worklist_page(struct city_dialog *pdialog)
 {
-  const char *tab_title = _("Pro_duction");
+  const char *tab_title = _("_Production");
   GtkWidget *label = gtk_label_new_with_mnemonic(tab_title);
   GtkWidget *page, *hbox, *editor, *bar;
 
Index: client/gui-gtk-2.0/messagewin.c
===================================================================
--- client/gui-gtk-2.0/messagewin.c     (revision 14011)
+++ client/gui-gtk-2.0/messagewin.c     (working copy)
@@ -183,11 +183,11 @@
                   G_CALLBACK(meswin_row_activated_callback), NULL);
 
   cmd = gui_dialog_add_stockbutton(meswin_shell, GTK_STOCK_JUMP_TO,
-      _("Goto _location"), CMD_GOTO);
+      _("Goto _Location"), CMD_GOTO);
   gtk_widget_set_sensitive(cmd, FALSE);
   
   cmd = gui_dialog_add_stockbutton(meswin_shell, GTK_STOCK_ZOOM_IN,
-      _("_Popup City"), CMD_POPCITY);
+      _("_Update City"), CMD_POPCITY);
   gtk_widget_set_sensitive(cmd, FALSE);
 
   gui_dialog_add_button(meswin_shell, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
Index: client/gui-gtk-2.0/cityrep.c
===================================================================
--- client/gui-gtk-2.0/cityrep.c        (revision 14011)
+++ client/gui-gtk-2.0/cityrep.c        (working copy)
@@ -676,7 +676,7 @@
   menubar = gtk_menu_bar_new();
   gtk_box_pack_start(GTK_BOX(vbox), menubar, TRUE, TRUE, 0);
   
-  item = gtk_menu_item_new_with_mnemonic(_("Pro_duction"));
+  item = gtk_menu_item_new_with_mnemonic(_("_Production"));
   city_production_command = item;
   gtk_menu_shell_append(GTK_MENU_SHELL(menubar), item);
 
@@ -703,7 +703,7 @@
   gtk_menu_shell_append(GTK_MENU_SHELL(menubar), item);
   create_select_menu(item);
 
-  item = gtk_menu_item_new_with_mnemonic(_("S_how"));
+  item = gtk_menu_item_new_with_mnemonic(_("_Display"));
   gtk_menu_shell_append(GTK_MENU_SHELL(menubar), item);
   update_view_menu(item);
   return vbox;
@@ -801,7 +801,7 @@
   city_center_command = w;
 
   w = gui_dialog_add_stockbutton(city_dialog_shell, GTK_STOCK_ZOOM_IN,
-      _("_Popup"), CITY_POPUP);
+      _("_Update"), CITY_POPUP);
   city_popup_command = w;
 
   w = gui_dialog_add_stockbutton(city_dialog_shell, GTK_STOCK_EXECUTE,
Index: client/gui-gtk-2.0/dialogs.c
===================================================================
--- client/gui-gtk-2.0/dialogs.c        (revision 14011)
+++ client/gui-gtk-2.0/dialogs.c        (working copy)
@@ -192,12 +192,12 @@
   gtk_widget_show(label);
   
   goto_command = gtk_stockbutton_new(GTK_STOCK_JUMP_TO,
-       _("_Goto location"));
+       _("Goto _Location"));
   gtk_dialog_add_action_widget(GTK_DIALOG(shell), goto_command, 1);
   gtk_widget_show(goto_command);
 
   popcity_command = gtk_stockbutton_new(GTK_STOCK_ZOOM_IN,
-       _("_Popup City"));
+       _("_Update City"));
   gtk_dialog_add_action_widget(GTK_DIALOG(shell), popcity_command, 2);
   gtk_widget_show(popcity_command);
 
Index: client/gui-gtk-2.0/plrdlg.c
===================================================================
--- client/gui-gtk-2.0/plrdlg.c (revision 14011)
+++ client/gui-gtk-2.0/plrdlg.c (working copy)
@@ -485,7 +485,7 @@
   gtk_box_set_child_packing(GTK_BOX(players_dialog_shell->action_area), 
       vbox, FALSE, FALSE, 0, GTK_PACK_END);
 
-  item = gtk_menu_item_new_with_mnemonic(_("S_how"));
+  item = gtk_menu_item_new_with_mnemonic(_("_Display"));
   menu = create_show_menu();
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), menu);
   gtk_menu_shell_append(GTK_MENU_SHELL(menubar), item);

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