[Freeciv-Dev] (PR#40684) [Patch] (i18n) Fix "Workers" translation ambiguity

[Madeline Book]

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

As reported on freeciv-i18n, there were a few unqualified
uses of _("Workers") in various places. The attached patch
adds either ?city: or ?unit: as appropriate.


-----------------------------------------------------------------------
私は王なら、労働者にさえ綺麗な靴下が与えられます。

commit 2cb408bb4abb75d20fa8705bb3b4370f927619ff
Author: Madeline Book <madeline.b...@gmail.com>
Date:   Tue Jan 27 15:41:32 2009 -0500

    Fix "Workers" translation ambiguity.
    
    Reported by:
      Sini Ruohomaa <sini.ruoho...@cs.helsinki.fi>
      Susanna Björverud <susanna.bjorve...@telia.com>
---
 client/cityrepdata.c       |    2 +-
 client/gui-xaw/citydlg.c   |    6 +++++-
 data/default/units.ruleset |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/cityrepdata.c b/client/cityrepdata.c
index 5d923c8..95df7de 100644
--- a/client/cityrepdata.c
+++ b/client/cityrepdata.c
@@ -462,7 +462,7 @@ static const struct city_report_spec base_city_report_specs[] = {
     NULL, FUNC_TAG(unhappy) },
   { FALSE, 2, 1, NULL, N_("?Angry workers:A"), N_("Workers: Angry"),
     NULL, FUNC_TAG(angry) },
-  { TRUE, 10, 1, N_("Workers"),
+  { TRUE, 10, 1, N_("?city:Workers"),
     N_("?happy/content/unhappy/angry:H/C/U/A"),
     N_("Workers: Happy, Content, Unhappy, Angry"),
     NULL, FUNC_TAG(workers) },
diff --git a/client/gui-xaw/citydlg.c b/client/gui-xaw/citydlg.c
index bc1a864..9fd43bf 100644
--- a/client/gui-xaw/citydlg.c
+++ b/client/gui-xaw/citydlg.c
@@ -2398,7 +2398,11 @@ void cityopt_cancel_command_callback(Widget w, XtPointer client_data,
 void cityopt_newcit_triggle_callback(Widget w, XtPointer client_data,
 					XtPointer call_data);
 
-char *newcitizen_labels[] = { N_("Workers"), N_("Scientists"), N_("Taxmen") };
+char *newcitizen_labels[] = {
+  N_("?city:Workers"),
+  N_("Scientists"),
+  N_("Taxmen")
+};
 
 static Widget cityopt_shell = 0;
 static Widget cityopt_triggle;
diff --git a/data/default/units.ruleset b/data/default/units.ruleset
index 3737f67..4c62553 100644
--- a/data/default/units.ruleset
+++ b/data/default/units.ruleset
@@ -235,7 +235,7 @@ Settlers and Engineers may work together to decrease the amount of\
 ")
 
 [unit_worker]
-name          = _("Workers")
+name          = _("?unit:Workers")
 class         = "Land"
 tech_req      = "Pottery"
 obsolete_by   = "Engineers"

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