[Freeciv-commits] r32698 - /branches/S2_6/server/settings.c
Author: cazfi
Date: Sat May 14 08:44:00 2016
New Revision: 32698
URL: http://svn.gna.org/viewcvs/freeciv?rev=32698&view=rev
Log:
Do not claim in server setting 'revolen' help that the value means number of
turns, as
the exact meaning depends on 'revolentype'
See bug #24656
Modified:
branches/S2_6/server/settings.c
Modified: branches/S2_6/server/settings.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/settings.c?rev=32698&r1=32697&r2=32698&view=diff
==
--- branches/S2_6/server/settings.c (original)
+++ branches/S2_6/server/settings.c Sat May 14 08:44:00 2016
@@ -2170,7 +2170,7 @@
GEN_INT("revolen", game.server.revolution_length,
SSET_RULES_FLEXIBLE, SSET_SOCIOLOGY, SSET_RARE, SSET_TO_CLIENT,
- N_("Length in turns of revolution"),
+ N_("Length of revolution"),
N_("When changing governments, a period of anarchy will occur. "
"Value of this setting, used the way 'revolentype' setting "
"dictates, defines the length of the anarchy."),
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32697 - /trunk/server/settings.c
Author: cazfi
Date: Sat May 14 08:43:51 2016
New Revision: 32697
URL: http://svn.gna.org/viewcvs/freeciv?rev=32697&view=rev
Log:
Do not claim in server setting 'revolen' help that the value means number of
turns, as
the exact meaning depends on 'revolentype'
See bug #24656
Modified:
trunk/server/settings.c
Modified: trunk/server/settings.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/settings.c?rev=32697&r1=32696&r2=32697&view=diff
==
--- trunk/server/settings.c (original)
+++ trunk/server/settings.c Sat May 14 08:43:51 2016
@@ -2217,7 +2217,7 @@
GEN_INT("revolen", game.server.revolution_length,
SSET_RULES_FLEXIBLE, SSET_SOCIOLOGY, SSET_RARE,
ALLOW_NONE, ALLOW_BASIC,
- N_("Length in turns of revolution"),
+ N_("Length of revolution"),
N_("When changing governments, a period of anarchy will occur. "
"Value of this setting, used the way 'revolentype' setting "
"dictates, defines the length of the anarchy."),
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32696 - in /trunk: configure.ac tools/Makefile.am tools/mpgui_gtk3.c
Author: cazfi
Date: Sat May 14 08:13:05 2016
New Revision: 32696
URL: http://svn.gna.org/viewcvs/freeciv?rev=32696&view=rev
Log:
Allow one to select gtk3x gui also to modpack installer.
See patch #7220
Modified:
trunk/configure.ac
trunk/tools/Makefile.am
trunk/tools/mpgui_gtk3.c
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=32696&r1=32695&r2=32696&view=diff
==
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sat May 14 08:13:05 2016
@@ -995,13 +995,14 @@
dnl freeciv-modpack checks
AC_ARG_ENABLE([fcmp],
- AS_HELP_STRING([--enable-fcmp=no/yes/gtk2/gtk3/qt/cli/all/auto], [build
freeciv-modpack-program [auto]]),
+ AS_HELP_STRING([--enable-fcmp=no/yes/gtk2/gtk3/gtk3x/qt/cli/all/auto],
[build freeciv-modpack-program [auto]]),
[fc_mp=${enableval}],
[fc_mp=auto])
fcmp_cli=no
fcmp_gtk2=no
fcmp_gtk3=no
+fcmp_gtk3x=no
fcmp_qt=no
fcmp_list=
@@ -1027,6 +1028,8 @@
test "x$mp" = "xgtk30" ||
test "x$mp" = "xgtk-3.0" ; then
req_fcmp_gtk3=yes
+elif test "x$mp" = "xgtk3x" ; then
+ req_fcmp_gtk3x=yes
elif test "x$mp" = "xqt" ; then
req_fcmp_qt=yes
elif test "x$mp" = "xcli" ; then
@@ -1065,6 +1068,34 @@
AC_MSG_ERROR([Cannot build gtk3-version of freeciv-modpack as requested])
fi
+if test "x$req_fcmp_gtk3x" = "xyes" ||
+ test "x$modinst" = "xall" || test "x$modinst" = "xauto" ; then
+ PKG_CHECK_MODULES([GTK3X_MP], [gtk+-3.0 >= 3.18.0],
+[
+ GTK3X_MP_CFLAGS="$GTK3X_MP_CFLAGS
-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_18"
+ GTK3X_MP_CFLAGS="$GTK3X_MP_CFLAGS
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46"
+ PKG_CHECK_MODULES([GTHREAD_GTK3X], [gthread-2.0],
+[
+ fcmp_gtk3x=yes
+ fcmp_list="$fcmp_list gtk3x"
+ mp_gtk3x_cflags="$GTK3X_MP_CFLAGS $GHTREAD_GTK3X_CFLAGS"
+ mp_gtk3x_libs="$GTK3X_MP_LIBS $GTHREAD_GTK3X_LIBS"
+ if test "x$MINGW32" = "xyes"; then
+dnl Required to compile gtk3 on Windows platform
+mp_gtk3x_cflags="$mp_gtk3x_cflags -mms-bitfields"
+mp_gtk3x_ldflags="$mp_gtk3x_ldflags -mwindows"
+ fi
+
+ if test "x$modinst" = "xauto" ; then
+modinst=found
+ fi
+], [])], [])
+fi
+
+if test "x$req_fcmp_gtk3x" = "xyes" && test "x$fcmp_gtk3x" != "xyes" ; then
+ AC_MSG_ERROR([Cannot build gtk3x-version of freeciv-modpack as requested])
+fi
+
if test "x$req_fcmp_gtk2" = "xyes" ||
test "x$modinst" = "xall" ; then
AM_PATH_GTK_2_0([2.12.0],
@@ -1127,6 +1158,7 @@
test "x$modinst" != "xno" &&
test "x$modinst" != "xcli" &&
test "x$fcmp_gtk3" != "xyes" &&
+ test "x$fcmp_gtk3x" != "xyes" &&
test "x$fcmp_gtk2" != "xyes" &&
test "x$fcmp_qt" != "xyes" ;then
AC_MSG_ERROR([Cannot build modpack installer with any gui])
@@ -1136,6 +1168,7 @@
dnl Hack to get a run-time icon -- not needed on Windows
mp_gtk2_cflags="$mp_gtk2_cflags
-DMPICON_PATH=\"\\\"$datadir/freeciv/misc/mpicon.png\\\"\""
mp_gtk3_cflags="$mp_gtk3_cflags
-DMPICON_PATH=\"\\\"$datadir/freeciv/misc/mpicon.png\\\"\""
+ mp_gtk3x_cflags="$mp_gtk3x_cflags
-DMPICON_PATH=\"\\\"$datadir/freeciv/misc/mpicon.png\\\"\""
fi
if test "x$fcmp_list" = "x" ; then
@@ -1144,6 +1177,7 @@
AM_CONDITIONAL([MODINST], [test "x$modinst" != "xno"])
AM_CONDITIONAL([MODINST_GTK3], [test "x$fcmp_gtk3" = "xyes"])
+AM_CONDITIONAL([MODINST_GTK3X], [test "x$fcmp_gtk3x" = "xyes"])
AM_CONDITIONAL([MODINST_GTK2], [test "x$fcmp_gtk2" = "xyes"])
AM_CONDITIONAL([MODINST_QT], [test "x$fcmp_qt" = "xyes"])
AM_CONDITIONAL([MODINST_CLI], [test "x$fcmp_cli" = "xyes"])
@@ -1211,6 +1245,9 @@
AC_SUBST([mp_gtk3_cflags])
AC_SUBST([mp_gtk3_libs])
AC_SUBST([mp_gtk3_ldflags])
+AC_SUBST([mp_gtk3x_cflags])
+AC_SUBST([mp_gtk3x_libs])
+AC_SUBST([mp_gtk3x_ldflags])
AC_SUBST([mp_qt_cppflags])
AC_SUBST([mp_qt_cxxflags])
AC_SUBST([mp_qt_libs])
Modified: trunk/tools/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/Makefile.am?rev=32696&r1=32695&r2=32696&view=diff
==
--- trunk/tools/Makefile.am (original)
+++ trunk/tools/Makefile.am Sat May 14 08:13:05 2016
@@ -28,6 +28,9 @@
endif
if MODINST_GTK3
bin_PROGRAMS += freeciv-mp-gtk3
+endif
+if MODINST_GTK3X
+bin_PROGRAMS += freeciv-mp-gtk3x
endif
if MODINST_QT
bin_PROGRAMS += freeciv-mp-qt
@@ -164,6 +167,28 @@
$(MPICON)
endif
+if MODINST_GTK3X
+freeciv_mp_gtk3x_CPPFLAGS = $(common_cppflags) $(mp_gtk3x_cflags) -DGTK3XMP
+
+# For the time being gtk3 gui sources are ok in respect to gtk3x
+# requirements - there's no deprecated functions used.
+# The only difference is in the name the binary prints out - that's what
+# -DGTK3XMP in the freeciv_mp_gtk3x_CPPFLAGS is for.
+# Instead of maintaining two files, use the same one until there
+# comes real reason to make them differ.
+freeciv_mp_gtk3x_SOURCES = mpgui_gtk3.c
+
+freeciv_mp_gtk3x_LDFLAGS = $(mp_gtk3x_ldflags)
+
+
[Freeciv-commits] r32695 - /trunk/translations/nations/fi.po
Author: mlinnaka Date: Sat May 14 06:40:39 2016 New Revision: 32695 URL: http://svn.gna.org/viewcvs/freeciv?rev=32695&view=rev Log: Some updates in Finnish translation, nations domain. Modified: trunk/translations/nations/fi.po Modified: trunk/translations/nations/fi.po URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/nations/fi.po?rev=32695&r1=32694&r2=32695&view=diff == --- trunk/translations/nations/fi.po(original) +++ trunk/translations/nations/fi.poSat May 14 06:40:39 2016 @@ -1,5 +1,5 @@ # Finnish translation for Freeciv -# Copyright (C) 2002-2003 2005-2009 2011-2012, 2014 +# Copyright (C) 2002-2003 2005-2009 2011-2012, 2014, 2016 # Sini Ruohomaa , # Markus Linnakangas , # Pekka Pessi , @@ -2992,11 +2992,11 @@ #: data/nation/burgundian.ruleset:3 msgid "Burgundian" -msgstr "burgundien" +msgstr "burgundilaisten" #: data/nation/burgundian.ruleset:4 msgid "?plural:Burgundians" -msgstr "burgundit" +msgstr "burgundilaiset" #: data/nation/burgundian.ruleset:6 msgid "" @@ -3037,12 +3037,10 @@ msgstr "Kansleri %s" #: data/nation/burgundic.ruleset:3 -#, fuzzy msgid "Burgundic" msgstr "burgundien" #: data/nation/burgundic.ruleset:4 -#, fuzzy msgid "?plural:Burgunds" msgstr "burgundit" @@ -3311,14 +3309,12 @@ msgstr "Amiraali %s" #: data/nation/carantanian.ruleset:3 -#, fuzzy msgid "Carantanian" -msgstr "karthagolaisten" +msgstr "karantanialaisten" #: data/nation/carantanian.ruleset:4 -#, fuzzy msgid "?plural:Carantanians" -msgstr "karthagolaiset" +msgstr "karantanialaiset" #: data/nation/carantanian.ruleset:6 msgid "" @@ -4432,14 +4428,12 @@ msgstr "Profeetta %s" #: data/nation/dacian.ruleset:3 -#, fuzzy msgid "Dacian" -msgstr "traakialaisten" +msgstr "daakialaisten" #: data/nation/dacian.ruleset:4 -#, fuzzy msgid "?plural:Dacians" -msgstr "traakialaiset" +msgstr "daakialaiset" #: data/nation/dacian.ruleset:6 msgid "" @@ -5108,12 +5102,11 @@ #: data/nation/formosan.ruleset:3 msgid "Formosan" -msgstr "" +msgstr "formosalaisten" #: data/nation/formosan.ruleset:4 -#, fuzzy msgid "?plural:Formosans" -msgstr "normannit" +msgstr "formosalaiset" #: data/nation/formosan.ruleset:7 #, no-c-format @@ -5424,12 +5417,11 @@ #: data/nation/gepid.ruleset:3 msgid "Gepid" -msgstr "" +msgstr "gepidien" #: data/nation/gepid.ruleset:4 -#, fuzzy msgid "?plural:Gepids" -msgstr "nepalilaiset" +msgstr "gepidit" #: data/nation/gepid.ruleset:6 msgid "" @@ -6520,14 +6512,12 @@ msgstr "Tuomari %s" #: data/nation/italiangreek.ruleset:3 -#, fuzzy msgid "Italian Greek" -msgstr "italialaisten" +msgstr "Italian kreikkalaisten" #: data/nation/italiangreek.ruleset:4 -#, fuzzy msgid "?plural:Italian Greeks" -msgstr "italialaiset" +msgstr "Italian kreikkalaiset" #: data/nation/italiangreek.ruleset:6 msgid "" @@ -6897,12 +6887,11 @@ #: data/nation/khoisan.ruleset:3 msgid "Khoisan" -msgstr "" +msgstr "khoisanien" #: data/nation/khoisan.ruleset:4 -#, fuzzy msgid "?plural:Khoisan" -msgstr "korealaiset" +msgstr "khoisanit" #: data/nation/khoisan.ruleset:6 msgid "" @@ -6995,12 +6984,11 @@ #: data/nation/komi.ruleset:3 msgid "Komi" -msgstr "" +msgstr "komien" #: data/nation/komi.ruleset:4 -#, fuzzy msgid "?plural:Komi" -msgstr "boijit" +msgstr "komit" #: data/nation/komi.ruleset:6 msgid "" @@ -7102,14 +7090,12 @@ "valtaa pitävät kurdit." #: data/nation/kushan.ruleset:3 -#, fuzzy msgid "Kushan" -msgstr "ašantien" +msgstr "kušanien" #: data/nation/kushan.ruleset:4 -#, fuzzy msgid "?plural:Kushans" -msgstr "shanit" +msgstr "kušanit" #: data/nation/kushan.ruleset:6 msgid "" @@ -7178,12 +7164,11 @@ #: data/nation/langobardic.ruleset:3 msgid "Langobardic" -msgstr "" +msgstr "langobardien" #: data/nation/langobardic.ruleset:4 -#, fuzzy msgid "?plural:Langobards" -msgstr "savoijilaiset" +msgstr "langobardit" #: data/nation/langobardic.ruleset:6 msgid "" @@ -7463,14 +7448,12 @@ "yhteydessä vuonna 1719." #: data/nation/ligurian.ruleset:3 -#, fuzzy msgid "Ligurian" -msgstr "liberialaisten" +msgstr "liguurien" #: data/nation/ligurian.ruleset:4 -#, fuzzy msgid "?plural:Ligurians" -msgstr "liburnialaiset" +msgstr "liguurit" #: data/nation/ligurian.ruleset:6 msgid "" @@ -7623,12 +7606,11 @@ #: data/nation/lycian.ruleset:3 msgid "Lycian" -msgstr "" +msgstr "lyykialaisten" #: data/nation/lycian.ruleset:4 -#, fuzzy msgid "?plural:Lycians" -msgstr "libyalaiset" +msgstr "lyykialaiset" #: data/nation/lycian.ruleset:6 msgid "" @@ -8029,14 +8011,12 @@ msgstr "Ylibramiini %s" #: data/nation/marshallese.ruleset:3 -#, fuzzy msgid "Marshallese" -msgstr "singaleesien" +msgstr "marshallinsaarelaisten" #: data/nation/marshallese.ruleset:4 -#, fuzzy msgid "?plural:Marshallese" -msgstr "maltalaiset" +msgstr "marshallinsaarelaiset" #: data/nation/marshallese.ruleset:6 msgid "" @@ -9037,12 +9017,11 @@ #:
[Freeciv-commits] r32694 - /branches/S2_6/translations/nations/fi.po
Author: mlinnaka Date: Fri May 13 23:12:28 2016 New Revision: 32694 URL: http://svn.gna.org/viewcvs/freeciv?rev=32694&view=rev Log: Some updates in Finnish translation, nations domain. Modified: branches/S2_6/translations/nations/fi.po Modified: branches/S2_6/translations/nations/fi.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/nations/fi.po?rev=32694&r1=32693&r2=32694&view=diff == --- branches/S2_6/translations/nations/fi.po(original) +++ branches/S2_6/translations/nations/fi.poFri May 13 23:12:28 2016 @@ -1,5 +1,5 @@ # Finnish translation for Freeciv -# Copyright (C) 2002-2003 2005-2009 2011-2012, 2014 +# Copyright (C) 2002-2003 2005-2009 2011-2012, 2014, 2016 # Sini Ruohomaa , # Markus Linnakangas , # Pekka Pessi , @@ -2992,11 +2992,11 @@ #: data/nation/burgundian.ruleset:3 msgid "Burgundian" -msgstr "burgundien" +msgstr "burgundilaisten" #: data/nation/burgundian.ruleset:4 msgid "?plural:Burgundians" -msgstr "burgundit" +msgstr "burgundilaiset" #: data/nation/burgundian.ruleset:6 msgid "" @@ -3037,12 +3037,10 @@ msgstr "Kansleri %s" #: data/nation/burgundic.ruleset:3 -#, fuzzy msgid "Burgundic" msgstr "burgundien" #: data/nation/burgundic.ruleset:4 -#, fuzzy msgid "?plural:Burgunds" msgstr "burgundit" @@ -3311,14 +3309,12 @@ msgstr "Amiraali %s" #: data/nation/carantanian.ruleset:3 -#, fuzzy msgid "Carantanian" -msgstr "karthagolaisten" +msgstr "karantanialaisten" #: data/nation/carantanian.ruleset:4 -#, fuzzy msgid "?plural:Carantanians" -msgstr "karthagolaiset" +msgstr "karantanialaiset" #: data/nation/carantanian.ruleset:6 msgid "" @@ -4432,14 +4428,12 @@ msgstr "Profeetta %s" #: data/nation/dacian.ruleset:3 -#, fuzzy msgid "Dacian" -msgstr "traakialaisten" +msgstr "daakialaisten" #: data/nation/dacian.ruleset:4 -#, fuzzy msgid "?plural:Dacians" -msgstr "traakialaiset" +msgstr "daakialaiset" #: data/nation/dacian.ruleset:6 msgid "" @@ -5108,12 +5102,11 @@ #: data/nation/formosan.ruleset:3 msgid "Formosan" -msgstr "" +msgstr "formosalaisten" #: data/nation/formosan.ruleset:4 -#, fuzzy msgid "?plural:Formosans" -msgstr "normannit" +msgstr "formosalaiset" #: data/nation/formosan.ruleset:7 #, no-c-format @@ -5424,12 +5417,11 @@ #: data/nation/gepid.ruleset:3 msgid "Gepid" -msgstr "" +msgstr "gepidien" #: data/nation/gepid.ruleset:4 -#, fuzzy msgid "?plural:Gepids" -msgstr "nepalilaiset" +msgstr "gepidit" #: data/nation/gepid.ruleset:6 msgid "" @@ -6520,14 +6512,12 @@ msgstr "Tuomari %s" #: data/nation/italiangreek.ruleset:3 -#, fuzzy msgid "Italian Greek" -msgstr "italialaisten" +msgstr "Italian kreikkalaisten" #: data/nation/italiangreek.ruleset:4 -#, fuzzy msgid "?plural:Italian Greeks" -msgstr "italialaiset" +msgstr "Italian kreikkalaiset" #: data/nation/italiangreek.ruleset:6 msgid "" @@ -6897,12 +6887,11 @@ #: data/nation/khoisan.ruleset:3 msgid "Khoisan" -msgstr "" +msgstr "khoisanien" #: data/nation/khoisan.ruleset:4 -#, fuzzy msgid "?plural:Khoisan" -msgstr "korealaiset" +msgstr "khoisanit" #: data/nation/khoisan.ruleset:6 msgid "" @@ -6995,12 +6984,11 @@ #: data/nation/komi.ruleset:3 msgid "Komi" -msgstr "" +msgstr "komien" #: data/nation/komi.ruleset:4 -#, fuzzy msgid "?plural:Komi" -msgstr "boijit" +msgstr "komit" #: data/nation/komi.ruleset:6 msgid "" @@ -7102,14 +7090,12 @@ "valtaa pitävät kurdit." #: data/nation/kushan.ruleset:3 -#, fuzzy msgid "Kushan" -msgstr "ašantien" +msgstr "kušanien" #: data/nation/kushan.ruleset:4 -#, fuzzy msgid "?plural:Kushans" -msgstr "shanit" +msgstr "kušanit" #: data/nation/kushan.ruleset:6 msgid "" @@ -7178,12 +7164,11 @@ #: data/nation/langobardic.ruleset:3 msgid "Langobardic" -msgstr "" +msgstr "langobardien" #: data/nation/langobardic.ruleset:4 -#, fuzzy msgid "?plural:Langobards" -msgstr "savoijilaiset" +msgstr "langobardit" #: data/nation/langobardic.ruleset:6 msgid "" @@ -7463,14 +7448,12 @@ "yhteydessä vuonna 1719." #: data/nation/ligurian.ruleset:3 -#, fuzzy msgid "Ligurian" -msgstr "liberialaisten" +msgstr "liguurien" #: data/nation/ligurian.ruleset:4 -#, fuzzy msgid "?plural:Ligurians" -msgstr "liburnialaiset" +msgstr "liguurit" #: data/nation/ligurian.ruleset:6 msgid "" @@ -7623,12 +7606,11 @@ #: data/nation/lycian.ruleset:3 msgid "Lycian" -msgstr "" +msgstr "lyykialaisten" #: data/nation/lycian.ruleset:4 -#, fuzzy msgid "?plural:Lycians" -msgstr "libyalaiset" +msgstr "lyykialaiset" #: data/nation/lycian.ruleset:6 msgid "" @@ -8029,14 +8011,12 @@ msgstr "Ylibramiini %s" #: data/nation/marshallese.ruleset:3 -#, fuzzy msgid "Marshallese" -msgstr "singaleesien" +msgstr "marshallinsaarelaisten" #: data/nation/marshallese.ruleset:4 -#, fuzzy msgid "?plural:Marshallese" -msgstr "maltalaiset" +msgstr "marshallinsaarelaiset" #: data/nation/marshallese.ruleset:6
[Freeciv-commits] r32693 - /branches/S2_4/po/ /branches/S2_5/translations/freeciv/ /branches/S2_5/translations/nations/ /branches/S2_6/transla...
Author: igx31 Date: Fri May 13 22:28:23 2016 New Revision: 32693 URL: http://svn.gna.org/viewcvs/freeciv?rev=32693&view=rev Log: Updated French translations Modified: branches/S2_4/po/fr.po branches/S2_5/translations/freeciv/fr.po branches/S2_5/translations/nations/fr.po branches/S2_6/translations/freeciv/fr.po branches/S2_6/translations/nations/fr.po branches/S2_6/translations/ruledit/fr.po trunk/translations/nations/fr.po trunk/translations/ruledit/fr.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_4/po/fr.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/po/fr.po?rev=32693&r1=32692&r2=32693&view=diff Modified: branches/S2_5/translations/freeciv/fr.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/fr.po?rev=32693&r1=32692&r2=32693&view=diff Modified: branches/S2_5/translations/nations/fr.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/nations/fr.po?rev=32693&r1=32692&r2=32693&view=diff Modified: branches/S2_6/translations/freeciv/fr.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/fr.po?rev=32693&r1=32692&r2=32693&view=diff Modified: branches/S2_6/translations/nations/fr.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/nations/fr.po?rev=32693&r1=32692&r2=32693&view=diff Modified: branches/S2_6/translations/ruledit/fr.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/ruledit/fr.po?rev=32693&r1=32692&r2=32693&view=diff Modified: trunk/translations/nations/fr.po URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/nations/fr.po?rev=32693&r1=32692&r2=32693&view=diff Modified: trunk/translations/ruledit/fr.po URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/ruledit/fr.po?rev=32693&r1=32692&r2=32693&view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32692 - /branches/S2_5/translations/nations/fi.po
Author: mlinnaka Date: Fri May 13 22:11:24 2016 New Revision: 32692 URL: http://svn.gna.org/viewcvs/freeciv?rev=32692&view=rev Log: Some updates in Finnish translation, nations domain. Modified: branches/S2_5/translations/nations/fi.po Modified: branches/S2_5/translations/nations/fi.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/nations/fi.po?rev=32692&r1=32691&r2=32692&view=diff == --- branches/S2_5/translations/nations/fi.po(original) +++ branches/S2_5/translations/nations/fi.poFri May 13 22:11:24 2016 @@ -1,5 +1,5 @@ # Finnish translation for Freeciv -# Copyright (C) 2002-2003 2005-2009 2011-2012, 2014 +# Copyright (C) 2002-2003 2005-2009 2011-2012, 2014, 2016 # Sini Ruohomaa , # Markus Linnakangas , # Pekka Pessi , @@ -2992,11 +2992,11 @@ #: data/nation/burgundian.ruleset:3 msgid "Burgundian" -msgstr "burgundien" +msgstr "burgundilaisten" #: data/nation/burgundian.ruleset:4 msgid "?plural:Burgundians" -msgstr "burgundit" +msgstr "burgundilaiset" #: data/nation/burgundian.ruleset:6 msgid "" @@ -3037,12 +3037,10 @@ msgstr "Kansleri %s" #: data/nation/burgundic.ruleset:3 -#, fuzzy msgid "Burgundic" msgstr "burgundien" #: data/nation/burgundic.ruleset:4 -#, fuzzy msgid "?plural:Burgunds" msgstr "burgundit" @@ -3311,14 +3309,12 @@ msgstr "Amiraali %s" #: data/nation/carantanian.ruleset:3 -#, fuzzy msgid "Carantanian" -msgstr "karthagolaisten" +msgstr "karantanialaisten" #: data/nation/carantanian.ruleset:4 -#, fuzzy msgid "?plural:Carantanians" -msgstr "karthagolaiset" +msgstr "karantanialaiset" #: data/nation/carantanian.ruleset:6 msgid "" @@ -4432,14 +4428,12 @@ msgstr "Profeetta %s" #: data/nation/dacian.ruleset:3 -#, fuzzy msgid "Dacian" -msgstr "traakialaisten" +msgstr "daakialaisten" #: data/nation/dacian.ruleset:4 -#, fuzzy msgid "?plural:Dacians" -msgstr "traakialaiset" +msgstr "daakialaiset" #: data/nation/dacian.ruleset:6 msgid "" @@ -5108,12 +5102,11 @@ #: data/nation/formosan.ruleset:3 msgid "Formosan" -msgstr "" +msgstr "formosalaisten" #: data/nation/formosan.ruleset:4 -#, fuzzy msgid "?plural:Formosans" -msgstr "normannit" +msgstr "formosalaiset" #: data/nation/formosan.ruleset:7 #, no-c-format @@ -5424,12 +5417,11 @@ #: data/nation/gepid.ruleset:3 msgid "Gepid" -msgstr "" +msgstr "gepidien" #: data/nation/gepid.ruleset:4 -#, fuzzy msgid "?plural:Gepids" -msgstr "nepalilaiset" +msgstr "gepidit" #: data/nation/gepid.ruleset:6 msgid "" @@ -6520,14 +6512,12 @@ msgstr "Tuomari %s" #: data/nation/italiangreek.ruleset:3 -#, fuzzy msgid "Italian Greek" -msgstr "italialaisten" +msgstr "Italian kreikkalaisten" #: data/nation/italiangreek.ruleset:4 -#, fuzzy msgid "?plural:Italian Greeks" -msgstr "italialaiset" +msgstr "Italian kreikkalaiset" #: data/nation/italiangreek.ruleset:6 msgid "" @@ -6897,12 +6887,11 @@ #: data/nation/khoisan.ruleset:3 msgid "Khoisan" -msgstr "" +msgstr "khoisanien" #: data/nation/khoisan.ruleset:4 -#, fuzzy msgid "?plural:Khoisan" -msgstr "korealaiset" +msgstr "khoisanit" #: data/nation/khoisan.ruleset:6 msgid "" @@ -6995,12 +6984,11 @@ #: data/nation/komi.ruleset:3 msgid "Komi" -msgstr "" +msgstr "komien" #: data/nation/komi.ruleset:4 -#, fuzzy msgid "?plural:Komi" -msgstr "boijit" +msgstr "komit" #: data/nation/komi.ruleset:6 msgid "" @@ -7102,14 +7090,12 @@ "valtaa pitävät kurdit." #: data/nation/kushan.ruleset:3 -#, fuzzy msgid "Kushan" -msgstr "ašantien" +msgstr "kušanien" #: data/nation/kushan.ruleset:4 -#, fuzzy msgid "?plural:Kushans" -msgstr "shanit" +msgstr "kušanit" #: data/nation/kushan.ruleset:6 msgid "" @@ -7178,12 +7164,11 @@ #: data/nation/langobardic.ruleset:3 msgid "Langobardic" -msgstr "" +msgstr "langobardien" #: data/nation/langobardic.ruleset:4 -#, fuzzy msgid "?plural:Langobards" -msgstr "savoijilaiset" +msgstr "langobardit" #: data/nation/langobardic.ruleset:6 msgid "" @@ -7463,14 +7448,12 @@ "yhteydessä vuonna 1719." #: data/nation/ligurian.ruleset:3 -#, fuzzy msgid "Ligurian" -msgstr "liberialaisten" +msgstr "liguurien" #: data/nation/ligurian.ruleset:4 -#, fuzzy msgid "?plural:Ligurians" -msgstr "liburnialaiset" +msgstr "liguurit" #: data/nation/ligurian.ruleset:6 msgid "" @@ -7623,12 +7606,11 @@ #: data/nation/lycian.ruleset:3 msgid "Lycian" -msgstr "" +msgstr "lyykialaisten" #: data/nation/lycian.ruleset:4 -#, fuzzy msgid "?plural:Lycians" -msgstr "libyalaiset" +msgstr "lyykialaiset" #: data/nation/lycian.ruleset:6 msgid "" @@ -8029,14 +8011,12 @@ msgstr "Ylibramiini %s" #: data/nation/marshallese.ruleset:3 -#, fuzzy msgid "Marshallese" -msgstr "singaleesien" +msgstr "marshallinsaarelaisten" #: data/nation/marshallese.ruleset:4 -#, fuzzy msgid "?plural:Marshallese" -msgstr "maltalaiset" +msgstr "marshallinsaarelaiset" #: data/nation/marshallese.ruleset:6
[Freeciv-commits] r32691 - /trunk/utility/netintf.c
Author: cazfi
Date: Fri May 13 21:55:48 2016
New Revision: 32691
URL: http://svn.gna.org/viewcvs/freeciv?rev=32691&view=rev
Log:
Fixed fc_inet_aton() to use inet_pton() when it should.
See bug #24661
Modified:
trunk/utility/netintf.c
Modified: trunk/utility/netintf.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/netintf.c?rev=32691&r1=32690&r2=32691&view=diff
==
--- trunk/utility/netintf.c (original)
+++ trunk/utility/netintf.c Fri May 13 21:55:48 2016
@@ -456,7 +456,7 @@
*/
bool fc_inet_aton(const char *cp, struct in_addr *inp, bool addr_none_ok)
{
-#ifdef IPV6_SUPPORT
+#ifdef FREECIV_IPV6_SUPPORT
/* Use inet_pton() */
if (!inet_pton(AF_INET, cp, &inp->s_addr)) {
return FALSE;
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32690 - /branches/S2_5/translations/freeciv/en_GB.po
Author: jtn Date: Fri May 13 21:26:12 2016 New Revision: 32690 URL: http://svn.gna.org/viewcvs/freeciv?rev=32690&view=rev Log: en_GB.po: translate "README.cma" as "README.governor" to work around bug #24650. Modified: branches/S2_5/translations/freeciv/en_GB.po Modified: branches/S2_5/translations/freeciv/en_GB.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/en_GB.po?rev=32690&r1=32689&r2=32690&view=diff == --- branches/S2_5/translations/freeciv/en_GB.po (original) +++ branches/S2_5/translations/freeciv/en_GB.po Fri May 13 21:26:12 2016 @@ -66,7 +66,7 @@ "Project-Id-Version: Freeciv 2.5.0\n" "Report-Msgid-Bugs-To: http://gna.org/projects/freeciv/\n"; "POT-Creation-Date: 2016-05-01 12:08+0100\n" -"PO-Revision-Date: 2016-05-01 12:09+0100\n" +"PO-Revision-Date: 2016-05-13 20:24+0100\n" "Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n" "Language-Team: \n" "Language: en_GB\n" @@ -2550,6 +2550,8 @@ msgid "Total Buy Cost: %d" msgstr "Total Buy Cost: %d" +# HACK: translate README.cma as README.governor to "fix" +# https://gna.org/bugs/?24650 without breaking string freeze. Remove soon! #: client/gui-gtk-2.0/cma_fe.c:256 client/gui-gtk-3.0/cma_fe.c:266 #: client/gui-xaw/cma_fe.c:83 msgid "" @@ -2561,7 +2563,7 @@ "For information on\n" "the citizen governor and governor presets,\n" "including sample presets,\n" -"see README.cma." +"see README.governor." #: client/gui-gtk-2.0/cma_fe.c:271 client/gui-gtk-3.0/cma_fe.c:281 msgid "Prese_ts:" @@ -27638,6 +27640,8 @@ "Use 'Game' --> 'Options' --> 'Save Settings' to store your presets " "permanently." +# HACK: translate README.cma as README.governor to "fix" +# https://gna.org/bugs/?24650 without breaking string freeze. Remove soon! #: data/helpdata.txt:1804 msgid "" "But beware! If you use the governor for some of your cities, you will " @@ -27650,7 +27654,7 @@ "encounter some difficulties with managing cities nearby, by hand. It's best " "to manage all cities on an island either by hand or by governor. Read more " "hints, some background information, and some preset examples in the file " -"README.cma, included with Freeciv." +"README.governor, included with Freeciv." #: data/helpdata.txt:1814 msgid "" ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32689 - /trunk/configure.ac
Author: cazfi
Date: Fri May 13 18:12:07 2016
New Revision: 32689
URL: http://svn.gna.org/viewcvs/freeciv?rev=32689&view=rev
Log:
Properly escape storage path on compiler commandline
See bug #24659
Modified:
trunk/configure.ac
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=32689&r1=32688&r2=32689&view=diff
==
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri May 13 18:12:07 2016
@@ -739,6 +739,7 @@
HOST_PATH_SEPARATOR=";"
HOST_DIR_SEPARATOR="\\"
+FREECIV_STORAGE_DIR_ESC=$(echo $FREECIV_STORAGE_DIR | $SED
's,/,,g')
FREECIV_STORAGE_DIR=$(echo $FREECIV_STORAGE_DIR | $SED 's,/,,g')
AC_DEFINE([FREECIV_SOCKET_ZERO_NOT_STDIN], [1], [Mingw-specific setting -
stdin])
@@ -1372,15 +1373,15 @@
FC_EXPAND_DIR(FREECIV_DATADIR, "$datadir/freeciv")
if test x"$MINGW" = xyes; then
- DEFAULT_SAVE_PATH=".;$FREECIV_STORAGE_DIRsaves"
+ DEFAULT_SAVE_PATH=".;${FREECIV_STORAGE_DIR_ESC}saves"
if test x$crosser = xyes ; then
-FC_CONF_PATH="../etc/freeciv"
-
DEFAULT_DATA_PATH=".;data;$FREECIV_STORAGE_DIR/$DATASUBDIR;$datadir/freeciv;../share/freeciv"
-
DEFAULT_SCENARIO_PATH=".;data/scenarios;$FREECIV_STORAGE_DIR/$DATASUBDIR/scenarios;$FREECIV_STORAGE_DIR/scenarios;$datadir/freeciv/scenarios;../share/freeciv/scenarios"
+FC_CONF_PATH="..etcfreeciv"
+
DEFAULT_DATA_PATH=".;data;${FREECIV_STORAGE_DIR_ESC}$DATASUBDIR;$datadirfreeciv;..sharefreeciv"
+
DEFAULT_SCENARIO_PATH=".;datascenarios;${FREECIV_STORAGE_DIR_ESC}$DATASUBDIRscenarios;${FREECIV_STORAGE_DIR_ESC}scenarios;$datadirfreecivscenarios;..sharefreecivscenarios"
else
FC_CONF_PATH="etcfreeciv"
-
DEFAULT_DATA_PATH=".;data;$FREECIV_STORAGE_DIR$DATASUBDIR;$datadirfreeciv"
-
DEFAULT_SCENARIO_PATH=".;datascenarios;$FREECIV_STORAGE_DIR$DATASUBDIRscenarios;$FREECIV_STORAGE_DIRscenarios;$datadirfreecivscenarios"
+
DEFAULT_DATA_PATH=".;data;${FREECIV_STORAGE_DIR_ESC}$DATASUBDIR;$datadirfreeciv"
+
DEFAULT_SCENARIO_PATH=".;datascenarios;${FREECIV_STORAGE_DIR_ESC}$DATASUBDIRscenarios;${FREECIV_STORAGE_DIR_ESC}scenarios;$datadirfreecivscenarios"
fi
else
FC_CONF_PATH="$sysconfdir/freeciv"
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32687 - in /branches/S2_6/client: gui-gtk-2.0/editprop.c gui-gtk-3.0/editprop.c
Author: cazfi
Date: Fri May 13 16:30:22 2016
New Revision: 32687
URL: http://svn.gna.org/viewcvs/freeciv?rev=32687&view=rev
Log:
Show "TRUE" and "FALSE" in their translated form when listing values of boolean
properties in the editor.
See bug #24660
Modified:
branches/S2_6/client/gui-gtk-2.0/editprop.c
branches/S2_6/client/gui-gtk-3.0/editprop.c
Modified: branches/S2_6/client/gui-gtk-2.0/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/editprop.c?rev=32687&r1=32686&r2=32687&view=diff
==
--- branches/S2_6/client/gui-gtk-2.0/editprop.c (original)
+++ branches/S2_6/client/gui-gtk-2.0/editprop.c Fri May 13 16:30:22 2016
@@ -1,4 +1,4 @@
-/**
+/***
Freeciv - Copyright (C) 2005 - The Freeciv Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2662,7 +2662,8 @@
case VALTYPE_INT:
return G_TYPE_INT;
case VALTYPE_BOOL:
-return G_TYPE_BOOLEAN;
+/* We want to show it as translated string, not as untranslated
G_TYPE_BOOLEAN */
+return G_TYPE_STRING;
case VALTYPE_STRING:
case VALTYPE_BUILT_ARRAY:
case VALTYPE_INVENTIONS_ARRAY:
@@ -5192,7 +5193,8 @@
gtk_list_store_set(store, iter, col_id, pv->data.v_int, -1);
break;
case VALTYPE_BOOL:
-gtk_list_store_set(store, iter, col_id, pv->data.v_bool, -1);
+/* Set as translated string, not as untranslated G_TYPE_BOOLEAN */
+gtk_list_store_set(store, iter, col_id, propval_as_string(pv), -1);
break;
case VALTYPE_STRING:
if (fc_strlcpy(buf, pv->data.v_string, 28) >= 28) {
Modified: branches/S2_6/client/gui-gtk-3.0/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/editprop.c?rev=32687&r1=32686&r2=32687&view=diff
==
--- branches/S2_6/client/gui-gtk-3.0/editprop.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/editprop.c Fri May 13 16:30:22 2016
@@ -1,4 +1,4 @@
-/**
+/***
Freeciv - Copyright (C) 2005 - The Freeciv Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2663,7 +2663,8 @@
case VALTYPE_INT:
return G_TYPE_INT;
case VALTYPE_BOOL:
-return G_TYPE_BOOLEAN;
+/* We want to show it as translated string, not as untranslated
G_TYPE_BOOLEAN */
+return G_TYPE_STRING;
case VALTYPE_STRING:
case VALTYPE_BUILT_ARRAY:
case VALTYPE_INVENTIONS_ARRAY:
@@ -5248,7 +5249,8 @@
gtk_list_store_set(store, iter, col_id, pv->data.v_int, -1);
break;
case VALTYPE_BOOL:
-gtk_list_store_set(store, iter, col_id, pv->data.v_bool, -1);
+/* Set as translated string, not as untranslated G_TYPE_BOOLEAN */
+gtk_list_store_set(store, iter, col_id, propval_as_string(pv), -1);
break;
case VALTYPE_STRING:
if (fc_strlcpy(buf, pv->data.v_string, 28) >= 28) {
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32688 - in /branches/S2_5/client: gui-gtk-2.0/editprop.c gui-gtk-3.0/editprop.c
Author: cazfi
Date: Fri May 13 16:30:30 2016
New Revision: 32688
URL: http://svn.gna.org/viewcvs/freeciv?rev=32688&view=rev
Log:
Show "TRUE" and "FALSE" in their translated form when listing values of boolean
properties in the editor.
See bug #24660
Modified:
branches/S2_5/client/gui-gtk-2.0/editprop.c
branches/S2_5/client/gui-gtk-3.0/editprop.c
Modified: branches/S2_5/client/gui-gtk-2.0/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-2.0/editprop.c?rev=32688&r1=32687&r2=32688&view=diff
==
--- branches/S2_5/client/gui-gtk-2.0/editprop.c (original)
+++ branches/S2_5/client/gui-gtk-2.0/editprop.c Fri May 13 16:30:30 2016
@@ -1,4 +1,4 @@
-/**
+/***
Freeciv - Copyright (C) 2005 - The Freeciv Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2557,7 +2557,8 @@
case VALTYPE_INT:
return G_TYPE_INT;
case VALTYPE_BOOL:
-return G_TYPE_BOOLEAN;
+/* We want to show it as translated string, not as untranslated
G_TYPE_BOOLEAN */
+return G_TYPE_STRING;
case VALTYPE_STRING:
case VALTYPE_BUILT_ARRAY:
case VALTYPE_INVENTIONS_ARRAY:
@@ -4147,7 +4148,7 @@
struct objprop *MY_op = objprop_new(ARG_id, ARG_name,\
ARG_flags, ARG_valtype, pp);\
objprop_hash_insert(pp->objprop_table, MY_op->id, MY_op);\
-} while (0)
+} while (FALSE)
switch (property_page_get_objtype(pp)) {
case OBJTYPE_TILE:
@@ -5003,7 +5004,8 @@
gtk_list_store_set(store, iter, col_id, pv->data.v_int, -1);
break;
case VALTYPE_BOOL:
-gtk_list_store_set(store, iter, col_id, pv->data.v_bool, -1);
+/* Set as translated string, not as untranslated G_TYPE_BOOLEAN */
+gtk_list_store_set(store, iter, col_id, propval_as_string(pv), -1);
break;
case VALTYPE_STRING:
if (fc_strlcpy(buf, pv->data.v_string, 28) >= 28) {
Modified: branches/S2_5/client/gui-gtk-3.0/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/editprop.c?rev=32688&r1=32687&r2=32688&view=diff
==
--- branches/S2_5/client/gui-gtk-3.0/editprop.c (original)
+++ branches/S2_5/client/gui-gtk-3.0/editprop.c Fri May 13 16:30:30 2016
@@ -1,4 +1,4 @@
-/**
+/***
Freeciv - Copyright (C) 2005 - The Freeciv Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2557,7 +2557,8 @@
case VALTYPE_INT:
return G_TYPE_INT;
case VALTYPE_BOOL:
-return G_TYPE_BOOLEAN;
+/* We want to show it as translated string, not as untranslated
G_TYPE_BOOLEAN */
+return G_TYPE_STRING;
case VALTYPE_STRING:
case VALTYPE_BUILT_ARRAY:
case VALTYPE_INVENTIONS_ARRAY:
@@ -4178,7 +4179,7 @@
struct objprop *MY_op = objprop_new(ARG_id, ARG_name,\
ARG_flags, ARG_valtype, pp);\
objprop_hash_insert(pp->objprop_table, MY_op->id, MY_op);\
-} while (0)
+} while (FALSE)
switch (property_page_get_objtype(pp)) {
case OBJTYPE_TILE:
@@ -5050,7 +5051,8 @@
gtk_list_store_set(store, iter, col_id, pv->data.v_int, -1);
break;
case VALTYPE_BOOL:
-gtk_list_store_set(store, iter, col_id, pv->data.v_bool, -1);
+/* Set as translated string, not as untranslated G_TYPE_BOOLEAN */
+gtk_list_store_set(store, iter, col_id, propval_as_string(pv), -1);
break;
case VALTYPE_STRING:
if (fc_strlcpy(buf, pv->data.v_string, 28) >= 28) {
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32686 - in /trunk/client: gui-gtk-2.0/editprop.c gui-gtk-3.0/editprop.c gui-gtk-3.x/editprop.c
Author: cazfi
Date: Fri May 13 16:30:13 2016
New Revision: 32686
URL: http://svn.gna.org/viewcvs/freeciv?rev=32686&view=rev
Log:
Show "TRUE" and "FALSE" in their translated form when listing values of boolean
properties in the editor.
See bug #24660
Modified:
trunk/client/gui-gtk-2.0/editprop.c
trunk/client/gui-gtk-3.0/editprop.c
trunk/client/gui-gtk-3.x/editprop.c
Modified: trunk/client/gui-gtk-2.0/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/editprop.c?rev=32686&r1=32685&r2=32686&view=diff
==
--- trunk/client/gui-gtk-2.0/editprop.c (original)
+++ trunk/client/gui-gtk-2.0/editprop.c Fri May 13 16:30:13 2016
@@ -1,4 +1,4 @@
-/**
+/***
Freeciv - Copyright (C) 2005 - The Freeciv Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2669,7 +2669,8 @@
case VALTYPE_INT:
return G_TYPE_INT;
case VALTYPE_BOOL:
-return G_TYPE_BOOLEAN;
+/* We want to show it as translated string, not as untranslated
G_TYPE_BOOLEAN */
+return G_TYPE_STRING;
case VALTYPE_STRING:
case VALTYPE_BUILT_ARRAY:
case VALTYPE_INVENTIONS_ARRAY:
@@ -5203,7 +5204,8 @@
gtk_list_store_set(store, iter, col_id, pv->data.v_int, -1);
break;
case VALTYPE_BOOL:
-gtk_list_store_set(store, iter, col_id, pv->data.v_bool, -1);
+/* Set as translated string, not as untranslated G_TYPE_BOOLEAN */
+gtk_list_store_set(store, iter, col_id, propval_as_string(pv), -1);
break;
case VALTYPE_STRING:
if (fc_strlcpy(buf, pv->data.v_string, 28) >= 28) {
Modified: trunk/client/gui-gtk-3.0/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/editprop.c?rev=32686&r1=32685&r2=32686&view=diff
==
--- trunk/client/gui-gtk-3.0/editprop.c (original)
+++ trunk/client/gui-gtk-3.0/editprop.c Fri May 13 16:30:13 2016
@@ -1,4 +1,4 @@
-/**
+/***
Freeciv - Copyright (C) 2005 - The Freeciv Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2670,7 +2670,8 @@
case VALTYPE_INT:
return G_TYPE_INT;
case VALTYPE_BOOL:
-return G_TYPE_BOOLEAN;
+/* We want to show it as translated string, not as untranslated
G_TYPE_BOOLEAN */
+return G_TYPE_STRING;
case VALTYPE_STRING:
case VALTYPE_BUILT_ARRAY:
case VALTYPE_INVENTIONS_ARRAY:
@@ -5259,7 +5260,8 @@
gtk_list_store_set(store, iter, col_id, pv->data.v_int, -1);
break;
case VALTYPE_BOOL:
-gtk_list_store_set(store, iter, col_id, pv->data.v_bool, -1);
+/* Set as translated string, not as untranslated G_TYPE_BOOLEAN */
+gtk_list_store_set(store, iter, col_id, propval_as_string(pv), -1);
break;
case VALTYPE_STRING:
if (fc_strlcpy(buf, pv->data.v_string, 28) >= 28) {
Modified: trunk/client/gui-gtk-3.x/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/editprop.c?rev=32686&r1=32685&r2=32686&view=diff
==
--- trunk/client/gui-gtk-3.x/editprop.c (original)
+++ trunk/client/gui-gtk-3.x/editprop.c Fri May 13 16:30:13 2016
@@ -1,4 +1,4 @@
-/**
+/***
Freeciv - Copyright (C) 2005 - The Freeciv Project
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2670,7 +2670,8 @@
case VALTYPE_INT:
return G_TYPE_INT;
case VALTYPE_BOOL:
-return G_TYPE_BOOLEAN;
+/* We want to show it as translated string, not as untranslated
G_TYPE_BOOLEAN */
+return G_TYPE_STRING;
case VALTYPE_STRING:
case VALTYPE_BUILT_ARRAY:
case VALTYPE_INVENTIONS_ARRAY:
@@ -5257,7 +5258,8 @@
gtk_list_store_set(store, iter, col_id, pv->data.v_int, -1);
break;
case VALTYPE_BOOL:
-gtk_list_store_set(store, iter, col_id, pv->data.v_bool, -1);
+/* Set as translated string, not as untranslated G_TYPE_BOOLEAN */
+gtk_list_store_set(store, iter, col_id, propval_as_string(pv), -1);
break;
case VALTYPE_STRING:
if (fc_strlcpy(buf, pv->data.v_string, 28) >= 28) {
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32685 - in /branches/S2_6: fc_version server/unithand.c
Author: sveinung
Date: Fri May 13 11:36:45 2016
New Revision: 32685
URL: http://svn.gna.org/viewcvs/freeciv?rev=32685&view=rev
Log:
protocol: specify when act prob is irrelevant.
Send the special action probability value ACTPROB_NA when no actprob should
exist.
See patch #7219
Modified:
branches/S2_6/fc_version
branches/S2_6/server/unithand.c
Modified: branches/S2_6/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/fc_version?rev=32685&r1=32684&r2=32685&view=diff
==
--- branches/S2_6/fc_version(original)
+++ branches/S2_6/fc_versionFri May 13 11:36:45 2016
@@ -55,7 +55,7 @@
# - Avoid adding a new mandatory capability to the development branch for
# as long as possible. We want to maintain network compatibility with
# the stable branch for as long as possible.
-NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2016.Apr.28"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2016.May.13"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
Modified: branches/S2_6/server/unithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/unithand.c?rev=32685&r1=32684&r2=32685&view=diff
==
--- branches/S2_6/server/unithand.c (original)
+++ branches/S2_6/server/unithand.c Fri May 13 11:36:45 2016
@@ -791,7 +791,8 @@
if (!target_tile || !actor_unit || !actor_player
|| actor_unit->owner != actor_player) {
action_iterate(act) {
- probabilities[act] = 0;
+ /* No probability can exist when the request is invalid. */
+ probabilities[act] = ACTPROB_NA;
} action_iterate_end;
dsend_packet_unit_actions(pc, actor_unit_id,
@@ -826,7 +827,7 @@
action_iterate(act) {
if (action_get_actor_kind(act) != AAK_UNIT) {
/* Not relevant. */
- probabilities[act] = ACTPROB_IMPOSSIBLE;
+ probabilities[act] = ACTPROB_NA;
continue;
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32684 - in /trunk: fc_version server/unithand.c
Author: sveinung
Date: Fri May 13 11:36:01 2016
New Revision: 32684
URL: http://svn.gna.org/viewcvs/freeciv?rev=32684&view=rev
Log:
protocol: specify when act prob is irrelevant.
Send the special action probability value ACTPROB_NA when no actprob should
exist.
See patch #7219
Modified:
trunk/fc_version
trunk/server/unithand.c
Modified: trunk/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=32684&r1=32683&r2=32684&view=diff
==
--- trunk/fc_version(original)
+++ trunk/fc_versionFri May 13 11:36:01 2016
@@ -55,7 +55,7 @@
# - Avoid adding a new mandatory capability to the development branch for
# as long as possible. We want to maintain network compatibility with
# the stable branch for as long as possible.
-NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2016.May.11"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2016.May.13"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
Modified: trunk/server/unithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/unithand.c?rev=32684&r1=32683&r2=32684&view=diff
==
--- trunk/server/unithand.c (original)
+++ trunk/server/unithand.c Fri May 13 11:36:01 2016
@@ -1131,7 +1131,8 @@
if (!target_tile || !actor_unit || !actor_player
|| actor_unit->owner != actor_player) {
action_iterate(act) {
- probabilities[act] = 0;
+ /* No probability can exist when the request is invalid. */
+ probabilities[act] = ACTPROB_NA;
} action_iterate_end;
dsend_packet_unit_actions(pc, actor_unit_id,
@@ -1166,7 +1167,7 @@
action_iterate(act) {
if (action_get_actor_kind(act) != AAK_UNIT) {
/* Not relevant. */
- probabilities[act] = ACTPROB_IMPOSSIBLE;
+ probabilities[act] = ACTPROB_NA;
continue;
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
