<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40685 >
Attached patch rephrases explanatory text in the function
text_happiness_units() for clarity and to avoid difficult
to translate sentence fragments.
-----------------------------------------------------------------------
粉々になりたくない！
commit 673b33072d0bb02c7c0202c2bd0ff4c620b726b0
Author: Madeline Book <madeline.b...@gmail.com>
Date: Tue Jan 27 15:46:20 2009 -0500
Fix sentence fragments.
Reported by: Sini Ruohomaa <sini.ruoho...@cs.helsinki.fi>
---
client/text.c | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/client/text.c b/client/text.c
index 9295f14..8f555f1 100644
--- a/client/text.c
+++ b/client/text.c
@@ -1263,7 +1263,6 @@ const char *text_happiness_cities(const struct city *pcity)
/****************************************************************************
Describing units that affect happiness.
- FIXME: sentence fragments with parenthesis are hard to translate!
****************************************************************************/
const char *text_happiness_units(const struct city *pcity)
{
@@ -1274,25 +1273,19 @@ const char *text_happiness_units(const struct city *pcity)
astr_clear(&str);
if (mlmax > 0) {
- astr_add_line(&str,
- /* TRANS: Martial law opening parenthesis */
- _("Martial law in effect ("));
-
+ int mleach = get_city_bonus(pcity, EFT_MARTIAL_LAW_EACH);
if (mlmax == 100) {
- astr_add(&str,
- /* TRANS: no [unit] maximum */
- _("no maximum, "));
+ astr_add_line(&str, "%s", _("Unlimited martial law in effect."));
} else {
- astr_add(&str,
- PL_("%d unit maximum, ",
- "%d units maximum, ",
- mlmax),
- mlmax);
+ astr_add_line(&str, PL_("%d military unit may impose martial law.",
+ "Up to %d military units may impose martial "
+ "law.", mlmax), mlmax);
}
- astr_add(&str,
- /* TRANS: Martial law closing parenthesis */
- _("%d per unit). "),
- get_city_bonus(pcity, EFT_MARTIAL_LAW_EACH));
+ astr_add_line(&str, PL_("Each military unit makes %d "
+ "unhappy citizen content.",
+ "Each military unit makes %d "
+ "unhappy citizens content.",
+ mleach), mleach);
} else if (uhcfac > 0) {
astr_add_line(&str,
_("Military units in the field may cause unhappiness. "));
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
