~saiarcot895/chromium-browser/chromium-browser.precise.dev

« back to all changes in this revision

Viewing changes to debian/patches/lp-translations-paths

  • Committer: Saikrishna Arcot
  • Date: 2015-09-03 17:21:26 UTC
  • Revision ID: saikrishna@saikrishna-vps-20150903172126-r5gjjm1zn0ds07na
Tags: 47.0.2498.0-0ubuntu1~ppa1~precise1
* New upstream version 47.0.2498.0
* Updated patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Index: dev.wily/content/app/strings/content_strings.grd
2
 
===================================================================
3
 
--- dev.wily.orig/content/app/strings/content_strings.grd
4
 
+++ dev.wily/content/app/strings/content_strings.grd
5
 
@@ -48,34 +48,34 @@ below:
6
 
     <output filename="content_strings_am.pak" type="data_package" lang="am" />
7
 
     <output filename="content_strings_ar.pak" type="data_package" lang="ar" />
8
 
     <if expr="use_third_party_translations">
9
 
-      <output filename="webkit_strings_ast.pak" type="data_package" lang="ast" />
10
 
+      <output filename="content_strings_ast.pak" type="data_package" lang="ast" />
11
 
     </if>
12
 
     <output filename="content_strings_bg.pak" type="data_package" lang="bg" />
13
 
     <output filename="content_strings_bn.pak" type="data_package" lang="bn" />
14
 
     <if expr="use_third_party_translations">
15
 
-      <output filename="webkit_strings_bs.pak" type="data_package" lang="bs" />
16
 
+      <output filename="content_strings_bs.pak" type="data_package" lang="bs" />
17
 
     </if>
18
 
     <output filename="content_strings_ca.pak" type="data_package" lang="ca" />
19
 
     <if expr="use_third_party_translations">
20
 
-      <output filename="webkit_strings_ca@valencia.pak" type="data_package" lang="ca@valencia" />
21
 
+      <output filename="content_strings_ca@valencia.pak" type="data_package" lang="ca@valencia" />
22
 
     </if>
23
 
     <output filename="content_strings_cs.pak" type="data_package" lang="cs" />
24
 
     <output filename="content_strings_da.pak" type="data_package" lang="da" />
25
 
     <output filename="content_strings_de.pak" type="data_package" lang="de" />
26
 
     <output filename="content_strings_el.pak" type="data_package" lang="el" />
27
 
     <if expr="use_third_party_translations">
28
 
-      <output filename="webkit_strings_en-AU.pak" type="data_package" lang="en-AU" />
29
 
+      <output filename="content_strings_en-AU.pak" type="data_package" lang="en-AU" />
30
 
     </if>
31
 
     <output filename="content_strings_en-GB.pak" type="data_package" lang="en-GB" />
32
 
     <output filename="content_strings_en-US.pak" type="data_package" lang="en" />
33
 
     <if expr="use_third_party_translations">
34
 
-      <output filename="webkit_strings_eo.pak" type="data_package" lang="eo" />
35
 
+      <output filename="content_strings_eo.pak" type="data_package" lang="eo" />
36
 
     </if>
37
 
     <output filename="content_strings_es.pak" type="data_package" lang="es" />
38
 
     <output filename="content_strings_es-419.pak" type="data_package" lang="es-419" />
39
 
     <output filename="content_strings_et.pak" type="data_package" lang="et" />
40
 
     <if expr="use_third_party_translations">
41
 
-      <output filename="webkit_strings_eu.pak" type="data_package" lang="eu" />
42
 
+      <output filename="content_strings_eu.pak" type="data_package" lang="eu" />
43
 
     </if>
44
 
     <output filename="content_strings_fa.pak" type="data_package" lang="fa" />
45
 
     <output filename="content_strings_fake-bidi.pak" type="data_package" lang="fake-bidi" />
46
 
@@ -83,7 +83,7 @@ below:
47
 
     <output filename="content_strings_fil.pak" type="data_package" lang="fil" />
48
 
     <output filename="content_strings_fr.pak" type="data_package" lang="fr" />
49
 
     <if expr="use_third_party_translations">
50
 
-      <output filename="webkit_strings_gl.pak" type="data_package" lang="gl" />
51
 
+      <output filename="content_strings_gl.pak" type="data_package" lang="gl" />
52
 
     </if>
53
 
     <output filename="content_strings_gu.pak" type="data_package" lang="gu" />
54
 
     <output filename="content_strings_he.pak" type="data_package" lang="he" />
55
 
@@ -91,20 +91,20 @@ below:
56
 
     <output filename="content_strings_hr.pak" type="data_package" lang="hr" />
57
 
     <output filename="content_strings_hu.pak" type="data_package" lang="hu" />
58
 
     <if expr="use_third_party_translations">
59
 
-      <output filename="webkit_strings_hy.pak" type="data_package" lang="hy" />
60
 
-      <output filename="webkit_strings_ia.pak" type="data_package" lang="ia" />
61
 
+      <output filename="content_strings_hy.pak" type="data_package" lang="hy" />
62
 
+      <output filename="content_strings_ia.pak" type="data_package" lang="ia" />
63
 
     </if>
64
 
     <output filename="content_strings_id.pak" type="data_package" lang="id" />
65
 
     <output filename="content_strings_it.pak" type="data_package" lang="it" />
66
 
     <output filename="content_strings_ja.pak" type="data_package" lang="ja" />
67
 
     <if expr="use_third_party_translations">
68
 
-      <output filename="webkit_strings_ka.pak" type="data_package" lang="ka" />
69
 
+      <output filename="content_strings_ka.pak" type="data_package" lang="ka" />
70
 
     </if>
71
 
     <output filename="content_strings_kn.pak" type="data_package" lang="kn" />
72
 
     <output filename="content_strings_ko.pak" type="data_package" lang="ko" />
73
 
     <if expr="use_third_party_translations">
74
 
-      <output filename="webkit_strings_ku.pak" type="data_package" lang="ku" />
75
 
-      <output filename="webkit_strings_kw.pak" type="data_package" lang="kw" />
76
 
+      <output filename="content_strings_ku.pak" type="data_package" lang="ku" />
77
 
+      <output filename="content_strings_kw.pak" type="data_package" lang="kw" />
78
 
     </if>
79
 
     <output filename="content_strings_lt.pak" type="data_package" lang="lt" />
80
 
     <output filename="content_strings_lv.pak" type="data_package" lang="lv" />
81
 
@@ -130,7 +130,7 @@ below:
82
 
     <output filename="content_strings_th.pak" type="data_package" lang="th" />
83
 
     <output filename="content_strings_tr.pak" type="data_package" lang="tr" />
84
 
     <if expr="use_third_party_translations">
85
 
-      <output filename="webkit_strings_ug.pak" type="data_package" lang="ug" />
86
 
+      <output filename="content_strings_ug.pak" type="data_package" lang="ug" />
87
 
     </if>
88
 
     <output filename="content_strings_uk.pak" type="data_package" lang="uk" />
89
 
     <output filename="content_strings_vi.pak" type="data_package" lang="vi" />
90
 
@@ -141,44 +141,44 @@ below:
91
 
     <file path="translations/content_strings_am.xtb" lang="am" />
92
 
     <file path="translations/content_strings_ar.xtb" lang="ar" />
93
 
     <if expr="use_third_party_translations">
94
 
-      <file path="../../third_party/launchpad_translations/webkit_strings_ast.xtb" lang="ast" />
95
 
+      <file path="../../../third_party/launchpad_translations/webkit_strings_ast.xtb" lang="ast" />
96
 
     </if>
97
 
     <file path="translations/content_strings_bg.xtb" lang="bg" />
98
 
     <file path="translations/content_strings_bn.xtb" lang="bn" />
99
 
     <if expr="use_third_party_translations">
100
 
-      <file path="../../third_party/launchpad_translations/webkit_strings_bs.xtb" lang="bs" />
101
 
+      <file path="../../../third_party/launchpad_translations/webkit_strings_bs.xtb" lang="bs" />
102
 
     </if>
103
 
     <file path="translations/content_strings_ca.xtb" lang="ca" />
104
 
     <if expr="use_third_party_translations">
105
 
-      <file path="../../third_party/launchpad_translations/webkit_strings_ca-valencia.xtb" lang="ca@valencia" />
106
 
+      <file path="../../../third_party/launchpad_translations/webkit_strings_ca-valencia.xtb" lang="ca@valencia" />
107
 
     </if>
108
 
     <file path="translations/content_strings_cs.xtb" lang="cs" />
109
 
     <file path="translations/content_strings_da.xtb" lang="da" />
110
 
     <file path="translations/content_strings_de.xtb" lang="de" />
111
 
     <file path="translations/content_strings_el.xtb" lang="el" />
112
 
     <if expr="use_third_party_translations">
113
 
-      <file path="../../third_party/launchpad_translations/webkit_strings_en-AU.xtb" lang="en-AU" />
114
 
+      <file path="../../../third_party/launchpad_translations/webkit_strings_en-AU.xtb" lang="en-AU" />
115
 
     </if>
116
 
     <file path="translations/content_strings_en-GB.xtb" lang="en-GB" />
117
 
     <file path="translations/content_strings_es.xtb" lang="es" />
118
 
     <file path="translations/content_strings_es-419.xtb" lang="es-419" />
119
 
     <file path="translations/content_strings_et.xtb" lang="et" />
120
 
     <if expr="use_third_party_translations">
121
 
-      <file path="../../third_party/launchpad_translations/webkit_strings_eu.xtb" lang="eu" />
122
 
+      <file path="../../../third_party/launchpad_translations/webkit_strings_eu.xtb" lang="eu" />
123
 
     </if>
124
 
     <file path="translations/content_strings_fa.xtb" lang="fa" />
125
 
     <file path="translations/content_strings_fi.xtb" lang="fi" />
126
 
     <file path="translations/content_strings_fil.xtb" lang="fil" />
127
 
     <file path="translations/content_strings_fr.xtb" lang="fr" />
128
 
     <if expr="use_third_party_translations">
129
 
-      <file path="../../third_party/launchpad_translations/webkit_strings_gl.xtb" lang="gl" />
130
 
+      <file path="../../../third_party/launchpad_translations/webkit_strings_gl.xtb" lang="gl" />
131
 
     </if>
132
 
     <file path="translations/content_strings_gu.xtb" lang="gu" />
133
 
     <file path="translations/content_strings_hi.xtb" lang="hi" />
134
 
     <file path="translations/content_strings_hr.xtb" lang="hr" />
135
 
     <file path="translations/content_strings_hu.xtb" lang="hu" />
136
 
     <if expr="use_third_party_translations">
137
 
-      <file path="../../third_party/launchpad_translations/webkit_strings_hy.xtb" lang="hy" />
138
 
+      <file path="../../../third_party/launchpad_translations/webkit_strings_hy.xtb" lang="hy" />
139
 
     </if>
140
 
     <file path="translations/content_strings_id.xtb" lang="id" />
141
 
     <file path="translations/content_strings_it.xtb" lang="it" />
142
 
@@ -186,13 +186,13 @@ below:
143
 
     <file path="translations/content_strings_iw.xtb" lang="he" />
144
 
     <file path="translations/content_strings_ja.xtb" lang="ja" />
145
 
     <if expr="use_third_party_translations">
146
 
-      <file path="../../third_party/launchpad_translations/webkit_strings_ka.xtb" lang="ka" />
147
 
+      <file path="../../../third_party/launchpad_translations/webkit_strings_ka.xtb" lang="ka" />
148
 
     </if>
149
 
     <file path="translations/content_strings_kn.xtb" lang="kn" />
150
 
     <file path="translations/content_strings_ko.xtb" lang="ko" />
151
 
     <if expr="use_third_party_translations">
152
 
-      <file path="../../third_party/launchpad_translations/webkit_strings_ku.xtb" lang="ku" />
153
 
-      <file path="../../third_party/launchpad_translations/webkit_strings_kw.xtb" lang="kw" />
154
 
+      <file path="../../../third_party/launchpad_translations/webkit_strings_ku.xtb" lang="ku" />
155
 
+      <file path="../../../third_party/launchpad_translations/webkit_strings_kw.xtb" lang="kw" />
156
 
     </if>
157
 
     <file path="translations/content_strings_lt.xtb" lang="lt" />
158
 
     <file path="translations/content_strings_lv.xtb" lang="lv" />
159
 
@@ -216,7 +216,7 @@ below:
160
 
     <file path="translations/content_strings_th.xtb" lang="th" />
161
 
     <file path="translations/content_strings_tr.xtb" lang="tr" />
162
 
     <if expr="use_third_party_translations">
163
 
-      <file path="../../third_party/launchpad_translations/webkit_strings_ug.xtb" lang="ug" />
164
 
+      <file path="../../../third_party/launchpad_translations/webkit_strings_ug.xtb" lang="ug" />
165
 
     </if>
166
 
     <file path="translations/content_strings_uk.xtb" lang="uk" />
167
 
     <file path="translations/content_strings_vi.xtb" lang="vi" />
168
 
Index: dev.wily/tools/grit/grit/testdata/chrome/app/generated_resources.grd
169
 
===================================================================
170
 
--- dev.wily.orig/tools/grit/grit/testdata/chrome/app/generated_resources.grd
171
 
+++ dev.wily/tools/grit/grit/testdata/chrome/app/generated_resources.grd
172
 
@@ -110,49 +110,49 @@ are declared in build/common.gypi.
173
 
   <translations>
174
 
     <file path="resources/generated_resources_am.xtb" lang="am" />
175
 
     <file path="resources/generated_resources_ar.xtb" lang="ar" />
176
 
-    <file path="../../third_party/launchpad_translations/generated_resources_ast.xtb" lang="ast" />
177
 
+    <file path="../../../third_party/launchpad_translations/generated_resources_ast.xtb" lang="ast" />
178
 
     <file path="resources/generated_resources_bg.xtb" lang="bg" />
179
 
     <file path="resources/generated_resources_bn.xtb" lang="bn" />
180
 
-    <file path="../../third_party/launchpad_translations/generated_resources_bs.xtb" lang="bs" />
181
 
+    <file path="../../../third_party/launchpad_translations/generated_resources_bs.xtb" lang="bs" />
182
 
     <file path="resources/generated_resources_ca.xtb" lang="ca" />
183
 
-    <file path="../../third_party/launchpad_translations/generated_resources_ca-valencia.xtb" lang="ca@valencia" />
184
 
+    <file path="../../../third_party/launchpad_translations/generated_resources_ca-valencia.xtb" lang="ca@valencia" />
185
 
     <file path="resources/generated_resources_cs.xtb" lang="cs" />
186
 
     <file path="resources/generated_resources_da.xtb" lang="da" />
187
 
     <file path="resources/generated_resources_de.xtb" lang="de" />
188
 
     <file path="resources/generated_resources_el.xtb" lang="el" />
189
 
-    <file path="../../third_party/launchpad_translations/generated_resources_en-AU.xtb" lang="en-AU" />
190
 
+    <file path="../../../third_party/launchpad_translations/generated_resources_en-AU.xtb" lang="en-AU" />
191
 
     <file path="resources/generated_resources_en-GB.xtb" lang="en-GB" />
192
 
-    <file path="../../third_party/launchpad_translations/generated_resources_eo.xtb" lang="eo" />
193
 
+    <file path="../../../third_party/launchpad_translations/generated_resources_eo.xtb" lang="eo" />
194
 
     <file path="resources/generated_resources_es.xtb" lang="es" />
195
 
     <file path="resources/generated_resources_es-419.xtb" lang="es-419" />
196
 
     <file path="resources/generated_resources_et.xtb" lang="et" />
197
 
-    <file path="../../third_party/launchpad_translations/generated_resources_eu.xtb" lang="eu" />
198
 
+    <file path="../../../third_party/launchpad_translations/generated_resources_eu.xtb" lang="eu" />
199
 
     <file path="resources/generated_resources_fa.xtb" lang="fa" />
200
 
     <file path="resources/generated_resources_fi.xtb" lang="fi" />
201
 
     <file path="resources/generated_resources_fil.xtb" lang="fil" />
202
 
     <file path="resources/generated_resources_fr.xtb" lang="fr" />
203
 
-    <file path="../../third_party/launchpad_translations/generated_resources_gl.xtb" lang="gl" />
204
 
+    <file path="../../../third_party/launchpad_translations/generated_resources_gl.xtb" lang="gl" />
205
 
     <file path="resources/generated_resources_gu.xtb" lang="gu" />
206
 
     <file path="resources/generated_resources_hi.xtb" lang="hi" />
207
 
     <file path="resources/generated_resources_hr.xtb" lang="hr" />
208
 
     <file path="resources/generated_resources_hu.xtb" lang="hu" />
209
 
-    <file path="../../third_party/launchpad_translations/generated_resources_hy.xtb" lang="hy" />
210
 
-    <file path="../../third_party/launchpad_translations/generated_resources_ia.xtb" lang="ia" />
211
 
+    <file path="../../../third_party/launchpad_translations/generated_resources_hy.xtb" lang="hy" />
212
 
+    <file path="../../../third_party/launchpad_translations/generated_resources_ia.xtb" lang="ia" />
213
 
     <file path="resources/generated_resources_id.xtb" lang="id" />
214
 
     <file path="resources/generated_resources_it.xtb" lang="it" />
215
 
     <!-- The translation console uses 'iw' for Hebrew, but we use 'he'. -->
216
 
     <file path="resources/generated_resources_iw.xtb" lang="he" />
217
 
     <file path="resources/generated_resources_ja.xtb" lang="ja" />
218
 
-    <file path="../../third_party/launchpad_translations/generated_resources_ka.xtb" lang="ka" />
219
 
+    <file path="../../../third_party/launchpad_translations/generated_resources_ka.xtb" lang="ka" />
220
 
     <file path="resources/generated_resources_kn.xtb" lang="kn" />
221
 
     <file path="resources/generated_resources_ko.xtb" lang="ko" />
222
 
-    <file path="../../third_party/launchpad_translations/generated_resources_ku.xtb" lang="ku" />
223
 
-    <file path="../../third_party/launchpad_translations/generated_resources_kw.xtb" lang="kw" />
224
 
+    <file path="../../../third_party/launchpad_translations/generated_resources_ku.xtb" lang="ku" />
225
 
+    <file path="../../../third_party/launchpad_translations/generated_resources_kw.xtb" lang="kw" />
226
 
     <file path="resources/generated_resources_lt.xtb" lang="lt" />
227
 
     <file path="resources/generated_resources_lv.xtb" lang="lv" />
228
 
     <file path="resources/generated_resources_ml.xtb" lang="ml" />
229
 
     <file path="resources/generated_resources_mr.xtb" lang="mr" />
230
 
-    <file path="../../third_party/launchpad_translations/generated_resources_ms.xtb" lang="ms" />
231
 
+    <file path="../../../third_party/launchpad_translations/generated_resources_ms.xtb" lang="ms" />
232
 
     <file path="resources/generated_resources_nl.xtb" lang="nl" />
233
 
     <file path="resources/generated_resources_no.xtb" lang="no" />
234
 
     <file path="resources/generated_resources_pl.xtb" lang="pl" />
235
 
@@ -169,7 +169,7 @@ are declared in build/common.gypi.
236
 
     <file path="resources/generated_resources_te.xtb" lang="te" />
237
 
     <file path="resources/generated_resources_th.xtb" lang="th" />
238
 
     <file path="resources/generated_resources_tr.xtb" lang="tr" />
239
 
-    <file path="../../third_party/launchpad_translations/generated_resources_ug.xtb" lang="ug" />
240
 
+    <file path="../../../third_party/launchpad_translations/generated_resources_ug.xtb" lang="ug" />
241
 
     <file path="resources/generated_resources_uk.xtb" lang="uk" />
242
 
     <file path="resources/generated_resources_vi.xtb" lang="vi" />
243
 
     <file path="resources/generated_resources_zh-CN.xtb" lang="zh-CN" />