Re: [Freeciv-Dev] (PR#39909) BUG: leader gender ignored in diplomat/spy dialog

2007-11-29 Thread William Allen Simpson

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

Committed S2_1 revision 14104 with po updates (attached).
Committed S2_2 revision 14105.
Committed trunk revision 14106.

Index: po/cs.po
===
--- po/cs.po(revision 14103)
+++ po/cs.po(working copy)
@@ -10385,11 +10385,13 @@
 msgstr "Rozvrátit nepřátelskou jednotku"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:692 client/gui-win32/dialogs.c:1662
-msgid "Sir, the diplomat is waiting for your command"
+#, fuzzy
+msgid "The diplomat is waiting for your command"
 msgstr "Pane, diplomat očekává Vaše rozkazy"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:693 client/gui-win32/dialogs.c:1663
-msgid "Sir, the spy is waiting for your command"
+#, fuzzy
+msgid "The spy is waiting for your command"
 msgstr "Pane, špion očekává Vaše rozkazy"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1664
Index: po/pt_BR.po
===
--- po/pt_BR.po (revision 14103)
+++ po/pt_BR.po (working copy)
@@ -10088,11 +10088,13 @@
 msgstr "Subverte Unidade Inimiga"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:692 client/gui-win32/dialogs.c:1662
-msgid "Sir, the diplomat is waiting for your command"
+#, fuzzy
+msgid "The diplomat is waiting for your command"
 msgstr "Mestre, o diplomata aguarda pelas suas ordens"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:693 client/gui-win32/dialogs.c:1663
-msgid "Sir, the spy is waiting for your command"
+#, fuzzy
+msgid "The spy is waiting for your command"
 msgstr "Mestre, o espião aguarda pelas suas ordens"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1664
Index: po/es.po
===
--- po/es.po(revision 14103)
+++ po/es.po(working copy)
@@ -10626,11 +10626,13 @@
 msgstr "Sobornar a una unidad enemiga"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:692 client/gui-win32/dialogs.c:1662
-msgid "Sir, the diplomat is waiting for your command"
+#, fuzzy
+msgid "The diplomat is waiting for your command"
 msgstr "Señor, el Diplomático está esperando órdenes"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:693 client/gui-win32/dialogs.c:1663
-msgid "Sir, the spy is waiting for your command"
+#, fuzzy
+msgid "The spy is waiting for your command"
 msgstr "Señor, el Espía está esperando órdenes"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1664
Index: po/ko.po
===
--- po/ko.po(revision 14103)
+++ po/ko.po(working copy)
@@ -9534,11 +9534,11 @@
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:692 client/gui-win32/dialogs.c:1662
-msgid "Sir, the diplomat is waiting for your command"
+msgid "The diplomat is waiting for your command"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:693 client/gui-win32/dialogs.c:1663
-msgid "Sir, the spy is waiting for your command"
+msgid "The spy is waiting for your command"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1664
Index: po/en_GB.po
===
--- po/en_GB.po (revision 14103)
+++ po/en_GB.po (working copy)
@@ -9556,11 +9556,11 @@
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:692 client/gui-win32/dialogs.c:1662
-msgid "Sir, the diplomat is waiting for your command"
+msgid "The diplomat is waiting for your command"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:693 client/gui-win32/dialogs.c:1663
-msgid "Sir, the spy is waiting for your command"
+msgid "The spy is waiting for your command"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1664
Index: po/no.po
===
--- po/no.po(revision 14103)
+++ po/no.po(working copy)
@@ -10352,11 +10352,13 @@
 msgstr "Vend om fiendtlig enhet"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:692 client/gui-win32/dialogs.c:1662
-msgid "Sir, the diplomat is waiting for your command"
+#, fuzzy
+msgid "The diplomat is waiting for your command"
 msgstr "Deres høyhet, diplomaten avventer deres ordre"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:693 client/gui-win32/dialogs.c:1663
-msgid "Sir, the spy is waiting for your command"
+#, fuzzy
+msgid "The spy is waiting for your command"
 msgstr "Deres høyhet, spionen avventer deres ordre"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1664
Index: po/hu.po
===
--- po/hu.po(revision 14103)
+++ po/hu.po(working copy)
@@ -10428,11 +10428,13 @@
 msgstr "Ellenséges egység átállítása"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:692 client/gui-win32/dialogs.c:1662
-msgid "Sir, the diplomat is waiting for your command"
+#, fuzzy
+msgid "The diplomat is waiting for your command"
 msgstr "Uram, a diploma

Re: [Freeciv-Dev] (PR#39909) BUG: leader gender ignored in diplomat/spy dialog

2007-11-28 Thread William Allen Simpson

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

Egor Vyscrebentsov wrote:
> What about
>Your majesty, ...
> and similar? (Seems to be a unisex form in all languages I know about.)
> Camrade for Communism makes the same thing.
> 
Your highness and excellency are also non-gender specific.  But what would
you do for Republic and Democracy?  Remembering history, the US Congress
argued for a long time (Adams favored "Excellency") before settling on the
simpler "Mr. President" -- but that won't work here

Once upon a time, the CDC Scope/Hustler operating system console said:

   "Yeah Master, what be thy bidding?"

That seemed fine -- until we had women in computer science.  There was one
in the year before me (the only woman in "The Soul of a New Machine"), and
several in my cohort.

Until somebody writes a nation-title-gender-address function, I'll just
remove the address.  Actually, it seems okay without the "flavor".



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


Re: [Freeciv-Dev] (PR#39909) BUG: leader gender ignored in diplomat/spy dialog

2007-11-28 Thread Egor Vyscrebentsov

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

On Wed, 28 Nov 2007 00:10:54 -0800 Jason Dorje Short wrote:

> Daniel Markstedt wrote:
> > Any reason the ruler titles can't be used as they are?
> >
> > "Prime Minister, ..."
> > "General, ..."
> > "Chief, ..."
> > etc.
>
>Queen, the diplomat is waiting for your command.
>
> Sounds very weird to me, worse than just removing the address.

Agree.

>Sire, the diplomat is waiting for your command.
> 
> ...is how it "should" be under monarchy.

What about
   Your majesty, ...
and similar? (Seems to be a unisex form in all languages I know about.)
Camrade for Communism makes the same thing.

-- 
Thanks, evyscr



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


Re: [Freeciv-Dev] (PR#39909) BUG: leader gender ignored in diplomat/spy dialog

2007-11-28 Thread Jason Dorje Short

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

Daniel Markstedt wrote:
> http://bugs.freeciv.org/Ticket/Display.html?id=39909 >
> 
> On 11/28/07, Jason Short <[EMAIL PROTECTED]> wrote:
>> http://bugs.freeciv.org/Ticket/Display.html?id=39909 >
>>
>>> [wsimpson - Sun Nov 25 18:14:27 2007]:
>>>
>>> "Sir, the diplomat is waiting for your command"
>>> "Sir, the spy is waiting for your command"
>> Problematic.
>>
>> Using Sir and Ma'am does not jive well with all governments.  But there
>> is no form-of-address identifier in the government ruleset to cover this
>> either.
>>
>> For 2.1 the best fix may just be removing the "Sir, " part (easily
>> adapted with PO files which become fuzzy).
>>
>> For the development branch maybe we should add such a field to the
>> governments.ruleset.  Sir/Ma'am, Sire/, Comrade/Comrade, etc.
>>
>> -jason
>>
> 
> Any reason the ruler titles can't be used as they are?
> 
> "Prime Minister, ..."
> "General, ..."
> "Chief, ..."
> etc.

   Queen, the diplomat is waiting for your command.

Sounds very weird to me, worse than just removing the address.

   Sire, the diplomat is waiting for your command.

...is how it "should" be under monarchy.

   The diplomat is waiting for your command.

...is a perfectly fine sentence, just lacking the flavor of the form of 
address.

-jason



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


Re: [Freeciv-Dev] (PR#39909) BUG: leader gender ignored in diplomat/spy dialog

2007-11-28 Thread Daniel Markstedt

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

On 11/28/07, Jason Short <[EMAIL PROTECTED]> wrote:
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39909 >
>
> > [wsimpson - Sun Nov 25 18:14:27 2007]:
> >
> > "Sir, the diplomat is waiting for your command"
> > "Sir, the spy is waiting for your command"
>
> Problematic.
>
> Using Sir and Ma'am does not jive well with all governments.  But there
> is no form-of-address identifier in the government ruleset to cover this
> either.
>
> For 2.1 the best fix may just be removing the "Sir, " part (easily
> adapted with PO files which become fuzzy).
>
> For the development branch maybe we should add such a field to the
> governments.ruleset.  Sir/Ma'am, Sire/, Comrade/Comrade, etc.
>
> -jason
>

Any reason the ruler titles can't be used as they are?

"Prime Minister, ..."
"General, ..."
"Chief, ..."
etc.

 ~Daniel



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


[Freeciv-Dev] (PR#39909) BUG: leader gender ignored in diplomat/spy dialog

2007-11-28 Thread Jason Short

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

> [wsimpson - Sun Nov 25 18:14:27 2007]:
> 
> "Sir, the diplomat is waiting for your command"
> "Sir, the spy is waiting for your command"

Problematic.

Using Sir and Ma'am does not jive well with all governments.  But there
is no form-of-address identifier in the government ruleset to cover this
either.

For 2.1 the best fix may just be removing the "Sir, " part (easily
adapted with PO files which become fuzzy).

For the development branch maybe we should add such a field to the
governments.ruleset.  Sir/Ma'am, Sire/, Comrade/Comrade, etc.

-jason


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


[Freeciv-Dev] (PR#39909) BUG: leader gender ignored in diplomat/spy dialog

2007-11-25 Thread William Allen Simpson

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

"Sir, the diplomat is waiting for your command"
"Sir, the spy is waiting for your command"



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