diff --git a/.tx/config b/.tx/config index 8d2f63b9..9e2054fb 100644 --- a/.tx/config +++ b/.tx/config @@ -2,7 +2,6 @@ host = https://www.transifex.net [sparkleshare.UI] -file_filter = po/.po -source_file = po/sparkleshare.pot +file_filter = SparkleShare/Common/Translations/.po +source_file = SparkleShare/Common/Translations/sparkleshare.pot source_lang = en - diff --git a/Makefile.am b/Makefile.am index b65969d4..9c482e69 100755 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -basedirs = build SparkleLib SparkleLib/Git po +basedirs = build SparkleLib SparkleLib/Git SUBDIRS = $(basedirs) $(GUISUBDIRS) DIST_SUBDIRS = $(basedirs) SparkleShare diff --git a/SparkleShare/Common/Plugins/Makefile.am b/SparkleShare/Common/Plugins/Makefile.am index a699d79d..c0085e2f 100644 --- a/SparkleShare/Common/Plugins/Makefile.am +++ b/SparkleShare/Common/Plugins/Makefile.am @@ -15,7 +15,7 @@ dist_plugins_DATA = \ ssnet.png \ own-server.png -@INTLTOOL_XML_RULE@ +#@INTLTOOL_XML_RULE@ pluginsdir = $(pkgdatadir)/plugins/ diff --git a/autogen.sh b/autogen.sh index b220e638..1e691c69 100755 --- a/autogen.sh +++ b/autogen.sh @@ -61,10 +61,10 @@ check_autotool_version aclocal 1.9 check_autotool_version automake 1.9 check_autotool_version autoconf 2.53 check_autotool_version $LIBTOOLIZE 1.4.3 -check_autotool_version intltoolize 0.35.0 +#check_autotool_version intltoolize 0.35.0 check_autotool_version pkg-config 0.14.0 -run intltoolize --force --copy +#run intltoolize --force --copy run $LIBTOOLIZE --force --copy --automake run aclocal -I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS run autoconf diff --git a/configure.ac b/configure.ac index e3df6938..9069dbac 100755 --- a/configure.ac +++ b/configure.ac @@ -21,12 +21,6 @@ fi AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave \${ACLOCAL_FLAGS}"]) -dnl i18n -IT_PROG_INTLTOOL([0.40.6]) -GETTEXT_PACKAGE=sparkleshare -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) - SHAMROCK_EXPAND_LIBDIR SHAMROCK_EXPAND_BINDIR SHAMROCK_EXPAND_DATADIR @@ -158,7 +152,6 @@ SparkleShare/Linux/Nautilus/Makefile SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py SparkleShare/Makefile -po/Makefile.in Makefile ])