diff options
author | Dan McGee <dan@archlinux.org> | 2007-07-06 17:59:08 -0400 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2007-07-06 17:59:08 -0400 |
commit | 49f447d02c803e5a2f63582ce78cabb850ebfa89 (patch) | |
tree | f290940beeee03141474a3f5929a47d5dc3ce0a2 | |
parent | 15e1ce2e709e0a16dd54ea3b5eaab0003e32b62d (diff) |
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 <dan@archlinux.org>
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | lib/libalpm/alpm.c | 1 | ||||
-rw-r--r-- | po/.gitignore (renamed from src/pacman/po/.gitignore) | 0 | ||||
-rw-r--r-- | po/LINGUAS (renamed from src/pacman/po/LINGUAS) | 0 | ||||
-rw-r--r-- | po/Makefile.in.in (renamed from src/pacman/po/Makefile.in.in) | 0 | ||||
-rw-r--r-- | po/Makevars (renamed from src/pacman/po/Makevars) | 2 | ||||
-rw-r--r-- | po/POTFILES.in (renamed from src/pacman/po/POTFILES.in) | 10 | ||||
-rw-r--r-- | po/de.po (renamed from src/pacman/po/de.po) | 0 | ||||
-rw-r--r-- | po/en_GB.po (renamed from src/pacman/po/en_GB.po) | 0 | ||||
-rw-r--r-- | po/es.po (renamed from src/pacman/po/es.po) | 0 | ||||
-rw-r--r-- | po/fr.po (renamed from src/pacman/po/fr.po) | 0 | ||||
-rw-r--r-- | po/hu.po (renamed from src/pacman/po/hu.po) | 0 | ||||
-rw-r--r-- | po/it.po (renamed from src/pacman/po/it.po) | 0 | ||||
-rw-r--r-- | po/pacman.pot (renamed from src/pacman/po/pacman.pot) | 0 | ||||
-rw-r--r-- | po/pl_PL.po (renamed from src/pacman/po/pl_PL.po) | 0 | ||||
-rw-r--r-- | po/pt_BR.po (renamed from src/pacman/po/pt_BR.po) | 0 | ||||
-rw-r--r-- | po/remove-potcdate.sin (renamed from src/pacman/po/remove-potcdate.sin) | 0 | ||||
-rw-r--r-- | po/ru_RU.po (renamed from src/pacman/po/ru_RU.po) | 0 | ||||
-rw-r--r-- | src/pacman/Makefile.am | 2 |
20 files changed, 14 insertions, 7 deletions
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 index 50a7b2a4..50a7b2a4 100644 --- a/src/pacman/po/.gitignore +++ b/po/.gitignore diff --git a/src/pacman/po/LINGUAS b/po/LINGUAS index 8c249f79..8c249f79 100644 --- a/src/pacman/po/LINGUAS +++ b/po/LINGUAS diff --git a/src/pacman/po/Makefile.in.in b/po/Makefile.in.in index 6f2e2e94..6f2e2e94 100644 --- a/src/pacman/po/Makefile.in.in +++ b/po/Makefile.in.in diff --git a/src/pacman/po/Makevars b/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 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 index ba31362f..ba31362f 100644 --- a/src/pacman/po/de.po +++ b/po/de.po diff --git a/src/pacman/po/en_GB.po b/po/en_GB.po index e9995d80..e9995d80 100644 --- a/src/pacman/po/en_GB.po +++ b/po/en_GB.po diff --git a/src/pacman/po/es.po b/po/es.po index dc845c4d..dc845c4d 100644 --- a/src/pacman/po/es.po +++ b/po/es.po diff --git a/src/pacman/po/fr.po b/po/fr.po index 521282cd..521282cd 100644 --- a/src/pacman/po/fr.po +++ b/po/fr.po diff --git a/src/pacman/po/hu.po b/po/hu.po index a9edb3e1..a9edb3e1 100644 --- a/src/pacman/po/hu.po +++ b/po/hu.po diff --git a/src/pacman/po/it.po b/po/it.po index 8f6d508b..8f6d508b 100644 --- a/src/pacman/po/it.po +++ b/po/it.po diff --git a/src/pacman/po/pacman.pot b/po/pacman.pot index f9d28a40..f9d28a40 100644 --- a/src/pacman/po/pacman.pot +++ b/po/pacman.pot diff --git a/src/pacman/po/pl_PL.po b/po/pl_PL.po index 863b54b5..863b54b5 100644 --- a/src/pacman/po/pl_PL.po +++ b/po/pl_PL.po diff --git a/src/pacman/po/pt_BR.po b/po/pt_BR.po index 126058e1..126058e1 100644 --- a/src/pacman/po/pt_BR.po +++ b/po/pt_BR.po diff --git a/src/pacman/po/remove-potcdate.sin b/po/remove-potcdate.sin index 2436c49e..2436c49e 100644 --- a/src/pacman/po/remove-potcdate.sin +++ b/po/remove-potcdate.sin diff --git a/src/pacman/po/ru_RU.po b/po/ru_RU.po index 502c958d..502c958d 100644 --- a/src/pacman/po/ru_RU.po +++ b/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 |