Re: [Freeciv-Dev] (PR#39385) RFE: Buy column on Cities report

William Allen Simpson Tue, 12 Jun 2007 18:26:55 -0700

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


Committed S2_1 revision 12989.
Committed trunk revision 12990.

At this point, both should function exactly the same.  Except Russian.

I was surprised to discover that there were quite a few conflicts with S2_1,
because folks have been updating .po files there without fixing trunk, and
vice versa.

Therefore, I harmonized them both.  The trunk changes are attached.

Unfortunately, ru.po isn't even using the same character set.  Somebody who
can read the language will have to handle them.  (Sorry, my russian is
limited to phonetic singing after much rehearsal.)

Please note: I only harmonized the parts of .po files near city report.
There are a lot of other differences that translators should handle.
Presumably the persons that committed updates to only one branch!

Index: po/cs.po
===================================================================
--- po/cs.po    (revision 12989)
+++ po/cs.po    (working copy)
@@ -7726,8 +7726,8 @@
 msgstr "Oslavuje/Klid/Nepokoj"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "StruÄnÄ +=Oslavuje, -=Nepokoj"
+msgid "Concise + Rapture, - Disorder"
+msgstr "StruÄnÄ + Oslavuje, - Nepokoj"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
Index: po/pt_BR.po
===================================================================
--- po/pt_BR.po (revision 12989)
+++ po/pt_BR.po (working copy)
@@ -7205,7 +7205,7 @@
 
 #: client/cityrepdata.c:73
 msgid "?city_state:Rapture"
-msgstr "Celebração"
+msgstr "CelebraÃ§Ã£o"
 
 #: client/cityrepdata.c:74
 msgid "?city_state:Disorder"
@@ -7217,10 +7217,9 @@
 
 #: client/cityrepdata.c:361
 msgid "(worklist)"
-msgstr ""
+msgstr "(lista de tarefas)"
 
 #: client/cityrepdata.c:429
-#, fuzzy
 msgid "?city:Name"
 msgstr "Nome"
 
@@ -7243,99 +7242,88 @@
 
 #: client/cityrepdata.c:433
 msgid "Rapture/Peace/Disorder"
-msgstr "Celebração/Paz/Desordem"
+msgstr "CelebraÃ§Ã£o/Paz/Desordem"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "Conciso +=Celebração, -=Desordem"
+msgid "Concise + Rapture, - Disorder"
+msgstr "Conciso + CelebraÃ§Ã£o, - Desordem"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
 msgid "Workers"
-msgstr "Operários"
+msgstr "OperÃ¡rios"
 
 #: client/cityrepdata.c:438
 msgid "?happy/content/unhappy/angry:H/C/U/A"
-msgstr "F/C/D/A"
+msgstr "F/C/D/Z"
 
 #: client/cityrepdata.c:439
-#, fuzzy
 msgid "Workers: Happy, Content, Unhappy, Angry"
-msgstr "Operários: Feliz, Contente, Descontente"
+msgstr "OperÃ¡rios: Feliz, Contente, Descontente, Zangado"
 
 #: client/cityrepdata.c:441
 msgid "?Happy workers:H"
 msgstr "F"
 
 #: client/cityrepdata.c:441
-#, fuzzy
 msgid "Workers: Happy"
-msgstr "Operários: Feliz"
+msgstr "OperÃ¡rios: Feliz"
 
 #: client/cityrepdata.c:443
 msgid "?Content workers:C"
-msgstr ""
+msgstr "C"
 
 #: client/cityrepdata.c:443
-#, fuzzy
 msgid "Workers: Content"
-msgstr "Operários: Contente"
+msgstr "OperÃ¡rios: Contente"
 
 #: client/cityrepdata.c:445
 msgid "?Unhappy workers:U"
 msgstr "D"
 
 #: client/cityrepdata.c:445
-#, fuzzy
 msgid "Workers: Unhappy"
-msgstr "Operários: Descontente"
+msgstr "OperÃ¡rios: Descontente"
 
 #: client/cityrepdata.c:447
 msgid "?Angry workers:A"
-msgstr ""
+msgstr "Z"
 
 #: client/cityrepdata.c:447
-#, fuzzy
 msgid "Workers: Angry"
-msgstr "Operários"
+msgstr "OperÃ¡rios: Zangado"
 
 #: client/cityrepdata.c:449
 msgid "Special"
 msgstr "Especial"
 
 #: client/cityrepdata.c:450
-#, fuzzy
 msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?Artistas, Cientistas, Fiscais:A/C/F"
+msgstr "A/C/F"
 
 #: client/cityrepdata.c:451
 msgid "Entertainers, Scientists, Taxmen"
 msgstr "Artistas, Cientistas, Fiscais"
 
 #: client/cityrepdata.c:453 client/cityrepdata.c:455
-#, fuzzy
 msgid "Best"
-msgstr "Servidor"
+msgstr "Melhor"
 
 #: client/cityrepdata.c:453
-#, fuzzy
 msgid "attack"
-msgstr "Ataque:"
+msgstr "ataque"
 
 #: client/cityrepdata.c:454
-#, fuzzy
 msgid "Best attacking units"
-msgstr "Atacar automaticamente contra unidades terrestres"
+msgstr "Unidades com melhor ataque"
 
 #: client/cityrepdata.c:455
-#, fuzzy
 msgid "defense"
-msgstr "Defesa:"
+msgstr "defesa"
 
 #: client/cityrepdata.c:456
-#, fuzzy
 msgid "Best defending units"
-msgstr "Dissolve unidade"
+msgstr "Unidades com melhor defesa"
 
 #: client/cityrepdata.c:457 client/cityrepdata.c:459
 #: client/gui-gtk-2.0/cityrep.c:1208 client/gui-gtk-2.0/cityrep.c:1229
@@ -7349,28 +7337,24 @@
 #: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:246
 #: client/gui-xaw/repodlgs.c:890 client/gui-xaw/repodlgs.c:1085
 #: data/Freeciv.in:1895 data/helpdata.txt:866
-#, fuzzy
 msgid "Units"
-msgstr "?_Lista de:Unidades"
+msgstr "Unidades"
 
 #: client/cityrepdata.c:457
-#, fuzzy
 msgid "?Supported (units):Owned"
-msgstr "suportadas"
+msgstr "Sup"
 
 #: client/cityrepdata.c:458
 msgid "Number of units supported"
-msgstr "Unidades suportadas"
+msgstr "NÃºmero de unidades suportadas"
 
 #: client/cityrepdata.c:459
-#, fuzzy
 msgid "?Present (units):Here"
-msgstr "presentes"
+msgstr "Prs"
 
 #: client/cityrepdata.c:460
-#, fuzzy
 msgid "Number of units present"
-msgstr "Unidades presentes"
+msgstr "NÃºmero de unidades presentes"
 
 #: client/cityrepdata.c:462
 msgid "Surplus"
@@ -7378,40 +7362,35 @@
 
 #: client/cityrepdata.c:462
 msgid "?food/production/trade:F/P/T"
-msgstr "?food/production/trade:C/P/c"
+msgstr "C/P/M"
 
 #: client/cityrepdata.c:463
 msgid "Surplus: Food, Production, Trade"
-msgstr "Excedentes: Comida, Produção, Comércio"
+msgstr "Excedentes: Comida, ProduÃ§Ã£o, ComÃ©rcio"
 
 #: client/cityrepdata.c:465
 msgid "?Food surplus [short]:+F"
 msgstr "+C"
 
 #: client/cityrepdata.c:465
-#, fuzzy
 msgid "Surplus: Food"
-msgstr "Excedentes: Comida"
+msgstr "Excedente: Comida"
 
 #: client/cityrepdata.c:467
-#, fuzzy
 msgid "?Production surplus [short]:+P"
-msgstr "?Produção em Série:+P"
+msgstr "+P"
 
 #: client/cityrepdata.c:468
-#, fuzzy
 msgid "Surplus: Production"
-msgstr "Excedentes: Produção"
+msgstr "Excedente: ProduÃ§Ã£o"
 
 #: client/cityrepdata.c:469
-#, fuzzy
 msgid "?Trade surplus [short]:+T"
-msgstr "?Rotas Comerciais:+c"
+msgstr "+M"
 
 #: client/cityrepdata.c:469
-#, fuzzy
 msgid "Surplus: Trade"
-msgstr "Excedentes: Comércio"
+msgstr "Excedente: ComÃ©rcio"
 
 #: client/cityrepdata.c:471 client/gui-gtk-2.0/repodlgs.c:652
 #: client/gui-win32/repodlgs.c:332 client/gui-xaw/menu.c:221
@@ -7422,138 +7401,125 @@
 
 #: client/cityrepdata.c:471
 msgid "?gold/luxury/science:G/L/S"
-msgstr "?gold/luxury/science:O/L/C"
+msgstr "M/L/C"
 
 #: client/cityrepdata.c:472
 msgid "Economy: Gold, Luxuries, Science"
-msgstr "Economia: Ouro, Luxo, Ciência"
+msgstr "Economia: Ouro, Luxo, CiÃªncia"
 
 #: client/cityrepdata.c:474
-#, fuzzy
 msgid "?Gold:G"
-msgstr "?Ouro:O"
+msgstr "M"
 
 #: client/cityrepdata.c:474
-#, fuzzy
 msgid "Economy: Gold"
-msgstr "Economia: Ouro"
+msgstr "Economia: Moedas"
 
 #: client/cityrepdata.c:476
-#, fuzzy
 msgid "?Luxury:L"
-msgstr "?Luxo:L"
+msgstr "L"
 
 #: client/cityrepdata.c:476
-#, fuzzy
 msgid "Economy: Luxury"
 msgstr "Economia: Luxo"
 
 #: client/cityrepdata.c:478
-#, fuzzy
 msgid "?Science:S"
-msgstr "?Ciência:C"
+msgstr "C"
 
 #: client/cityrepdata.c:478
-#, fuzzy
 msgid "Economy: Science"
-msgstr "Economia: Ciência"
+msgstr "Economia: CiÃªncia"
 
 #: client/cityrepdata.c:480
-#, fuzzy
 msgid "?number_trade_routes:n"
-msgstr "?Rotas Comerciais:R"
+msgstr "n"
 
 #: client/cityrepdata.c:480
-#, fuzzy
 msgid "?number_trade_routes:R"
-msgstr "?Rotas Comerciais:c"
+msgstr "R"
 
 #: client/cityrepdata.c:481
 msgid "Number of Trade Routes"
-msgstr "Número de Rotas Comerciais"
+msgstr "NÃºmero de Rotas Comerciais"
 
 #: client/cityrepdata.c:483 client/gui-sdl/citydlg.c:3019
 #: client/gui-sdl/citydlg.c:3131
 msgid "Stock"
-msgstr "Stock"
+msgstr "Estoque"
 
 #: client/cityrepdata.c:483
 msgid "Food Stock"
-msgstr "Stock de Comida"
+msgstr "Estoque de Comida"
 
 #: client/cityrepdata.c:485
-#, fuzzy
 msgid "?pollution [short]:Pol"
-msgstr "Poluição"
+msgstr "Pol"
 
 #: client/cityrepdata.c:487
 msgid "?food (population):Grow"
-msgstr "Comida"
+msgstr "Cresce"
 
 #: client/cityrepdata.c:487 client/gui-gtk-2.0/wldlg.c:1005
 #: client/gui-win32/citydlg.c:1097 client/gui-win32/wldlg.c:807
 #, fuzzy
 msgid "Turns"
-msgstr "Turco"
+msgstr "Turnos"
 
 #: client/cityrepdata.c:487
 msgid "Turns until growth/famine"
-msgstr "Turco de Comida"
+msgstr "Turnos atÃ© crescimento/fome"
 
 #: client/cityrepdata.c:489
-#, fuzzy
 msgid "?Trade loss (corruption) [short]:-T"
-msgstr "-c"
+msgstr "-M"
 
 #: client/cityrepdata.c:489
 msgid "Corruption"
-msgstr "Corrupção"
+msgstr "CorrupÃ§Ã£o"
 
 #: client/cityrepdata.c:491
 msgid "?Production loss (waste) [short]:-P"
 msgstr "-P"
 
 #: client/cityrepdata.c:491
-#, fuzzy
 msgid "Waste"
-msgstr "Esperar"
+msgstr "DesperdÃcio"
 
 #: client/cityrepdata.c:493
 msgid "?cma:Governor"
-msgstr ""
+msgstr "Governo"
 
 #: client/cityrepdata.c:493 client/gui-gtk-2.0/cityrep.c:1214
 #: client/gui-gtk-2.0/cityrep.c:1487 client/gui-mui/citydlg.c:1374
 #: client/gui-sdl/citydlg.c:3824 client/gui-sdl/cma_fe.c:851
 #: client/gui-win32/citydlg.c:730 data/Freeciv.in:1459 data/helpdata.txt:777
 msgid "Citizen Governor"
-msgstr ""
+msgstr "GestÃ£o de CidadÃ£os"
 
 #: client/cityrepdata.c:495 client/cityrepdata.c:496
 msgid "Currently Building"
-msgstr "Actualmente Contrói"
+msgstr "Atualmente Construindo"
 
 #: client/cityrepdata.c:495
 msgid "?Stock/Target:(Have/Need)"
-msgstr "Stock"
+msgstr "(Estoque/Objetivo)"
 
 #: client/cityrepdata.c:495
 msgid "Turns/Buy"
-msgstr "Turco"
+msgstr "Turnos/Compra"
 
 #: client/cityrepdata.c:554
-#, fuzzy
 msgid "?specialist:S"
-msgstr "?Especial:E"
+msgstr "E"
 
 #: client/cityrepdata.c:557
-#, fuzzy, c-format
 msgid "Specialists"
-msgstr "Especial"
+msgstr "Especialistas"
 
 #: client/civclient.c:200
 msgid "  -a, --autoconnect\tSkip connect dialog\n"
-msgstr ""
+msgstr "  -a, --autoconnect\tSaltar diÃ¡logo de conexÃ£o\n"
 
 #: client/civclient.c:210
 #, fuzzy
@@ -14597,7 +14563,7 @@
 #: client/gui-sdl/citydlg.c:2603
 #, fuzzy, c-format
 msgid "?food:Surplus: %d"
-msgstr "Excedentes: %d"
+msgstr "Excedente: %d"
 
 #: client/gui-sdl/citydlg.c:2651
 #, fuzzy, c-format
Index: po/es.po
===================================================================
--- po/es.po    (revision 12989)
+++ po/es.po    (working copy)
@@ -7885,8 +7885,8 @@
 msgstr "Celebraciones/Paz/Disturbios"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "Breve: +=Celebraciones, -=Disturbios"
+msgid "Concise + Rapture, - Disorder"
+msgstr "Breve: + Celebraciones, - Disturbios"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
Index: po/en_GB.po
===================================================================
--- po/en_GB.po (revision 12989)
+++ po/en_GB.po (working copy)
@@ -7030,7 +7030,7 @@
 msgstr ""
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
+msgid "Concise + Rapture, - Disorder"
 msgstr ""
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
Index: po/no.po
===================================================================
--- po/no.po    (revision 12989)
+++ po/no.po    (working copy)
@@ -7705,8 +7705,8 @@
 msgstr "Feiring/Fred/Uroligheter"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "Kort +=Feiring, -=Uroligheter"
+msgid "Concise + Rapture, - Disorder"
+msgstr "Kort + Feiring, - Uroligheter"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
Index: po/hu.po
===================================================================
--- po/hu.po    (revision 12989)
+++ po/hu.po    (working copy)
@@ -7784,8 +7784,8 @@
 msgstr "Öröm/Béke/Zavargás"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "Jelek: +=Ünneplés, -=Zavargás"
+msgid "Concise + Rapture, - Disorder"
+msgstr "Jelek: + Ünneplés, - Zavargás"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
Index: po/uk.po
===================================================================
--- po/uk.po    (revision 12989)
+++ po/uk.po    (working copy)
@@ -7248,8 +7248,8 @@
 msgstr "úÁÈÏÐÌÎÅÎÎÑ/óÐÏË¦Ê/úÁ×ÏÒÕÛÅÎÎÑ"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "óÔÉÓÌÏ +=úÁÈÏÐÌÅÎÎÑ, -=úÁ×ÏÒÕÛÅÎÎÑ"
+msgid "Concise + Rapture, - Disorder"
+msgstr "óÔÉÓÌÏ + úÁÈÏÐÌÅÎÎÑ, - úÁ×ÏÒÕÛÅÎÎÑ"
 
 #: client/cityrepdata.c:437
 #: client/gui-mui/citydlg.c:1365
@@ -15055,7 +15055,7 @@
 #: client/gui-sdl/citydlg.c:2613
 #, c-format
 msgid "?food:Surplus: %d"
-msgstr "?îÁÄÌÉÛÏË: %d"
+msgstr "îÁÄÌÉÛÏË: %d"
 
 #: client/gui-sdl/citydlg.c:2661
 #, c-format
Index: po/ro.po
===================================================================
--- po/ro.po    (revision 12989)
+++ po/ro.po    (working copy)
@@ -7296,51 +7296,51 @@
 #: client/citydlg_common.c:399
 #, fuzzy, c-format
 msgid "%+4d : Citizens\n"
-msgstr "%s - %s cetÄÅ£eni"
+msgstr "%+4d : CetÄÅ£eni\n"
 
 #: client/citydlg_common.c:406
 #, c-format
 msgid "%+4d : Taxed from trade\n"
-msgstr ""
+msgstr "%+4d : Taxe din comerÅ£\n"
 
 #: client/citydlg_common.c:424
 #, c-format
 msgid "%+4d : Trade route with %s\n"
-msgstr ""
+msgstr "%+4d : RutÄ comercialÄ cu %s\n"
 
 #: client/citydlg_common.c:433
 #, fuzzy, c-format
 msgid "%+4d : Building tithes\n"
-msgstr "Constuind UnitÄÅ£i"
+msgstr "%+4d : Impozit pe clÄdire\n"
 
 #: client/citydlg_common.c:456
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
-msgstr ""
+msgstr "%+4d : Bonus de la %s (%+d%%)\n"
 
 #: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Waste\n"
-msgstr ""
+msgstr "%+4d : DeÅeuri\n"
 
 #: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Disorder\n"
-msgstr ""
+msgstr "%+4d : Dezordine\n"
 
 #: client/citydlg_common.c:480
 #, c-format
 msgid "%+4d : Used\n"
-msgstr ""
+msgstr "%+4d : FolosiÅ£i\n"
 
 #: client/citydlg_common.c:485
 msgid "==== : Adds up to\n"
-msgstr ""
+msgstr "==== : Se adaugÄ pÃ¢nÄ la \n"
 
 #: client/citydlg_common.c:487
 #, c-format
 msgid "%4d : Total surplus"
-msgstr ""
+msgstr "%4d : Surplus total"
 
 #: client/cityrepdata.c:73
 msgid "?city_state:Rapture"
@@ -7377,15 +7377,15 @@
 #: client/cityrepdata.c:433 client/plrdlg_common.c:261
 #: client/gui-mui/plrdlg.c:172 client/gui-win32/plrdlg.c:337
 msgid "State"
-msgstr "Statut"
+msgstr "Stare"
 
 #: client/cityrepdata.c:433
 msgid "Rapture/Peace/Disorder"
 msgstr "Bucurie/LiniÅte/Dezordine"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "+=Bucurie, -=Dezordine"
+msgid "Concise + Rapture, - Disorder"
+msgstr "Concis + Bucurie, - Dezordine"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
@@ -7430,7 +7430,7 @@
 
 #: client/cityrepdata.c:447
 msgid "Workers: Angry"
-msgstr "LucrÄtori: FurioÅi"
+msgstr "LucrÄtori: ÃnfuriaÅ£Ã®"
 
 #: client/cityrepdata.c:449
 msgid "Special"
@@ -7438,34 +7438,31 @@
 
 #: client/cityrepdata.c:450
 msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr ""
+msgstr "?entertainers/scientists/taxmen:M/C/Ã"
 
 #: client/cityrepdata.c:451
 msgid "Entertainers, Scientists, Taxmen"
-msgstr ""
+msgstr "Muncitori, CercetÄtori, Ãncasatori"
 
 #: client/cityrepdata.c:453 client/cityrepdata.c:455
-#, fuzzy
 msgid "Best"
-msgstr "-ul"
+msgstr "Cel mai bun"
 
 #: client/cityrepdata.c:453
 msgid "attack"
 msgstr "atac"
 
 #: client/cityrepdata.c:454
-#, fuzzy
 msgid "Best attacking units"
-msgstr "Auto atacÄ unitÄÅ£i aeriene"
+msgstr "Cele mai bune unitÄÅ£i de atac"
 
 #: client/cityrepdata.c:455
 msgid "defense"
 msgstr "apÄrare"
 
 #: client/cityrepdata.c:456
-#, fuzzy
 msgid "Best defending units"
-msgstr "UnitÄÅ£i prezente"
+msgstr "Cele mai bune unitÄÅ£i de apÄrare"
 
 #: client/cityrepdata.c:457 client/cityrepdata.c:459
 #: client/gui-gtk-2.0/cityrep.c:1208 client/gui-gtk-2.0/cityrep.c:1229
@@ -7504,11 +7501,11 @@
 
 #: client/cityrepdata.c:462
 msgid "?food/production/trade:F/P/T"
-msgstr "H/P/N"
+msgstr "H/P/C"
 
 #: client/cityrepdata.c:463
 msgid "Surplus: Food, Production, Trade"
-msgstr "Surplus: HranÄ, ProducÅ£ie, NegoÅ£"
+msgstr "Surplus: HranÄ, ProducÅ£ie, ComerÅ£"
 
 #: client/cityrepdata.c:465
 msgid "?Food surplus [short]:+F"
@@ -7528,11 +7525,11 @@
 
 #: client/cityrepdata.c:469
 msgid "?Trade surplus [short]:+T"
-msgstr "+N"
+msgstr "+C"
 
 #: client/cityrepdata.c:469
 msgid "Surplus: Trade"
-msgstr "Surplus: NegoÅ£"
+msgstr "Surplus: ComerÅ£"
 
 #: client/cityrepdata.c:471 client/gui-gtk-2.0/repodlgs.c:652
 #: client/gui-win32/repodlgs.c:332 client/gui-xaw/menu.c:221
@@ -7559,7 +7556,7 @@
 
 #: client/cityrepdata.c:476
 msgid "?Luxury:L"
-msgstr "L"
+msgstr "?Lux:L"
 
 #: client/cityrepdata.c:476
 msgid "Economy: Luxury"
@@ -7574,18 +7571,16 @@
 msgstr "Economie: ÅtiinÅ£Ä"
 
 #: client/cityrepdata.c:480
-#, fuzzy
 msgid "?number_trade_routes:n"
 msgstr "?Rata de _Impozit:R"
 
 #: client/cityrepdata.c:480
-#, fuzzy
 msgid "?number_trade_routes:R"
 msgstr "?Rata de _Impozit:C"
 
 #: client/cityrepdata.c:481
 msgid "Number of Trade Routes"
-msgstr "NumÄrul de Schimburi Comerciale"
+msgstr "NumÄrul de rute comerciale"
 
 #: client/cityrepdata.c:483 client/gui-sdl/citydlg.c:3019
 #: client/gui-sdl/citydlg.c:3131
@@ -7602,7 +7597,7 @@
 
 #: client/cityrepdata.c:487
 msgid "?food (population):Grow"
-msgstr "HranÄ"
+msgstr "CreÅte"
 
 #: client/cityrepdata.c:487 client/gui-gtk-2.0/wldlg.c:1005
 #: client/gui-win32/citydlg.c:1097 client/gui-win32/wldlg.c:807
@@ -7615,7 +7610,7 @@
 
 #: client/cityrepdata.c:489
 msgid "?Trade loss (corruption) [short]:-T"
-msgstr "-N"
+msgstr "-C"
 
 #: client/cityrepdata.c:489
 msgid "Corruption"
@@ -7631,18 +7626,18 @@
 
 #: client/cityrepdata.c:493
 msgid "?cma:Governor"
-msgstr ""
+msgstr "?cma:Guvernator"
 
 #: client/cityrepdata.c:493 client/gui-gtk-2.0/cityrep.c:1214
 #: client/gui-gtk-2.0/cityrep.c:1487 client/gui-mui/citydlg.c:1374
 #: client/gui-sdl/citydlg.c:3824 client/gui-sdl/cma_fe.c:851
 #: client/gui-win32/citydlg.c:730 data/Freeciv.in:1459 data/helpdata.txt:777
 msgid "Citizen Governor"
-msgstr ""
+msgstr "Guvernatorul cetÄÅ£enilor"
 
 #: client/cityrepdata.c:495 client/cityrepdata.c:496
 msgid "Currently Building"
-msgstr "Ãn ConstrucÅ£ie"
+msgstr "Ãn construcÅ£ie"
 
 #: client/cityrepdata.c:495
 msgid "?Stock/Target:(Have/Need)"
@@ -7653,12 +7648,10 @@
 msgstr "Runde/CumpÄrare"
 
 #: client/cityrepdata.c:554
-#, fuzzy
 msgid "?specialist:S"
 msgstr "?Speciale:S"
 
 #: client/cityrepdata.c:557
-#, fuzzy, c-format
 msgid "Specialists"
 msgstr "Speciale"
 
Index: po/ru.po
===================================================================
--- po/ru.po    (revision 12989)
+++ po/ru.po    (working copy)
@@ -7893,8 +7893,8 @@
 msgstr "âÕÍ/íÉÒ/âÅÓÐÏÒÑÄËÉ"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "ëÒÁÔËÏ +=âÕÍ, -=âÅÓÐÏÒÑÄÏË"
+msgid "Concise + Rapture, - Disorder"
+msgstr "ëÒÁÔËÏ + âÕÍ, - âÅÓÐÏÒÑÄÏË"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
Index: po/el.po
===================================================================
--- po/el.po    (revision 12989)
+++ po/el.po    (working copy)
@@ -7512,7 +7512,7 @@
 msgstr ""
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
+msgid "Concise + Rapture, - Disorder"
 msgstr ""
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
Index: po/ar.po
===================================================================
--- po/ar.po    (revision 12989)
+++ po/ar.po    (working copy)
@@ -7455,8 +7455,8 @@
 msgstr "ÙØ´ÙØ© Ø§ÙØ·Ø±Ø¨/Ø§ÙØ³ÙØ§Ù/Ø§ÙÙÙØ¶Ù"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "Ø¯ÙÙÙ +=ÙØ´ÙØ© Ø§ÙØ·Ø±Ø¨, -=ÙÙØ¶Ù"
+msgid "Concise + Rapture, - Disorder"
+msgstr "Ø¯ÙÙÙ + ÙØ´ÙØ© Ø§ÙØ·Ø±Ø¨, - ÙÙØ¶Ù"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
Index: po/fr.po
===================================================================
--- po/fr.po    (revision 12989)
+++ po/fr.po    (working copy)
@@ -7907,8 +7907,8 @@
 msgstr "Extase/Paix/Troubles"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "+=Extase, -=Troubles"
+msgid "Concise + Rapture, - Disorder"
+msgstr "+ Extase, - Troubles"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
Index: po/et.po
===================================================================
--- po/et.po    (revision 12989)
+++ po/et.po    (working copy)
@@ -7567,8 +7567,8 @@
 msgstr "Joovastus/Rahu/Rahutused"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "+=Joovastus, -=Rahutused"
+msgid "Concise + Rapture, - Disorder"
+msgstr "+ Joovastus, - Rahutused"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
@@ -7768,7 +7768,7 @@
 #: client/cityrepdata.c:483 client/gui-sdl/citydlg.c:3019
 #: client/gui-sdl/citydlg.c:3131
 msgid "Stock"
-msgstr "laos"
+msgstr "Tehtud"
 
 #: client/cityrepdata.c:483
 msgid "Food Stock"
@@ -7824,18 +7824,17 @@
 
 #: client/cityrepdata.c:495
 msgid "?Stock/Target:(Have/Need)"
-msgstr "(StockTÃLGIMIND/SihtmÃ¤rk)"
+msgstr "(Tehtud/Siht)"
 
 #: client/cityrepdata.c:495
 msgid "Turns/Buy"
-msgstr "KÃ¤ike/Osta"
+msgstr "KÃ¤ike/Hind"
 
 #: client/cityrepdata.c:554
 msgid "?specialist:S"
 msgstr "?specialist:S"
 
 #: client/cityrepdata.c:557
-#, c-format
 msgid "Specialists"
 msgstr "Spetsialistid"
 
Index: po/nl.po
===================================================================
--- po/nl.po    (revision 12989)
+++ po/nl.po    (working copy)
@@ -7770,8 +7770,8 @@
 msgstr "Extase/Vrede/Onlusten"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "Beknopt +=Extase, -=Onlusten"
+msgid "Concise + Rapture, - Disorder"
+msgstr "Beknopt + Extase, - Onlusten"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
Index: po/pl.po
===================================================================
--- po/pl.po    (revision 12989)
+++ po/pl.po    (working copy)
@@ -7865,8 +7865,8 @@
 msgstr "Entuzjazm/PokÃ³j/Zamieszki"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "ZwiÄÅºle +=Entuzjazm, -=Zamieszki"
+msgid "Concise + Rapture, - Disorder"
+msgstr "ZwiÄÅºle + Entuzjazm, - Zamieszki"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
Index: po/it.po
===================================================================
--- po/it.po    (revision 12989)
+++ po/it.po    (working copy)
@@ -7924,8 +7924,8 @@
 msgstr "Entusiasmo/Pace/Sommossa"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "Abbreviato +=Entusiasmo, -=Sommossa"
+msgid "Concise + Rapture, - Disorder"
+msgstr "Abbreviato + Entusiasmo, - Sommossa"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
Index: po/lt.po
===================================================================
--- po/lt.po    (revision 12989)
+++ po/lt.po    (working copy)
@@ -6886,7 +6886,7 @@
 
 #: client/cityrepdata.c:431
 msgid "?size [short]:Sz"
-msgstr "?size:Dy"
+msgstr "Dy"
 
 #: client/cityrepdata.c:431
 msgid "Size"
@@ -6904,8 +6904,8 @@
 msgstr "SusiÅ¾avÄjÄs/Taika/Netvarka"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "+=SusiÅ¾avÄjÄs, -=Netvarka"
+msgid "Concise + Rapture, - Disorder"
+msgstr "+ SusiÅ¾avÄjÄs, - Netvarka"
 
 #: client/cityrepdata.c:437
 #: client/gui-mui/citydlg.c:1365
@@ -7032,7 +7032,7 @@
 
 #: client/cityrepdata.c:462
 msgid "Surplus"
-msgstr ""
+msgstr "Perteklius"
 
 #: client/cityrepdata.c:462
 msgid "?food/production/trade:F/P/T"
@@ -7199,7 +7199,6 @@
 msgstr "?specialist:S"
 
 #: client/cityrepdata.c:557
-#, c-format
 msgid "Specialists"
 msgstr "Specialistai"
 
@@ -9286,7 +9285,7 @@
 #: client/text.c:952
 #, c-format
 msgid "Support:         %5d %%"
-msgstr "Palaikymas:     %5d %%"
+msgstr "Palaikymas:      %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
 #: client/text.c:956
@@ -18749,7 +18748,7 @@
 #: data/civ2/buildings.ruleset:935
 #: data/civ1/buildings.ruleset:634
 msgid "Apollo Program"
-msgstr "Apollo programa"
+msgstr "âApolloâ programa"
 
 #: data/default/buildings.ruleset:962
 #: data/civ2/buildings.ruleset:949
Index: po/pt.po
===================================================================
--- po/pt.po    (revision 12989)
+++ po/pt.po    (working copy)
@@ -7643,8 +7643,8 @@
 msgstr "CelebraÃ§Ã£o/Paz/Desordem"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "Conciso +=CelebraÃ§Ã£o, -=Desordem"
+msgid "Concise + Rapture, - Disorder"
+msgstr "Conciso + CelebraÃ§Ã£o, - Desordem"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
Index: po/ca.po
===================================================================
--- po/ca.po    (revision 12989)
+++ po/ca.po    (working copy)
@@ -7694,8 +7694,8 @@
 msgstr "En festa/pau/desordre"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "ConcÃs +=En festa, -=Desordre"
+msgid "Concise + Rapture, - Disorder"
+msgstr "ConcÃs + En festa, - Desordre"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
Index: po/da.po
===================================================================
--- po/da.po    (revision 12989)
+++ po/da.po    (working copy)
@@ -7757,8 +7757,8 @@
 msgstr "Fest/fred/uroligheder"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "Kort +=fest, -=uroligheder"
+msgid "Concise + Rapture, - Disorder"
+msgstr "Kort + fest, - uroligheder"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
Index: po/fa.po
===================================================================
--- po/fa.po    (revision 12989)
+++ po/fa.po    (working copy)
@@ -7032,8 +7032,8 @@
 msgstr "././ÙØ®ØªÙ Ø´Ø¯Ù"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "+=Rapture, -=ÙØ®ØªÙ Ø´Ø¯Ù"
+msgid "Concise + Rapture, - Disorder"
+msgstr "+ Rapture, - ÙØ®ØªÙ Ø´Ø¯Ù"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
Index: po/sv.po
===================================================================
--- po/sv.po    (revision 12989)
+++ po/sv.po    (working copy)
@@ -7825,8 +7825,8 @@
 msgstr "HÃ¤nryckning/Frid/Upplopp"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "Kortfattad +=HÃ¤nryckning, -=Upplopp"
+msgid "Concise + Rapture, - Disorder"
+msgstr "Kortfattad + HÃ¤nryckning, - Upplopp"
 
 # DM> Ordet arbetare fÃ¶rekommer bÃ¥de i enhetsnamn och i kolumn i 
stadsrapport-
 # fÃ¶nstret. Detta Ã¤r en kompromiss.
Index: po/de.po
===================================================================
--- po/de.po    (revision 12989)
+++ po/de.po    (working copy)
@@ -7878,8 +7878,8 @@
 msgstr "begeistert/normal/in Aufruhr"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "einspaltige Statusanzeige: +=begeistert, -=in Aufruhr"
+msgid "Concise + Rapture, - Disorder"
+msgstr "einspaltige Statusanzeige: + begeistert, - in Aufruhr"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
Index: po/ja.po
===================================================================
--- po/ja.po    (revision 12989)
+++ po/ja.po    (working copy)
@@ -8256,8 +8256,8 @@
 msgstr "æå/å¹³å/æ··ä¹±"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "ç°¡ç¥è¡¨ç¤º +=æå, -=æ··ä¹±"
+msgid "Concise + Rapture, - Disorder"
+msgstr "ç°¡ç¥è¡¨ç¤º + æå, - æ··ä¹±"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
Index: po/he.po
===================================================================
--- po/he.po    (revision 12989)
+++ po/he.po    (working copy)
@@ -1,5 +1,5 @@
 # Hebrew translation for Freeciv.
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2007 Free Software Foundation, Inc.
 # Nir Peled <[EMAIL PROTECTED]>, 2002.
 # This translation is covered by the GNU General Public License Version 2.
 #
@@ -7053,85 +7053,85 @@
 msgstr ""
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr ""
+msgid "Concise + Rapture, - Disorder"
+msgstr "××©××¨ + ×©××××Ö¾××¦×¨××, - ××××××ª"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
 msgid "Workers"
-msgstr ""
+msgstr "×¤××¢×××"
 
 #: client/cityrepdata.c:438
 msgid "?happy/content/unhappy/angry:H/C/U/A"
-msgstr ""
+msgstr "?×©××/××¨××¦×/×¢×¦××/×××¢×¡:×©/×/×¢/×"
 
 #: client/cityrepdata.c:439
 msgid "Workers: Happy, Content, Unhappy, Angry"
-msgstr ""
+msgstr "×¤××¢×××: ×©××××, ××¨××¦××, ×¢×¦××××, ×××¢×¡××"
 
 #: client/cityrepdata.c:441
 msgid "?Happy workers:H"
-msgstr ""
+msgstr "?×¤××¢××× ×©××××:×©"
 
 #: client/cityrepdata.c:441
 msgid "Workers: Happy"
-msgstr ""
+msgstr "×¤××¢×××: ×©××××"
 
 #: client/cityrepdata.c:443
 msgid "?Content workers:C"
-msgstr ""
+msgstr "?×¤××¢××× ××¨××¦××:× "
 
 #: client/cityrepdata.c:443
 msgid "Workers: Content"
-msgstr ""
+msgstr "×¤××¢×××: ××¨××¦××"
 
 #: client/cityrepdata.c:445
 msgid "?Unhappy workers:U"
-msgstr ""
+msgstr "?×¤××¢××× ×¢×¦××××:×¢"
 
 #: client/cityrepdata.c:445
 msgid "Workers: Unhappy"
-msgstr ""
+msgstr "×¤××¢×××: ×¢×¦××××"
 
 #: client/cityrepdata.c:447
 msgid "?Angry workers:A"
-msgstr ""
+msgstr "?×¤××¢××× ×××¢×¡××:×"
 
 #: client/cityrepdata.c:447
 msgid "Workers: Angry"
-msgstr ""
+msgstr "×¤××¢×××: ×××¢×¡××"
 
 #: client/cityrepdata.c:449
 msgid "Special"
-msgstr ""
+msgstr "×××¨×ª×"
 
 #: client/cityrepdata.c:450
 msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr ""
+msgstr "?×××¨× ××/×××¢× ××/××××Ö¾××¡:×/×/×"
 
 #: client/cityrepdata.c:451
 msgid "Entertainers, Scientists, Taxmen"
-msgstr ""
+msgstr "×××¨× ××, ×××¢× ××, ××××Ö¾××¡"
 
 #: client/cityrepdata.c:453 client/cityrepdata.c:455
 msgid "Best"
-msgstr ""
+msgstr "×××× ××××ª×¨"
 
 #: client/cityrepdata.c:453
 msgid "attack"
-msgstr ""
+msgstr "××ª×§×¤×"
 
 #: client/cityrepdata.c:454
 msgid "Best attacking units"
-msgstr ""
+msgstr "×××××××ª ××ª××§×¤××ª ××××××ª ××××ª×¨"
 
 #: client/cityrepdata.c:455
 msgid "defense"
-msgstr ""
+msgstr "××× ×"
 
 #: client/cityrepdata.c:456
 msgid "Best defending units"
-msgstr ""
+msgstr "×××××××ª ×××× ××ª ××××××ª ××××ª×¨"
 
 #: client/cityrepdata.c:457 client/cityrepdata.c:459
 #: client/gui-gtk-2.0/cityrep.c:1208 client/gui-gtk-2.0/cityrep.c:1229
@@ -7146,186 +7146,183 @@
 #: client/gui-xaw/repodlgs.c:890 client/gui-xaw/repodlgs.c:1085
 #: data/Freeciv.in:1895 data/helpdata.txt:866
 msgid "Units"
-msgstr ""
+msgstr "××××××ª"
 
 #: client/cityrepdata.c:457
 msgid "?Supported (units):Owned"
-msgstr ""
+msgstr "?× ×ª××××ª(××××××ª):×ª××"
 
 #: client/cityrepdata.c:458
 msgid "Number of units supported"
-msgstr ""
+msgstr "××¡×¤×¨ ××××××ª × ×ª××××ª"
 
 #: client/cityrepdata.c:459
 msgid "?Present (units):Here"
-msgstr ""
+msgstr "?× ×××××ª (××××××ª):× ××"
 
 #: client/cityrepdata.c:460
 msgid "Number of units present"
-msgstr ""
+msgstr "××¡×¤×¨ ××××××ª × ×××××ª"
 
 #: client/cityrepdata.c:462
 msgid "Surplus"
-msgstr ""
+msgstr "×¢×××£"
 
 #: client/cityrepdata.c:462
 msgid "?food/production/trade:F/P/T"
-msgstr ""
+msgstr "?××××/××¦××¨/×¡××¨:×/×/×¡"
 
 #: client/cityrepdata.c:463
 msgid "Surplus: Food, Production, Trade"
-msgstr ""
+msgstr "×¢×××£: ××××, ××¦××¨, ×¡××¨"
 
 #: client/cityrepdata.c:465
 msgid "?Food surplus [short]:+F"
-msgstr ""
+msgstr "?×¢×××£ ××××:×+ "
 
 #: client/cityrepdata.c:465
 msgid "Surplus: Food"
-msgstr ""
+msgstr "×¢×××£: ××××"
 
 #: client/cityrepdata.c:467
 msgid "?Production surplus [short]:+P"
-msgstr ""
+msgstr "?×¢×××£ ××¦××¨:×+"
 
 #: client/cityrepdata.c:468
 msgid "Surplus: Production"
-msgstr ""
+msgstr "×¢×××£: ××¦××¨"
 
 #: client/cityrepdata.c:469
 msgid "?Trade surplus [short]:+T"
-msgstr ""
+msgstr "?×¢×××£ ×¡××¨:×¡+ "
 
 #: client/cityrepdata.c:469
 msgid "Surplus: Trade"
-msgstr ""
+msgstr "×¢×××£: ×¡××¨"
 
 #: client/cityrepdata.c:471 client/gui-gtk-2.0/repodlgs.c:652
 #: client/gui-win32/repodlgs.c:332 client/gui-xaw/menu.c:221
 #: client/gui-xaw/repodlgs.c:654 client/gui-xaw/repodlgs.c:783
 #: data/Freeciv.in:1819
 msgid "Economy"
-msgstr ""
+msgstr "×××××"
 
 #: client/cityrepdata.c:471
 msgid "?gold/luxury/science:G/L/S"
-msgstr ""
+msgstr "?×××/×©×¤×¢/×××¢:×/×©/×"
 
 #: client/cityrepdata.c:472
 msgid "Economy: Gold, Luxuries, Science"
-msgstr "×××××: ×××, ×××ª×¨××ª, ×××¢"
+msgstr "×××××: ×××, ×©×¤×¢, ×××¢"
 
 #: client/cityrepdata.c:474
-#, fuzzy
 msgid "?Gold:G"
-msgstr "×××: "
+msgstr "?×××:×"
 
 #: client/cityrepdata.c:474
 msgid "Economy: Gold"
-msgstr ""
+msgstr "×××××: ×××"
 
 #: client/cityrepdata.c:476
 msgid "?Luxury:L"
-msgstr ""
+msgstr "?×©×¤×¢:×©"
 
 #: client/cityrepdata.c:476
 msgid "Economy: Luxury"
-msgstr ""
+msgstr "×××××: ×©×¤×¢"
 
 #: client/cityrepdata.c:478
 msgid "?Science:S"
-msgstr ""
+msgstr "?×××¢:× "
 
 #: client/cityrepdata.c:478
-#, fuzzy
 msgid "Economy: Science"
-msgstr "×××××: ×××, ×××ª×¨××ª, ×××¢"
+msgstr "×××××: ×××¢"
 
 #: client/cityrepdata.c:480
 msgid "?number_trade_routes:n"
-msgstr ""
+msgstr "?× ×ª×××Ö¾×¡××¨:× "
 
 #: client/cityrepdata.c:480
 msgid "?number_trade_routes:R"
-msgstr ""
+msgstr "?× ×ª×××Ö¾×¡××¨:×¡"
 
 #: client/cityrepdata.c:481
 msgid "Number of Trade Routes"
-msgstr ""
+msgstr "××¡×¤×¨ × ×ª×××Ö¾×¡××¨"
 
 #: client/cityrepdata.c:483 client/gui-sdl/citydlg.c:3019
 #: client/gui-sdl/citydlg.c:3131
 msgid "Stock"
-msgstr ""
+msgstr "××××"
 
 #: client/cityrepdata.c:483
 msgid "Food Stock"
-msgstr ""
+msgstr "×××× ××××"
 
 #: client/cityrepdata.c:485
 msgid "?pollution [short]:Pol"
-msgstr ""
+msgstr "?×××××:×××"
 
 #: client/cityrepdata.c:487
 msgid "?food (population):Grow"
-msgstr ""
+msgstr "×¦××××"
 
 #: client/cityrepdata.c:487 client/gui-gtk-2.0/wldlg.c:1005
 #: client/gui-win32/citydlg.c:1097 client/gui-win32/wldlg.c:807
 msgid "Turns"
-msgstr ""
+msgstr "×ª××¨××ª"
 
 #: client/cityrepdata.c:487
 msgid "Turns until growth/famine"
-msgstr ""
+msgstr "××¡×¤×¨ ×ª××¨××ª ×¢× ××¦××××/×¨×¢×"
 
 #: client/cityrepdata.c:489
 msgid "?Trade loss (corruption) [short]:-T"
-msgstr ""
+msgstr "?×©×××ª××ª:×©××ª"
 
 #: client/cityrepdata.c:489
 msgid "Corruption"
-msgstr ""
+msgstr "×©×××ª××ª"
 
 #: client/cityrepdata.c:491
 msgid "?Production loss (waste) [short]:-P"
-msgstr ""
+msgstr "?×××××:×××"
 
 #: client/cityrepdata.c:491
 msgid "Waste"
-msgstr ""
+msgstr "×××××"
 
 #: client/cityrepdata.c:493
 msgid "?cma:Governor"
-msgstr ""
+msgstr "?×¡× ×: ×××©×"
 
 #: client/cityrepdata.c:493 client/gui-gtk-2.0/cityrep.c:1214
 #: client/gui-gtk-2.0/cityrep.c:1487 client/gui-mui/citydlg.c:1374
 #: client/gui-sdl/citydlg.c:3824 client/gui-sdl/cma_fe.c:851
 #: client/gui-win32/citydlg.c:730 data/Freeciv.in:1459 data/helpdata.txt:777
 msgid "Citizen Governor"
-msgstr ""
+msgstr "×××©× ×××¨×××"
 
 #: client/cityrepdata.c:495 client/cityrepdata.c:496
 msgid "Currently Building"
-msgstr ""
+msgstr "××¨××¢ ××× ××"
 
 #: client/cityrepdata.c:495
 msgid "?Stock/Target:(Have/Need)"
-msgstr ""
+msgstr "(××××/×××¨×)"
 
 #: client/cityrepdata.c:495
 msgid "Turns/Buy"
-msgstr ""
+msgstr "×ª××¨××ª/×¨××©"
 
 #: client/cityrepdata.c:554
 msgid "?specialist:S"
-msgstr ""
+msgstr "?×××××:×"
 
 #: client/cityrepdata.c:557
-#, fuzzy, c-format
 msgid "Specialists"
-msgstr "×××××1"
+msgstr "×××××"
 
 #: client/civclient.c:200
 msgid "  -a, --autoconnect\tSkip connect dialog\n"
Index: po/fi.po
===================================================================
--- po/fi.po    (revision 12989)
+++ po/fi.po    (working copy)
@@ -7893,7 +7893,7 @@
 #: client/citydlg_common.c:406
 #, fuzzy, c-format
 msgid "%+4d : Taxed from trade\n"
-msgstr "Ei vakituisia kauppareittejÃ¤.\n"
+msgstr "%+4d : Verotettu kaupasta\n"
 
 #: client/citydlg_common.c:424
 #, fuzzy, c-format
@@ -7976,8 +7976,8 @@
 msgstr "Hurmoksessa/Rauhallinen/Levoton"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "Lyhenne +=Hurmoksessa, -=Levoton"
+msgid "Concise + Rapture, - Disorder"
+msgstr "Lyhenne + Hurmoksessa, - Levoton"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
@@ -8026,7 +8026,7 @@
 
 #: client/cityrepdata.c:449
 msgid "Special"
-msgstr "Erityisalat"
+msgstr "Erikoistuneet"
 
 #: client/cityrepdata.c:450
 msgid "?entertainers/scientists/taxmen:E/S/T"
@@ -8217,9 +8217,8 @@
 msgstr "Hukkaan"
 
 #: client/cityrepdata.c:493
-#, fuzzy
 msgid "?cma:Governor"
-msgstr "Hallintomuoto"
+msgstr "KÃ¤skynhaltija"
 
 #: client/cityrepdata.c:493 client/gui-gtk-2.0/cityrep.c:1214
 #: client/gui-gtk-2.0/cityrep.c:1487 client/gui-mui/citydlg.c:1374
@@ -8227,7 +8226,7 @@
 #: client/gui-win32/citydlg.c:730 data/Freeciv.in:1459 data/helpdata.txt:777
 #, fuzzy
 msgid "Citizen Governor"
-msgstr "Kaupunkiraportti..."
+msgstr "KÃ¤skynhaltija"
 
 #: client/cityrepdata.c:495 client/cityrepdata.c:496
 msgid "Currently Building"
@@ -8242,14 +8241,12 @@
 msgstr "Pelivuoroa/Ostohinta"
 
 #: client/cityrepdata.c:554
-#, fuzzy
 msgid "?specialist:S"
-msgstr "?Erityispiirteet:E"
+msgstr "E"
 
 #: client/cityrepdata.c:557
-#, fuzzy, c-format
 msgid "Specialists"
-msgstr "Erityispiirteet"
+msgstr "Erikoistuneet"
 
 #: client/civclient.c:200
 msgid "  -a, --autoconnect\tSkip connect dialog\n"
Index: po/zh_CN.po
===================================================================
--- po/zh_CN.po (revision 12989)
+++ po/zh_CN.po (working copy)
@@ -7392,14 +7392,12 @@
 msgstr "½¨³É"
 
 #: client/citydlg_common.c:345
-#, fuzzy
 msgid "Great Wonder"
-msgstr "Ææ¼£"
+msgstr "´óÆæ¼£"
 
 #: client/citydlg_common.c:349
-#, fuzzy
 msgid "Small Wonder"
-msgstr "¿ÉÓÃÆæ¼£"
+msgstr "Ð¡Ææ¼£"
 
 #: client/citydlg_common.c:368
 #, c-format
@@ -7407,14 +7405,14 @@
 msgstr "%d/»ØºÏ"
 
 #: client/citydlg_common.c:399
-#, fuzzy, c-format
+#, c-format
 msgid "%+4d : Citizens\n"
-msgstr "%s - %s ÊÐÃñ"
+msgstr "%+4d : ÊÐÃñ\n"
 
 #: client/citydlg_common.c:406
 #, c-format
 msgid "%+4d : Taxed from trade\n"
-msgstr ""
+msgstr "%+4d : Taxed from trade\n"
 
 #: client/citydlg_common.c:424
 #, fuzzy, c-format
@@ -7461,7 +7459,7 @@
 
 #: client/cityrepdata.c:74
 msgid "?city_state:Disorder"
-msgstr "»ìÂÒ"
+msgstr "É§ÂÒ"
 
 #: client/cityrepdata.c:75
 msgid "?city_state:Peace"
@@ -7481,11 +7479,11 @@
 
 #: client/cityrepdata.c:431
 msgid "?size [short]:Sz"
-msgstr "´óÐ¡"
+msgstr "¹æÄ£"
 
 #: client/cityrepdata.c:431
 msgid "Size"
-msgstr "´óÐ¡"
+msgstr "¹æÄ£"
 
 #: client/cityrepdata.c:433 client/plrdlg_common.c:261
 #: client/gui-mui/plrdlg.c:172 client/gui-win32/plrdlg.c:337
@@ -7494,11 +7492,11 @@
 
 #: client/cityrepdata.c:433
 msgid "Rapture/Peace/Disorder"
-msgstr "¿ñ»¶/Æ½¾²/»ìÂÒ"
+msgstr "¿ñ»¶/Æ½¾²/É§ÂÒ"
 
 #: client/cityrepdata.c:435
-msgid "Concise +=Rapture, -=Disorder"
-msgstr "±ê¼Ç + ±íÊ¾¿ñ»¶£¬- ±íÊ¾»ìÂÒ"
+msgid "Concise + Rapture, - Disorder"
+msgstr "±ê¼Ç + ±íÊ¾¿ñ»¶£¬- ±íÊ¾É§ÂÒ"
 
 #: client/cityrepdata.c:437 client/gui-mui/citydlg.c:1365
 #: client/gui-xaw/citydlg.c:2408 data/default/units.ruleset:309
@@ -7511,7 +7509,7 @@
 
 #: client/cityrepdata.c:439
 msgid "Workers: Happy, Content, Unhappy, Angry"
-msgstr "¹¤ÈË£º¿ìÀÖ/Âú×ã/²»¿ì/·ßÅ"
+msgstr "¹¤ÈË£º¿ìÀÖ/Âú×ã/ÓÇÓô/·ßÅ"
 
 #: client/cityrepdata.c:441
 msgid "?Happy workers:H"
@@ -7519,7 +7517,7 @@
 
 #: client/cityrepdata.c:441
 msgid "Workers: Happy"
-msgstr "¹¤ÈË£º¸ßÐË"
+msgstr "¹¤ÈË£º¿ìÀÖ"
 
 #: client/cityrepdata.c:443
 msgid "?Content workers:C"
@@ -7531,11 +7529,11 @@
 
 #: client/cityrepdata.c:445
 msgid "?Unhappy workers:U"
-msgstr "Óô"
+msgstr "ÓÇ"
 
 #: client/cityrepdata.c:445
 msgid "Workers: Unhappy"
-msgstr "¹¤ÈË£º²»¿ì"
+msgstr "¹¤ÈË£ºÓÇÓô"
 
 #: client/cityrepdata.c:447
 msgid "?Angry workers:A"
@@ -7618,7 +7616,7 @@
 
 #: client/cityrepdata.c:463
 msgid "Surplus: Food, Production, Trade"
-msgstr "Ó¯Óà£ºÊ³Îï/×ÊÔ´/Ã³Ò×"
+msgstr "Ó¯Óà£ºÊ³Îï/Îï×Ê/Ã³Ò×"
 
 #: client/cityrepdata.c:465
 msgid "?Food surplus [short]:+F"
@@ -7634,7 +7632,7 @@
 
 #: client/cityrepdata.c:468
 msgid "Surplus: Production"
-msgstr "Ó¯Óà£º×ÊÔ´"
+msgstr "Ó¯Óà£ºÎï×Ê"
 
 #: client/cityrepdata.c:469
 msgid "?Trade surplus [short]:+T"
@@ -7738,17 +7736,15 @@
 msgstr "ËðºÄ"
 
 #: client/cityrepdata.c:493
-#, fuzzy
 msgid "?cma:Governor"
-msgstr "×Ü¶½"
+msgstr "¹ÜÀíÕß"
 
 #: client/cityrepdata.c:493 client/gui-gtk-2.0/cityrep.c:1214
 #: client/gui-gtk-2.0/cityrep.c:1487 client/gui-mui/citydlg.c:1374
 #: client/gui-sdl/citydlg.c:3824 client/gui-sdl/cma_fe.c:851
 #: client/gui-win32/citydlg.c:730 data/Freeciv.in:1459 data/helpdata.txt:777
-#, fuzzy
 msgid "Citizen Governor"
-msgstr "×Ü¶½"
+msgstr "ÊÐÃñ¹ÜÀíÕß"
 
 #: client/cityrepdata.c:495 client/cityrepdata.c:496
 msgid "Currently Building"
@@ -7763,14 +7759,12 @@
 msgstr "»ØºÏ/¹ºÂò£©"
 
 #: client/cityrepdata.c:554
-#, fuzzy
 msgid "?specialist:S"
-msgstr "ÌØ²ú"
+msgstr "×¨"
 
 #: client/cityrepdata.c:557
-#, fuzzy, c-format
 msgid "Specialists"
-msgstr "ÌØ²ú"
+msgstr "×¨ÒµÈËÔ±£º"
 
 #: client/civclient.c:200
 msgid "  -a, --autoconnect\tSkip connect dialog\n"
Index: client/cityrepdata.c
===================================================================
--- client/cityrepdata.c        (revision 12989)
+++ client/cityrepdata.c        (working copy)
@@ -447,7 +447,7 @@
     N_("Entertainers, Scientists, Taxmen"),
     NULL, FUNC_TAG(specialists) },
 
-  { FALSE,  1, 1, NULL,  NULL,          N_("Concise +=Rapture, -=Disorder"),
+  { FALSE,  1, 1, NULL,  NULL,          N_("Concise + Rapture, - Disorder"),
     NULL, FUNC_TAG(hstate_concise) },
   { TRUE,  -8, 1, NULL,  N_("State"),   N_("Rapture/Peace/Disorder"),
     NULL, FUNC_TAG(hstate_verbose) },
@@ -517,7 +517,8 @@
     NULL, FUNC_TAG(cma) },
 
   { TRUE,   9, 1, N_("Production"), N_("Turns/Buy"),
-    N_("Turns or gold to complete production"),
+  /*N_("Turns or gold to complete production"), future menu needs translation 
*/
+    N_("Production"),
     NULL, FUNC_TAG(build_cost) },
   { TRUE,   0, 1, N_("Currently Building"),
     N_("?Stock/Target:(Have/Need)"),

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

Re: [Freeciv-Dev] (PR#39385) RFE: Buy column on Cities report

Reply via email to