Author: cazfi
Date: Wed Mar 2 10:34:27 2016
New Revision: 32151
URL: http://svn.gna.org/viewcvs/freeciv?rev=32151&view=rev
Log:
Renamed translation domain 'freeciv' as 'freeciv-core'
See patch #7021
Added:
trunk/translations/core/
- copied from r32150, trunk/translations/freeciv/
Removed:
trunk/translations/freeciv/
Modified:
trunk/bootstrap/Makefile.am
trunk/configure.ac
trunk/translations/Makefile.am
trunk/translations/core/Makevars
trunk/translations/stats.sh
trunk/utility/fciconv.c
trunk/utility/shared.c
trunk/win32/installer/Makefile
trunk/win32/installer_msys2/Makefile
Modified: trunk/bootstrap/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/Makefile.am?rev=32151&r1=32150&r2=32151&view=diff
==============================================================================
--- trunk/bootstrap/Makefile.am (original)
+++ trunk/bootstrap/Makefile.am Wed Mar 2 10:34:27 2016
@@ -13,7 +13,7 @@
fc_gitrev_gen.h.tmpl \
generate_gitrev.sh \
generate_langstat.sh \
- langstat_freeciv.txt \
+ langstat_core.txt \
langstat_nations.txt \
langstat_ruledit.txt \
freeciv.desktop.in \
@@ -38,8 +38,8 @@
Makerules.mk \
langnames.txt
-langstat_freeciv.txt:
- "$(top_srcdir)/bootstrap/generate_langstat.sh" freeciv "$(top_srcdir)"
"$(top_builddir)"
+langstat_core.txt:
+ "$(top_srcdir)/bootstrap/generate_langstat.sh" core "$(top_srcdir)"
"$(top_builddir)"
langstat_nations.txt:
"$(top_srcdir)/bootstrap/generate_langstat.sh" nations "$(top_srcdir)"
"$(top_builddir)"
@@ -47,6 +47,6 @@
langstat_ruledit.txt:
"$(top_srcdir)/bootstrap/generate_langstat.sh" ruledit "$(top_srcdir)"
"$(top_builddir)"
-.PHONY: langstat_freeciv.txt langstat_nations.txt langstat_ruledit.txt
+.PHONY: langstat_core.txt langstat_nations.txt langstat_ruledit.txt
-MAINTAINERCLEANFILES = langstat_freeciv.txt langstat_nations.txt
langstat_ruledit.txt
+MAINTAINERCLEANFILES = langstat_core.txt langstat_nations.txt
langstat_ruledit.txt
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=32151&r1=32150&r2=32151&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Mar 2 10:34:27 2016
@@ -759,7 +759,7 @@
dnl HOST_PATH_SEPARATOR=$PATH_SEPARATOR
dnl fi
-dnl note this has to match the path installed by translations/freeciv/Makefile
+dnl note this has to match the path installed by translations/*/Makefile
if test x"$MINGW" != "xyes"; then
CPPFLAGS="$CPPFLAGS -DLOCALEDIR=\"\\\"$localedir\\\"\""
else
@@ -1623,7 +1623,7 @@
tools/ruledit/Makefile
gen_headers/Makefile
translations/Makefile
- translations/freeciv/Makefile.in
+ translations/core/Makefile.in
translations/nations/Makefile.in
translations/ruledit/Makefile.in
doc/Makefile
Modified: trunk/translations/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/translations/Makefile.am?rev=32151&r1=32150&r2=32151&view=diff
==============================================================================
--- trunk/translations/Makefile.am (original)
+++ trunk/translations/Makefile.am Wed Mar 2 10:34:27 2016
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = freeciv nations ruledit
+SUBDIRS = core nations ruledit
EXTRA_DIST = Strings.txt stats.sh
Modified: trunk/translations/core/Makevars
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/translations/core/Makevars?rev=32151&r1=32150&r2=32151&view=diff
==============================================================================
--- trunk/translations/core/Makevars (original)
+++ trunk/translations/core/Makevars Wed Mar 2 10:34:27 2016
@@ -1,10 +1,10 @@
# Makefile variables for PO directory in any package using GNU gettext.
# Usually the message domain is the same as the package name.
-DOMAIN = freeciv
+DOMAIN = freeciv-core
# These two variables depend on the location of this directory.
-subdir = translations/freeciv
+subdir = translations/core
top_builddir = ../..
# These options get passed to xgettext.
Modified: trunk/translations/stats.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/translations/stats.sh?rev=32151&r1=32150&r2=32151&view=diff
==============================================================================
--- trunk/translations/stats.sh (original)
+++ trunk/translations/stats.sh Wed Mar 2 10:34:27 2016
@@ -61,7 +61,7 @@
if test "x$1" != "x" && test "x$1" != "xall" ; then
DOMAINLIST="$1"
else
- DOMAINLIST="freeciv nations ruledit"
+ DOMAINLIST="core nations ruledit"
fi
for domain in $DOMAINLIST
Modified: trunk/utility/fciconv.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/fciconv.c?rev=32151&r1=32150&r2=32151&view=diff
==============================================================================
--- trunk/utility/fciconv.c (original)
+++ trunk/utility/fciconv.c Wed Mar 2 10:34:27 2016
@@ -117,7 +117,7 @@
}
#ifdef ENABLE_NLS
- bind_textdomain_codeset(PACKAGE, internal_encoding);
+ bind_textdomain_codeset("freeciv-core", internal_encoding);
#endif
#ifdef DEBUG
Modified: trunk/utility/shared.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/shared.c?rev=32151&r1=32150&r2=32151&view=diff
==============================================================================
--- trunk/utility/shared.c (original)
+++ trunk/utility/shared.c Wed Mar 2 10:34:27 2016
@@ -1551,8 +1551,8 @@
#endif /* WIN32_NATIVE */
(void) setlocale(LC_ALL, "");
- (void) bindtextdomain(PACKAGE, get_locale_dir());
- (void) textdomain(PACKAGE);
+ (void) bindtextdomain("freeciv-core", get_locale_dir());
+ (void) textdomain("freeciv-core");
/* Don't touch the defaults when LC_NUMERIC == "C".
This is intended to cater to the common case where:
Modified: trunk/win32/installer/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/Makefile?rev=32151&r1=32150&r2=32151&view=diff
==============================================================================
--- trunk/win32/installer/Makefile (original)
+++ trunk/win32/installer/Makefile Wed Mar 2 10:34:27 2016
@@ -60,8 +60,8 @@
cd build-$(GUI); ../../../configure CPPFLAGS="-D_WIN32_WINNT=0x0600"
--enable-client=$(GUI) --with-followtag="win32-S3_0" --enable-fcdb=sqlite3
--enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
# make
make -C build-$(GUI)
- make -C build-$(GUI)/translations/freeciv update-po
- make -C build-$(GUI)/bootstrap langstat_freeciv.txt
+ make -C build-$(GUI)/translations/core update-po
+ make -C build-$(GUI)/bootstrap langstat_core.txt
build-freeciv-ruledit:
# create build directory
Modified: trunk/win32/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=32151&r1=32150&r2=32151&view=diff
==============================================================================
--- trunk/win32/installer_msys2/Makefile (original)
+++ trunk/win32/installer_msys2/Makefile Wed Mar 2 10:34:27 2016
@@ -71,8 +71,8 @@
cd build-$(WINARCH)-$(GUI); ../../../configure
CPPFLAGS="-D_WIN32_WINNT=0x0600" --enable-client=$(GUI)
--with-followtag="win32-S3_0" --enable-fcdb=sqlite3 --without-readline
--disable-sdl-mixer --disable-nls --enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
# make
make -C build-$(WINARCH)-$(GUI)
- make -C build-$(WINARCH)-$(GUI)/translations/freeciv update-po
- make -C build-$(WINARCH)-$(GUI)/bootstrap langstat_freeciv.txt
+ make -C build-$(WINARCH)-$(GUI)/translations/core update-po
+ make -C build-$(WINARCH)-$(GUI)/bootstrap langstat_core.txt
build-freeciv-ruledit:
# create build directory
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
