Merge lp:~unit193/xubuntu-docs/utopic into lp:xubuntu-docs/utopic

[Unit 193]

Attribute translators and do it in each Language's credits.

[lp:~unit193/xubuntu-docs/utopic]

211. By Pasi Lallinaho on 2014-07-01

Merging Unit193's branch to attribute translators per language correctly.

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-12 22:40:11 +0000
+++ debian/changelog	2014-07-01 20:27:45 +0000
@@ -3,9 +3,14 @@
   [ David Pires ]
   * Fix the printing chapter to remove a reference to a obsolete setting (LP: #1299743)
 
+  [ Pasi Lallinaho ]
   * Bump version to 14.10.
   * Fix broken startpage logo. (LP: #1310347)
 
+  [ Unit 193 ]
+  * scripts/translators.sh, desktop-guide/Makefile, desktop-guide/C/index.xml:
+    - Attribute translators in their own Language's credits.
+
  -- Pasi Lallinaho <[e-mail]>  Sun, 20 Apr 2014 22:12:01 +0300
 
 xubuntu-docs (14.04.1) trusty; urgency=medium

=== modified file 'desktop-guide/C/index.xml'
--- desktop-guide/C/index.xml	2014-02-17 23:32:54 +0000
+++ desktop-guide/C/index.xml	2014-07-01 20:27:45 +0000
@@ -31,6 +31,9 @@
 				<listitem><para>Jay van Cooten (skippersboss)</para></listitem> 
 			</itemizedlist>
 
+			<para>The contributors to this translation of the documentation are:</para>
+			<xi:include href="translators.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 			<para>The contributors to previous versions to this documentation are:</para>
 			<itemizedlist>
 				<listitem><para>Jim Campbell (jwcampbell)</para></listitem>

=== modified file 'desktop-guide/Makefile'
--- desktop-guide/Makefile	2014-03-15 11:56:14 +0000
+++ desktop-guide/Makefile	2014-07-01 20:27:45 +0000
@@ -15,6 +15,7 @@
 endif
 
 html: style
+	@echo "<para>Attributed on each language's page.</para>" > C/translators.xml
 	xsltproc --xinclude -o ../build/desktop-guide/index.html $(XUBUNTUXSL) C/index.xml
 
 style:
@@ -27,11 +28,11 @@
 translate:
 	../scripts/translate.sh $(OPTS); \
 	for dir in $(TRANSLATIONS); do \
-		xsltproc --xinclude -o ../build/$$dir/index.html $(XUBUNTUXSL) $$dir/index.xml && \
-		rm -rf $$dir/; \
+		../scripts/translators.sh -l $$dir > $$dir/translators.xml ;\
+		xsltproc --xinclude -o ../build/$$dir/index.html $(XUBUNTUXSL) $$dir/index.xml ;\
 	done
 
 clean:
-	${RM} -r $(TRANSLATIONS)
+	${RM} -r $(TRANSLATIONS) C/translators.xml
 
 .PHONY: html translate

=== modified file 'desktop-guide/po/desktop-guide.pot'
--- desktop-guide/po/desktop-guide.pot	2014-03-20 00:49:35 +0000
+++ desktop-guide/po/desktop-guide.pot	2014-07-01 20:27:45 +0000
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-20 02:49+0200\n"
+"POT-Creation-Date: 2014-07-01 16:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -762,7 +762,7 @@
 msgstr ""
 
 #: desktop-guide/C/printing-scanning.xml:63(para)
-msgid "If you do not have a network printer, but want your printer to be shared to other computers on your network, click <menuchoice><guimenu>Server</guimenu><guimenuitem>Settings</guimenuitem></menuchoice> from the <guilabel>Printers</guilabel> dialog, check the box <guilabel>Publish shared printers connected to this system</guilabel>, and then press <guibutton>OK</guibutton>. Other Linux/Ubuntu based systems need to have <guilabel>Show printers shared by other systems</guilabel> checked in the server settings dialog in order to access the printer."
+msgid "If you do not have a network printer, but want your printer to be shared to other computers on your network, click <menuchoice><guimenu>Server</guimenu><guimenuitem>Settings</guimenuitem></menuchoice> from the <guilabel>Printers</guilabel> dialog, check the box <guilabel>Publish shared printers connected to this system</guilabel>, and then press <guibutton>OK</guibutton>. Other computers running versions of Xubuntu later than 13.04 will automatically detect printers shared this way. Computers running Xubuntu versions prior to 13.10, or other Linux/Ubuntu-based systems, may need to enable a setting to show shared printers."
 msgstr ""
 
 #: desktop-guide/C/printing-scanning.xml:68(title)
@@ -1948,86 +1948,90 @@
 msgstr ""
 
 #: desktop-guide/C/index.xml:34(para)
+msgid "The contributors to this translation of the documentation are:"
+msgstr ""
+
+#: desktop-guide/C/index.xml:37(para)
 msgid "The contributors to previous versions to this documentation are:"
 msgstr ""
 
-#: desktop-guide/C/index.xml:36(para)
+#: desktop-guide/C/index.xml:39(para)
 msgid "Jim Campbell (jwcampbell)"
 msgstr ""
 
-#: desktop-guide/C/index.xml:37(para)
+#: desktop-guide/C/index.xml:40(para)
 msgid "Freddy Martinez (freddymartinez9)"
 msgstr ""
 
-#: desktop-guide/C/index.xml:38(para)
+#: desktop-guide/C/index.xml:41(para)
 msgid "Jan M. (fijam7)"
 msgstr ""
 
-#: desktop-guide/C/index.xml:39(para)
+#: desktop-guide/C/index.xml:42(para)
 msgid "Cody A.W. Somerville (cody-somerville)"
 msgstr ""
 
-#: desktop-guide/C/index.xml:40(para)
+#: desktop-guide/C/index.xml:43(para)
 msgid "Luzius Thöny (lucius-antonius)"
 msgstr ""
 
-#: desktop-guide/C/index.xml:43(para)
+#: desktop-guide/C/index.xml:46(para)
 msgid "This document is made available under the Creative Commons ShareAlike 2.5 License (CC-BY-SA)."
 msgstr ""
 
-#: desktop-guide/C/index.xml:44(para)
+#: desktop-guide/C/index.xml:47(para)
 msgid "You are free to modify, extend, and improve the Ubuntu documentation source code under the terms of this license. All derivative works must be released under this license."
 msgstr ""
 
-#: desktop-guide/C/index.xml:46(para)
+#: desktop-guide/C/index.xml:49(para)
 msgid "This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE AS DESCRIBED IN THE DISCLAIMER."
 msgstr ""
 
-#: desktop-guide/C/index.xml:49(para)
+#: desktop-guide/C/index.xml:52(para)
 msgid "A copy of the license is available here: <link linkend=\"cc-by-sa\">Creative Commons ShareAlike License</link>."
 msgstr ""
 
-#: desktop-guide/C/index.xml:50(para)
+#: desktop-guide/C/index.xml:53(para)
 msgid "All trademarks or registered trademarks are the property of the respective owners."
 msgstr ""
 
-#: desktop-guide/C/index.xml:54(year)
+#: desktop-guide/C/index.xml:57(year)
 msgid "2012"
 msgstr ""
 
-#: desktop-guide/C/index.xml:55(year)
+#: desktop-guide/C/index.xml:58(year)
 msgid "2013"
 msgstr ""
 
-#: desktop-guide/C/index.xml:56(year)
+#: desktop-guide/C/index.xml:59(year)
 msgid "2014"
 msgstr ""
 
-#: desktop-guide/C/index.xml:57(holder)
+#: desktop-guide/C/index.xml:60(holder)
 msgid "Canonical Ltd. and members of the Xubuntu Documentation team."
 msgstr ""
 
-#: desktop-guide/C/index.xml:61(publishername)
+#: desktop-guide/C/index.xml:64(publishername)
 msgid "The Ubuntu Documentation Project"
 msgstr ""
 
-#: desktop-guide/C/index.xml:64(title)
+#: desktop-guide/C/index.xml:67(title)
 msgid "Welcome!"
 msgstr ""
 
-#: desktop-guide/C/index.xml:66(para)
+#: desktop-guide/C/index.xml:69(para)
 msgid "This documentation provides documentation to the most common issues with Xubuntu, including:"
 msgstr ""
 
-#: desktop-guide/C/index.xml:71(para)
+#: desktop-guide/C/index.xml:74(para)
 msgid "In addition, this documentation has three quick guides:"
 msgstr ""
 
-#: desktop-guide/C/index.xml:77(para)
+#: desktop-guide/C/index.xml:80(para)
 msgid "The complete set of topics is listed below. If you require help with a topic or problem that is not addressed by the documentation, go to the <ulink url=\"http://xubuntu.org/help/\">Help &amp; Support</ulink> page of the Xubuntu website. There you will find links to additional help resources."
 msgstr ""
 
-#: desktop-guide/C/index.xml:79(para)
+#: desktop-guide/C/index.xml:82(para)
 msgid "If you would like to contribute to Xubuntu, including this documentation, see the <ulink url=\"http://xubuntu.org/contribute/\">Get Involved</ulink> section of the Xubuntu website."
 msgstr ""
 

=== added file 'scripts/translators.sh'
--- scripts/translators.sh	1970-01-01 00:00:00 +0000
+++ scripts/translators.sh	2014-07-01 20:27:45 +0000
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+CURDIR=$(pwd)/po/
+
+get_languages() {
+if [ "$generated" = yes ];then
+   languages=$(cat po/LINGUAS)
+elif [ -n $language ];then
+   languages=$language
+else
+   languages=$(basename -s.po $CURDIR/*.po)
+fi
+}
+
+build_creds() {
+#for lang in `basename -s.po *.po`;do  ## Good for testing, uses all translations it can find.
+echo "<itemizedlist>"
+for lang in $languages;do
+	mkdir -p $CURDIR/mo/$lang/LC_MESSAGES/
+	msgfmt -o $CURDIR/mo/$lang/LC_MESSAGES/xubuntu-docs.mo $CURDIR/$lang.po
+	TEXTDOMAINDIR=$CURDIR/mo/ LANGUAGE=$lang gettext -d xubuntu-docs -s 'translator-credits' | \
+		sed -e 's@^  @\t<listitem><para>@' -e '/launchpad.net/s@$@)</para></listitem>@' \
+		-e 's@https://launchpad.net/~@(@' -e /Launchpad\ Contributions/d -e /^translator-credits$/d
+done | sort | uniq
+echo "</itemizedlist>"
+rm -rf $CURDIR/mo/
+}
+
+grep_creds() {
+## Don't build, just grep.
+## This is incomplete and unused, potentially helpful later.
+for lang in $languages;do
+	echo  msggrep --msgid -F -e 'translator-credits' $lang.po
+done
+}
+
+while getopts ":gl:" Option
+do
+        case ${Option} in
+		g) generated=yes;;
+		l) language=${OPTARG};;
+		*) echo "Please specify an argument.";;
+	esac
+done
+
+get_languages
+build_creds