tx: simplify source (.pot) file generation

4 files changed, 14 insertions, 11 deletions

diff --git a/.tx/config b/.tx/config
index e9ee140..cada4cc 100644
--- a/.tx/config
+++ b/.tx/config
@@ -3,14 +3,14 @@ host = https://www.transifex.com
 
 [MATE.master--mate-user-guide]
 file_filter = po/<lang>.po
-source_file = po/mate-user-guide.pot
+source_file = mate-user-guide.pot
 source_lang = en
 type = PO
 minimum_perc = 2
 
 [MATE.master--mate-user-guide-content]
 file_filter = mate-user-guide/<lang>/<lang>.po
-source_file = mate-user-guide/mate-user-guide.pot
+source_file = mate-user-guide-content.pot
 source_lang = en
 type = PO
 minimum_perc = 2
diff --git a/makepot b/makepot
index 160890f..63248d3 100755
--- a/makepot
+++ b/makepot
@@ -1,7 +1,10 @@
 #! /bin/sh
 
 PACKAGE=mate-user-guide;
+PACKAGE_CONTENT=mate-user-guide-content;
 
+# normal translations for the package
 make -C po $PACKAGE.pot && mv po/$PACKAGE.pot .
 
-make -C $PACKAGE $PACKAGE.pot
+# translations for the quide itself
+make -C $PACKAGE $PACKAGE_CONTENT.pot && mv $PACKAGE/$PACKAGE_CONTENT.pot .
diff --git a/mate-user-guide/mate-user-guide.pot b/mate-user-guide-content.pot
index d99228e..00e98bf 100644
--- a/mate-user-guide/mate-user-guide.pot
+++ b/mate-user-guide-content.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-03-18 17:57+0100\n"
+"POT-Creation-Date: 2018-09-23 14:23+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -5709,7 +5709,6 @@ msgstr ""
 
 #. (itstool) path: figure/title
 #: C/goscaja.xml:600
-#: C/goscaja.xml:637
 msgid "The button bar."
 msgstr ""
 
@@ -5783,6 +5782,12 @@ msgstr ""
 msgid "By pressing <keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo> or selecting the <guibutton>Search</guibutton> toolbar button the search bar appears. For more information on searching see <xref linkend=\"caja-searching\"/>. The search bar is excellent for locating files of folders when you are not sure of their exact location."
 msgstr ""
 
+#. (itstool) path: figure/title
+#: C/goscaja.xml:637
+#: C/goscaja.xml:977
+msgid "The search bar."
+msgstr ""
+
 #. (itstool) path: imageobject/imagedata
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -6234,11 +6239,6 @@ msgstr ""
 msgid "The <application>Caja</application> file manager includes an easy and simple to use way search for your files and folders. To begin a search press <keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo> or select the <guibutton>Search</guibutton> toolbar button. The search bar should appear as in <xref linkend=\"goscaja-FIG-925\"/>"
 msgstr ""
 
-#. (itstool) path: figure/title
-#: C/goscaja.xml:977
-msgid "The search bar."
-msgstr ""
-
 #. (itstool) path: sect1/para
 #: C/goscaja.xml:989
 msgid "Enter characters present in the name or contents of the file or folder you wish to find and press <keycap>Enter</keycap>. The results of your search should appear in the view pane as illustrated in <xref linkend=\"goscaja-FIG-926\"/>"
diff --git a/mate-user-guide/Makefile.am b/mate-user-guide/Makefile.am
index ee08d21..0205869 100644
--- a/mate-user-guide/Makefile.am
+++ b/mate-user-guide/Makefile.am
@@ -1,6 +1,6 @@
 @YELP_HELP_RULES@
 
-HELP_ID = mate-user-guide
+HELP_ID = mate-user-guide-content
 HELP_FILES = index.docbook	\
 	legal.xml		\
 	gosbasic.xml		\