Merge lp:~nobuto/ubuntu/maverick/ubufox/lp664651 into lp:ubuntu/natty/ubufox
- Maverick (10.10)
- lp664651
- Merge into natty
Proposed by
Nobuto Murata
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 45 | ||||
Proposed branch: | lp:~nobuto/ubuntu/maverick/ubufox/lp664651 | ||||
Merge into: | lp:ubuntu/natty/ubufox | ||||
Diff against target: |
350 lines (+27/-27) 27 files modified
locale/af-ZA/ubufox.properties (+1/-1) locale/ar/ubufox.properties (+1/-1) locale/bg/ubufox.properties (+1/-1) locale/ca/ubufox.properties (+1/-1) locale/cs-CZ/ubufox.properties (+1/-1) locale/de-DE/ubufox.properties (+1/-1) locale/el-GR/ubufox.properties (+1/-1) locale/en-US/ubufox.properties (+1/-1) locale/es/ubufox.properties (+1/-1) locale/eu/ubufox.properties (+1/-1) locale/fi-FI/ubufox.properties (+1/-1) locale/fr/ubufox.properties (+1/-1) locale/gl-ES/ubufox.properties (+1/-1) locale/hu-HU/ubufox.properties (+1/-1) locale/it-IT/ubufox.properties (+1/-1) locale/ja/ubufox.properties (+1/-1) locale/lt-LT/ubufox.properties (+1/-1) locale/nl-NL/ubufox.properties (+1/-1) locale/pl-PL/ubufox.properties (+1/-1) locale/pt-BR/ubufox.properties (+1/-1) locale/pt/ubufox.properties (+1/-1) locale/ro/ubufox.properties (+1/-1) locale/ru-RU/ubufox.properties (+1/-1) locale/sl-SI/ubufox.properties (+1/-1) locale/sv-SE/ubufox.properties (+1/-1) locale/uk/ubufox.properties (+1/-1) locale/zh-CN/ubufox.properties (+1/-1) |
||||
To merge this branch: | bzr merge lp:~nobuto/ubuntu/maverick/ubufox/lp664651 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Micah Gersten (community) | Approve | ||
Review via email: mp+39082@code.launchpad.net |
Commit message
Description of the change
update release notes target from 10.04 to 10.10.
To post a comment you must log in.
Revision history for this message
Nobuto Murata (nobuto) wrote : | # |
> The merge looks fine, do you have an E-Mail address you'd like me to use for
> you in the changelog?
please use nobuto at nobuto-murata.org, thanks.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'locale/af-ZA/ubufox.properties' |
2 | --- locale/af-ZA/ubufox.properties 2010-02-17 21:49:55 +0000 |
3 | +++ locale/af-ZA/ubufox.properties 2010-10-21 18:56:50 +0000 |
4 | @@ -3,7 +3,7 @@ |
5 | prefMessage=Int Voork Waarde: %d |
6 | extensions.ubufox@ubuntu.com.description=Ubuntu Firefox Pak |
7 | ubufox.pluginWizard.availablePluginsPage.description.label=Kies bykomstighede vir media tipe |
8 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
9 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
10 | browser.startup.homepage=about:home |
11 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
12 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
13 | |
14 | === modified file 'locale/ar/ubufox.properties' |
15 | --- locale/ar/ubufox.properties 2010-02-17 21:49:55 +0000 |
16 | +++ locale/ar/ubufox.properties 2010-10-21 18:56:50 +0000 |
17 | @@ -3,7 +3,7 @@ |
18 | prefMessage=قيمة التفضيل الصحيحة: %d |
19 | extensions.ubufox@ubuntu.com.description=حزمة فايرفوكس من أوبونتو. |
20 | ubufox.pluginWizard.availablePluginsPage.description.label=اختر ملحقة لنوع الوسائط |
21 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
22 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
23 | browser.startup.homepage=about:home |
24 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
25 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
26 | |
27 | === modified file 'locale/bg/ubufox.properties' |
28 | --- locale/bg/ubufox.properties 2010-04-09 15:31:08 +0000 |
29 | +++ locale/bg/ubufox.properties 2010-10-21 18:56:50 +0000 |
30 | @@ -3,7 +3,7 @@ |
31 | prefMessage=Int Pref Value: %d |
32 | extensions.ubufox@ubuntu.com.description=Ubuntu Firefox Pack. |
33 | ubufox.pluginWizard.availablePluginsPage.description.label=Избор на приставка за тип медия |
34 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
35 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
36 | browser.startup.homepage=about:home |
37 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
38 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
39 | |
40 | === modified file 'locale/ca/ubufox.properties' |
41 | --- locale/ca/ubufox.properties 2010-02-17 21:49:55 +0000 |
42 | +++ locale/ca/ubufox.properties 2010-10-21 18:56:50 +0000 |
43 | @@ -3,7 +3,7 @@ |
44 | prefMessage=Valor pref int: %d |
45 | extensions.ubufox@ubuntu.com.description=Paquet del Firefox de l'Ubuntu. |
46 | ubufox.pluginWizard.availablePluginsPage.description.label=Trieu un connector per al tipus multimèdia |
47 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
48 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
49 | browser.startup.homepage=about:home |
50 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
51 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
52 | |
53 | === modified file 'locale/cs-CZ/ubufox.properties' |
54 | --- locale/cs-CZ/ubufox.properties 2010-02-17 21:49:55 +0000 |
55 | +++ locale/cs-CZ/ubufox.properties 2010-10-21 18:56:50 +0000 |
56 | @@ -3,7 +3,7 @@ |
57 | prefMessage=Int Pref Value: %d |
58 | extensions.ubufox@ubuntu.com.description=Ubuntu rozšíření pro Firefox. |
59 | ubufox.pluginWizard.availablePluginsPage.description.label=Zvolte zásuvný modul pro daný typ média |
60 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
61 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
62 | browser.startup.homepage=about:home |
63 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
64 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
65 | |
66 | === modified file 'locale/de-DE/ubufox.properties' |
67 | --- locale/de-DE/ubufox.properties 2010-02-17 21:49:55 +0000 |
68 | +++ locale/de-DE/ubufox.properties 2010-10-21 18:56:50 +0000 |
69 | @@ -2,7 +2,7 @@ |
70 | helloMessageTitle=Hello |
71 | extensions.ubufox@ubuntu.com.description=Ubuntu Firefox Paket. |
72 | ubufox.pluginWizard.availablePluginsPage.description.label=Wähle ein plugin für Medien Typ |
73 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
74 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
75 | browser.startup.homepage=about:home |
76 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
77 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
78 | |
79 | === modified file 'locale/el-GR/ubufox.properties' |
80 | --- locale/el-GR/ubufox.properties 2010-02-17 21:49:55 +0000 |
81 | +++ locale/el-GR/ubufox.properties 2010-10-21 18:56:50 +0000 |
82 | @@ -3,7 +3,7 @@ |
83 | prefMessage=Int Pref Value: %d |
84 | extensions.ubufox@ubuntu.com.description=Πακέτο του Ubuntu για το Firefox. |
85 | ubufox.pluginWizard.availablePluginsPage.description.label=Επιλέξτε ένα πρόσθετο για τη μορφή του πολυμέσου |
86 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
87 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
88 | browser.startup.homepage=about:home |
89 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
90 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
91 | |
92 | === modified file 'locale/en-US/ubufox.properties' |
93 | --- locale/en-US/ubufox.properties 2010-02-17 21:49:55 +0000 |
94 | +++ locale/en-US/ubufox.properties 2010-10-21 18:56:50 +0000 |
95 | @@ -3,7 +3,7 @@ |
96 | prefMessage=Int Pref Value: %d |
97 | extensions.ubufox@ubuntu.com.description=Ubuntu Firefox Pack. |
98 | ubufox.pluginWizard.availablePluginsPage.description.label=Choose a plugin for media type |
99 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
100 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
101 | browser.startup.homepage=about:home |
102 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
103 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
104 | |
105 | === modified file 'locale/es/ubufox.properties' |
106 | --- locale/es/ubufox.properties 2010-02-17 21:49:55 +0000 |
107 | +++ locale/es/ubufox.properties 2010-10-21 18:56:50 +0000 |
108 | @@ -3,7 +3,7 @@ |
109 | prefMessage=Valor de Pref Int: %d |
110 | extensions.ubufox@ubuntu.com.description=Paquete de Ubuntu para Firefox. |
111 | ubufox.pluginWizard.availablePluginsPage.description.label=Seleccione un complemento para el tipo de medio |
112 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
113 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
114 | browser.startup.homepage=about:home |
115 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
116 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
117 | |
118 | === modified file 'locale/eu/ubufox.properties' |
119 | --- locale/eu/ubufox.properties 2010-02-17 21:49:55 +0000 |
120 | +++ locale/eu/ubufox.properties 2010-10-21 18:56:50 +0000 |
121 | @@ -4,7 +4,7 @@ |
122 | extensions.ubufox@ubuntu.com.description=Ubuntu Firefox Pack. |
123 | ubufox.pluginWizard.availablePluginsPage.description.label=Multimedia mota horrentzako plugina hautatu |
124 | |
125 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
126 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
127 | browser.startup.homepage=about:home |
128 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
129 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
130 | |
131 | === modified file 'locale/fi-FI/ubufox.properties' |
132 | --- locale/fi-FI/ubufox.properties 2010-02-17 21:49:55 +0000 |
133 | +++ locale/fi-FI/ubufox.properties 2010-10-21 18:56:50 +0000 |
134 | @@ -3,7 +3,7 @@ |
135 | prefMessage=Int Pref Value: %d |
136 | extensions.ubufox@ubuntu.com.description=Ubuntun Firefox-paketti |
137 | ubufox.pluginWizard.availablePluginsPage.description.label=Valitse mediatyypille sopiva liit\u00e4nn\u00e4inen |
138 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
139 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
140 | browser.startup.homepage=about:home |
141 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
142 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
143 | |
144 | === modified file 'locale/fr/ubufox.properties' |
145 | --- locale/fr/ubufox.properties 2010-02-17 21:49:55 +0000 |
146 | +++ locale/fr/ubufox.properties 2010-10-21 18:56:50 +0000 |
147 | @@ -3,7 +3,7 @@ |
148 | prefMessage=Int Pref Value: %d |
149 | extensions.ubufox@ubuntu.com.description=Paquet Firefox Pour Ubuntu. |
150 | ubufox.pluginWizard.availablePluginsPage.description.label=Sélectionnez un plugin pour le type de média |
151 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
152 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
153 | browser.startup.homepage=about:home |
154 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
155 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
156 | |
157 | === modified file 'locale/gl-ES/ubufox.properties' |
158 | --- locale/gl-ES/ubufox.properties 2010-02-17 21:49:55 +0000 |
159 | +++ locale/gl-ES/ubufox.properties 2010-10-21 18:56:50 +0000 |
160 | @@ -3,7 +3,7 @@ |
161 | prefMessage=Int Pref Value: %d |
162 | extensions.ubufox@ubuntu.com.description=Paquete de Ubuntu para Firefox. |
163 | ubufox.pluginWizard.availablePluginsPage.description.label=Escoller un plugin para o tipo de contido |
164 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
165 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
166 | browser.startup.homepage=about:home |
167 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
168 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
169 | |
170 | === modified file 'locale/hu-HU/ubufox.properties' |
171 | --- locale/hu-HU/ubufox.properties 2010-02-17 21:49:55 +0000 |
172 | +++ locale/hu-HU/ubufox.properties 2010-10-21 18:56:50 +0000 |
173 | @@ -3,7 +3,7 @@ |
174 | prefMessage=Egész tulajdonságérték: %d |
175 | extensions.ubufox@ubuntu.com.description=Ubuntu Firefox csomag |
176 | ubufox.pluginWizard.availablePluginsPage.description.label=Válasszon egy bővítményt a médiatípushoz |
177 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
178 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
179 | browser.startup.homepage=about:home |
180 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
181 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
182 | |
183 | === modified file 'locale/it-IT/ubufox.properties' |
184 | --- locale/it-IT/ubufox.properties 2010-02-17 21:49:55 +0000 |
185 | +++ locale/it-IT/ubufox.properties 2010-10-21 18:56:50 +0000 |
186 | @@ -3,7 +3,7 @@ |
187 | prefMessage=Int Pref Value: %d |
188 | extensions.ubufox@ubuntu.com.description=Pacchetto Firefox Ubuntu. |
189 | ubufox.pluginWizard.availablePluginsPage.description.label=Scegliere un plugin per il tipo di media |
190 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
191 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
192 | browser.startup.homepage=about:home |
193 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
194 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
195 | |
196 | === modified file 'locale/ja/ubufox.properties' |
197 | --- locale/ja/ubufox.properties 2010-02-17 21:49:55 +0000 |
198 | +++ locale/ja/ubufox.properties 2010-10-21 18:56:50 +0000 |
199 | @@ -3,7 +3,7 @@ |
200 | prefMessage=Int Pref Value: %d |
201 | extensions.ubufox@ubuntu.com.description=Ubuntu Firefox Pack. |
202 | ubufox.pluginWizard.availablePluginsPage.description.label=メディアの種類でプラグインを選択する |
203 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
204 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
205 | browser.startup.homepage=about:home |
206 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
207 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
208 | |
209 | === modified file 'locale/lt-LT/ubufox.properties' |
210 | --- locale/lt-LT/ubufox.properties 2010-02-17 21:49:55 +0000 |
211 | +++ locale/lt-LT/ubufox.properties 2010-10-21 18:56:50 +0000 |
212 | @@ -3,7 +3,7 @@ |
213 | prefMessage=Int parinkties reikšmė: %d |
214 | extensions.ubufox@ubuntu.com.description=Ubuntu Firefox paketas |
215 | ubufox.pluginWizard.availablePluginsPage.description.label=Pasirinkite įskiepį failo tipui |
216 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
217 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
218 | browser.startup.homepage=about:home |
219 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
220 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
221 | |
222 | === modified file 'locale/nl-NL/ubufox.properties' |
223 | --- locale/nl-NL/ubufox.properties 2010-04-09 15:31:08 +0000 |
224 | +++ locale/nl-NL/ubufox.properties 2010-10-21 18:56:50 +0000 |
225 | @@ -3,7 +3,7 @@ |
226 | prefMessage=Int Pref Value: %d |
227 | extensions.ubufox@ubuntu.com.description=Ubuntu Firefox-pakket. |
228 | ubufox.pluginWizard.availablePluginsPage.description.label=Kies een plug-in voor het mediatype |
229 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
230 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
231 | browser.startup.homepage=about:home |
232 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/locales/index-nl.html |
233 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/locales/index-nl.html |
234 | |
235 | === modified file 'locale/pl-PL/ubufox.properties' |
236 | --- locale/pl-PL/ubufox.properties 2010-02-17 21:49:55 +0000 |
237 | +++ locale/pl-PL/ubufox.properties 2010-10-21 18:56:50 +0000 |
238 | @@ -3,7 +3,7 @@ |
239 | prefMessage=Int Pref Value: %d |
240 | extensions.ubufox@ubuntu.com.description=Pakiet Ubuntu Firefox. |
241 | ubufox.pluginWizard.availablePluginsPage.description.label=Wybór wtyczki dla typu pliku |
242 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
243 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
244 | browser.startup.homepage=about:home |
245 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
246 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
247 | |
248 | === modified file 'locale/pt-BR/ubufox.properties' |
249 | --- locale/pt-BR/ubufox.properties 2010-02-17 21:49:55 +0000 |
250 | +++ locale/pt-BR/ubufox.properties 2010-10-21 18:56:50 +0000 |
251 | @@ -3,7 +3,7 @@ |
252 | prefMessage=Int Pref Value: %d |
253 | extensions.ubufox@ubuntu.com.description=Ubuntu Firefox Pacocte |
254 | ubufox.pluginWizard.availablePluginsPage.description.label=Escolha um plug-in para o tipo de mídia |
255 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
256 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
257 | browser.startup.homepage=about:home |
258 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
259 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
260 | |
261 | === modified file 'locale/pt/ubufox.properties' |
262 | --- locale/pt/ubufox.properties 2010-02-17 21:49:55 +0000 |
263 | +++ locale/pt/ubufox.properties 2010-10-21 18:56:50 +0000 |
264 | @@ -3,7 +3,7 @@ |
265 | prefMessage=Int Pref Value: %d |
266 | extensions.ubufox@ubuntu.com.description=Pacote Ubuntu Firefox |
267 | ubufox.pluginWizard.availablePluginsPage.description.label=Escolha um plugin para o tipo de media |
268 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
269 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
270 | browser.startup.homepage=file:///usr/share/ubuntu-artwork/home/locales/index-pt.html |
271 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
272 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
273 | |
274 | === modified file 'locale/ro/ubufox.properties' |
275 | --- locale/ro/ubufox.properties 2010-02-17 21:49:55 +0000 |
276 | +++ locale/ro/ubufox.properties 2010-10-21 18:56:50 +0000 |
277 | @@ -3,7 +3,7 @@ |
278 | prefMessage=Int Pref Value: %d |
279 | extensions.ubufox@ubuntu.com.description=Pachetul Ubuntu Firefox. |
280 | ubufox.pluginWizard.availablePluginsPage.description.label=Alegeți un modul pentru acest tip media |
281 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
282 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
283 | browser.startup.homepage=about:home |
284 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
285 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
286 | |
287 | === modified file 'locale/ru-RU/ubufox.properties' |
288 | --- locale/ru-RU/ubufox.properties 2010-02-17 21:49:55 +0000 |
289 | +++ locale/ru-RU/ubufox.properties 2010-10-21 18:56:50 +0000 |
290 | @@ -3,7 +3,7 @@ |
291 | prefMessage=Int Pref Value: %d |
292 | extensions.ubufox@ubuntu.com.description=Расширения Firefox для Ubuntu |
293 | ubufox.pluginWizard.availablePluginsPage.description.label=Выберите плагин для типа содержимого |
294 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
295 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
296 | browser.startup.homepage=about:home |
297 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
298 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
299 | |
300 | === modified file 'locale/sl-SI/ubufox.properties' |
301 | --- locale/sl-SI/ubufox.properties 2010-02-17 21:49:55 +0000 |
302 | +++ locale/sl-SI/ubufox.properties 2010-10-21 18:56:50 +0000 |
303 | @@ -3,7 +3,7 @@ |
304 | prefMessage=Int Pref Value: %d |
305 | extensions.ubufox@ubuntu.com.description=Ubuntu razširitve za Firefox. |
306 | ubufox.pluginWizard.availablePluginsPage.description.label=Izberite vtičnik za vrsto datoteke |
307 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
308 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
309 | browser.startup.homepage=about:home |
310 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
311 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
312 | |
313 | === modified file 'locale/sv-SE/ubufox.properties' |
314 | --- locale/sv-SE/ubufox.properties 2010-02-17 21:49:55 +0000 |
315 | +++ locale/sv-SE/ubufox.properties 2010-10-21 18:56:50 +0000 |
316 | @@ -3,7 +3,7 @@ |
317 | prefMessage=Int Pref Value: %d |
318 | extensions.ubufox@ubuntu.com.description=Ubuntu-paket för Firefox. |
319 | ubufox.pluginWizard.availablePluginsPage.description.label=Välj ett instick för mediatypen |
320 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
321 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
322 | browser.startup.homepage=about:home |
323 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
324 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
325 | |
326 | === modified file 'locale/uk/ubufox.properties' |
327 | --- locale/uk/ubufox.properties 2010-02-17 21:49:55 +0000 |
328 | +++ locale/uk/ubufox.properties 2010-10-21 18:56:50 +0000 |
329 | @@ -3,7 +3,7 @@ |
330 | prefMessage=Int Pref Value: %d |
331 | extensions.ubufox@ubuntu.com.description=Убунтівські доповнення до Firefox. |
332 | ubufox.pluginWizard.availablePluginsPage.description.label=Оберіть модуль для цього типу файлів |
333 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
334 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
335 | browser.startup.homepage=about:home |
336 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
337 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
338 | |
339 | === modified file 'locale/zh-CN/ubufox.properties' |
340 | --- locale/zh-CN/ubufox.properties 2010-02-17 21:49:55 +0000 |
341 | +++ locale/zh-CN/ubufox.properties 2010-10-21 18:56:50 +0000 |
342 | @@ -3,7 +3,7 @@ |
343 | prefMessage=整数偏好值: %d |
344 | extensions.ubufox@ubuntu.com.description=Ubuntu 火狐扩展包. |
345 | ubufox.pluginWizard.availablePluginsPage.description.label=选择打开媒体的插件 |
346 | -app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004 |
347 | +app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1010 |
348 | browser.startup.homepage=about:home |
349 | browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html |
350 | app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html |
The merge looks fine, do you have an E-Mail address you'd like me to use for you in the changelog?