From 49f447d02c803e5a2f63582ce78cabb850ebfa89 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 6 Jul 2007 17:59:08 -0400 Subject: [PATCH] First step of moving translations from src/pacman/po to po/ Move the translations from src/pacman/po to just po/ so we can include the scripts gettext translations in the same message catalog as that of the pacman frontend. The libalpm message catalog, for now, will remain a separate existence. Signed-off-by: Dan McGee --- Makefile.am | 4 +--- configure.ac | 2 +- lib/libalpm/alpm.c | 1 + {src/pacman/po => po}/.gitignore | 0 {src/pacman/po => po}/LINGUAS | 0 {src/pacman/po => po}/Makefile.in.in | 0 {src/pacman/po => po}/Makevars | 2 +- {src/pacman/po => po}/POTFILES.in | 10 ++++++++++ {src/pacman/po => po}/de.po | 0 {src/pacman/po => po}/en_GB.po | 0 {src/pacman/po => po}/es.po | 0 {src/pacman/po => po}/fr.po | 0 {src/pacman/po => po}/hu.po | 0 {src/pacman/po => po}/it.po | 0 {src/pacman/po => po}/pacman.pot | 0 {src/pacman/po => po}/pl_PL.po | 0 {src/pacman/po => po}/pt_BR.po | 0 {src/pacman/po => po}/remove-potcdate.sin | 0 {src/pacman/po => po}/ru_RU.po | 0 src/pacman/Makefile.am | 2 -- 20 files changed, 14 insertions(+), 7 deletions(-) rename {src/pacman/po => po}/.gitignore (100%) rename {src/pacman/po => po}/LINGUAS (100%) rename {src/pacman/po => po}/Makefile.in.in (100%) rename {src/pacman/po => po}/Makevars (97%) rename {src/pacman/po => po}/POTFILES.in (53%) rename {src/pacman/po => po}/de.po (100%) rename {src/pacman/po => po}/en_GB.po (100%) rename {src/pacman/po => po}/es.po (100%) rename {src/pacman/po => po}/fr.po (100%) rename {src/pacman/po => po}/hu.po (100%) rename {src/pacman/po => po}/it.po (100%) rename {src/pacman/po => po}/pacman.pot (100%) rename {src/pacman/po => po}/pl_PL.po (100%) rename {src/pacman/po => po}/pt_BR.po (100%) rename {src/pacman/po => po}/remove-potcdate.sin (100%) rename {src/pacman/po => po}/ru_RU.po (100%) diff --git a/Makefile.am b/Makefile.am index 3b8a0c35..039e2fbe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,4 @@ -SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc pactest contrib - -#DISTCHECK_CONFIGURE_FLAGS = --disable-fakeroot +SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc po pactest contrib # Some files automatically included, so they aren't specified below: # AUTHORS, COPYING, NEWS, README diff --git a/configure.ac b/configure.ac index 24d7219b..9a439346 100644 --- a/configure.ac +++ b/configure.ac @@ -233,13 +233,13 @@ AC_CONFIG_FILES([ lib/libalpm/Makefile lib/libalpm/po/Makefile.in src/pacman/Makefile -src/pacman/po/Makefile.in src/util/Makefile scripts/Makefile doc/Makefile etc/Makefile etc/pacman.d/Makefile etc/abs/Makefile +po/Makefile.in pactest/Makefile contrib/Makefile Makefile diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index dc5ab649..11d00d4d 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -52,6 +52,7 @@ int SYMEXPORT alpm_initialize(void) if(handle == NULL) { RET_ERR(PM_ERR_MEMORY, -1); } + bindtextdomain("libalpm", LOCALEDIR); return(0); } diff --git a/src/pacman/po/.gitignore b/po/.gitignore similarity index 100% rename from src/pacman/po/.gitignore rename to po/.gitignore diff --git a/src/pacman/po/LINGUAS b/po/LINGUAS similarity index 100% rename from src/pacman/po/LINGUAS rename to po/LINGUAS diff --git a/src/pacman/po/Makefile.in.in b/po/Makefile.in.in similarity index 100% rename from src/pacman/po/Makefile.in.in rename to po/Makefile.in.in diff --git a/src/pacman/po/Makevars b/po/Makevars similarity index 97% rename from src/pacman/po/Makevars rename to po/Makevars index dd4e84b4..94d8294a 100644 --- a/src/pacman/po/Makevars +++ b/po/Makevars @@ -5,7 +5,7 @@ DOMAIN = pacman # These two variables depend on the location of this directory. subdir = po -top_builddir = ../../../ +top_builddir = ../ # These options get passed to xgettext. XGETTEXT_OPTIONS = \ diff --git a/src/pacman/po/POTFILES.in b/po/POTFILES.in similarity index 53% rename from src/pacman/po/POTFILES.in rename to po/POTFILES.in index 8e48b826..841240b9 100644 --- a/src/pacman/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,6 @@ # List of source files with translatable strings +# pacman frontend source files src/pacman/add.c src/pacman/callback.c src/pacman/conf.c @@ -10,3 +11,12 @@ src/pacman/query.c src/pacman/remove.c src/pacman/sync.c src/pacman/util.c + +# scripts with gettext translations +scripts/abs.in +scripts/gensync.in +scripts/makepkg.in +scripts/pacman-optimize.in +scripts/repo-add.in +scripts/repo-remove.in +scripts/updatesync.in diff --git a/src/pacman/po/de.po b/po/de.po similarity index 100% rename from src/pacman/po/de.po rename to po/de.po diff --git a/src/pacman/po/en_GB.po b/po/en_GB.po similarity index 100% rename from src/pacman/po/en_GB.po rename to po/en_GB.po diff --git a/src/pacman/po/es.po b/po/es.po similarity index 100% rename from src/pacman/po/es.po rename to po/es.po diff --git a/src/pacman/po/fr.po b/po/fr.po similarity index 100% rename from src/pacman/po/fr.po rename to po/fr.po diff --git a/src/pacman/po/hu.po b/po/hu.po similarity index 100% rename from src/pacman/po/hu.po rename to po/hu.po diff --git a/src/pacman/po/it.po b/po/it.po similarity index 100% rename from src/pacman/po/it.po rename to po/it.po diff --git a/src/pacman/po/pacman.pot b/po/pacman.pot similarity index 100% rename from src/pacman/po/pacman.pot rename to po/pacman.pot diff --git a/src/pacman/po/pl_PL.po b/po/pl_PL.po similarity index 100% rename from src/pacman/po/pl_PL.po rename to po/pl_PL.po diff --git a/src/pacman/po/pt_BR.po b/po/pt_BR.po similarity index 100% rename from src/pacman/po/pt_BR.po rename to po/pt_BR.po diff --git a/src/pacman/po/remove-potcdate.sin b/po/remove-potcdate.sin similarity index 100% rename from src/pacman/po/remove-potcdate.sin rename to po/remove-potcdate.sin diff --git a/src/pacman/po/ru_RU.po b/po/ru_RU.po similarity index 100% rename from src/pacman/po/ru_RU.po rename to po/ru_RU.po diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 39e65920..589ac63c 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS = po - # paths set at make time conffile = ${sysconfdir}/pacman.conf