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

> [book - Sun Feb 15 19:50:48 2009]:
> 
> Reported by Susanna Björverud on freeciv-i18n and missed
> by me when I posted the other i18n fixes. ;(

Version 2 is fixed to work in trunk, and for S2_1 I changed
the qualifiers for "Leader" when used as a player title in
data/nation/slovakian.ruleset to ?male: and ?female: so as
to match trunk.

I am still a little unsure of the qualifiers in the nation
ruleset file though. Maybe they should be "?(fe)maletitle:"?


-----------------------------------------------------------------------
王女様と呼んでもいい。
diff --git a/client/gui-gtk-2.0/pages.c b/client/gui-gtk-2.0/pages.c
index a0f138b..6d1aaa1 100644
--- a/client/gui-gtk-2.0/pages.c
+++ b/client/gui-gtk-2.0/pages.c
@@ -1529,8 +1529,8 @@ GtkWidget *create_start_page(void)
 
   rend = gtk_cell_renderer_text_new();
   gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view),
-					      -1, _("Leader"), rend,
-					      "text", 3, NULL);
+                                              -1, _("?player:Leader"),
+                                              rend, "text", 3, NULL);
 
   rend = gtk_cell_renderer_text_new();
   col = gtk_tree_view_column_new_with_attributes(_("Nation"),
diff --git a/data/default/units.ruleset b/data/default/units.ruleset
index 4c62553..6a47f75 100644
--- a/data/default/units.ruleset
+++ b/data/default/units.ruleset
@@ -1861,7 +1861,7 @@ Explorers are very useful for mapping unknown territory.\
 ")
 
 [unit_leader]
-name          = _("Leader")
+name          = _("?unit:Leader")
 class         = "Land"
 tech_req      = "None"
 obsolete_by   = "None"
diff --git a/data/nation/slovakian.ruleset b/data/nation/slovakian.ruleset
index 256a35f..1147886 100644
--- a/data/nation/slovakian.ruleset
+++ b/data/nation/slovakian.ruleset
@@ -23,7 +23,7 @@ flag_alt = "-" ; former CzechoSlovakia has the same flag as Czech
                ; - the blue triangle in it means Slovakia
 city_style = "European"
 ruler_titles = { "government",      "male_title",        "female_title"
-                  "Despotism",      _("Leader"),         _("Leader")
+                  "Despotism",      _("?male:Leader"),   _("?female:Leader")
                   "Republic",       _("President"),      _("President")
                   "Democracy",      _("Prime Minister"), _("Prime Minister")
                   "Fundamentalism", _("Pope"),           _("Priestess")
diff --git a/client/gui-gtk-2.0/pages.c b/client/gui-gtk-2.0/pages.c
index 928b042..55f3fca 100644
--- a/client/gui-gtk-2.0/pages.c
+++ b/client/gui-gtk-2.0/pages.c
@@ -1539,7 +1539,7 @@ GtkWidget *create_start_page(void)
                CL_COL_GGZ_RATING, "rating_col");
   add_tree_col(view, G_TYPE_BOOLEAN, _("Ready"),
                CL_COL_READY_STATE, NULL);
-  add_tree_col(view, G_TYPE_STRING, _("Leader"),
+  add_tree_col(view, G_TYPE_STRING, _("?player:Leader"),
                CL_COL_PLAYER_NAME, NULL);
   add_tree_col(view, G_TYPE_STRING, _("Nation"),
                CL_COL_NATION, NULL);
diff --git a/data/default/units.ruleset b/data/default/units.ruleset
index 13fd5a0..6462a4d 100644
--- a/data/default/units.ruleset
+++ b/data/default/units.ruleset
@@ -1965,7 +1965,7 @@ Explorers are brave individuals that are very useful for\
 ")
 
 [unit_leader]
-name          = _("Leader")
+name          = _("?unit:Leader")
 class         = "Land"
 tech_req      = "None"
 obsolete_by   = "None"
diff --git a/data/nation/slovakian.ruleset b/data/nation/slovakian.ruleset
index 1ae17b9..ae1c088 100644
--- a/data/nation/slovakian.ruleset
+++ b/data/nation/slovakian.ruleset
@@ -23,7 +23,7 @@ flag_alt = "-" ; former CzechoSlovakia has the same flag as Czech
                ; - the blue triangle in it means Slovakia
 city_style = "European"
 ruler_titles = { "government",      "male_title",        "female_title"
-                  "Despotism",      _("Leader"),         _("?female:Leader")
+                  "Despotism",      _("?male:Leader"),   _("?female:Leader")
                   "Republic",       _("President"),    _("?female:President")
                   "Democracy",_("Prime Minister"),_("?female:Prime Minister")
                   "Fundamentalism", _("Pope"),           _("Priestess")
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to