From ee76417972b3a749a28a627c2858c09311d9c0c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 13 Jun 2014 17:30:40 +0200
Subject: Separate package description translations from string translations.

* po/packages/LINGUAS, po/packages/Makevars, po/packages/POTFILES.in:
  New files.
* po/guix/Makevars (DOMAIN): Change to "guix".
  (XGETTEXT_OPTIONS): Remove "--keyword=synopsis --keyword=description".
* po/guix/POTFILES.in: Remove gnu/packages/*.scm.
* configure.ac: Change to gettext 0.18.3.  Produce
  po/packages/Makefile.in.
* Makefile.am (SUBDIRS): Add po/packages.
* guix/ui.scm (%package-text-domain): New variable.
  (P_): New procedure.
  (package->recutils): Use 'P_' instead of '_'.
* guix/scripts/package.scm (find-packages-by-description): Use 'P_'
  instead of 'gettext'.
---
 po/guix/Makevars        |  6 ++----
 po/guix/POTFILES.in     |  5 +----
 po/packages/LINGUAS     |  4 ++++
 po/packages/Makevars    | 19 +++++++++++++++++++
 po/packages/POTFILES.in |  6 ++++++
 5 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 po/packages/LINGUAS
 create mode 100644 po/packages/Makevars
 create mode 100644 po/packages/POTFILES.in

(limited to 'po')

diff --git a/po/guix/Makevars b/po/guix/Makevars
index 3f85141efb..87bb438418 100644
--- a/po/guix/Makevars
+++ b/po/guix/Makevars
@@ -1,17 +1,15 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
-DOMAIN = $(PACKAGE)
+DOMAIN = guix
 
 subdir = po/guix
 top_builddir = ../..
 
 # These options get passed to xgettext.  We want to catch standard
-# gettext uses, package synopses and descriptions, and SRFI-35 error
-# condition messages.
+# gettext uses, and SRFI-35 error condition messages.
 XGETTEXT_OPTIONS =				\
   --language=Scheme --from-code=UTF-8		\
   --keyword=_ --keyword=N_			\
-  --keyword=synopsis --keyword=description	\
   --keyword=message
 
 COPYRIGHT_HOLDER = Ludovic Courtès
diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in
index ef864fe817..bf2d31306a 100644
--- a/po/guix/POTFILES.in
+++ b/po/guix/POTFILES.in
@@ -1,9 +1,6 @@
 # List of source files which contain translatable strings.
+# This should be source files of the various tools, and not package modules.
 gnu/packages.scm
-gnu/packages/base.scm
-gnu/packages/guile.scm
-gnu/packages/lout.scm
-gnu/packages/recutils.scm
 guix/scripts/build.scm
 guix/scripts/download.scm
 guix/scripts/package.scm
diff --git a/po/packages/LINGUAS b/po/packages/LINGUAS
new file mode 100644
index 0000000000..dcb16dfaa7
--- /dev/null
+++ b/po/packages/LINGUAS
@@ -0,0 +1,4 @@
+# Set of available languages.
+
+en@boldquot
+en@quot
diff --git a/po/packages/Makevars b/po/packages/Makevars
new file mode 100644
index 0000000000..1b4689b7c3
--- /dev/null
+++ b/po/packages/Makevars
@@ -0,0 +1,19 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# This domain contains only translations of package synopses and descriptions.
+DOMAIN = guix-packages
+
+subdir = po/packages
+top_builddir = ../..
+
+# These options get passed to xgettext.  We want to catch exclusively package
+# synopses and descriptions.
+XGETTEXT_OPTIONS =				\
+  --language=Scheme --from-code=UTF-8		\
+  --keyword=synopsis --keyword=description
+
+COPYRIGHT_HOLDER = Ludovic Courtès
+
+MSGID_BUGS_ADDRESS = ludo@gnu.org
+
+EXTRA_LOCALE_CATEGORIES =
diff --git a/po/packages/POTFILES.in b/po/packages/POTFILES.in
new file mode 100644
index 0000000000..43db1b2719
--- /dev/null
+++ b/po/packages/POTFILES.in
@@ -0,0 +1,6 @@
+# List of source files which contain translatable strings.  These should be
+# only package modules.  Strings of the tools are in 'po/guix'.
+gnu/packages/base.scm
+gnu/packages/guile.scm
+gnu/packages/lout.scm
+gnu/packages/recutils.scm
-- 
cgit v1.2.1