Merge lp:~dholbach/help-app/1433210 into lp:help-app
- 1433210
- Merge into trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Daniel Holbach | ||||
Approved revision: | 150 | ||||
Merged at revision: | 153 | ||||
Proposed branch: | lp:~dholbach/help-app/1433210 | ||||
Merge into: | lp:help-app | ||||
Diff against target: |
399 lines (+72/-46) 13 files modified
content/pages/index.md (+4/-3) internals/local/q-and-a.py (+1/-1) internals/pelicanconf.py (+1/-1) internals/translations/build.py (+23/-5) po/de.po (+4/-4) po/es.po (+5/-4) po/fr.po (+5/-4) po/help.pot (+4/-4) po/it.po (+5/-4) po/pl.po (+5/-4) po/pt.po (+5/-4) po/ro.po (+5/-4) po/ru.po (+5/-4) |
||||
To merge this branch: | bzr merge lp:~dholbach/help-app/1433210 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Nicholas Skaggs (community) | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Review via email:
|
Commit message
Readd .link-cta-ubuntu so we can use it to more prominently point out call to action links. This will also allow us to add more attr_list (https:/
The CTA links now work in the web version, on the app version we're still blocked on bug 1433532.
Description of the change
Readd .link-cta-ubuntu so we can use it to more prominently point out call to action links. This will also allow us to add more attr_list (https:/
The CTA links now work in the web version, on the app version we're still blocked on bug 1433532.
- 149. By Daniel Holbach
-
remove test changes as they are not finished yet

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
- 150. By Daniel Holbach
-
update statement in markdown extension to how it's defined in pelicanconf too

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:150
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://

Nicholas Skaggs (nskaggs) : | # |
Preview Diff
1 | === modified file 'content/pages/index.md' | |||
2 | --- content/pages/index.md 2015-03-19 11:10:25 +0000 | |||
3 | +++ content/pages/index.md 2015-06-05 14:27:17 +0000 | |||
4 | @@ -7,6 +7,7 @@ | |||
5 | 7 | * Tips and tricks to make you more productive | 7 | * Tips and tricks to make you more productive |
6 | 8 | * Links to get in touch with experts and other community members | 8 | * Links to get in touch with experts and other community members |
7 | 9 | 9 | ||
11 | 10 | [Take me to the FAQ!]({filename}faq.md) | 10 | [Take me to the FAQ!]({filename}faq.md){: .link-cta-ubuntu} |
12 | 11 | 11 | ||
13 | 12 | [Get in touch]({filename}get-in-touch.md) | 12 | [Get in touch]({filename}get-in-touch.md){: .link-cta-ubuntu} |
14 | 13 | |||
15 | 13 | 14 | ||
16 | === modified file 'internals/local/q-and-a.py' | |||
17 | --- internals/local/q-and-a.py 2015-03-30 14:38:28 +0000 | |||
18 | +++ internals/local/q-and-a.py 2015-06-05 14:27:17 +0000 | |||
19 | @@ -42,7 +42,7 @@ | |||
20 | 42 | image_block = img_matches.group(0) | 42 | image_block = img_matches.group(0) |
21 | 43 | answer = answer.replace(image_block, '') | 43 | answer = answer.replace(image_block, '') |
22 | 44 | 44 | ||
24 | 45 | if statement == '!!QA': | 45 | if statement == ' !!QA': |
25 | 46 | # <div class="row"> | 46 | # <div class="row"> |
26 | 47 | # <div class="eight-col"> | 47 | # <div class="eight-col"> |
27 | 48 | # <!-- question & answer --> | 48 | # <!-- question & answer --> |
28 | 49 | 49 | ||
29 | === modified file 'internals/pelicanconf.py' | |||
30 | --- internals/pelicanconf.py 2015-05-13 14:55:10 +0000 | |||
31 | +++ internals/pelicanconf.py 2015-06-05 14:27:17 +0000 | |||
32 | @@ -62,7 +62,7 @@ | |||
33 | 62 | ] | 62 | ] |
34 | 63 | 63 | ||
35 | 64 | Q_AND_A_CLASSES = [ | 64 | Q_AND_A_CLASSES = [ |
37 | 65 | '!!QA', | 65 | ' !!QA', |
38 | 66 | ] | 66 | ] |
39 | 67 | 67 | ||
40 | 68 | HIDE_FROM_POT = Q_AND_A_CLASSES + [ | 68 | HIDE_FROM_POT = Q_AND_A_CLASSES + [ |
41 | 69 | 69 | ||
42 | === modified file 'internals/translations/build.py' | |||
43 | --- internals/translations/build.py 2015-05-13 17:04:59 +0000 | |||
44 | +++ internals/translations/build.py 2015-06-05 14:27:17 +0000 | |||
45 | @@ -84,17 +84,17 @@ | |||
46 | 84 | self.pofile.fuzzy_entries(), | 84 | self.pofile.fuzzy_entries(), |
47 | 85 | self.pofile.untranslated_entries()]: | 85 | self.pofile.untranslated_entries()]: |
48 | 86 | for entry in entry_group: | 86 | for entry in entry_group: |
52 | 87 | for statement in HIDE_FROM_POT: | 87 | if entry.comment in HIDE_FROM_POT: |
53 | 88 | if statement in entry.comment: | 88 | entries += [entry] |
51 | 89 | entries += [entry] | ||
54 | 90 | for entry in entries: | 89 | for entry in entries: |
55 | 91 | if not entry.msgid.endswith(entry.comment): | 90 | if not entry.msgid.endswith(entry.comment): |
57 | 92 | entry.msgid += ' %s' % entry.comment | 91 | entry.msgid += entry.comment |
58 | 93 | if entry.msgstr and not entry.msgstr.endswith(entry.comment): | 92 | if entry.msgstr and not entry.msgstr.endswith(entry.comment): |
60 | 94 | entry.msgstr += ' %s' % entry.comment | 93 | entry.msgstr += entry.comment |
61 | 95 | entry.comment = '' | 94 | entry.comment = '' |
62 | 96 | self.save() | 95 | self.save() |
63 | 97 | 96 | ||
64 | 97 | # Make sure META_TAGS are not accidentally translated | ||
65 | 98 | def safeguard_meta_tags(self): | 98 | def safeguard_meta_tags(self): |
66 | 99 | for tag in META_TAGS: | 99 | for tag in META_TAGS: |
67 | 100 | for entry in self.find_in_msgid(tag): | 100 | for entry in self.find_in_msgid(tag): |
68 | @@ -132,16 +132,34 @@ | |||
69 | 132 | link_msgstr = list(re.findall(link_regex, entry.msgstr)) | 132 | link_msgstr = list(re.findall(link_regex, entry.msgstr)) |
70 | 133 | return (link_msgid, link_msgstr) | 133 | return (link_msgid, link_msgstr) |
71 | 134 | 134 | ||
72 | 135 | # All markdown links in the po file (everything starting with {filename} | ||
73 | 136 | # need to be handled with care. | ||
74 | 137 | # 1) In the case of Spanish translations, we want for example | ||
75 | 138 | # 'faq.es.md' instead 'faq.md'. | ||
76 | 139 | # 2) If we mark a link with an attr_list tag, like {: .link-cta-ubuntu}, | ||
77 | 140 | # this also needs to be preserved. | ||
78 | 141 | # | ||
79 | 135 | def rewrite_links(self, documents, bcp47): | 142 | def rewrite_links(self, documents, bcp47): |
80 | 143 | |||
81 | 144 | # In this specific po file, find all markdown links | ||
82 | 136 | for entry in self.find_in_msgid('{filename}'): | 145 | for entry in self.find_in_msgid('{filename}'): |
83 | 137 | (link_msgid, link_msgstr) = \ | 146 | (link_msgid, link_msgstr) = \ |
84 | 138 | self.find_link_in_markdown_message(entry) | 147 | self.find_link_in_markdown_message(entry) |
85 | 148 | |||
86 | 149 | # Find all links which are part of our documents (filter out | ||
87 | 150 | # images, etc.) | ||
88 | 139 | if [doc for doc in documents.docs if doc.endswith(link_msgid)]: | 151 | if [doc for doc in documents.docs if doc.endswith(link_msgid)]: |
89 | 140 | translated_doc_fn = os.path.basename( | 152 | translated_doc_fn = os.path.basename( |
90 | 141 | documents.translated_doc_fn(link_msgid, bcp47)) | 153 | documents.translated_doc_fn(link_msgid, bcp47)) |
91 | 154 | |||
92 | 155 | # If the translation part of the message does not exist, | ||
93 | 156 | # just use the msgid | ||
94 | 142 | if not link_msgstr: | 157 | if not link_msgstr: |
95 | 143 | entry.msgstr = entry.msgid | 158 | entry.msgstr = entry.msgid |
96 | 144 | link_msgstr = [link_msgid] | 159 | link_msgstr = [link_msgid] |
97 | 160 | |||
98 | 161 | # Rewrite filename part of the translated text. | ||
99 | 162 | # This keeps the label translated, if it already is. | ||
100 | 145 | entry.msgstr = entry.msgstr.replace(link_msgstr[0], | 163 | entry.msgstr = entry.msgstr.replace(link_msgstr[0], |
101 | 146 | translated_doc_fn) | 164 | translated_doc_fn) |
102 | 147 | self.save() | 165 | self.save() |
103 | 148 | 166 | ||
104 | === modified file 'po/de.po' | |||
105 | --- po/de.po 2015-06-05 07:41:28 +0000 | |||
106 | +++ po/de.po 2015-06-05 14:27:17 +0000 | |||
107 | @@ -7,7 +7,7 @@ | |||
108 | 7 | msgstr "" | 7 | msgstr "" |
109 | 8 | "Project-Id-Version: PACKAGE VERSION\n" | 8 | "Project-Id-Version: PACKAGE VERSION\n" |
110 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
112 | 10 | "POT-Creation-Date: 2015-06-04 09:48+0200\n" | 10 | "POT-Creation-Date: 2015-06-04 17:47+0200\n" |
113 | 11 | "PO-Revision-Date: 2015-06-04 16:05+0000\n" | 11 | "PO-Revision-Date: 2015-06-04 16:05+0000\n" |
114 | 12 | "Last-Translator: Daniel Holbach <daniel.holbach@ubuntu.com>\n" | 12 | "Last-Translator: Daniel Holbach <daniel.holbach@ubuntu.com>\n" |
115 | 13 | "Language-Team: LANGUAGE <LL@li.org>\n" | 13 | "Language-Team: LANGUAGE <LL@li.org>\n" |
116 | @@ -122,13 +122,13 @@ | |||
117 | 122 | "Links um in Kontakt mit Experten und anderen aus der Ubuntu Gemeinschaft zu " | 122 | "Links um in Kontakt mit Experten und anderen aus der Ubuntu Gemeinschaft zu " |
118 | 123 | "kommen" | 123 | "kommen" |
119 | 124 | 124 | ||
121 | 125 | #. type: Plain text | 125 | #. {: .link-cta-ubuntu} |
122 | 126 | #: content/pages/index.md:11 | 126 | #: content/pages/index.md:11 |
123 | 127 | msgid "[Take me to the FAQ!]({filename}faq.md)" | 127 | msgid "[Take me to the FAQ!]({filename}faq.md)" |
124 | 128 | msgstr "[Bringen Sie mich zur FAQ!]({filename}faq.de.md)" | 128 | msgstr "[Bringen Sie mich zur FAQ!]({filename}faq.de.md)" |
125 | 129 | 129 | ||
128 | 130 | #. type: Plain text | 130 | #. {: .link-cta-ubuntu} |
129 | 131 | #: content/pages/index.md:12 | 131 | #: content/pages/index.md:13 |
130 | 132 | msgid "[Get in touch]({filename}get-in-touch.md)" | 132 | msgid "[Get in touch]({filename}get-in-touch.md)" |
131 | 133 | msgstr "[Kontakt]({filename}get-in-touch.de.md)" | 133 | msgstr "[Kontakt]({filename}get-in-touch.de.md)" |
132 | 134 | 134 | ||
133 | 135 | 135 | ||
134 | === modified file 'po/es.po' | |||
135 | --- po/es.po 2015-06-05 07:41:28 +0000 | |||
136 | +++ po/es.po 2015-06-05 14:27:17 +0000 | |||
137 | @@ -7,10 +7,11 @@ | |||
138 | 7 | msgstr "" | 7 | msgstr "" |
139 | 8 | "Project-Id-Version: ubuntu-devices-help\n" | 8 | "Project-Id-Version: ubuntu-devices-help\n" |
140 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
142 | 10 | "POT-Creation-Date: 2015-06-04 09:48+0200\n" | 10 | "POT-Creation-Date: 2015-06-04 17:47+0200\n" |
143 | 11 | "PO-Revision-Date: 2015-06-03 22:30+0000\n" | 11 | "PO-Revision-Date: 2015-06-03 22:30+0000\n" |
144 | 12 | "Last-Translator: David Gámiz Jiménez <david.gamiz@gmail.com>\n" | 12 | "Last-Translator: David Gámiz Jiménez <david.gamiz@gmail.com>\n" |
145 | 13 | "Language-Team: Spanish <es@li.org>\n" | 13 | "Language-Team: Spanish <es@li.org>\n" |
146 | 14 | "Language: es\n" | ||
147 | 14 | "MIME-Version: 1.0\n" | 15 | "MIME-Version: 1.0\n" |
148 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
149 | 16 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
150 | @@ -109,13 +110,13 @@ | |||
151 | 109 | msgid "Links to get in touch with experts and other community members" | 110 | msgid "Links to get in touch with experts and other community members" |
152 | 110 | msgstr "" | 111 | msgstr "" |
153 | 111 | 112 | ||
155 | 112 | #. type: Plain text | 113 | #. {: .link-cta-ubuntu} |
156 | 113 | #: content/pages/index.md:11 | 114 | #: content/pages/index.md:11 |
157 | 114 | msgid "[Take me to the FAQ!]({filename}faq.md)" | 115 | msgid "[Take me to the FAQ!]({filename}faq.md)" |
158 | 115 | msgstr "[Take me to the FAQ!]({filename}faq.es.md)" | 116 | msgstr "[Take me to the FAQ!]({filename}faq.es.md)" |
159 | 116 | 117 | ||
162 | 117 | #. type: Plain text | 118 | #. {: .link-cta-ubuntu} |
163 | 118 | #: content/pages/index.md:12 | 119 | #: content/pages/index.md:13 |
164 | 119 | msgid "[Get in touch]({filename}get-in-touch.md)" | 120 | msgid "[Get in touch]({filename}get-in-touch.md)" |
165 | 120 | msgstr "[Get in touch]({filename}get-in-touch.es.md)" | 121 | msgstr "[Get in touch]({filename}get-in-touch.es.md)" |
166 | 121 | 122 | ||
167 | 122 | 123 | ||
168 | === modified file 'po/fr.po' | |||
169 | --- po/fr.po 2015-06-05 07:41:28 +0000 | |||
170 | +++ po/fr.po 2015-06-05 14:27:17 +0000 | |||
171 | @@ -7,10 +7,11 @@ | |||
172 | 7 | msgstr "" | 7 | msgstr "" |
173 | 8 | "Project-Id-Version: ubuntu-devices-help\n" | 8 | "Project-Id-Version: ubuntu-devices-help\n" |
174 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
176 | 10 | "POT-Creation-Date: 2015-06-04 09:48+0200\n" | 10 | "POT-Creation-Date: 2015-06-04 17:47+0200\n" |
177 | 11 | "PO-Revision-Date: 2015-02-27 12:21+0000\n" | 11 | "PO-Revision-Date: 2015-02-27 12:21+0000\n" |
178 | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
179 | 13 | "Language-Team: French <fr@li.org>\n" | 13 | "Language-Team: French <fr@li.org>\n" |
180 | 14 | "Language: fr\n" | ||
181 | 14 | "MIME-Version: 1.0\n" | 15 | "MIME-Version: 1.0\n" |
182 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
183 | 16 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
184 | @@ -107,13 +108,13 @@ | |||
185 | 107 | msgid "Links to get in touch with experts and other community members" | 108 | msgid "Links to get in touch with experts and other community members" |
186 | 108 | msgstr "" | 109 | msgstr "" |
187 | 109 | 110 | ||
189 | 110 | #. type: Plain text | 111 | #. {: .link-cta-ubuntu} |
190 | 111 | #: content/pages/index.md:11 | 112 | #: content/pages/index.md:11 |
191 | 112 | msgid "[Take me to the FAQ!]({filename}faq.md)" | 113 | msgid "[Take me to the FAQ!]({filename}faq.md)" |
192 | 113 | msgstr "[Take me to the FAQ!]({filename}faq.fr.md)" | 114 | msgstr "[Take me to the FAQ!]({filename}faq.fr.md)" |
193 | 114 | 115 | ||
196 | 115 | #. type: Plain text | 116 | #. {: .link-cta-ubuntu} |
197 | 116 | #: content/pages/index.md:12 | 117 | #: content/pages/index.md:13 |
198 | 117 | msgid "[Get in touch]({filename}get-in-touch.md)" | 118 | msgid "[Get in touch]({filename}get-in-touch.md)" |
199 | 118 | msgstr "[Get in touch]({filename}get-in-touch.fr.md)" | 119 | msgstr "[Get in touch]({filename}get-in-touch.fr.md)" |
200 | 119 | 120 | ||
201 | 120 | 121 | ||
202 | === modified file 'po/help.pot' | |||
203 | --- po/help.pot 2015-06-05 07:41:28 +0000 | |||
204 | +++ po/help.pot 2015-06-05 14:27:17 +0000 | |||
205 | @@ -7,7 +7,7 @@ | |||
206 | 7 | msgid "" | 7 | msgid "" |
207 | 8 | msgstr "" | 8 | msgstr "" |
208 | 9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
210 | 10 | "POT-Creation-Date: 2015-06-05 09:40+0200\n" | 10 | "POT-Creation-Date: 2015-06-05 12:37+0200\n" |
211 | 11 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 11 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
212 | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
213 | 13 | "Language-Team: LANGUAGE <LL@li.org>\n" | 13 | "Language-Team: LANGUAGE <LL@li.org>\n" |
214 | @@ -106,13 +106,13 @@ | |||
215 | 106 | msgid "Links to get in touch with experts and other community members" | 106 | msgid "Links to get in touch with experts and other community members" |
216 | 107 | msgstr "" | 107 | msgstr "" |
217 | 108 | 108 | ||
219 | 109 | #. type: Plain text | 109 | #. {: .link-cta-ubuntu} |
220 | 110 | #: content/pages/index.md:11 | 110 | #: content/pages/index.md:11 |
221 | 111 | msgid "[Take me to the FAQ!]({filename}faq.md)" | 111 | msgid "[Take me to the FAQ!]({filename}faq.md)" |
222 | 112 | msgstr "" | 112 | msgstr "" |
223 | 113 | 113 | ||
226 | 114 | #. type: Plain text | 114 | #. {: .link-cta-ubuntu} |
227 | 115 | #: content/pages/index.md:12 | 115 | #: content/pages/index.md:13 |
228 | 116 | msgid "[Get in touch]({filename}get-in-touch.md)" | 116 | msgid "[Get in touch]({filename}get-in-touch.md)" |
229 | 117 | msgstr "" | 117 | msgstr "" |
230 | 118 | 118 | ||
231 | 119 | 119 | ||
232 | === modified file 'po/it.po' | |||
233 | --- po/it.po 2015-06-05 07:41:28 +0000 | |||
234 | +++ po/it.po 2015-06-05 14:27:17 +0000 | |||
235 | @@ -7,10 +7,11 @@ | |||
236 | 7 | msgstr "" | 7 | msgstr "" |
237 | 8 | "Project-Id-Version: ubuntu-devices-help\n" | 8 | "Project-Id-Version: ubuntu-devices-help\n" |
238 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
240 | 10 | "POT-Creation-Date: 2015-06-04 09:48+0200\n" | 10 | "POT-Creation-Date: 2015-06-04 17:47+0200\n" |
241 | 11 | "PO-Revision-Date: 2015-03-05 11:21+0000\n" | 11 | "PO-Revision-Date: 2015-03-05 11:21+0000\n" |
242 | 12 | "Last-Translator: Silvia Bindelli <silvia.bindelli@ubuntu-it.org>\n" | 12 | "Last-Translator: Silvia Bindelli <silvia.bindelli@ubuntu-it.org>\n" |
243 | 13 | "Language-Team: Italian <it@li.org>\n" | 13 | "Language-Team: Italian <it@li.org>\n" |
244 | 14 | "Language: it\n" | ||
245 | 14 | "MIME-Version: 1.0\n" | 15 | "MIME-Version: 1.0\n" |
246 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
247 | 16 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
248 | @@ -109,13 +110,13 @@ | |||
249 | 109 | msgid "Links to get in touch with experts and other community members" | 110 | msgid "Links to get in touch with experts and other community members" |
250 | 110 | msgstr "" | 111 | msgstr "" |
251 | 111 | 112 | ||
253 | 112 | #. type: Plain text | 113 | #. {: .link-cta-ubuntu} |
254 | 113 | #: content/pages/index.md:11 | 114 | #: content/pages/index.md:11 |
255 | 114 | msgid "[Take me to the FAQ!]({filename}faq.md)" | 115 | msgid "[Take me to the FAQ!]({filename}faq.md)" |
256 | 115 | msgstr "[Take me to the FAQ!]({filename}faq.it.md)" | 116 | msgstr "[Take me to the FAQ!]({filename}faq.it.md)" |
257 | 116 | 117 | ||
260 | 117 | #. type: Plain text | 118 | #. {: .link-cta-ubuntu} |
261 | 118 | #: content/pages/index.md:12 | 119 | #: content/pages/index.md:13 |
262 | 119 | msgid "[Get in touch]({filename}get-in-touch.md)" | 120 | msgid "[Get in touch]({filename}get-in-touch.md)" |
263 | 120 | msgstr "[Get in touch]({filename}get-in-touch.it.md)" | 121 | msgstr "[Get in touch]({filename}get-in-touch.it.md)" |
264 | 121 | 122 | ||
265 | 122 | 123 | ||
266 | === modified file 'po/pl.po' | |||
267 | --- po/pl.po 2015-06-05 07:41:28 +0000 | |||
268 | +++ po/pl.po 2015-06-05 14:27:17 +0000 | |||
269 | @@ -7,10 +7,11 @@ | |||
270 | 7 | msgstr "" | 7 | msgstr "" |
271 | 8 | "Project-Id-Version: help-app\n" | 8 | "Project-Id-Version: help-app\n" |
272 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
274 | 10 | "POT-Creation-Date: 2015-06-04 09:48+0200\n" | 10 | "POT-Creation-Date: 2015-06-04 17:47+0200\n" |
275 | 11 | "PO-Revision-Date: 2015-05-15 13:17+0000\n" | 11 | "PO-Revision-Date: 2015-05-15 13:17+0000\n" |
276 | 12 | "Last-Translator: Bartosz Kosiorek <Unknown>\n" | 12 | "Last-Translator: Bartosz Kosiorek <Unknown>\n" |
277 | 13 | "Language-Team: Polish <pl@li.org>\n" | 13 | "Language-Team: Polish <pl@li.org>\n" |
278 | 14 | "Language: pl\n" | ||
279 | 14 | "MIME-Version: 1.0\n" | 15 | "MIME-Version: 1.0\n" |
280 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
281 | 16 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
282 | @@ -107,13 +108,13 @@ | |||
283 | 107 | msgid "Links to get in touch with experts and other community members" | 108 | msgid "Links to get in touch with experts and other community members" |
284 | 108 | msgstr "" | 109 | msgstr "" |
285 | 109 | 110 | ||
287 | 110 | #. type: Plain text | 111 | #. {: .link-cta-ubuntu} |
288 | 111 | #: content/pages/index.md:11 | 112 | #: content/pages/index.md:11 |
289 | 112 | msgid "[Take me to the FAQ!]({filename}faq.md)" | 113 | msgid "[Take me to the FAQ!]({filename}faq.md)" |
290 | 113 | msgstr "[Take me to the FAQ!]({filename}faq.pl.md)" | 114 | msgstr "[Take me to the FAQ!]({filename}faq.pl.md)" |
291 | 114 | 115 | ||
294 | 115 | #. type: Plain text | 116 | #. {: .link-cta-ubuntu} |
295 | 116 | #: content/pages/index.md:12 | 117 | #: content/pages/index.md:13 |
296 | 117 | msgid "[Get in touch]({filename}get-in-touch.md)" | 118 | msgid "[Get in touch]({filename}get-in-touch.md)" |
297 | 118 | msgstr "[Get in touch]({filename}get-in-touch.pl.md)" | 119 | msgstr "[Get in touch]({filename}get-in-touch.pl.md)" |
298 | 119 | 120 | ||
299 | 120 | 121 | ||
300 | === modified file 'po/pt.po' | |||
301 | --- po/pt.po 2015-06-05 07:41:28 +0000 | |||
302 | +++ po/pt.po 2015-06-05 14:27:17 +0000 | |||
303 | @@ -7,10 +7,11 @@ | |||
304 | 7 | msgstr "" | 7 | msgstr "" |
305 | 8 | "Project-Id-Version: ubuntu-devices-help\n" | 8 | "Project-Id-Version: ubuntu-devices-help\n" |
306 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
308 | 10 | "POT-Creation-Date: 2015-06-04 09:48+0200\n" | 10 | "POT-Creation-Date: 2015-06-04 17:47+0200\n" |
309 | 11 | "PO-Revision-Date: 2015-03-19 00:27+0000\n" | 11 | "PO-Revision-Date: 2015-03-19 00:27+0000\n" |
310 | 12 | "Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n" | 12 | "Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n" |
311 | 13 | "Language-Team: Portuguese <pt@li.org>\n" | 13 | "Language-Team: Portuguese <pt@li.org>\n" |
312 | 14 | "Language: pt\n" | ||
313 | 14 | "MIME-Version: 1.0\n" | 15 | "MIME-Version: 1.0\n" |
314 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
315 | 16 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
316 | @@ -109,13 +110,13 @@ | |||
317 | 109 | msgid "Links to get in touch with experts and other community members" | 110 | msgid "Links to get in touch with experts and other community members" |
318 | 110 | msgstr "" | 111 | msgstr "" |
319 | 111 | 112 | ||
321 | 112 | #. type: Plain text | 113 | #. {: .link-cta-ubuntu} |
322 | 113 | #: content/pages/index.md:11 | 114 | #: content/pages/index.md:11 |
323 | 114 | msgid "[Take me to the FAQ!]({filename}faq.md)" | 115 | msgid "[Take me to the FAQ!]({filename}faq.md)" |
324 | 115 | msgstr "[Take me to the FAQ!]({filename}faq.pt.md)" | 116 | msgstr "[Take me to the FAQ!]({filename}faq.pt.md)" |
325 | 116 | 117 | ||
328 | 117 | #. type: Plain text | 118 | #. {: .link-cta-ubuntu} |
329 | 118 | #: content/pages/index.md:12 | 119 | #: content/pages/index.md:13 |
330 | 119 | msgid "[Get in touch]({filename}get-in-touch.md)" | 120 | msgid "[Get in touch]({filename}get-in-touch.md)" |
331 | 120 | msgstr "[Get in touch]({filename}get-in-touch.pt.md)" | 121 | msgstr "[Get in touch]({filename}get-in-touch.pt.md)" |
332 | 121 | 122 | ||
333 | 122 | 123 | ||
334 | === modified file 'po/ro.po' | |||
335 | --- po/ro.po 2015-06-05 07:41:28 +0000 | |||
336 | +++ po/ro.po 2015-06-05 14:27:17 +0000 | |||
337 | @@ -7,10 +7,11 @@ | |||
338 | 7 | msgstr "" | 7 | msgstr "" |
339 | 8 | "Project-Id-Version: ubuntu-devices-help\n" | 8 | "Project-Id-Version: ubuntu-devices-help\n" |
340 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
342 | 10 | "POT-Creation-Date: 2015-06-04 09:48+0200\n" | 10 | "POT-Creation-Date: 2015-06-04 17:47+0200\n" |
343 | 11 | "PO-Revision-Date: 2015-02-27 11:15+0000\n" | 11 | "PO-Revision-Date: 2015-02-27 11:15+0000\n" |
344 | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
345 | 13 | "Language-Team: Romanian <ro@li.org>\n" | 13 | "Language-Team: Romanian <ro@li.org>\n" |
346 | 14 | "Language: ro\n" | ||
347 | 14 | "MIME-Version: 1.0\n" | 15 | "MIME-Version: 1.0\n" |
348 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
349 | 16 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
350 | @@ -107,13 +108,13 @@ | |||
351 | 107 | msgid "Links to get in touch with experts and other community members" | 108 | msgid "Links to get in touch with experts and other community members" |
352 | 108 | msgstr "" | 109 | msgstr "" |
353 | 109 | 110 | ||
355 | 110 | #. type: Plain text | 111 | #. {: .link-cta-ubuntu} |
356 | 111 | #: content/pages/index.md:11 | 112 | #: content/pages/index.md:11 |
357 | 112 | msgid "[Take me to the FAQ!]({filename}faq.md)" | 113 | msgid "[Take me to the FAQ!]({filename}faq.md)" |
358 | 113 | msgstr "[Take me to the FAQ!]({filename}faq.ro.md)" | 114 | msgstr "[Take me to the FAQ!]({filename}faq.ro.md)" |
359 | 114 | 115 | ||
362 | 115 | #. type: Plain text | 116 | #. {: .link-cta-ubuntu} |
363 | 116 | #: content/pages/index.md:12 | 117 | #: content/pages/index.md:13 |
364 | 117 | msgid "[Get in touch]({filename}get-in-touch.md)" | 118 | msgid "[Get in touch]({filename}get-in-touch.md)" |
365 | 118 | msgstr "[Get in touch]({filename}get-in-touch.ro.md)" | 119 | msgstr "[Get in touch]({filename}get-in-touch.ro.md)" |
366 | 119 | 120 | ||
367 | 120 | 121 | ||
368 | === modified file 'po/ru.po' | |||
369 | --- po/ru.po 2015-06-05 07:41:28 +0000 | |||
370 | +++ po/ru.po 2015-06-05 14:27:17 +0000 | |||
371 | @@ -7,10 +7,11 @@ | |||
372 | 7 | msgstr "" | 7 | msgstr "" |
373 | 8 | "Project-Id-Version: help-app\n" | 8 | "Project-Id-Version: help-app\n" |
374 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
376 | 10 | "POT-Creation-Date: 2015-06-04 09:48+0200\n" | 10 | "POT-Creation-Date: 2015-06-04 17:47+0200\n" |
377 | 11 | "PO-Revision-Date: 2015-04-29 13:02+0000\n" | 11 | "PO-Revision-Date: 2015-04-29 13:02+0000\n" |
378 | 12 | "Last-Translator: Aleksey Kabanov <Unknown>\n" | 12 | "Last-Translator: Aleksey Kabanov <Unknown>\n" |
379 | 13 | "Language-Team: Russian <ru@li.org>\n" | 13 | "Language-Team: Russian <ru@li.org>\n" |
380 | 14 | "Language: ru\n" | ||
381 | 14 | "MIME-Version: 1.0\n" | 15 | "MIME-Version: 1.0\n" |
382 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
383 | 16 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
384 | @@ -107,13 +108,13 @@ | |||
385 | 107 | msgid "Links to get in touch with experts and other community members" | 108 | msgid "Links to get in touch with experts and other community members" |
386 | 108 | msgstr "" | 109 | msgstr "" |
387 | 109 | 110 | ||
389 | 110 | #. type: Plain text | 111 | #. {: .link-cta-ubuntu} |
390 | 111 | #: content/pages/index.md:11 | 112 | #: content/pages/index.md:11 |
391 | 112 | msgid "[Take me to the FAQ!]({filename}faq.md)" | 113 | msgid "[Take me to the FAQ!]({filename}faq.md)" |
392 | 113 | msgstr "[Take me to the FAQ!]({filename}faq.ru.md)" | 114 | msgstr "[Take me to the FAQ!]({filename}faq.ru.md)" |
393 | 114 | 115 | ||
396 | 115 | #. type: Plain text | 116 | #. {: .link-cta-ubuntu} |
397 | 116 | #: content/pages/index.md:12 | 117 | #: content/pages/index.md:13 |
398 | 117 | msgid "[Get in touch]({filename}get-in-touch.md)" | 118 | msgid "[Get in touch]({filename}get-in-touch.md)" |
399 | 118 | msgstr "[Get in touch]({filename}get-in-touch.ru.md)" | 119 | msgstr "[Get in touch]({filename}get-in-touch.ru.md)" |
400 | 119 | 120 |
PASSED: Continuous integration, rev:149 91.189. 93.70:8080/ job/help- app-ci/ 42/ 91.189. 93.70:8080/ job/help- app-utopic- amd64-ci/ 42 91.189. 93.70:8080/ job/help- app-vivid- amd64-ci/ 44
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/help- app-ci/ 42/rebuild
http://