Permalink
Browse files

Merge branch 'bugfixes' into 3.1

  • Loading branch information...
automerge authored and cybersphinx committed Aug 31, 2012
2 parents 84baba8 + c3ba962 commit 23ab2996ebe28af867c7736f6a51392bab2db7f1
Showing with 15,297 additions and 30 deletions.
  1. +1 −1 autogen.sh
  2. +1 −1 configure.ac
  3. +3 −0 lib/framework/i18n.cpp
  4. +29 −0 macosx/Resources/wzlocal/el.lproj/InfoPlist.strings
  5. +7 −0 pkg/nsis/warzone2100.nsi
  6. +1 −0 po/LINGUAS
  7. +15,224 −0 po/el.po
  8. +26 −28 po/pl.po
  9. +5 −0 src/main.cpp
View
@@ -149,7 +149,7 @@ not_version ()
cd "$SRCDIR"
version_check 1 "autoconf" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 56 || DIE=1
-version_check 1 "automake" "ftp://ftp.gnu.org/pub/gnu/automake/" 1 10 || DIE=1
+version_check 1 "automake" "ftp://ftp.gnu.org/pub/gnu/automake/" 1 11 || DIE=1
if [ "$DIE" -eq 1 ]; then
exit 1
fi
View
@@ -1,7 +1,7 @@
AC_PREREQ([2.56])
AC_INIT([Warzone 2100],[3.1git],[http://wz2100.net/],[warzone2100])
-AM_INIT_AUTOMAKE([1.10 tar-ustar no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.11 tar-ustar no-dist-gzip dist-xz])
# Set to the default or stupid automake will use the much slower but useless -e(xtreme!!!) option.
AC_SUBST([XZ_OPT], ["-6"])
View
@@ -53,6 +53,7 @@
#define LANG_NAME_FRENCH "Français"
#define LANG_NAME_FRISIAN_NETHERLANDS "frysk"
#define LANG_NAME_GERMAN "Deutsch"
+#define LANG_NAME_GREEK "Ελληνικά"
#define LANG_NAME_HUNGARIAN "magyar"
#define LANG_NAME_IRISH "Imruagadh"
#define LANG_NAME_ITALIAN "Italiano"
@@ -95,6 +96,7 @@ static const struct
// { "cs", LANG_NAME_CZECH, LANG_CZECH, SUBLANG_DEFAULT },
// { "da", LANG_NAME_DANISH, LANG_DANISH, SUBLANG_DEFAULT },
{ "de", LANG_NAME_GERMAN, LANG_GERMAN, SUBLANG_GERMAN },
+ { "el", LANG_NAME_GREEK, LANG_GREEK, SUBLANG_DEFAULT },
{ "en", LANG_NAME_ENGLISH, LANG_ENGLISH, SUBLANG_DEFAULT },
{ "en_GB", LANG_NAME_ENGLISH_UK, LANG_ENGLISH, SUBLANG_ENGLISH_UK },
{ "es", LANG_NAME_SPANISH, LANG_SPANISH, SUBLANG_SPANISH },
@@ -156,6 +158,7 @@ static const struct
// { "cs_CZ", LANG_NAME_CZECH, "cs_CZ.UTF-8", "cs" },
// { "da", LANG_NAME_DANISH, "da_DK.UTF-8", "da_DK" },
{ "de", LANG_NAME_GERMAN, "de_DE.UTF-8", "de_DE" },
+ { "el_GR", LANG_NAME_GREEK, "el_GR.UTF-8", "el" },
{ "en", LANG_NAME_ENGLISH, "en_US.UTF-8", "en_US" },
{ "en_GB", LANG_NAME_ENGLISH_UK, "en_GB.UTF-8", "en_GB" },
{ "es", LANG_NAME_SPANISH, "es_ES.UTF-8", "es_ES" },
@@ -0,0 +1,29 @@
+/* Localized versions of Info.plist keys */
+
+/* Only change the strings after the '='; '\n' gives you a new line, do not use it in the CFBundleName or CFBundleDisplayName strings */
+
+
+/* Warzone */ /* Name in the menubar */
+CFBundleName = "Warzone";
+
+/* Warzone 2100 */ /* Name of the app bundle */
+CFBundleDisplayName = "Warzone 2100";
+
+/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
+NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
+
+
+/* Warzone 2100 Map / Mod File */ /* Description of .wz files */
+"Warzone 2100 Map / Mod File" = "Warzone 2100 Map / Mod File";
+
+/* Warzone 2100 Multiplayer Mod File */ /* Description of .mod.wz files */
+"Warzone 2100 Multiplayer Mod File" = "Warzone 2100 Multiplayer Mod File";
+
+/* Warzone 2100 Campaign Mod File */ /* Description of .cam.wz files */
+"Warzone 2100 Campaign Mod File" = "Warzone 2100 Campaign Mod File";
+
+/* Warzone 2100 Global Mod File */ /* Description of .gmod.wz files */
+"Warzone 2100 Global Mod File" = "Warzone 2100 Global Mod File";
+
+/* Warzone 2100 Music Mod File */ /* Description of .music.wz files */
+"Warzone 2100 Music Mod File" = "Warzone 2100 Music Mod File";
View
@@ -353,6 +353,9 @@ Section "-NLS files" SecNLS_files
SetOutPath "$INSTDIR\locale\de\LC_MESSAGES"
File "/oname=${PACKAGE}.mo" "${TOP_SRCDIR}\po\de.gmo"
+ SetOutPath "$INSTDIR\locale\el\LC_MESSAGES"
+ File "/oname=${PACKAGE}.mo" "${TOP_SRCDIR}\po\el.gmo"
+
SetOutPath "$INSTDIR\locale\en_GB\LC_MESSAGES"
File "/oname=${PACKAGE}.mo" "${TOP_SRCDIR}\po\en_GB.gmo"
@@ -785,6 +788,10 @@ Section "Uninstall"
RMDir "$INSTDIR\locale\de\LC_MESSAGES"
RMDir "$INSTDIR\locale\de"
+ Delete "$INSTDIR\locale\el\LC_MESSAGES\${PACKAGE}.mo"
+ RMDir "$INSTDIR\locale\el\LC_MESSAGES"
+ RMDir "$INSTDIR\locale\el"
+
Delete "$INSTDIR\locale\en_GB\LC_MESSAGES\${PACKAGE}.mo"
RMDir "$INSTDIR\locale\en_GB\LC_MESSAGES"
RMDir "$INSTDIR\locale\en_GB"
View
@@ -2,6 +2,7 @@ ca_ES
cs
da
de
+el
en_GB
es
et_EE
Oops, something went wrong.

0 comments on commit 23ab299

Please sign in to comment.