Skip to content

Commit fe4b7e6

Browse files
wjyrichBLumia
wjyrich
authored and
BLumia
committed
fix: Add quotation marks to the app name in the uninstall dialog
add "" for app uninstall pms-bug-315259
1 parent 9478166 commit fe4b7e6

40 files changed

Lines changed: 461 additions & 277 deletions

‎qml/Main.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ QtObject {
397397
spacing: 0
398398
Label {
399399
font: DTK.fontManager.t5
400-
text: qsTr("Are you sure you want to uninstall %1?").arg(confirmUninstallDlg.appName)
400+
text: qsTr("Are you sure you want to uninstall \"%1\"?").arg(confirmUninstallDlg.appName)
401401
wrapMode: Text.Wrap
402402
horizontalAlignment: Text.AlignHCenter
403403
Layout.preferredWidth: 400

‎shell-launcher-applet/package/launcheritem.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ AppletItem {
306306
spacing: 0
307307
Label {
308308
font: DTK.fontManager.t5
309-
text: qsTr("Are you sure you want to uninstall %1?").arg(confirmUninstallDlg.appName)
309+
text: qsTr("Are you sure you want to uninstall \"%1\"?").arg(confirmUninstallDlg.appName)
310310
wrapMode: Text.Wrap
311311
horizontalAlignment: Text.AlignHCenter
312312
Layout.preferredWidth: 400

‎shell-launcher-applet/translations/org.deepin.ds.dock.launcherapplet.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<context>
117117
<name>FullscreenFrame</name>
118118
<message>
119-
<location filename="../../qml/FullscreenFrame.qml" line="163"/>
119+
<location filename="../../qml/FullscreenFrame.qml" line="254"/>
120120
<source>Window Mode</source>
121121
<translation type="unfinished"></translation>
122122
</message>
@@ -180,7 +180,7 @@
180180
</message>
181181
<message>
182182
<location filename="../../qml/Main.qml" line="400"/>
183-
<source>Are you sure you want to uninstall %1?</source>
183+
<source>Are you sure you want to uninstall &quot;%1&quot;?</source>
184184
<translation type="unfinished"></translation>
185185
</message>
186186
<message>
@@ -210,7 +210,7 @@
210210
<translation type="unfinished"></translation>
211211
</message>
212212
<message>
213-
<location filename="../../qml/FullscreenFrame.qml" line="556"/>
213+
<location filename="../../qml/FullscreenFrame.qml" line="557"/>
214214
<location filename="../../qml/windowed/SearchResultView.qml" line="102"/>
215215
<source>No search results</source>
216216
<translation type="unfinished"></translation>
@@ -327,17 +327,17 @@
327327
<translation type="unfinished"></translation>
328328
</message>
329329
<message>
330-
<location filename="../package/launcheritem.qml" line="299"/>
331-
<source>Are you sure you want to uninstall %1?</source>
330+
<location filename="../package/launcheritem.qml" line="309"/>
331+
<source>Are you sure you want to uninstall &quot;%1&quot;?</source>
332332
<translation type="unfinished"></translation>
333333
</message>
334334
<message>
335-
<location filename="../package/launcheritem.qml" line="311"/>
335+
<location filename="../package/launcheritem.qml" line="321"/>
336336
<source>Cancel</source>
337337
<translation type="unfinished"></translation>
338338
</message>
339339
<message>
340-
<location filename="../package/launcheritem.qml" line="325"/>
340+
<location filename="../package/launcheritem.qml" line="335"/>
341341
<source>Confirm</source>
342342
<translation type="unfinished"></translation>
343343
</message>

‎shell-launcher-applet/translations/org.deepin.ds.dock.launcherapplet_az.ts‎

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="az">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!DOCTYPE TS>
3+
<TS version="2.1" language="az">
24
<context>
35
<name>AppItemMenu</name>
46
<message>
@@ -77,12 +79,12 @@
7779
<message>
7880
<location filename="../../qml/windowed/BottomBar.qml" line="33"/>
7981
<source>Power</source>
80-
<translation type="unfinished"/>
82+
<translation type="unfinished"></translation>
8183
</message>
8284
<message>
8385
<location filename="../../qml/windowed/BottomBar.qml" line="62"/>
8486
<source>Search</source>
85-
<translation type="unfinished"/>
87+
<translation type="unfinished"></translation>
8688
</message>
8789
<message>
8890
<location filename="../../qml/windowed/BottomBar.qml" line="109"/>
@@ -114,7 +116,7 @@
114116
<context>
115117
<name>FullscreenFrame</name>
116118
<message>
117-
<location filename="../../qml/FullscreenFrame.qml" line="163"/>
119+
<location filename="../../qml/FullscreenFrame.qml" line="254"/>
118120
<source>Window Mode</source>
119121
<translation>Pencərə rejimi</translation>
120122
</message>
@@ -124,27 +126,27 @@
124126
<message>
125127
<location filename="../../qml/Main.qml" line="22"/>
126128
<source>Internet</source>
127-
<translation type="unfinished"/>
129+
<translation type="unfinished"></translation>
128130
</message>
129131
<message>
130132
<location filename="../../qml/Main.qml" line="24"/>
131133
<source>Chat</source>
132-
<translation type="unfinished"/>
134+
<translation type="unfinished"></translation>
133135
</message>
134136
<message>
135137
<location filename="../../qml/Main.qml" line="26"/>
136138
<source>Music</source>
137-
<translation type="unfinished"/>
139+
<translation type="unfinished"></translation>
138140
</message>
139141
<message>
140142
<location filename="../../qml/Main.qml" line="28"/>
141143
<source>Video</source>
142-
<translation type="unfinished"/>
144+
<translation type="unfinished"></translation>
143145
</message>
144146
<message>
145147
<location filename="../../qml/Main.qml" line="30"/>
146148
<source>Graphics</source>
147-
<translation type="unfinished"/>
149+
<translation type="unfinished"></translation>
148150
</message>
149151
<message>
150152
<location filename="../../qml/Main.qml" line="32"/>
@@ -154,22 +156,22 @@
154156
<message>
155157
<location filename="../../qml/Main.qml" line="34"/>
156158
<source>Office</source>
157-
<translation type="unfinished"/>
159+
<translation type="unfinished"></translation>
158160
</message>
159161
<message>
160162
<location filename="../../qml/Main.qml" line="36"/>
161163
<source>Reading</source>
162-
<translation type="unfinished"/>
164+
<translation type="unfinished"></translation>
163165
</message>
164166
<message>
165167
<location filename="../../qml/Main.qml" line="38"/>
166168
<source>Development</source>
167-
<translation type="unfinished"/>
169+
<translation type="unfinished"></translation>
168170
</message>
169171
<message>
170172
<location filename="../../qml/Main.qml" line="40"/>
171173
<source>System</source>
172-
<translation type="unfinished"/>
174+
<translation type="unfinished"></translation>
173175
</message>
174176
<message>
175177
<location filename="../../qml/Main.qml" line="42"/>
@@ -178,8 +180,12 @@
178180
</message>
179181
<message>
180182
<location filename="../../qml/Main.qml" line="400"/>
183+
<source>Are you sure you want to uninstall &quot;%1&quot;?</source>
184+
<translation type="unfinished"></translation>
185+
</message>
186+
<message>
181187
<source>Are you sure you want to uninstall %1?</source>
182-
<translation>%1 cıxartmaq istəyirsiniz?
188+
<translation type="vanished">%1 cıxartmaq istəyirsiniz?
183189
</translation>
184190
</message>
185191
<message>
@@ -209,7 +215,7 @@
209215
<translation>Bütün uquanlar</translation>
210216
</message>
211217
<message>
212-
<location filename="../../qml/FullscreenFrame.qml" line="556"/>
218+
<location filename="../../qml/FullscreenFrame.qml" line="557"/>
213219
<location filename="../../qml/windowed/SearchResultView.qml" line="102"/>
214220
<source>No search results</source>
215221
<translation>Axtarış nəticəsi tapılmadı</translation>
@@ -268,27 +274,27 @@
268274
<message>
269275
<location filename="../package/launcheritem.qml" line="111"/>
270276
<source>Internet</source>
271-
<translation type="unfinished"/>
277+
<translation type="unfinished"></translation>
272278
</message>
273279
<message>
274280
<location filename="../package/launcheritem.qml" line="113"/>
275281
<source>Chat</source>
276-
<translation type="unfinished"/>
282+
<translation type="unfinished"></translation>
277283
</message>
278284
<message>
279285
<location filename="../package/launcheritem.qml" line="115"/>
280286
<source>Music</source>
281-
<translation type="unfinished"/>
287+
<translation type="unfinished"></translation>
282288
</message>
283289
<message>
284290
<location filename="../package/launcheritem.qml" line="117"/>
285291
<source>Video</source>
286-
<translation type="unfinished"/>
292+
<translation type="unfinished"></translation>
287293
</message>
288294
<message>
289295
<location filename="../package/launcheritem.qml" line="119"/>
290296
<source>Graphics</source>
291-
<translation type="unfinished"/>
297+
<translation type="unfinished"></translation>
292298
</message>
293299
<message>
294300
<location filename="../package/launcheritem.qml" line="121"/>
@@ -298,22 +304,22 @@
298304
<message>
299305
<location filename="../package/launcheritem.qml" line="123"/>
300306
<source>Office</source>
301-
<translation type="unfinished"/>
307+
<translation type="unfinished"></translation>
302308
</message>
303309
<message>
304310
<location filename="../package/launcheritem.qml" line="125"/>
305311
<source>Reading</source>
306-
<translation type="unfinished"/>
312+
<translation type="unfinished"></translation>
307313
</message>
308314
<message>
309315
<location filename="../package/launcheritem.qml" line="127"/>
310316
<source>Development</source>
311-
<translation type="unfinished"/>
317+
<translation type="unfinished"></translation>
312318
</message>
313319
<message>
314320
<location filename="../package/launcheritem.qml" line="129"/>
315321
<source>System</source>
316-
<translation type="unfinished"/>
322+
<translation type="unfinished"></translation>
317323
</message>
318324
<message>
319325
<location filename="../package/launcheritem.qml" line="131"/>
@@ -326,20 +332,24 @@
326332
<translation>launchpad</translation>
327333
</message>
328334
<message>
329-
<location filename="../package/launcheritem.qml" line="299"/>
335+
<location filename="../package/launcheritem.qml" line="309"/>
336+
<source>Are you sure you want to uninstall &quot;%1&quot;?</source>
337+
<translation type="unfinished"></translation>
338+
</message>
339+
<message>
330340
<source>Are you sure you want to uninstall %1?</source>
331-
<translation>%1 cıxış etmək istəyirsiniz?
341+
<translation type="vanished">%1 cıxış etmək istəyirsiniz?
332342
</translation>
333343
</message>
334344
<message>
335-
<location filename="../package/launcheritem.qml" line="311"/>
345+
<location filename="../package/launcheritem.qml" line="321"/>
336346
<source>Cancel</source>
337347
<translation>İptal</translation>
338348
</message>
339349
<message>
340-
<location filename="../package/launcheritem.qml" line="325"/>
350+
<location filename="../package/launcheritem.qml" line="335"/>
341351
<source>Confirm</source>
342352
<translation>Təsdiq et</translation>
343353
</message>
344354
</context>
345-
</TS>
355+
</TS>

‎shell-launcher-applet/translations/org.deepin.ds.dock.launcherapplet_bo.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
<translation type="obsolete">བཤེར་འཚོལ།</translation>
160160
</message>
161161
<message>
162-
<location filename="../../qml/FullscreenFrame.qml" line="163"/>
162+
<location filename="../../qml/FullscreenFrame.qml" line="254"/>
163163
<source>Window Mode</source>
164164
<translation type="unfinished"></translation>
165165
</message>
@@ -223,7 +223,7 @@
223223
</message>
224224
<message>
225225
<location filename="../../qml/Main.qml" line="400"/>
226-
<source>Are you sure you want to uninstall %1?</source>
226+
<source>Are you sure you want to uninstall &quot;%1&quot;?</source>
227227
<translation type="unfinished"></translation>
228228
</message>
229229
<message>
@@ -253,7 +253,7 @@
253253
<translation type="unfinished"></translation>
254254
</message>
255255
<message>
256-
<location filename="../../qml/FullscreenFrame.qml" line="556"/>
256+
<location filename="../../qml/FullscreenFrame.qml" line="557"/>
257257
<location filename="../../qml/windowed/SearchResultView.qml" line="102"/>
258258
<source>No search results</source>
259259
<translation type="unfinished"></translation>
@@ -385,17 +385,17 @@
385385
<translation type="unfinished"></translation>
386386
</message>
387387
<message>
388-
<location filename="../package/launcheritem.qml" line="299"/>
389-
<source>Are you sure you want to uninstall %1?</source>
388+
<location filename="../package/launcheritem.qml" line="309"/>
389+
<source>Are you sure you want to uninstall &quot;%1&quot;?</source>
390390
<translation type="unfinished"></translation>
391391
</message>
392392
<message>
393-
<location filename="../package/launcheritem.qml" line="311"/>
393+
<location filename="../package/launcheritem.qml" line="321"/>
394394
<source>Cancel</source>
395395
<translation type="unfinished"></translation>
396396
</message>
397397
<message>
398-
<location filename="../package/launcheritem.qml" line="325"/>
398+
<location filename="../package/launcheritem.qml" line="335"/>
399399
<source>Confirm</source>
400400
<translation type="unfinished"></translation>
401401
</message>

‎shell-launcher-applet/translations/org.deepin.ds.dock.launcherapplet_ca.ts‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="ca">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!DOCTYPE TS>
3+
<TS version="2.1" language="ca">
24
<context>
35
<name>AppItemMenu</name>
46
<message>
@@ -114,7 +116,7 @@
114116
<context>
115117
<name>FullscreenFrame</name>
116118
<message>
117-
<location filename="../../qml/FullscreenFrame.qml" line="163"/>
119+
<location filename="../../qml/FullscreenFrame.qml" line="254"/>
118120
<source>Window Mode</source>
119121
<translation>Mode de finestra</translation>
120122
</message>
@@ -178,8 +180,12 @@
178180
</message>
179181
<message>
180182
<location filename="../../qml/Main.qml" line="400"/>
183+
<source>Are you sure you want to uninstall &quot;%1&quot;?</source>
184+
<translation type="unfinished"></translation>
185+
</message>
186+
<message>
181187
<source>Are you sure you want to uninstall %1?</source>
182-
<translation>Segur que voleu desinstal·lar %1?</translation>
188+
<translation type="vanished">Segur que voleu desinstal·lar %1?</translation>
183189
</message>
184190
<message>
185191
<location filename="../../qml/Main.qml" line="412"/>
@@ -208,7 +214,7 @@
208214
<translation>Totes les aplicacions</translation>
209215
</message>
210216
<message>
211-
<location filename="../../qml/FullscreenFrame.qml" line="556"/>
217+
<location filename="../../qml/FullscreenFrame.qml" line="557"/>
212218
<location filename="../../qml/windowed/SearchResultView.qml" line="102"/>
213219
<source>No search results</source>
214220
<translation>No hi ha resultats de la cerca.</translation>
@@ -325,19 +331,23 @@
325331
<translation>plataforma de llançament</translation>
326332
</message>
327333
<message>
328-
<location filename="../package/launcheritem.qml" line="299"/>
334+
<location filename="../package/launcheritem.qml" line="309"/>
335+
<source>Are you sure you want to uninstall &quot;%1&quot;?</source>
336+
<translation type="unfinished"></translation>
337+
</message>
338+
<message>
329339
<source>Are you sure you want to uninstall %1?</source>
330-
<translation>Segur que voleu desinstal·lar %1?</translation>
340+
<translation type="vanished">Segur que voleu desinstal·lar %1?</translation>
331341
</message>
332342
<message>
333-
<location filename="../package/launcheritem.qml" line="311"/>
343+
<location filename="../package/launcheritem.qml" line="321"/>
334344
<source>Cancel</source>
335345
<translation>Cancel·la</translation>
336346
</message>
337347
<message>
338-
<location filename="../package/launcheritem.qml" line="325"/>
348+
<location filename="../package/launcheritem.qml" line="335"/>
339349
<source>Confirm</source>
340350
<translation>Confirmeu-ho</translation>
341351
</message>
342352
</context>
343-
</TS>
353+
</TS>

0 commit comments

Comments
 (0)