Merge lp:~unit193/xubuntu-docs/utopic into lp:xubuntu-docs/utopic
- utopic
- Merge into utopic
Proposed by
Unit 193
Status: | Merged |
---|---|
Merged at revision: | 211 |
Proposed branch: | lp:~unit193/xubuntu-docs/utopic |
Merge into: | lp:xubuntu-docs/utopic |
Diff against target: |
244 lines (+85/-25) 5 files modified
debian/changelog (+5/-0) desktop-guide/C/index.xml (+3/-0) desktop-guide/Makefile (+4/-3) desktop-guide/po/desktop-guide.pot (+26/-22) scripts/translators.sh (+47/-0) |
To merge this branch: | bzr merge lp:~unit193/xubuntu-docs/utopic |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Pasi Lallinaho | Pending | ||
Review via email: mp+225229@code.launchpad.net |
Commit message
Description of the change
Attribute translators and do it in each Language's credits.
To post a comment you must log in.
lp:~unit193/xubuntu-docs/utopic
updated
- 211. By Pasi Lallinaho
-
Merging Unit193's branch to attribute translators per language correctly.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' | |||
2 | --- debian/changelog 2014-06-12 22:40:11 +0000 | |||
3 | +++ debian/changelog 2014-07-01 20:27:45 +0000 | |||
4 | @@ -3,9 +3,14 @@ | |||
5 | 3 | [ David Pires ] | 3 | [ David Pires ] |
6 | 4 | * Fix the printing chapter to remove a reference to a obsolete setting (LP: #1299743) | 4 | * Fix the printing chapter to remove a reference to a obsolete setting (LP: #1299743) |
7 | 5 | 5 | ||
8 | 6 | [ Pasi Lallinaho ] | ||
9 | 6 | * Bump version to 14.10. | 7 | * Bump version to 14.10. |
10 | 7 | * Fix broken startpage logo. (LP: #1310347) | 8 | * Fix broken startpage logo. (LP: #1310347) |
11 | 8 | 9 | ||
12 | 10 | [ Unit 193 ] | ||
13 | 11 | * scripts/translators.sh, desktop-guide/Makefile, desktop-guide/C/index.xml: | ||
14 | 12 | - Attribute translators in their own Language's credits. | ||
15 | 13 | |||
16 | 9 | -- Pasi Lallinaho <pasi@shimmerproject.org> Sun, 20 Apr 2014 22:12:01 +0300 | 14 | -- Pasi Lallinaho <pasi@shimmerproject.org> Sun, 20 Apr 2014 22:12:01 +0300 |
17 | 10 | 15 | ||
18 | 11 | xubuntu-docs (14.04.1) trusty; urgency=medium | 16 | xubuntu-docs (14.04.1) trusty; urgency=medium |
19 | 12 | 17 | ||
20 | === modified file 'desktop-guide/C/index.xml' | |||
21 | --- desktop-guide/C/index.xml 2014-02-17 23:32:54 +0000 | |||
22 | +++ desktop-guide/C/index.xml 2014-07-01 20:27:45 +0000 | |||
23 | @@ -31,6 +31,9 @@ | |||
24 | 31 | <listitem><para>Jay van Cooten (skippersboss)</para></listitem> | 31 | <listitem><para>Jay van Cooten (skippersboss)</para></listitem> |
25 | 32 | </itemizedlist> | 32 | </itemizedlist> |
26 | 33 | 33 | ||
27 | 34 | <para>The contributors to this translation of the documentation are:</para> | ||
28 | 35 | <xi:include href="translators.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> | ||
29 | 36 | |||
30 | 34 | <para>The contributors to previous versions to this documentation are:</para> | 37 | <para>The contributors to previous versions to this documentation are:</para> |
31 | 35 | <itemizedlist> | 38 | <itemizedlist> |
32 | 36 | <listitem><para>Jim Campbell (jwcampbell)</para></listitem> | 39 | <listitem><para>Jim Campbell (jwcampbell)</para></listitem> |
33 | 37 | 40 | ||
34 | === modified file 'desktop-guide/Makefile' | |||
35 | --- desktop-guide/Makefile 2014-03-15 11:56:14 +0000 | |||
36 | +++ desktop-guide/Makefile 2014-07-01 20:27:45 +0000 | |||
37 | @@ -15,6 +15,7 @@ | |||
38 | 15 | endif | 15 | endif |
39 | 16 | 16 | ||
40 | 17 | html: style | 17 | html: style |
41 | 18 | @echo "<para>Attributed on each language's page.</para>" > C/translators.xml | ||
42 | 18 | xsltproc --xinclude -o ../build/desktop-guide/index.html $(XUBUNTUXSL) C/index.xml | 19 | xsltproc --xinclude -o ../build/desktop-guide/index.html $(XUBUNTUXSL) C/index.xml |
43 | 19 | 20 | ||
44 | 20 | style: | 21 | style: |
45 | @@ -27,11 +28,11 @@ | |||
46 | 27 | translate: | 28 | translate: |
47 | 28 | ../scripts/translate.sh $(OPTS); \ | 29 | ../scripts/translate.sh $(OPTS); \ |
48 | 29 | for dir in $(TRANSLATIONS); do \ | 30 | for dir in $(TRANSLATIONS); do \ |
51 | 30 | xsltproc --xinclude -o ../build/$$dir/index.html $(XUBUNTUXSL) $$dir/index.xml && \ | 31 | ../scripts/translators.sh -l $$dir > $$dir/translators.xml ;\ |
52 | 31 | rm -rf $$dir/; \ | 32 | xsltproc --xinclude -o ../build/$$dir/index.html $(XUBUNTUXSL) $$dir/index.xml ;\ |
53 | 32 | done | 33 | done |
54 | 33 | 34 | ||
55 | 34 | clean: | 35 | clean: |
57 | 35 | ${RM} -r $(TRANSLATIONS) | 36 | ${RM} -r $(TRANSLATIONS) C/translators.xml |
58 | 36 | 37 | ||
59 | 37 | .PHONY: html translate | 38 | .PHONY: html translate |
60 | 38 | 39 | ||
61 | === modified file 'desktop-guide/po/desktop-guide.pot' | |||
62 | --- desktop-guide/po/desktop-guide.pot 2014-03-20 00:49:35 +0000 | |||
63 | +++ desktop-guide/po/desktop-guide.pot 2014-07-01 20:27:45 +0000 | |||
64 | @@ -1,7 +1,7 @@ | |||
65 | 1 | msgid "" | 1 | msgid "" |
66 | 2 | msgstr "" | 2 | msgstr "" |
67 | 3 | "Project-Id-Version: PACKAGE VERSION\n" | 3 | "Project-Id-Version: PACKAGE VERSION\n" |
69 | 4 | "POT-Creation-Date: 2014-03-20 02:49+0200\n" | 4 | "POT-Creation-Date: 2014-07-01 16:18-0400\n" |
70 | 5 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 5 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
71 | 6 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 6 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
72 | 7 | "Language-Team: LANGUAGE <LL@li.org>\n" | 7 | "Language-Team: LANGUAGE <LL@li.org>\n" |
73 | @@ -762,7 +762,7 @@ | |||
74 | 762 | msgstr "" | 762 | msgstr "" |
75 | 763 | 763 | ||
76 | 764 | #: desktop-guide/C/printing-scanning.xml:63(para) | 764 | #: desktop-guide/C/printing-scanning.xml:63(para) |
78 | 765 | 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." | 765 | 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." |
79 | 766 | msgstr "" | 766 | msgstr "" |
80 | 767 | 767 | ||
81 | 768 | #: desktop-guide/C/printing-scanning.xml:68(title) | 768 | #: desktop-guide/C/printing-scanning.xml:68(title) |
82 | @@ -1948,86 +1948,90 @@ | |||
83 | 1948 | msgstr "" | 1948 | msgstr "" |
84 | 1949 | 1949 | ||
85 | 1950 | #: desktop-guide/C/index.xml:34(para) | 1950 | #: desktop-guide/C/index.xml:34(para) |
86 | 1951 | msgid "The contributors to this translation of the documentation are:" | ||
87 | 1952 | msgstr "" | ||
88 | 1953 | |||
89 | 1954 | #: desktop-guide/C/index.xml:37(para) | ||
90 | 1951 | msgid "The contributors to previous versions to this documentation are:" | 1955 | msgid "The contributors to previous versions to this documentation are:" |
91 | 1952 | msgstr "" | 1956 | msgstr "" |
92 | 1953 | 1957 | ||
94 | 1954 | #: desktop-guide/C/index.xml:36(para) | 1958 | #: desktop-guide/C/index.xml:39(para) |
95 | 1955 | msgid "Jim Campbell (jwcampbell)" | 1959 | msgid "Jim Campbell (jwcampbell)" |
96 | 1956 | msgstr "" | 1960 | msgstr "" |
97 | 1957 | 1961 | ||
99 | 1958 | #: desktop-guide/C/index.xml:37(para) | 1962 | #: desktop-guide/C/index.xml:40(para) |
100 | 1959 | msgid "Freddy Martinez (freddymartinez9)" | 1963 | msgid "Freddy Martinez (freddymartinez9)" |
101 | 1960 | msgstr "" | 1964 | msgstr "" |
102 | 1961 | 1965 | ||
104 | 1962 | #: desktop-guide/C/index.xml:38(para) | 1966 | #: desktop-guide/C/index.xml:41(para) |
105 | 1963 | msgid "Jan M. (fijam7)" | 1967 | msgid "Jan M. (fijam7)" |
106 | 1964 | msgstr "" | 1968 | msgstr "" |
107 | 1965 | 1969 | ||
109 | 1966 | #: desktop-guide/C/index.xml:39(para) | 1970 | #: desktop-guide/C/index.xml:42(para) |
110 | 1967 | msgid "Cody A.W. Somerville (cody-somerville)" | 1971 | msgid "Cody A.W. Somerville (cody-somerville)" |
111 | 1968 | msgstr "" | 1972 | msgstr "" |
112 | 1969 | 1973 | ||
114 | 1970 | #: desktop-guide/C/index.xml:40(para) | 1974 | #: desktop-guide/C/index.xml:43(para) |
115 | 1971 | msgid "Luzius Thöny (lucius-antonius)" | 1975 | msgid "Luzius Thöny (lucius-antonius)" |
116 | 1972 | msgstr "" | 1976 | msgstr "" |
117 | 1973 | 1977 | ||
119 | 1974 | #: desktop-guide/C/index.xml:43(para) | 1978 | #: desktop-guide/C/index.xml:46(para) |
120 | 1975 | msgid "This document is made available under the Creative Commons ShareAlike 2.5 License (CC-BY-SA)." | 1979 | msgid "This document is made available under the Creative Commons ShareAlike 2.5 License (CC-BY-SA)." |
121 | 1976 | msgstr "" | 1980 | msgstr "" |
122 | 1977 | 1981 | ||
124 | 1978 | #: desktop-guide/C/index.xml:44(para) | 1982 | #: desktop-guide/C/index.xml:47(para) |
125 | 1979 | 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." | 1983 | 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." |
126 | 1980 | msgstr "" | 1984 | msgstr "" |
127 | 1981 | 1985 | ||
129 | 1982 | #: desktop-guide/C/index.xml:46(para) | 1986 | #: desktop-guide/C/index.xml:49(para) |
130 | 1983 | 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." | 1987 | 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." |
131 | 1984 | msgstr "" | 1988 | msgstr "" |
132 | 1985 | 1989 | ||
134 | 1986 | #: desktop-guide/C/index.xml:49(para) | 1990 | #: desktop-guide/C/index.xml:52(para) |
135 | 1987 | msgid "A copy of the license is available here: <link linkend=\"cc-by-sa\">Creative Commons ShareAlike License</link>." | 1991 | msgid "A copy of the license is available here: <link linkend=\"cc-by-sa\">Creative Commons ShareAlike License</link>." |
136 | 1988 | msgstr "" | 1992 | msgstr "" |
137 | 1989 | 1993 | ||
139 | 1990 | #: desktop-guide/C/index.xml:50(para) | 1994 | #: desktop-guide/C/index.xml:53(para) |
140 | 1991 | msgid "All trademarks or registered trademarks are the property of the respective owners." | 1995 | msgid "All trademarks or registered trademarks are the property of the respective owners." |
141 | 1992 | msgstr "" | 1996 | msgstr "" |
142 | 1993 | 1997 | ||
144 | 1994 | #: desktop-guide/C/index.xml:54(year) | 1998 | #: desktop-guide/C/index.xml:57(year) |
145 | 1995 | msgid "2012" | 1999 | msgid "2012" |
146 | 1996 | msgstr "" | 2000 | msgstr "" |
147 | 1997 | 2001 | ||
149 | 1998 | #: desktop-guide/C/index.xml:55(year) | 2002 | #: desktop-guide/C/index.xml:58(year) |
150 | 1999 | msgid "2013" | 2003 | msgid "2013" |
151 | 2000 | msgstr "" | 2004 | msgstr "" |
152 | 2001 | 2005 | ||
154 | 2002 | #: desktop-guide/C/index.xml:56(year) | 2006 | #: desktop-guide/C/index.xml:59(year) |
155 | 2003 | msgid "2014" | 2007 | msgid "2014" |
156 | 2004 | msgstr "" | 2008 | msgstr "" |
157 | 2005 | 2009 | ||
159 | 2006 | #: desktop-guide/C/index.xml:57(holder) | 2010 | #: desktop-guide/C/index.xml:60(holder) |
160 | 2007 | msgid "Canonical Ltd. and members of the Xubuntu Documentation team." | 2011 | msgid "Canonical Ltd. and members of the Xubuntu Documentation team." |
161 | 2008 | msgstr "" | 2012 | msgstr "" |
162 | 2009 | 2013 | ||
164 | 2010 | #: desktop-guide/C/index.xml:61(publishername) | 2014 | #: desktop-guide/C/index.xml:64(publishername) |
165 | 2011 | msgid "The Ubuntu Documentation Project" | 2015 | msgid "The Ubuntu Documentation Project" |
166 | 2012 | msgstr "" | 2016 | msgstr "" |
167 | 2013 | 2017 | ||
169 | 2014 | #: desktop-guide/C/index.xml:64(title) | 2018 | #: desktop-guide/C/index.xml:67(title) |
170 | 2015 | msgid "Welcome!" | 2019 | msgid "Welcome!" |
171 | 2016 | msgstr "" | 2020 | msgstr "" |
172 | 2017 | 2021 | ||
174 | 2018 | #: desktop-guide/C/index.xml:66(para) | 2022 | #: desktop-guide/C/index.xml:69(para) |
175 | 2019 | msgid "This documentation provides documentation to the most common issues with Xubuntu, including:" | 2023 | msgid "This documentation provides documentation to the most common issues with Xubuntu, including:" |
176 | 2020 | msgstr "" | 2024 | msgstr "" |
177 | 2021 | 2025 | ||
179 | 2022 | #: desktop-guide/C/index.xml:71(para) | 2026 | #: desktop-guide/C/index.xml:74(para) |
180 | 2023 | msgid "In addition, this documentation has three quick guides:" | 2027 | msgid "In addition, this documentation has three quick guides:" |
181 | 2024 | msgstr "" | 2028 | msgstr "" |
182 | 2025 | 2029 | ||
184 | 2026 | #: desktop-guide/C/index.xml:77(para) | 2030 | #: desktop-guide/C/index.xml:80(para) |
185 | 2027 | 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 & Support</ulink> page of the Xubuntu website. There you will find links to additional help resources." | 2031 | 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 & Support</ulink> page of the Xubuntu website. There you will find links to additional help resources." |
186 | 2028 | msgstr "" | 2032 | msgstr "" |
187 | 2029 | 2033 | ||
189 | 2030 | #: desktop-guide/C/index.xml:79(para) | 2034 | #: desktop-guide/C/index.xml:82(para) |
190 | 2031 | 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." | 2035 | 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." |
191 | 2032 | msgstr "" | 2036 | msgstr "" |
192 | 2033 | 2037 | ||
193 | 2034 | 2038 | ||
194 | === added file 'scripts/translators.sh' | |||
195 | --- scripts/translators.sh 1970-01-01 00:00:00 +0000 | |||
196 | +++ scripts/translators.sh 2014-07-01 20:27:45 +0000 | |||
197 | @@ -0,0 +1,47 @@ | |||
198 | 1 | #!/bin/sh | ||
199 | 2 | |||
200 | 3 | CURDIR=$(pwd)/po/ | ||
201 | 4 | |||
202 | 5 | get_languages() { | ||
203 | 6 | if [ "$generated" = yes ];then | ||
204 | 7 | languages=$(cat po/LINGUAS) | ||
205 | 8 | elif [ -n $language ];then | ||
206 | 9 | languages=$language | ||
207 | 10 | else | ||
208 | 11 | languages=$(basename -s.po $CURDIR/*.po) | ||
209 | 12 | fi | ||
210 | 13 | } | ||
211 | 14 | |||
212 | 15 | build_creds() { | ||
213 | 16 | #for lang in `basename -s.po *.po`;do ## Good for testing, uses all translations it can find. | ||
214 | 17 | echo "<itemizedlist>" | ||
215 | 18 | for lang in $languages;do | ||
216 | 19 | mkdir -p $CURDIR/mo/$lang/LC_MESSAGES/ | ||
217 | 20 | msgfmt -o $CURDIR/mo/$lang/LC_MESSAGES/xubuntu-docs.mo $CURDIR/$lang.po | ||
218 | 21 | TEXTDOMAINDIR=$CURDIR/mo/ LANGUAGE=$lang gettext -d xubuntu-docs -s 'translator-credits' | \ | ||
219 | 22 | sed -e 's@^ @\t<listitem><para>@' -e '/launchpad.net/s@$@)</para></listitem>@' \ | ||
220 | 23 | -e 's@https://launchpad.net/~@(@' -e /Launchpad\ Contributions/d -e /^translator-credits$/d | ||
221 | 24 | done | sort | uniq | ||
222 | 25 | echo "</itemizedlist>" | ||
223 | 26 | rm -rf $CURDIR/mo/ | ||
224 | 27 | } | ||
225 | 28 | |||
226 | 29 | grep_creds() { | ||
227 | 30 | ## Don't build, just grep. | ||
228 | 31 | ## This is incomplete and unused, potentially helpful later. | ||
229 | 32 | for lang in $languages;do | ||
230 | 33 | echo msggrep --msgid -F -e 'translator-credits' $lang.po | ||
231 | 34 | done | ||
232 | 35 | } | ||
233 | 36 | |||
234 | 37 | while getopts ":gl:" Option | ||
235 | 38 | do | ||
236 | 39 | case ${Option} in | ||
237 | 40 | g) generated=yes;; | ||
238 | 41 | l) language=${OPTARG};; | ||
239 | 42 | *) echo "Please specify an argument.";; | ||
240 | 43 | esac | ||
241 | 44 | done | ||
242 | 45 | |||
243 | 46 | get_languages | ||
244 | 47 | build_creds |