]> git.pld-linux.org Git - packages/kde4-kdebase-workspace.git/blame - kde4-kdebase-workspace-branch.diff
projects / packages / kde4-kdebase-workspace.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- rel 4; branch diff update
[packages/kde4-kdebase-workspace.git] / kde4-kdebase-workspace-branch.diff
CommitLineData
7aab7511
AM		 1--- workspace/ksmserver/kcm/kcmsmserver.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
2+++ workspace/ksmserver/kcm/kcmsmserver.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
3@@ -87,8 +87,8 @@
4 Name[uz@cyrillic]=Сеанс бошқарувчиси
5 Name[vi]=Bộ quản lý phiên chạy
6 Name[wa]=Manaedjeu di sessions
7+Name[xh]=Umphathi wesiqendu
8 Name[x-test]=xxSession Managerxx
9-Name[xh]=Umphathi wesiqendu
10 Name[zh_CN]=会话管理器
11 Name[zh_TW]=工作階段管理程式
12
13@@ -167,8 +167,8 @@
14 Comment[uz@cyrillic]=Сеанс бошқарувчисини ва чиқиш мосламаларини мослаш
15 Comment[vi]=Cấu hình trình quản lý phiên chạy và thiết lập đăng xuất
16 Comment[wa]=Apontiaedje do manaedjeu di sessions eyet apontiaedjes do dislodjaedje
17+Comment[xh]=Qwalasela umphathi wesiqendu nezicwangciso zokuphuma ngaphandle
18 Comment[x-test]=xxConfigure the session manager and logout settingsxx
19-Comment[xh]=Qwalasela umphathi wesiqendu nezicwangciso zokuphuma ngaphandle
20 Comment[zh_CN]=配置会话管理器和注销设置
21 Comment[zh_TW]=設定工作階段管理程式與登出設定值
22
23--- workspace/kcontrol/dateandtime/clock.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
24+++ workspace/kcontrol/dateandtime/clock.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
25@@ -90,8 +90,8 @@
26 Name[uz@cyrillic]=Сана ва вақт
27 Name[vi]=Ngày và Giờ
28 Name[wa]=Date et eure
29+Name[xh]=Umhla & Ixesha
30 Name[x-test]=xxDate & Timexx
31-Name[xh]=Umhla & Ixesha
32 Name[zh_CN]=日期和时间
33 Name[zh_TW]=日期和時間
34
35@@ -173,8 +173,8 @@
36 Comment[uz@cyrillic]=Сана ва вақтнинг мосламалари
37 Comment[vi]=Thiết lập ngày giờ
38 Comment[wa]=Apontiaedjes del date et l' eure
39+Comment[xh]=Izicwangciso zomhla kunye nexesha
40 Comment[x-test]=xxDate and time settingsxx
41-Comment[xh]=Izicwangciso zomhla kunye nexesha
42 Comment[zh_CN]=日期和时间设置
43 Comment[zh_TW]=日期和時間設定值
44
45--- workspace/kcontrol/dateandtime/dtime.cpp (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
46+++ workspace/kcontrol/dateandtime/dtime.cpp (.../branches/KDE/4.2/kdebase) (wersja 974231)
47@@ -204,8 +204,6 @@
48
49 connect( &internalTimer, SIGNAL(timeout()), SLOT(timeout()) );
50
51- load();
52-
53 kclock->setEnabled(false);
401a794a
AM		 54 }
55
7aab7511
AM		 56@@ -262,6 +260,7 @@
57 // since there is nothing writing it.
58 KConfig _config( "kcmclockrc", KConfig::NoGlobals );
59 KConfigGroup config(&_config, "NTP");
60+ timeServerList->clear();
61 timeServerList->addItems(config.readEntry("servers",
62 i18n("Public Time Server (pool.ntp.org),\
63 asia.pool.ntp.org,\
64--- workspace/kcontrol/kfontinst/kcmfontinst/fontinst.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
65+++ workspace/kcontrol/kfontinst/kcmfontinst/fontinst.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
66@@ -87,8 +87,8 @@
67 Name[uz@cyrillic]=Шрифт ўрнатгич
68 Name[vi]=Cài đặt Phông chữ
69 Name[wa]=Astaleu di fontes
70+Name[xh]=Umfaki Wohlobo lwegama
71 Name[x-test]=xxFont Installerxx
72-Name[xh]=Umfaki Wohlobo lwegama
73 Name[zh_CN]=字体安装程序
74 Name[zh_TW]=字型安裝程式
75
76--- workspace/kcontrol/kfontinst/viewpart/kfontviewpart.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
77+++ workspace/kcontrol/kfontinst/viewpart/kfontviewpart.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
78@@ -77,8 +77,8 @@
79 Name[uz@cyrillic]=Шрифт кўрувчи
80 Name[vi]=Bộ xem Phông chữ
81 Name[wa]=Håyneu d' fontes
82+Name[xh]=Imboniselo Yohlobo lwegama
83 Name[x-test]=xxFont Viewerxx
84-Name[xh]=Imboniselo Yohlobo lwegama
85 Name[zh_CN]=字体查看器
86 Name[zh_TW]=字型檢視器
87 MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-pcf;application/x-font-bdf;fonts/package;
88--- workspace/kcontrol/kfontinst/kio/fonts.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
89+++ workspace/kcontrol/kfontinst/kio/fonts.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
90@@ -81,8 +81,8 @@
91 Name[uz@cyrillic]=Шрифтлар
92 Name[vi]=Phông chữ
93 Name[wa]=Fontes
94+Name[xh]=Uhlobo lwamagama
95 Name[x-test]=xxFontsxx
96-Name[xh]=Uhlobo lwamagama
97 Name[zh_CN]=字体
98 Name[zh_TW]=字型
99 Open=false
100--- workspace/kcontrol/kfontinst/thumbnail/fontthumbnail.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
101+++ workspace/kcontrol/kfontinst/thumbnail/fontthumbnail.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
102@@ -79,8 +79,8 @@
103 Name[uz@cyrillic]=Шрифт-файллари
104 Name[vi]=Tập tin Phông chữ
105 Name[wa]=Fitchîs fontes
106+Name[xh]=Iifayile Zohlobo lwamagama
107 Name[x-test]=xxFont Filesxx
108-Name[xh]=Iifayile Zohlobo lwamagama
109 Name[zh_CN]=字体文件
110 Name[zh_TW]=字型檔案
111 X-KDE-ServiceTypes=ThumbCreator
112--- workspace/kcontrol/smartcard/smartcard.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
113+++ workspace/kcontrol/smartcard/smartcard.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
114@@ -154,8 +154,8 @@
115 Comment[uz@cyrillic]=Smartcard'ни мослаш
116 Comment[vi]=Cấu hình khả năng hỗ trợ thẻ thông minh
117 Comment[wa]=Apontyî li sopoirt smartcard
118+Comment[xh]=Qwalasela inkxaso ye smartcard
119 Comment[x-test]=xxConfigure smartcard supportxx
120-Comment[xh]=Qwalasela inkxaso ye smartcard
121 Comment[zh_CN]=配置智能卡支持
122 Comment[zh_TW]=設定智慧卡 (SmartCard) 支援
123 X-KDE-Keywords=Smartcard,PKCS,SSL,reader,smart,card
124--- workspace/kcontrol/screensaver/screensaver.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
125+++ workspace/kcontrol/screensaver/screensaver.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
126@@ -86,8 +86,8 @@
127 Name[uz@cyrillic]=Экран сақловчиси
128 Name[vi]=Bảo vệ Màn hình
129 Name[wa]=Sipårgneu di waitroûle
130+Name[xh]=Umgcini Wekhusi
131 Name[x-test]=xxScreen Saverxx
132-Name[xh]=Umgcini Wekhusi
133 Name[zh_CN]=屏幕保护程序
134 Name[zh_TW]=螢幕保護程式
135
136@@ -168,8 +168,8 @@
137 Comment[uz@cyrillic]=Экран сақловчисининг мосламалари
138 Comment[vi]=Thiết lập Trình bảo vệ Màn hình
139 Comment[wa]=Apontiaedjes do spårgneu di waitroûle
140+Comment[xh]=Izicwangciso Zomgcini Wekhusi
141 Comment[x-test]=xxScreen Saver Settingsxx
142-Comment[xh]=Izicwangciso Zomgcini Wekhusi
143 Comment[zh_CN]=屏幕保护程序设置
144 Comment[zh_TW]=螢幕保護程式設定
145
146--- workspace/kcontrol/autostart/autostart.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
147+++ workspace/kcontrol/autostart/autostart.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
148@@ -76,8 +76,8 @@
149 Name[uz@cyrillic]=Авто-бошлаш
150 Name[vi]=Tự khởi chạy
151 Name[wa]=Enondaedje tot seu
152+Name[xh]=Isiqalo esizenzekelayo
153 Name[x-test]=xxAutostartxx
154-Name[xh]=Isiqalo esizenzekelayo
155 Name[zh_CN]=自动启动
156 Name[zh_TW]=自動啟動
157
158--- workspace/kcontrol/energy/energy.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
159+++ workspace/kcontrol/energy/energy.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
160@@ -90,8 +90,8 @@
161 Name[uz@cyrillic]=Электр таъминотни бошқариш
162 Name[vi]=Điều khiển nguồn điện
163 Name[wa]=Controle di l' alimintåcion
164+Name[xh]=Ulawulo Lwamandla
165 Name[x-test]=xxPower Controlxx
166-Name[xh]=Ulawulo Lwamandla
167 Name[zh_CN]=电源控制
168 Name[zh_TW]=電源控制
169
170@@ -172,8 +172,8 @@
171 Comment[uz@cyrillic]=Дисплейнинг электр таъминоти учун мосламалар
172 Comment[vi]=Thiết lập để quản lý nguồn điện của màn hình
173 Comment[wa]=Tchuzes po håyner l' manaedjmint d' enerdjeye
174+Comment[xh]=Izicwangciso zoboniso lophatho lwamandla
175 Comment[x-test]=xxSettings for display power managementxx
176-Comment[xh]=Izicwangciso zoboniso lophatho lwamandla
177 Comment[zh_CN]=显示器电源管理设置
178 Comment[zh_TW]=顯示器電源管理的設定值
179
180--- workspace/kcontrol/fonts/fonts.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
181+++ workspace/kcontrol/fonts/fonts.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
182@@ -90,8 +90,8 @@
183 Name[uz@cyrillic]=Шрифтлар
184 Name[vi]=Phông chữ
185 Name[wa]=Fontes
186+Name[xh]=Uhlobo lwamagama
187 Name[x-test]=xxFontsxx
188-Name[xh]=Uhlobo lwamagama
189 Name[zh_CN]=字体
190 Name[zh_TW]=字型
191
192@@ -174,8 +174,8 @@
193 Comment[uz@cyrillic]=Шрифтларни мослаш
194 Comment[vi]=Thiết lập phông chữ
195 Comment[wa]=Apontiaedje des fontes
196+Comment[xh]=Izicwangciso zohlobo lwamagama
197 Comment[x-test]=xxFont settingsxx
198-Comment[xh]=Izicwangciso zohlobo lwamagama
199 Comment[zh_CN]=字体设置
200 Comment[zh_TW]=字型設定
201
202--- workspace/kcontrol/hardware/joystick/joystick.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
203+++ workspace/kcontrol/hardware/joystick/joystick.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
204@@ -177,8 +177,8 @@
205 Name[uz@cyrillic]=Жойстик
206 Name[vi]=Cần điều khiển
207 Name[wa]=Djîsse di djeu
208+Name[xh]=Uvuyo
209 Name[x-test]=xxJoystickxx
210-Name[xh]=Uvuyo
211 Name[zh_CN]=游戏杆
212 Name[zh_TW]=搖桿
213
214--- workspace/kcontrol/kxkb/keyboard_layout.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
215+++ workspace/kcontrol/kxkb/keyboard_layout.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
216@@ -92,8 +92,8 @@
217 Name[uz@cyrillic]=Тугмалар тартиби
218 Name[vi]=Bố trí bàn phím
219 Name[wa]=Adjinçmint del taprece
220+Name[xh]=Ubeko Lwebhodi yezitshixo
221 Name[x-test]=xxKeyboard Layoutxx
222-Name[xh]=Ubeko Lwebhodi yezitshixo
223 Name[zh_CN]=键盘布局
224 Name[zh_TW]=鍵盤配置
225
226@@ -175,8 +175,8 @@
227 Comment[uz@cyrillic]=Тугмалар тартиби
228 Comment[vi]=Bố trí bàn phím
229 Comment[wa]=Adjinçmint des tapes del taprece
230+Comment[xh]=Ubeko Lwebhodi yezitshixo
231 Comment[x-test]=xxKeyboard Layoutxx
232-Comment[xh]=Ubeko Lwebhodi yezitshixo
233 Comment[zh_CN]=键盘布局
234 Comment[zh_TW]=鍵盤配置
235
236--- workspace/kcontrol/kxkb/plasma-applet-kxkb.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
237+++ workspace/kcontrol/kxkb/plasma-applet-kxkb.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
238@@ -74,8 +74,8 @@
239 Name[uz@cyrillic]=Тугмалар тартиби учун восита
240 Name[vi]=Công cụ Ánh xạ Bàn phím
241 Name[wa]=Adjinçmint del taprece
242+Name[xh]=Isixhobo semaphu yebhodi enezitshixo
243 Name[x-test]=xxKeyboard Map Toolxx
244-Name[xh]=Isixhobo semaphu yebhodi enezitshixo
245 Name[zh_CN]=键盘映射工具
246 Name[zh_TW]=鍵盤映射工具
247 Icon=keyboard_layout
248--- workspace/kcontrol/kxkb/kxkb.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
249+++ workspace/kcontrol/kxkb/kxkb.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
250@@ -83,7 +83,7 @@
251 Name[uz@cyrillic]=Тугмалар тартиби учун восита
252 Name[vi]=Công cụ Ánh xạ Bàn phím
253 Name[wa]=Adjinçmint del taprece
254+Name[xh]=Isixhobo semaphu yebhodi enezitshixo
255 Name[x-test]=xxKeyboard Map Toolxx
256-Name[xh]=Isixhobo semaphu yebhodi enezitshixo
257 Name[zh_CN]=键盘映射工具
258 Name[zh_TW]=鍵盤映射工具
259--- workspace/kcontrol/input/mouse.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
260+++ workspace/kcontrol/input/mouse.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
261@@ -171,8 +171,8 @@
262 Comment[uz@cyrillic]=Сичқончанинг мосламалари
263 Comment[vi]=Thiết lập con chuột
264 Comment[wa]=Apontiaedjes del sori
265+Comment[xh]=Izicwangciso ze mouse
266 Comment[x-test]=xxMouse settingsxx
267-Comment[xh]=Izicwangciso ze mouse
268 Comment[zh_CN]=鼠标设置
269 Comment[zh_TW]=滑鼠設定
270
271--- workspace/kcontrol/style/style.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
272+++ workspace/kcontrol/style/style.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
273@@ -90,8 +90,8 @@
274 Name[uz@cyrillic]=Услуб
275 Name[vi]=Kiểu dáng
276 Name[wa]=Stîle
277+Name[xh]=Uhlobo
278 Name[x-test]=xxStylexx
279-Name[xh]=Uhlobo
280 Name[zh_CN]=风格
281 Name[zh_TW]=風格
282 Comment=Allows the manipulation of widget behavior and changing the Style for KDE
283@@ -167,8 +167,8 @@
284 Comment[uk]=Керування поведінкою віджетів та зміна стилю KDE
285 Comment[vi]=Cho phép điều chỉnh ứng xử của các ô điều khiển và thay đổi kiểu dáng của KDE
286 Comment[wa]=Permete di candjî l' dujhance et li stîle des ahesses po KDE
287+Comment[xh]=Ivumela uhanahaniso lokuziphatha kwe widget kwaye itshintsha Uhlobo lwe KDE
288 Comment[x-test]=xxAllows the manipulation of widget behavior and changing the Style for KDExx
289-Comment[xh]=Ivumela uhanahaniso lokuziphatha kwe widget kwaye itshintsha Uhlobo lwe KDE
290 Comment[zh_CN]=允许操纵修饰行为和更改 KDE 的样式
291 Comment[zh_TW]=讓您控制視窗元件 (widget) 的操作方式，以及更改 KDE 的風格
292
293--- workspace/kcontrol/keyboard/kcm_keyboard.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
294+++ workspace/kcontrol/keyboard/kcm_keyboard.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
295@@ -91,8 +91,8 @@
296 Name[uz@cyrillic]=Тугматаг
297 Name[vi]=Bàn phím
298 Name[wa]=Taprece
299+Name[xh]=Ibhodi enezitshixo
300 Name[x-test]=xxKeyboardxx
301-Name[xh]=Ibhodi enezitshixo
302 Name[zh_CN]=键盘
303 Name[zh_TW]=鍵盤
304
305@@ -174,8 +174,8 @@
306 Comment[uz@cyrillic]=Тугматагнинг мосламалари
307 Comment[vi]=Thiết lập bàn phím
308 Comment[wa]=Apontiaedje del taprece
309+Comment[xh]=Izicwangciso zebhodi enezitshixo
310 Comment[x-test]=xxKeyboard settingsxx
311-Comment[xh]=Izicwangciso zebhodi enezitshixo
312 Comment[zh_CN]=键盘设置
313 Comment[zh_TW]=鍵盤設定
314
315--- workspace/kcontrol/keyboard/keyboard.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
316+++ workspace/kcontrol/keyboard/keyboard.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
317@@ -93,8 +93,8 @@
318 Name[uz@cyrillic]=Тугматаг
319 Name[vi]=Bàn phím
320 Name[wa]=Taprece
321+Name[xh]=Ibhodi enezitshixo
322 Name[x-test]=xxKeyboardxx
323-Name[xh]=Ibhodi enezitshixo
324 Name[zh_CN]=键盘
325 Name[zh_TW]=鍵盤
326
327@@ -176,8 +176,8 @@
328 Comment[uz@cyrillic]=Тугматагнинг мосламалари
329 Comment[vi]=Thiết lập bàn phím
330 Comment[wa]=Apontiaedje del taprece
331+Comment[xh]=Izicwangciso zebhodi enezitshixo
332 Comment[x-test]=xxKeyboard settingsxx
333-Comment[xh]=Izicwangciso zebhodi enezitshixo
334 Comment[zh_CN]=键盘设置
335 Comment[zh_TW]=鍵盤設定
336
337--- workspace/kcontrol/colors/colors.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
338+++ workspace/kcontrol/colors/colors.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
339@@ -89,8 +89,8 @@
340 Name[uz@cyrillic]=Ранглар
341 Name[vi]=Màu sắc
342 Name[wa]=Coleurs
343+Name[xh]=Imibala
344 Name[x-test]=xxColorsxx
345-Name[xh]=Imibala
346 Name[zh_CN]=颜色
347 Name[zh_TW]=顏色
348
349@@ -173,8 +173,8 @@
350 Comment[uz@cyrillic]=Рангларнинг мосламалари
351 Comment[vi]=Thiết lập màu
352 Comment[wa]=Apontiaedje des coleurs
353+Comment[xh]=Izicwangciso zombala
354 Comment[x-test]=xxColor settingsxx
355-Comment[xh]=Izicwangciso zombala
356 Comment[zh_CN]=颜色设置
357 Comment[zh_TW]=顏色設定
358
359--- workspace/kcontrol/access/kcmaccess.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
360+++ workspace/kcontrol/access/kcmaccess.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
361@@ -91,8 +91,8 @@
362 Name[uz@cyrillic]=Қулайликлар
363 Name[vi]=Khả năng truy cập
364 Name[wa]=Accessibilité
365+Name[xh]=Unikezelo
366 Name[x-test]=xxAccessibilityxx
367-Name[xh]=Unikezelo
368 Name[zh_CN]=辅助
369 Name[zh_TW]=無障礙輔助
370
371@@ -171,8 +171,8 @@
372 Comment[uz@cyrillic]=Ногирон кишилар учун қулайликлар
373 Comment[vi]=Hỗ trợ người gặp khó khăn nhín, nghe, di chuyện con chuột, gõ bàn phím v.v.
374 Comment[wa]=Rind pus åjhey l' accessibilité po les sakîs k' ont des andicapes
375+Comment[xh]=Phucula unikekezeleko lwabantu abakhubazekileyo
376 Comment[x-test]=xxImprove accessibility for disabled personsxx
377-Comment[xh]=Phucula unikekezeleko lwabantu abakhubazekileyo
378 Comment[zh_CN]=方便残疾人使用的辅助功能
379 Comment[zh_TW]=方便傷殘人士使用
380
381--- workspace/kcontrol/randr/krandrmodule.cpp (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
382+++ workspace/kcontrol/randr/krandrmodule.cpp (.../branches/KDE/4.2/kdebase) (wersja 974231)
383@@ -86,6 +86,9 @@
384
385 void KRandRModule::defaults()
401a794a 386 {
7aab7511
AM		 387+ if (!m_display->isValid()) {
388+ return;
389+ }
390 #ifdef HAS_RANDR_1_2
391 if (RandR::has_1_2)
392 m_config->defaults();
393@@ -98,6 +101,9 @@
394 {
395 kDebug() << "Loading KRandRModule...";
396
397+ if (!m_display->isValid()) {
398+ return;
399+ }
400 #ifdef HAS_RANDR_1_2
401 if (RandR::has_1_2)
402 m_config->load();
403@@ -110,6 +116,9 @@
404
405 void KRandRModule::save()
406 {
407+ if (!m_display->isValid()) {
408+ return;
409+ }
410 #ifdef HAS_RANDR_1_2
411 if (RandR::has_1_2)
412 m_config->save();
413@@ -121,6 +130,9 @@
401a794a 414
7aab7511 415 void KRandRModule::apply()
401a794a 416 {
7aab7511
AM		 417+ if (!m_display->isValid()) {
418+ return;
419+ }
420 #ifdef HAS_RANDR_1_2
421 if (RandR::has_1_2)
422 m_config->apply();
423--- workspace/kcontrol/kthememanager/kthememanager.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
424+++ workspace/kcontrol/kthememanager/kthememanager.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
425@@ -87,8 +87,8 @@
426 Name[uz@cyrillic]=Мавзу бошқарувчиси
427 Name[vi]=Bộ quản lý sắc thái
428 Name[wa]=Manaedjeu d' tinmes
429+Name[xh]=Umphathi Womxholo
430 Name[x-test]=xxTheme Managerxx
431-Name[xh]=Umphathi Womxholo
432 Name[zh_CN]=主题管理器
433 Name[zh_TW]=佈景管理程式
434
435--- workspace/kcontrol/launch/kcmlaunch.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
436+++ workspace/kcontrol/launch/kcmlaunch.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
437@@ -72,8 +72,8 @@
438 Name[se]=Prográmmaálggahan ávaštus
439 Name[sk]=Odozva na štart programov
440 Name[sl]=Povratna informacija zagona
441-Name[sr]=Одзив покретања
442-Name[sr@latin]=Odziv pokretanja
443+Name[sr]=Одзив при покретању
444+Name[sr@latin]=Odziv pri pokretanju
445 Name[sv]=Gensvar vid programstart
446 Name[ta]=கருத்தை தொடங்கு
447 Name[te]=లాంచ్ ప్రతిస్పందన
448@@ -150,8 +150,8 @@
449 Comment[se]=Vállje makkár ávaštus galga leat prográmmaid álggahettiin
450 Comment[sk]=Vyberte štýl odozvy pri štarte aplikácií
451 Comment[sl]=Izberite program - stil pošiljanja povratne informacije
452-Comment[sr]=Изаберите како се јавља покретање програма
453-Comment[sr@latin]=Izaberite kako se javlja pokretanje programa
454+Comment[sr]=Изаберите стил одзива при покретању програма
455+Comment[sr@latin]=Izaberite stil odziva pri pokretanju programa
456 Comment[sv]=Välj typ av gensvar vid programstart
457 Comment[ta]=பயன்பாடு-தொடக்கத்துக்கான கருத்து பாணியை தேர்ந்தெடு
458 Comment[te]=అనువర్తనం-లాంచ్ ప్రతిస్పందన శైలిని ఎంచుకొనుము
459@@ -162,8 +162,8 @@
460 Comment[uz@cyrillic]=Дастур ишга тушиш хабарномасининг турини танлаш
461 Comment[vi]=Chọn kiểu mà chương trình sẽ gửi phản hồi về khi khởi động
462 Comment[wa]=Tchoezi l' stile di ritoû d' enondaedje di programe
463+Comment[xh]=Khetha isicelo-yenza uhlobo lwesiphumo seLaunch
464 Comment[x-test]=xxChoose application-launch feedback stylexx
465-Comment[xh]=Khetha isicelo-yenza uhlobo lwesiphumo seLaunch
466 Comment[zh_CN]=选择程序启动反馈风格
467 Comment[zh_TW]=選擇程式啟動時的回饋風格
468
469--- workspace/kcontrol/keys/keys.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
470+++ workspace/kcontrol/keys/keys.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
471@@ -154,8 +154,8 @@
472 Comment[uz@cyrillic]=Тугмалар бирикмасини мослаш
473 Comment[vi]=Cấu hình các tổ hợp phím
474 Comment[wa]=Apontiaedje des rascourtis di tapes
475+Comment[xh]=Uqwalaselo lwezibopheleo zesitshixo
476 Comment[x-test]=xxConfiguration of keybindingsxx
477-Comment[xh]=Uqwalaselo lwezibopheleo zesitshixo
478 Comment[zh_CN]=键绑定配置
479 Comment[zh_TW]=按鍵關聯設定
480
481--- workspace/kcontrol/keys/schemes/mac4.kksrc (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
482+++ workspace/kcontrol/keys/schemes/mac4.kksrc (.../branches/KDE/4.2/kdebase) (wersja 974231)
483@@ -76,8 +76,8 @@
484 Name[uz@cyrillic]=Mac мавзуси
485 Name[vi]=Phối hợp của Mac
486 Name[wa]=Djeu d' rascourtis Mac
487+Name[xh]=Udweliso lwe Mac
488 Name[x-test]=xxMac Schemexx
489-Name[xh]=Udweliso lwe Mac
490 Name[zh_CN]=Mac 方案
491 Name[zh_TW]=Mac 機制
492 Uses Win Modifier=true
493--- workspace/kcontrol/keys/schemes/kde3.kksrc (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
494+++ workspace/kcontrol/keys/schemes/kde3.kksrc (.../branches/KDE/4.2/kdebase) (wersja 974231)
495@@ -67,8 +67,8 @@
496 Name[uk]=Типова для KDE з 3 клавішами-модифікаторами
497 Name[vi]=Mặc định KDE cho 3 Phím Bổ trợ
498 Name[wa]=Prémetou KDE (3 tapes modifieueses)
499+Name[xh]=KDE Engagqibekanga ye 3 Izitsixo Mofifier
500 Name[x-test]=xxKDE Default for 3 Modifier Keysxx
501-Name[xh]=KDE Engagqibekanga ye 3 Izitsixo Mofifier
502 Name[zh_CN]=三个修饰键的 KDE 默认值
503 Name[zh_TW]=KDE 預設 3 個變更鍵
504 Uses Win Modifier=false
505--- workspace/kcontrol/keys/schemes/unix3.kksrc (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
506+++ workspace/kcontrol/keys/schemes/unix3.kksrc (.../branches/KDE/4.2/kdebase) (wersja 974231)
507@@ -76,8 +76,8 @@
508 Name[uz@cyrillic]=UNIX мавзуси
509 Name[vi]=Phối hợp của Unix
510 Name[wa]=Djeu d' rascourtis Unix
511+Name[xh]=Udweliso lwe UNIX
512 Name[x-test]=xxUNIX Schemexx
513-Name[xh]=Udweliso lwe UNIX
514 Name[zh_CN]=Unix 方案
515 Name[zh_TW]=UNIX 機制
516 Uses Win Modifier=false
517--- workspace/kcontrol/keys/schemes/kde4.kksrc (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
518+++ workspace/kcontrol/keys/schemes/kde4.kksrc (.../branches/KDE/4.2/kdebase) (wersja 974231)
519@@ -67,8 +67,8 @@
520 Name[uk]=Типова для KDE з 4 клавішами-модифікаторами
521 Name[vi]=Mặc định KDE cho 4 Phím Bổ trợ
522 Name[wa]=Prémetou KDE (4 tapes modifieueses)
523+Name[xh]=KDE Engagqibekanga ye 4 Izitsixo Mofifier
524 Name[x-test]=xxKDE Default for 4 Modifier Keysxx
525-Name[xh]=KDE Engagqibekanga ye 4 Izitsixo Mofifier
526 Name[zh_CN]=四个修饰键的 KDE 默认值
527 Name[zh_TW]=KDE 預設 4 個變更鍵
528 Uses Win Modifier=true
529--- workspace/kcontrol/keys/schemes/win3.kksrc (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
530+++ workspace/kcontrol/keys/schemes/win3.kksrc (.../branches/KDE/4.2/kdebase) (wersja 974231)
531@@ -75,8 +75,8 @@
532 Name[uz@cyrillic]=Windows қолипи (Win тугмаси билан)
533 Name[vi]=Phối hợp của Windows (không có phím Cửa sổ)
534 Name[wa]=Djeu Windows (sins tape Win)
535+Name[xh]=Window Yodweliso (Ngaphandle kwe Win key)
536 Name[x-test]=xxWindows Scheme (Without Win Key)xx
537-Name[xh]=Window Yodweliso (Ngaphandle kwe Win key)
538 Name[zh_CN]=Windows 方案(无 Win 键)
539 Name[zh_TW]=Windows 機制（沒有 Win 鍵）
540 Uses Win Modifier=false
541--- workspace/kcontrol/keys/schemes/win4.kksrc (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
542+++ workspace/kcontrol/keys/schemes/win4.kksrc (.../branches/KDE/4.2/kdebase) (wersja 974231)
543@@ -75,8 +75,8 @@
544 Name[uz@cyrillic]=Windows қолипи (Win тугмасиз)
545 Name[vi]=Phối hợp của Windows (có phím Cửa sổ)
546 Name[wa]=Djeu Windows (avou tape Win)
547+Name[xh]=Windows Ezingagqibekanga (Nge Win-key)
548 Name[x-test]=xxWindows Scheme (With Win Key)xx
549-Name[xh]=Windows Ezingagqibekanga (Nge Win-key)
550 Name[zh_CN]=Windows 方案(有 Win 键)
551 Name[zh_TW]=Windows 機制（有 Win 鍵）
552 Uses Win Modifier=true
553--- workspace/kcontrol/kdm/background/programs/xearth.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
554+++ workspace/kcontrol/kdm/background/programs/xearth.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
555@@ -61,8 +61,8 @@
556 Comment[uz@cyrillic]=XEarth (Кирик Жонсон томонидан)
557 Comment[vi]=Trái Đất X bởi Kirk Johnson
558 Comment[wa]=XDaegne pal Kirk Johnson
559+Comment[xh]=XEarth ngu Kirk Johnson
560 Comment[x-test]=xxXEarth by Kirk Johnsonxx
561-Comment[xh]=XEarth ngu Kirk Johnson
562 Comment[zh_CN]=X 地球，作者 Kirk Johnson
563 Comment[zh_TW]=X 地球（by Kirk Johnson）
564 Executable=xearth
565--- workspace/kcontrol/kdm/background/programs/xplanet.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
566+++ workspace/kcontrol/kdm/background/programs/xplanet.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
567@@ -63,8 +63,8 @@
568 Comment[uz@cyrillic]=XPlanet (Хари Нейр томонидан)
569 Comment[vi]=Hành tinh X bởi Hari Nair
570 Comment[wa]=XPlanete pal Hari Nair
571+Comment[xh]=XPlanet ngu Hari Nair
572 Comment[x-test]=xxXPlanet by Hari Nairxx
573-Comment[xh]=XPlanet ngu Hari Nair
574 Comment[zh_CN]=X 行星，作者 Hari Nair
575 Comment[zh_TW]=行星（by Hari Nair）
576 Executable=xplanet
577--- workspace/kcontrol/kdm/background/programs/xglobe.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
578+++ workspace/kcontrol/kdm/background/programs/xglobe.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
579@@ -61,8 +61,8 @@
580 Comment[uz@cyrillic]=XGlobe (Торстен Шойерман томонидан)
581 Comment[vi]=Qủa cầu X bởi Thorsten Scheuermann
582 Comment[wa]=XGlobe pal Thorsten Scheuermann
583+Comment[xh]=XGlobe ngu Thorsten Scheuermann
584 Comment[x-test]=xxXGlobe by Thorsten Scheuermannxx
585-Comment[xh]=XGlobe ngu Thorsten Scheuermann
586 Comment[zh_CN]=X 球体，作者 Thorsten Scheuermann
587 Comment[zh_TW]=X 地球儀（by Thorsten Scheuermann）
588 Executable=xglobe
589--- workspace/kcontrol/kdm/background/patterns/triangles.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
590+++ workspace/kcontrol/kdm/background/patterns/triangles.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
591@@ -66,8 +66,8 @@
592 Comment[uz@cyrillic]=Учбурчаклар
593 Comment[vi]=Tam giác
594 Comment[wa]=Triyangues
595+Comment[xh]=Oonxantathu
596 Comment[x-test]=xxTrianglesxx
597-Comment[xh]=Oonxantathu
598 Comment[zh_CN]=三角
599 Comment[zh_TW]=三角形
600 File=triangles.png
601--- workspace/kcontrol/kdm/background/patterns/stonewall2.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
602+++ workspace/kcontrol/kdm/background/patterns/stonewall2.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
603@@ -61,8 +61,8 @@
604 Comment[uz@cyrillic]=Тош девол 2 (Тигерт томонидан)
605 Comment[vi]=Tường đá 2 bởi Tigert
606 Comment[wa]=Meur di pîre 2 pal Tigert
607+Comment[xh]=Stonewall 2 ngu Tigert
608 Comment[x-test]=xxStonewall 2 by Tigertxx
609-Comment[xh]=Stonewall 2 ngu Tigert
610 Comment[zh_CN]=石墙 2，作者：Tigert
611 Comment[zh_TW]=石牆 II（by Tigert）
612 File=stonewall2.png
613--- workspace/kcontrol/kdm/background/patterns/pavement.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
614+++ workspace/kcontrol/kdm/background/patterns/pavement.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
615@@ -63,8 +63,8 @@
616 Comment[uz@cyrillic]=Йўлак
617 Comment[vi]=Lát gạch hoa
618 Comment[wa]=Trotwer
619+Comment[xh]=Umgangatho osecaleni kwendlela
620 Comment[x-test]=xxPavementxx
621-Comment[xh]=Umgangatho osecaleni kwendlela
622 Comment[zh_CN]=路面
623 Comment[zh_TW]=人行道
624 File=pavement.png
625--- workspace/kcontrol/kdm/background/patterns/flowers.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
626+++ workspace/kcontrol/kdm/background/patterns/flowers.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
627@@ -70,8 +70,8 @@
628 Comment[uz@cyrillic]=Гуллар
629 Comment[vi]=Bông hoa
630 Comment[wa]=Fleurs
631+Comment[xh]=Iintyatyambo
632 Comment[x-test]=xxFlowersxx
633-Comment[xh]=Iintyatyambo
634 Comment[zh_CN]=花朵
635 Comment[zh_TW]=花兒
636 File=flowers.png
637--- workspace/kcontrol/kdm/kdm.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
638+++ workspace/kcontrol/kdm/kdm.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
639@@ -91,8 +91,8 @@
640 Name[uz@cyrillic]=Кириш бошқарувчиси
641 Name[vi]=Bộ quản lý Đăng nhập
642 Name[wa]=Manaedjeu d' elodjaedje
643+Name[xh]=Umphathi Wegama elithile
644 Name[x-test]=xxLogin Managerxx
645-Name[xh]=Umphathi Wegama elithile
646 Name[zh_CN]=登录管理器
647 Name[zh_TW]=登錄管理程式
648
649@@ -174,8 +174,8 @@
650 Comment[uz@cyrillic]=Тизимга кириш бошқарувчисини (KDM) мослаш
651 Comment[vi]=Cấu hình trình quản lý đăng nhập (KDM)
652 Comment[wa]=Apontyî l' manaedjeu d' elodjaedje (KDM)
653+Comment[xh]=Qwalasela umphathi wegama elithile (KDM)
654 Comment[x-test]=xxConfigure the login manager (KDM)xx
655-Comment[xh]=Qwalasela umphathi wegama elithile (KDM)
656 Comment[zh_CN]=配置登录管理器(KDM)
657 Comment[zh_TW]=設定登入管理程式 (KDM)
658
659--- workspace/kcontrol/bell/bell.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
660+++ workspace/kcontrol/bell/bell.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
661@@ -90,8 +90,8 @@
662 Name[uz@cyrillic]=Тизим товуш сигнали
663 Name[vi]=Chuông hệ thống
664 Name[wa]=Xhuflet do sistinme
665+Name[xh]=Indlela yokusebenza Yentsimbi
666 Name[x-test]=xxSystem Bellxx
667-Name[xh]=Indlela yokusebenza Yentsimbi
668 Name[zh_CN]=系统铃声
669 Name[zh_TW]=系統鈴聲
670
671@@ -172,8 +172,8 @@
672 Comment[uz@cyrillic]=Тизим товуш сигналини мослаш
673 Comment[vi]=Cấu hình Chuông Hệ thống
674 Comment[wa]=Apontiaedje do xhuflet do sistinme
675+Comment[xh]=Uqwalaselo Lwendlela Yentsimbi
676 Comment[x-test]=xxSystem Bell Configurationxx
677-Comment[xh]=Uqwalaselo Lwendlela Yentsimbi
678 Comment[zh_CN]=系统铃声配置
679 Comment[zh_TW]=系統鈴聲組態
680
681--- workspace/systemsettings/categories/settings-system.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
682+++ workspace/systemsettings/categories/settings-system.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
683@@ -78,7 +78,7 @@
684 Name[uz@cyrillic]=Тизим
685 Name[vi]=Hệ thống
686 Name[wa]=Sistinme
687+Name[xh]=Indlela esestyenziswayo
688 Name[x-test]=xxSystemxx
689-Name[xh]=Indlela esestyenziswayo
690 Name[zh_CN]=系统
691 Name[zh_TW]=系統
692--- workspace/systemsettings/categories/settings-accessibility.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
693+++ workspace/systemsettings/categories/settings-accessibility.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
694@@ -85,7 +85,7 @@
695 Name[uz@cyrillic]=Қулайликлар
696 Name[vi]=Khả năng truy cập
697 Name[wa]=Accessibilité
698+Name[xh]=Unikezelo
699 Name[x-test]=xxAccessibilityxx
700-Name[xh]=Unikezelo
701 Name[zh_CN]=辅助
702 Name[zh_TW]=無障礙輔助
703--- workspace/systemsettings/categories/settings-window-behaviour.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
704+++ workspace/systemsettings/categories/settings-window-behaviour.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
705@@ -80,7 +80,7 @@
706 Name[uz@cyrillic]=Ойнанинг хусусиятлари
707 Name[vi]=Ứng xử của Cửa sổ
708 Name[wa]=Dujhance des purneas
709+Name[xh]=Ukuziphatha kwe Window
710 Name[x-test]=xxWindow Behaviorxx
711-Name[xh]=Ukuziphatha kwe Window
712 Name[zh_CN]=窗口行为
713 Name[zh_TW]=視窗行為
714--- workspace/systemsettings/categories/settings-appearance.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
715+++ workspace/systemsettings/categories/settings-appearance.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
716@@ -84,7 +84,7 @@
717 Name[uz@cyrillic]=Ташқи кўриниш
718 Name[vi]=Diện mạo
719 Name[wa]=Rivnance
720+Name[xh]=Inkangeleko
721 Name[x-test]=xxAppearancexx
722-Name[xh]=Inkangeleko
723 Name[zh_CN]=外观
724 Name[zh_TW]=外觀
725--- workspace/systemsettings/categories/settings-advanced.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
726+++ workspace/systemsettings/categories/settings-advanced.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
727@@ -62,7 +62,7 @@
728 Name[pa]=ਤਕਨੀਕੀ
729 Name[pl]=Zaawansowane
730 Name[pt]=Avançado
731-Name[pt_BR]=Avançados
732+Name[pt_BR]=Avançado
733 Name[ro]=Avansat
734 Name[ru]=Дополнительно
735 Name[se]=Viiddiduvvon
736@@ -81,7 +81,7 @@
737 Name[uz@cyrillic]=Қўшимча
738 Name[vi]=Nâng cao
739 Name[wa]=Sipepieus
740+Name[xh]=Ebhekisa phambili
741 Name[x-test]=xxAdvancedxx
742-Name[xh]=Ebhekisa phambili
743 Name[zh_CN]=高级
744 Name[zh_TW]=進階
745--- workspace/systemsettings/mainwindow.cpp (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
746+++ workspace/systemsettings/mainwindow.cpp (.../branches/KDE/4.2/kdebase) (wersja 974231)
747@@ -332,7 +332,7 @@
748 groupWidget->addModule( mItem->item );
749 } else {
750 foreach ( MenuItem * i, mItem->children ) {
751- kDebug() << "adding " , i->item.fileName();
752+ kDebug() << "adding " << i->item.fileName();
753 groupWidget->addModule( i->item );
754 }
755 }
756--- workspace/klipper/klipperrc.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
757+++ workspace/klipper/klipperrc.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
758@@ -76,8 +76,8 @@
759 Description[uz@cyrillic]=Jpeg-расм
760 Description[vi]=Ảnh JPEG
761 Description[wa]=Imådje JPEG
762+Description[xh]=Jpeg-Umfanekiso
763 Description[x-test]=xxJpeg-Imagexx
764-Description[xh]=Jpeg-Umfanekiso
765 Description[zh_CN]=JPEG 图像
766 Description[zh_TW]=JPEG 影像
767 Number of commands=1
768@@ -385,8 +385,8 @@
769 Description[uz@cyrillic]=Konqueror &билан очиш
770 Description[vi]=Mở bằng &Konqueror
771 Description[wa]=Drovi avou &Konqueror
772+Description[xh]=Vula nge &Konqueror
773 Description[x-test]=xxOpen with &Konquerorxx
774-Description[xh]=Vula nge &Konqueror
775 Description[zh_CN]=用 &Konqueror 打开
776 Description[zh_TW]=使用 &Konqueror 開啟
777 Enabled=true
778@@ -471,8 +471,8 @@
779 Description[uz@cyrillic]=Mozilla билан &очиш
780 Description[vi]=Mở bằng &Mozilla
781 Description[wa]=Drovi avou &Mozilla
782+Description[xh]=Vula nge &Mozilla
783 Description[x-test]=xxOpen with &Mozillaxx
784-Description[xh]=Vula nge &Mozilla
785 Description[zh_CN]=用 &Mozilla 打开
786 Description[zh_TW]=使用 &Mozilla 開啟
787 Enabled=true
788@@ -555,8 +555,8 @@
789 Description[uz@cyrillic]=URL'ни &жўнатиш
790 Description[vi]=Gửi &URL
791 Description[wa]=Evoyî &hårdêye
792+Description[xh]=Thumela i &URL
793 Description[x-test]=xxSend &URLxx
794-Description[xh]=Thumela i &URL
795 Description[zh_CN]=发送 &URL
796 Description[zh_TW]=送出 &URL
797 Enabled=true
798@@ -724,8 +724,8 @@
799 Description[uz@cyrillic]=&Бетни жўнатиш
800 Description[vi]=Gửi &Trang
801 Description[wa]=Evoyî &pådje
802+Description[xh]=Thumela &Iphepha
803 Description[x-test]=xxSend &Pagexx
804-Description[xh]=Thumela &Iphepha
805 Description[zh_CN]=发送页面(&P)
806 Description[zh_TW]=送出 &Page
807 Enabled=true
808@@ -799,8 +799,8 @@
809 Description[uz@cyrillic]=Хат-URL
810 Description[vi]=Gửi thư chứa URL
811 Description[wa]=Hårdêye emile
812+Description[xh]=Iposi-URL
813 Description[x-test]=xxMail-URLxx
814-Description[xh]=Iposi-URL
815 Description[zh_CN]=mail URL
816 Description[zh_TW]=郵寄 URL
817 Number of commands=2
818@@ -1055,8 +1055,8 @@
819 Description[uz@cyrillic]=Матн файли
820 Description[vi]=Tập tin Văn bản
821 Description[wa]=Fitchî tecse
822+Description[xh]=Ifayile Yombhalo
823 Description[x-test]=xxText Filexx
824-Description[xh]=Ifayile Yombhalo
825 Description[zh_CN]=文本文件
826 Description[zh_TW]=文字檔案
827 Number of commands=1
828@@ -1224,8 +1224,8 @@
829 Description[uz@cyrillic]=Локал файлининг URL'и
830 Description[vi]=URL tập tin cục bộ
831 Description[wa]=Hårdêye viè on fitchî locå
832+Description[xh]=Ifayile yobulali ye URL
833 Description[x-test]=xxLocal file URLxx
834-Description[xh]=Ifayile yobulali ye URL
835 Description[zh_CN]=本地文件 URL
836 Description[zh_TW]=本地檔案 URL
837 Number of commands=2
838@@ -1309,8 +1309,8 @@
839 Description[uz@cyrillic]=URL'ни &жўнатиш
840 Description[vi]=Gửi &URL
841 Description[wa]=Evoyî &hårdêye
842+Description[xh]=Thumela i &URL
843 Description[x-test]=xxSend &URLxx
844-Description[xh]=Thumela i &URL
845 Description[zh_CN]=发送 &URL
846 Description[zh_TW]=送出 &URL
847 Enabled=true
848@@ -1395,8 +1395,8 @@
849 Description[uz@cyrillic]=&Файлни жўнатиш
850 Description[vi]=Gửi &Tập tin
851 Description[wa]=Evoyî &fitchî
852+Description[xh]=Thumela &Ifayile
853 Description[x-test]=xxSend &Filexx
854-Description[xh]=Thumela &Ifayile
855 Description[zh_CN]=发送文件(&F)
856 Description[zh_TW]=送出檔案(&F)
857 Enabled=true
858@@ -1543,8 +1543,8 @@
859 Description[uz@cyrillic]=URL'ни &жўнатиш
860 Description[vi]=Gửi &URL
861 Description[wa]=Evoyî &hårdêye
862+Description[xh]=Thumela i &URL
863 Description[x-test]=xxSend &URLxx
864-Description[xh]=Thumela i &URL
865 Description[zh_CN]=发送 &URL
866 Description[zh_TW]=送出 &URL
867 Enabled=true
868@@ -1629,8 +1629,8 @@
869 Description[uz@cyrillic]=&Файлни жўнатиш
870 Description[vi]=Gửi &Tập tin
871 Description[wa]=Evoyî &fitchî
872+Description[xh]=Thumela &Ifayile
873 Description[x-test]=xxSend &Filexx
874-Description[xh]=Thumela &Ifayile
875 Description[zh_CN]=发送文件(&F)
876 Description[zh_TW]=送出檔案(&F)
877 Enabled=true
878@@ -1850,8 +1850,8 @@
879 Description[uz@cyrillic]=Konqueror &билан очиш
880 Description[vi]=Mở bằng &Konqueror
881 Description[wa]=Drovi avou &Konqueror
882+Description[xh]=Vula nge &Konqueror
883 Description[x-test]=xxOpen with &Konquerorxx
884-Description[xh]=Vula nge &Konqueror
885 Description[zh_CN]=用 &Konqueror 打开
886 Description[zh_TW]=使用 &Konqueror 開啟
887 Enabled=true
888@@ -1935,8 +1935,8 @@
889 Description[uz@cyrillic]=Mozilla билан &очиш
890 Description[vi]=Mở bằng &Mozilla
891 Description[wa]=Drovi avou &Mozilla
892+Description[xh]=Vula nge &Mozilla
893 Description[x-test]=xxOpen with &Mozillaxx
894-Description[xh]=Vula nge &Mozilla
895 Description[zh_CN]=用 &Mozilla 打开
896 Description[zh_TW]=使用 &Mozilla 開啟
897 Enabled=true
898@@ -2019,8 +2019,8 @@
899 Description[uz@cyrillic]=URL'ни &жўнатиш
900 Description[vi]=Gửi &URL
901 Description[wa]=Evoyî &hårdêye
902+Description[xh]=Thumela i &URL
903 Description[x-test]=xxSend &URLxx
904-Description[xh]=Thumela i &URL
905 Description[zh_CN]=发送 &URL
906 Description[zh_TW]=送出 &URL
907 Enabled=true
908@@ -2105,8 +2105,8 @@
909 Description[uz@cyrillic]=&Файлни жўнатиш
910 Description[vi]=Gửi &Tập tin
911 Description[wa]=Evoyî &fitchî
912+Description[xh]=Thumela &Ifayile
913 Description[x-test]=xxSend &Filexx
914-Description[xh]=Thumela &Ifayile
915 Description[zh_CN]=发送文件(&F)
916 Description[zh_TW]=送出檔案(&F)
917 Enabled=true
918--- workspace/klipper/klipper.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
919+++ workspace/klipper/klipper.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
920@@ -95,8 +95,8 @@
921 GenericName[uz@cyrillic]=Клипборд воситаси
922 GenericName[vi]=Công cụ Bảng nháp
923 GenericName[wa]=Usteye do tchapea emacralé
924+GenericName[xh]=Isixhobo Sebhodi eqhoboshayo
925 GenericName[x-test]=xxClipboard Toolxx
926-GenericName[xh]=Isixhobo Sebhodi eqhoboshayo
927 GenericName[zh_CN]=剪贴板工具
928 GenericName[zh_TW]=剪貼簿工具
929 Exec=klipper
930--- workspace/CMakeLists.txt (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
931+++ workspace/CMakeLists.txt (.../branches/KDE/4.2/kdebase) (wersja 974231)
932@@ -3,7 +3,7 @@
933 # Used e.g. in KDE4WorkspaceConfig.cmake, Alex
934 set(KDE4WORKSPACE_VERSION_MAJOR 4)
935 set(KDE4WORKSPACE_VERSION_MINOR 2)
936-set(KDE4WORKSPACE_VERSION_PATCH 3)
937+set(KDE4WORKSPACE_VERSION_PATCH 4)
938 set(KDE4WORKSPACE_VERSION ${KDE4WORKSPACE_VERSION_MAJOR}.${KDE4WORKSPACE_VERSION_MINOR}.${KDE4WORKSPACE_VERSION_PATCH} )
401a794a 939
401a794a 940
7aab7511 941@@ -16,7 +16,7 @@
401a794a 942
850b7a80 943
7aab7511
AM		 944 #search packages used by KDE
945-find_package(KDE4 4.2.3 REQUIRED)
946+find_package(KDE4 4.2.4 REQUIRED)
947 find_package(Strigi REQUIRED)
948 find_package(QImageBlitz REQUIRED)
949 find_package(ZLIB REQUIRED)
950--- workspace/powerdevil/daemon/PowerDevilDaemon.cpp (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
951+++ workspace/powerdevil/daemon/PowerDevilDaemon.cpp (.../branches/KDE/4.2/kdebase) (wersja 974231)
952@@ -102,7 +102,7 @@
850b7a80
AM		 953 , battery(0)
954 , currentConfig(0)
7aab7511
AM		 955 , status(PowerDevilDaemon::NoAction)
956- , ckSessionInterface(0) {};
957+ , ckSessionInterface(0) {}
850b7a80
AM		 958
959 Solid::Control::PowerManager::Notifier * notifier;
960 QPointer<Solid::Battery> battery;
7aab7511
AM		 961@@ -163,8 +163,7 @@
962
963 if (conn.interface()->isServiceRegistered("org.freedesktop.PowerManagement") ||
964 conn.interface()->isServiceRegistered("com.novell.powersave") ||
965- conn.interface()->isServiceRegistered("org.freedesktop.Policy.Power") ||
966- conn.interface()->isServiceRegistered("org.kde.powerdevilsystem")) {
967+ conn.interface()->isServiceRegistered("org.freedesktop.Policy.Power")) {
968 kError() << "PowerDevil not initialized, another power manager has been detected";
850b7a80
AM		 969 return;
970 }
7aab7511
AM		 971@@ -222,9 +221,8 @@
972 new PowerDevilAdaptor(this);
973 new PowerManagementConnector(this);
974
975- // This gets registered to avoid double copies.
976- QDBusConnection::sessionBus().registerService("org.kde.powerdevilsystem");
977 conn.interface()->registerService("org.freedesktop.Policy.Power");
978+ QDBusConnection::sessionBus().registerService("org.kde.powerdevil");
979 // All systems up Houston, let's go!
980 refreshStatus();
850b7a80 981 }
7aab7511
AM		 982--- workspace/powerdevil/kcmodule/PowerDevilKCM.cpp (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
983+++ workspace/powerdevil/kcmodule/PowerDevilKCM.cpp (.../branches/KDE/4.2/kdebase) (wersja 974231)
984@@ -80,21 +80,23 @@
985 QDBusInterface iface("org.kde.kded", "/modules/powerdevil");
850b7a80 986
7aab7511
AM		 987 if (iface.isValid()) {
988- QDBusConnection conn = QDBusConnection::systemBus();
989+ if (!QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.powerdevil").value()) {
990+ QDBusConnection conn = QDBusConnection::systemBus();
991
992- if (conn.interface()->isServiceRegistered("org.freedesktop.PowerManagement") || (
993- conn.interface()->isServiceRegistered("org.freedesktop.Policy.Power") && !QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.powerdevilsystem"))){
994- initError(i18n("Another power manager has been detected. PowerDevil will not start if "
995- "other power managers are active. If you want to use PowerDevil as your primary "
996- "power manager, please remove the existing one and restart PowerDevil service."));
997- return;
998- } else if (conn.interface()->isServiceRegistered("com.novell.powersave")) {
999- initError(i18n("It seems powersaved is running on this system. PowerDevil will not start if "
1000- "other power managers are active. If you want to use PowerDevil as your primary "
1001- "power manager, please stop powersaved and restart PowerDevil service."));
1002- return;
1003+ if (conn.interface()->isServiceRegistered("org.freedesktop.PowerManagement") ||
1004+ QDBusConnection::sessionBus().interface()->isServiceRegistered("org.freedesktop.PowerManagement")) {
1005+ initError(i18n("Another power manager has been detected. PowerDevil will not start if "
1006+ "other power managers are active. If you want to use PowerDevil as your primary "
1007+ "power manager, please remove the existing one and restart PowerDevil service."));
1008+ return;
1009+ } else if (conn.interface()->isServiceRegistered("com.novell.powersave")) {
1010+ initError(i18n("It seems powersaved is running on this system. PowerDevil will not start if "
1011+ "other power managers are active. If you want to use PowerDevil as your primary "
1012+ "power manager, please stop powersaved and restart PowerDevil service."));
1013+ return;
1014+ }
1015 }
850b7a80 1016-
7aab7511
AM		 1017+
1018 initView();
850b7a80 1019 return;
7aab7511
AM		 1020 } else {
1021--- workspace/krunner/interfaces/default/interface.cpp (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1022+++ workspace/krunner/interfaces/default/interface.cpp (.../branches/KDE/4.2/kdebase) (wersja 974231)
1023@@ -120,13 +120,13 @@
1024 KLineEdit *lineEdit = new KLineEdit(m_searchTerm);
1025 QAction *focusEdit = new QAction(this);
1026 focusEdit->setShortcut(Qt::Key_F6);
1027-
1028+
1029 // in therory, the widget should detect the direction from the content
1030 // but this is not available in Qt4.4/KDE 4.2, so the best default for this widget
1031 // is LTR: as it's more or less a "command line interface"
1032 // FIXME remove this code when KLineEdit has automatic direction detection of the "paragraph"
1033 m_searchTerm->setLayoutDirection( Qt::LeftToRight );
1034-
1035+
1036 connect(focusEdit, SIGNAL(triggered(bool)), lineEdit, SLOT(setFocus()));
1037 addAction(focusEdit);
1038
1039@@ -179,7 +179,7 @@
1040 m_resultsView->setAlignment(Qt::AlignLeft | Qt::AlignTop);
1041
1042 //kDebug() << "size:" << m_resultsView->size() << m_resultsView->minimumSize();
1043- m_resultsScene = new ResultScene(runnerManager, m_searchTerm, this);
1044+ m_resultsScene = new ResultScene(runnerManager, this);
1045 m_resultsView->setScene(m_resultsScene);
1046 m_resultsView->setMinimumSize(m_resultsScene->minimumSizeHint());
1047 connect(m_resultsScene, SIGNAL(matchCountChanged(int)), this, SLOT(matchCountChanged(int)));
1048--- workspace/krunner/interfaces/default/resultscene.h (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1049+++ workspace/krunner/interfaces/default/resultscene.h (.../branches/KDE/4.2/kdebase) (wersja 974231)
1050@@ -45,7 +45,7 @@
1051 Q_OBJECT
1052
1053 public:
1054- explicit ResultScene(Plasma::RunnerManager *runnerManager, QWidget * focusBase, QObject *parent = 0);
1055+ explicit ResultScene(Plasma::RunnerManager *runnerManager, QObject *parent = 0);
1056 ~ResultScene();
1057
1058 void resize(int width, int height);
1059@@ -80,7 +80,6 @@
1060 private:
1061 ResultItem* addQueryMatch(const Plasma::QueryMatch &match, bool useAnyId);
1062 void performResize(int width, int height);
1063- bool canMoveItemFocus() const;
1064
1065 Plasma::RunnerManager *m_runnerManager;
1066
1067@@ -106,8 +105,6 @@
1068 uint m_currentPage;
1069 Plasma::FrameSvg *m_frame;
1070
1071- QWidget *m_focusBase;
1072-
1073 private slots:
1074 void layoutIcons();
1075 void slotArrowResultItemPressed();
1076--- workspace/krunner/interfaces/default/resultscene.cpp (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1077+++ workspace/krunner/interfaces/default/resultscene.cpp (.../branches/KDE/4.2/kdebase) (wersja 974231)
1078@@ -41,15 +41,14 @@
1079
1080 #include "resultitem.h"
1081
1082-ResultScene::ResultScene(Plasma::RunnerManager *manager, QWidget * focusBase, QObject *parent)
1083+ResultScene::ResultScene(Plasma::RunnerManager *manager, QObject *parent)
1084 : QGraphicsScene(parent),
1085 m_runnerManager(manager),
1086 m_cIndex(0),
1087 m_rowStride(0),
1088 m_pageStride(0),
1089 m_pageCount(0),
1090- m_currentPage(0),
1091- m_focusBase(focusBase)
1092+ m_currentPage(0)
850b7a80 1093 {
7aab7511 1094 setItemIndexMethod(NoIndex);
ce826774 1095
7aab7511
AM		 1096@@ -123,15 +122,6 @@
1097 emit matchCountChanged(0);
ce826774 1098 }
1099
7aab7511
AM		 1100-bool ResultScene::canMoveItemFocus() const
1101-{
1102- // We prevent a late query result from stealing the item focus from the user
1103- // The item focus can be moved only if the focusBase widget (the khistorycombobox)
1104- // has focus (i.e. the user is still typing or waiting) or if there is no item currently focused
1105-
1106- return m_focusBase->hasFocus() || (!focusItem());
1107-}
1108-
1109 void ResultScene::setQueryMatches(const QList<Plasma::QueryMatch> &m)
850b7a80 1110 {
7aab7511
AM		 1111 // kDebug() << "============================" << endl << "matches retrieved: " << m.count();
1112@@ -194,15 +184,15 @@
1113 item->setIndex(i);
1114
1115 // it is vital that focus is set *after* the index
1116- if (i == 0 && canMoveItemFocus()) {
1117+ if (i == 0) {
1118 setFocusItem(item);
1119- emit itemHoverEnter(item);
1120 }
4aa11692 1121
7aab7511
AM		 1122 ++i;
1123 tab = item;
4aa11692
AM		 1124 }
1125
7aab7511 1126+ emit itemHoverEnter(m_items.at(0));
850b7a80 1127 }
4aa11692 1128
7aab7511
AM		 1129 ResultItem* ResultScene::addQueryMatch(const Plasma::QueryMatch &match, bool useAnyId)
1130--- workspace/kmenuedit/kmenuedit.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1131+++ workspace/kmenuedit/kmenuedit.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1132@@ -84,8 +84,8 @@
1133 Name[uz@cyrillic]=Меню таҳрирчи
1134 Name[vi]=Biên soạn trình đơn
1135 Name[wa]=Aspougneu di menus
1136+Name[xh]=Umhleli we Menu
1137 Name[x-test]=xxMenu Editorxx
1138-Name[xh]=Umhleli we Menu
1139 Name[zh_CN]=菜单编辑器
1140 Name[zh_TW]=選單編輯器
1141
1142--- workspace/libs/ksysguard/processcore/processes_linux_p.cpp (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1143+++ workspace/libs/ksysguard/processcore/processes_linux_p.cpp (.../branches/KDE/4.2/kdebase) (wersja 974231)
1144@@ -143,6 +143,7 @@
1145 switch( mBuffer[0]) {
1146 case 'N':
1147 if((unsigned int)size > sizeof("Name:") && qstrncmp(mBuffer, "Name:", sizeof("Name:")-1) == 0) {
1148+ if(process->command.isEmpty())
1149 process->name = QString::fromLocal8Bit(mBuffer + sizeof("Name:")-1, size-sizeof("Name:")+1).trimmed();
1150 if(++found == 4) goto finish;
1151 }
1152@@ -354,6 +355,12 @@
1153 //cmdline seperates parameters with the NULL character
1154 process->command.replace('\0', ' ');
1155 process->command = process->command.trimmed();
1156+ if(!process->command.isEmpty()) {
1157+ QString processname = process->command;
1158+ processname.remove(QRegExp("^[^ ]*/"));
1159+ if(processname.startsWith(process->name))
1160+ process->name = processname;
850b7a80 1161+ }
4aa11692 1162
7aab7511
AM		 1163 mFile.close();
1164 return true;
1165--- workspace/libs/ksysguard/processui/ksysguardprocesslist.cpp (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1166+++ workspace/libs/ksysguard/processui/ksysguardprocesslist.cpp (.../branches/KDE/4.2/kdebase) (wersja 974231)
1167@@ -259,9 +259,7 @@
1168 d->mUi->txtFilter->installEventFilter(this);
1169 d->mUi->treeView->installEventFilter(this);
1170
1171- //Logical column 0 will always be the tree bit with the process name. We expand this automatically in code,
1172- //so don't let the user change it
1173- d->mUi->treeView->header()->setResizeMode(0, QHeaderView::ResizeToContents);
1174+ d->mUi->treeView->header()->setResizeMode(0, QHeaderView::Interactive);
1175 d->mUi->treeView->header()->setStretchLastSection(true);
1176 d->mUi->treeView->setDragEnabled(true);
1177 d->mUi->treeView->setDragDropMode(QAbstractItemView::DragOnly);
1178@@ -297,8 +295,7 @@
1179 d->mUi->btnKillProcess->setIcon(KIcon("process-stop"));
1180
1181 //If the view resorts continually, then it can be hard to keep track of processes. By doing it only every few seconds it reduces the 'jumping around'
1182- QTimer *mTimer = new QTimer(this);
1183- connect(mTimer, SIGNAL(timeout()), &d->mFilterModel, SLOT(invalidate()));
1184+// QTimer *mTimer = new QTimer(this);
1185 // mTimer->start(4000);
1186 // QT BUG? We have to disable the sorting for now because there seems to be a bug in Qt introduced in Qt 4.4beta which makes the view scroll back to the top
1187 d->mModel.update(d->mUpdateIntervalMSecs);
1188@@ -1111,6 +1108,7 @@
1189 void KSysGuardProcessList::restoreHeaderState(const QByteArray & state) {
1190 d->mUi->treeView->header()->restoreState(state);
1191 d->mFilterModel.sort( d->mUi->treeView->header()->sortIndicatorSection(), d->mUi->treeView->header()->sortIndicatorOrder() );
1192+ d->mUi->treeView->header()->setResizeMode(0, QHeaderView::Interactive);
850b7a80 1193 }
4aa11692 1194
7aab7511
AM		 1195 bool KSysGuardProcessList::eventFilter(QObject *obj, QEvent *event) {
1196--- workspace/kscreensaver/kblank_screensaver/kblank.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1197+++ workspace/kscreensaver/kblank_screensaver/kblank.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1198@@ -81,8 +81,8 @@
1199 Name[uz@cyrillic]=Бўш экран
1200 Name[vi]=Màn hình Trống
1201 Name[wa]=Noere waitroûle
1202+Name[xh]=Ikhusi Elingenanto
1203 Name[x-test]=xxBlank Screenxx
1204-Name[xh]=Ikhusi Elingenanto
1205 Name[zh_CN]=黑屏幕
1206 Name[zh_TW]=空白螢幕
1207
1208@@ -165,8 +165,8 @@
1209 Name[uz@cyrillic]=Ўрнатиш
1210 Name[vi]=Thiết lập...
1211 Name[wa]=Apontyî...
1212+Name[xh]=Iyacwangciswa...
1213 Name[x-test]=xxSetup...xx
1214-Name[xh]=Iyacwangciswa...
1215 Name[zh_CN]=设置...
1216 Name[zh_TW]=設定...
1217 Icon=kscreensaver
1218--- workspace/kscreensaver/krandom_screensaver/krandom.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1219+++ workspace/kscreensaver/krandom_screensaver/krandom.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1220@@ -81,8 +81,8 @@
1221 Name[uz@cyrillic]=Тасодифий
1222 Name[vi]=Ngẫu nhiên
1223 Name[wa]=A l' astcheyance
1224+Name[xh]=Ngaphandle kwenjongo
1225 Name[x-test]=xxRandomxx
1226-Name[xh]=Ngaphandle kwenjongo
1227 Name[zh_CN]=随机
1228 Name[zh_TW]=隨機
1229
1230@@ -165,8 +165,8 @@
1231 Name[uz@cyrillic]=Ўрнатиш
1232 Name[vi]=Thiết lập...
1233 Name[wa]=Apontyî...
1234+Name[xh]=Iyacwangciswa...
1235 Name[x-test]=xxSetup...xx
1236-Name[xh]=Iyacwangciswa...
1237 Name[zh_CN]=设置...
1238 Name[zh_TW]=設定...
1239 Icon=kscreensaver
1240--- workspace/khotkeys/kcm_hotkeys/kcm_module_factory.cpp (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1241+++ workspace/khotkeys/kcm_hotkeys/kcm_module_factory.cpp (.../branches/KDE/4.2/kdebase) (wersja 974231)
1242@@ -34,7 +34,7 @@
1243 registerPlugin<KCMHotkeys>("khotkeys");
1244 // registerPlugin<KCMGestures>("gestures");
1245 )
1246-K_EXPORT_PLUGIN(KCMModuleFactory("kcm_khotkeys"))
1247+K_EXPORT_PLUGIN(KCMModuleFactory("kcm_khotkeys", "khotkeys"))
1248
1249
1250 extern "C"
1251--- workspace/khotkeys/data/konqueror_gestures_kde321.khotkeys (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1252+++ workspace/khotkeys/data/konqueror_gestures_kde321.khotkeys (.../branches/KDE/4.2/kdebase) (wersja 974231)
1253@@ -1079,7 +1079,7 @@
1254 Name[de]=Nächstes Unterfenster aktivieren
1255 Name[el]=Ενεργοποίηση επόμενης καρτέλας
1256 Name[eo]=Aktivigi la sekvan langeton
1257-Name[es]=Activar la siguiente solapa
1258+Name[es]=Activar la siguiente pestaña
1259 Name[et]=Järgmise kaardi aktiveerimine
1260 Name[eu]=Aktibatu hurrengo fitxa
1261 Name[fa]=فعال کردن تب بعدی
1262@@ -1284,7 +1284,7 @@
1263 Name[de]=Vorheriges Unterfenster aktivieren
1264 Name[el]=Ενεργοποίηση προηγούμενης καρτέλας
1265 Name[eo]=Aktivigi antaŭan langeton
1266-Name[es]=Activar la solapa anterior
1267+Name[es]=Activar la pestaña anterior
1268 Name[et]=Eelmise kaardi aktiveerimine
1269 Name[eu]=Aktibatu aurreko fitxa
1270 Name[fa]=فعال کردن تب قبلی
1271@@ -1550,7 +1550,7 @@
1272 Name[de]=Unterfenster duplizieren
1273 Name[el]=Αντίγραφο καρτέλας
1274 Name[eo]=Kopii la langeton
1275-Name[es]=Duplicar la solapa
1276+Name[es]=Duplicar la pestaña
1277 Name[et]=Kaardi dubleerimine
1278 Name[eu]=Bikoiztu fitxa
1279 Name[fa]=تب مضاعف
1280@@ -2219,8 +2219,8 @@
1281 Name[uz@cyrillic]=Уй
1282 Name[vi]=Nhà
1283 Name[wa]=Måjhon
1284+Name[xh]=Ikhaya
1285 Name[x-test]=xxHomexx
1286-Name[xh]=Ikhaya
1287 Name[zh_CN]=主文件夹
1288 Name[zh_TW]=家目錄
1289 Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
1290@@ -2364,7 +2364,7 @@
1291 Name[de]=Unterfenster schließen
1292 Name[el]=Κλείσιμο καρτέλας
1293 Name[eo]=Fermi la langeton
1294-Name[es]=Cerrar la solapa
1295+Name[es]=Cerrar la pestaña
1296 Name[et]=Kaardi sulgemine
1297 Name[eu]=Itxi fitxa
1298 Name[fa]=بستن تب
1299@@ -2566,7 +2566,7 @@
1300 Name[de]=Neues Unterfenster
1301 Name[el]=Νέα καρτέλα
1302 Name[eo]=Nova langeto
1303-Name[es]=Nueva solapa
1304+Name[es]=Nueva pestaña
1305 Name[et]=Uus kaart
1306 Name[eu]=Fitxa berria
1307 Name[fa]=تب جدید
1308@@ -2836,8 +2836,8 @@
1309 Name[uz@cyrillic]=Янги ойна
1310 Name[vi]=Cửa sổ mới
1311 Name[wa]=Novea purnea
1312+Name[xh]=Window Entsha
1313 Name[x-test]=xxNew Windowxx
1314-Name[xh]=Window Entsha
1315 Name[zh_CN]=新建窗口
1316 Name[zh_TW]=新視窗
1317 Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
1318--- workspace/khotkeys/data/kde32b1.khotkeys (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1319+++ workspace/khotkeys/data/kde32b1.khotkeys (.../branches/KDE/4.2/kdebase) (wersja 974231)
1320@@ -558,7 +558,7 @@
1321 Name[ru]=Ввод "Hello"
1322 Name[se]=Čális «Bures»
1323 Name[sk]=Napísať 'Hello'
1324-Name[sl]=Vnesi »Živjo«
1325+Name[sl]=Vnesi »Hello«
1326 Name[sr]=Унос „Hello“
1327 Name[sr@latin]=Unos „Hello“
1328 Name[sv]=Skriv 'Hej'
1329@@ -773,7 +773,7 @@
1330 Name[ru]=Запустить Konsole
1331 Name[se]=Vuoje konsolla
1332 Name[sk]=Spustiť Konsole
1333-Name[sl]=Poženi konzolo
1334+Name[sl]=Poženi Konzolo
1335 Name[sr]=Покрени Конзолу
1336 Name[sr@latin]=Pokreni Konsolu
1337 Name[sv]=Kör Terminal
1338@@ -1017,7 +1017,6 @@
1339 Comment[ne]=Qt डिजाइनर
1340 Comment[pa]=Qt ਡਿਜ਼ਾਈਨਰ
1341 Comment[pt_BR]=Designer Qt
1342-Comment[sl]=Snovalnik Qt
1343 Comment[sr]=КуТ‑дизајнер
1344 Comment[sr@latin]=QtDesigner
1345 Comment[ta]=Qt வடிவமைப்பாளர்
1346--- workspace/kwin/effects/logout.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1347+++ workspace/kwin/effects/logout.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1348@@ -78,7 +78,7 @@
1349 Comment=Desaturate the desktop when displaying the logout dialog
1350 Comment[ar]=إلغاء تشبع ألوان سطح المكتب عن ظهور حور الخروج
1351 Comment[bg]=Избледняване на работния плот при показване на прозореца за изход
1352-Comment[ca]=Reducció de la saturació de l'escriptori en mostar el diàleg de sortida
1353+Comment[ca]=Reducció de la saturació de l'escriptori en mostrar el diàleg de sortida
1354 Comment[cs]=Odbarvit plochu při zobrazení okna pro odhlášení
1355 Comment[da]=Afmæt farverne på desktoppen når log ud-dialogen vises
1356 Comment[de]=Färbt die Arbeitsfläche in Grautöne, wenn der Abmelde-Dialog erscheint.
1357--- workspace/kwin/clients/kwmtheme/kwmtheme.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1358+++ workspace/kwin/clients/kwmtheme/kwmtheme.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1359@@ -76,8 +76,8 @@
1360 Name[uz@cyrillic]=KWM мавзуси
1361 Name[vi]=Sắc thái KWM
1362 Name[wa]=Tinme KWM
1363+Name[xh]=Umxholo we KWM
1364 Name[x-test]=xxKWM Themexx
1365-Name[xh]=Umxholo we KWM
1366 Name[zh_CN]=KWM 主题
1367 Name[zh_TW]=KWM 主題
1368 X-KDE-Library=kwin3_kwmtheme
1369--- workspace/kwin/clients/laptop/laptop.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1370+++ workspace/kwin/clients/laptop/laptop.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
850b7a80 1371@@ -61,8 +61,8 @@
7aab7511
AM		 1372 Name[uz@cyrillic]=Лаптоп
1373 Name[vi]=Máy xách tay
1374 Name[wa]=Poirtåve
1375+Name[xh]=Umphezulu osongiweyo
1376 Name[x-test]=xxLaptopxx
1377-Name[xh]=Umphezulu osongiweyo
1378 Name[zh_CN]=笔记本电脑
1379 Name[zh_TW]=筆記型電腦
1380 X-KDE-Library=kwin3_laptop
1381--- workspace/kwin/kcmkwin/kwindecoration/kwindecoration.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1382+++ workspace/kwin/kcmkwin/kwindecoration/kwindecoration.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1383@@ -156,8 +156,8 @@
1384 Comment[uz@cyrillic]=Ойна сарлавҳасининг ташқи кўринишини мослаш
1385 Comment[vi]=Cấu hình giao diện và cảm nhận cho tên cửa sổ
1386 Comment[wa]=Apontyî li rivnance eyet l' dujhance des tites des purneas
1387+Comment[xh]=Qwalasela inkangeleko nemvakalelo yezihloko zeWindow
1388 Comment[x-test]=xxConfigure the look and feel of window titlesxx
1389-Comment[xh]=Qwalasela inkangeleko nemvakalelo yezihloko zeWindow
1390 Comment[zh_CN]=配置窗口标题的观感
1391 Comment[zh_TW]=設定視窗標題列的外觀與感覺
1392
1393--- workspace/kwin/kcmkwin/kwindesktop/desktop.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1394+++ workspace/kwin/kcmkwin/kwindesktop/desktop.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1395@@ -85,8 +85,8 @@
1396 Name[uz@cyrillic]=Бир нечта иш столлари
1397 Name[vi]=Đa màn hình nền
1398 Name[wa]=Multi-scribannes
1399+Name[xh]=Desktops Ezininzi
1400 Name[x-test]=xxMultiple Desktopsxx
1401-Name[xh]=Desktops Ezininzi
1402 Name[zh_CN]=多个桌面
1403 Name[zh_TW]=多重桌面
1404
1405@@ -163,8 +163,8 @@
1406 Comment[uz@cyrillic]=Бу ерда виртуал иш столларнинг сонини мослашингиз мумкин
1407 Comment[vi]=Bạn có khả năng đặt số màn hình nền ảo ở đây
1408 Comment[wa]=Vos ploz apontyî cobén di forveyous scribannes i gn a.
1409+Comment[xh]=Ungaqwalasela ukuba zizakubangakanani ii desktops ezingabonakaliyo.
1410 Comment[x-test]=xxYou can configure how many virtual desktops there are.xx
1411-Comment[xh]=Ungaqwalasela ukuba zizakubangakanani ii desktops ezingabonakaliyo.
1412 Comment[zh_CN]=您可以在这里配置虚拟桌面的数量。
1413 Comment[zh_TW]=您可以在這裡設定要有多少個虛擬桌面。
1414 X-KDE-Keywords=desktop,desktops,number,virtual desktop
1415--- workspace/kwin/kcmkwin/kwinoptions/kwinfocus.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1416+++ workspace/kwin/kcmkwin/kwinoptions/kwinfocus.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1417@@ -151,8 +151,8 @@
1418 Comment[uz]=Oynani fokuslash qoidasini moslash
1419 Comment[uz@cyrillic]=Ойнани фокуслаш қоидасини мослаш
1420 Comment[vi]=Cấu hình chính sách về tiêu điểm trên cửa sổ
1421+Comment[xh]=Qwalasela inkqubo yobekiso lwe window
1422 Comment[x-test]=xxConfigure the window focus policyxx
1423-Comment[xh]=Qwalasela inkqubo yobekiso lwe window
1424 Comment[zh_CN]=配置窗口焦点策略
1425 Comment[zh_TW]=設定視窗焦點政策
1426
1427--- workspace/kwin/kcmkwin/kwinoptions/kwinoptions.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1428+++ workspace/kwin/kcmkwin/kwinoptions/kwinoptions.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1429@@ -87,8 +87,8 @@
1430 Name[uz@cyrillic]=Ойнанинг хусусиятлари
1431 Name[vi]=Ứng xử của Cửa sổ
1432 Name[wa]=Dujhance des purneas
1433+Name[xh]=Ukuziphatha kwe Window
1434 Name[x-test]=xxWindow Behaviorxx
1435-Name[xh]=Ukuziphatha kwe Window
1436 Name[zh_CN]=窗口行为
1437 Name[zh_TW]=視窗行為
1438
1439--- workspace/kwin/kcmkwin/kwinoptions/kwinmoving.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1440+++ workspace/kwin/kcmkwin/kwinoptions/kwinmoving.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1441@@ -83,8 +83,8 @@
1442 Name[uz@cyrillic]=Кўчириш
1443 Name[vi]=Di chuyển
1444 Name[wa]=Bodjî
1445+Name[xh]=Iyahamba
1446 Name[x-test]=xxMovingxx
1447-Name[xh]=Iyahamba
1448 Name[zh_CN]=移动
1449 Name[zh_TW]=移動
1450
1451@@ -161,8 +161,8 @@
1452 Comment[uz@cyrillic]=Ойналарни кўчириш йўлини мослаш
1453 Comment[vi]=Cấu hình cách di chuyển cửa sổ
1454 Comment[wa]=Apontyî l' manire di bodjî des purneas
1455+Comment[xh]=Qwalasela iindlela ii windows ezshukunyiswa ngayo
1456 Comment[x-test]=xxConfigure the way that windows are movedxx
1457-Comment[xh]=Qwalasela iindlela ii windows ezshukunyiswa ngayo
1458 Comment[zh_CN]=配置窗口移动的方式
1459 Comment[zh_TW]=設定視窗移動的方式
1460
1461--- workspace/kwin/kcmkwin/kwinoptions/kwinactions.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1462+++ workspace/kwin/kcmkwin/kwinoptions/kwinactions.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1463@@ -84,8 +84,8 @@
1464 Name[uz@cyrillic]=Амаллар
1465 Name[vi]=Hành động
1466 Name[wa]=Accions
1467+Name[xh]=Iintshukumo
1468 Name[x-test]=xxActionsxx
1469-Name[xh]=Iintshukumo
1470 Name[zh_CN]=动作
1471 Name[zh_TW]=動作
1472
1473@@ -162,8 +162,8 @@
1474 Comment[uz@cyrillic]=Сичқонча ва тугматагни мослаш
1475 Comment[vi]=Cấu hình thiết lập bàn phím và con chuột
1476 Comment[wa]=Apontiaedjes del sori eyet del taprece
1477+Comment[xh]=Qwalasela izicwangciso zebhodi yezitshixho neze mouse
1478 Comment[x-test]=xxConfigure keyboard and mouse settingsxx
1479-Comment[xh]=Qwalasela izicwangciso zebhodi yezitshixho neze mouse
1480 Comment[zh_CN]=配置键盘和鼠标设置
1481 Comment[zh_TW]=設定鍵盤與滑鼠的設定值
1482
1483--- workspace/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1484+++ workspace/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1485@@ -65,7 +65,7 @@
1486 Name[pa]=ਤਕਨੀਕੀ
1487 Name[pl]=Zaawansowane
1488 Name[pt]=Avançado
1489-Name[pt_BR]=Avançados
1490+Name[pt_BR]=Avançado
1491 Name[ro]=Avansat
1492 Name[ru]=Дополнительно
1493 Name[se]=Viiddiduvvon
1494@@ -84,8 +84,8 @@
1495 Name[uz@cyrillic]=Қўшимча
1496 Name[vi]=Nâng cao
1497 Name[wa]=Sipepieus
1498+Name[xh]=Ebhekisa phambili
1499 Name[x-test]=xxAdvancedxx
1500-Name[xh]=Ebhekisa phambili
1501 Name[zh_CN]=高级
1502 Name[zh_TW]=進階
1503
1504@@ -160,8 +160,8 @@
1505 Comment[uz@cyrillic]=Ойна бошқарувнинг кўшимча имкониятларини мослаш
1506 Comment[vi]=Cấu hình các tính năng quản lý cửa sổ nâng cao
1507 Comment[wa]=Apontiaedje des spepieusès fonccionålités do manaedjaedje des purneas
1508+Comment[xh]=Qwalasela imisebenzi esemqoka ebhekisa phambili yophatho lwe window
1509 Comment[x-test]=xxConfigure advanced window management featuresxx
1510-Comment[xh]=Qwalasela imisebenzi esemqoka ebhekisa phambili yophatho lwe window
1511 Comment[zh_CN]=配置高级窗口管理特性
1512 Comment[zh_TW]=設定進階視窗管理功能
1513
1514--- workspace/kwin/geometrytip.cpp (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1515+++ workspace/kwin/geometrytip.cpp (.../branches/KDE/4.2/kdebase) (wersja 974231)
1516@@ -33,6 +33,7 @@
1517 setLineWidth(1);
1518 setFrameStyle( QFrame::Raised | QFrame::StyledPanel );
1519 setAlignment( Qt::AlignCenter | Qt::AlignTop );
1520+ setWindowFlags( Qt::X11BypassWindowManagerHint );
1521 sizeHints = xSizeHints;
1522 if( save_under )
850b7a80 1523 {
7aab7511
AM		 1524--- workspace/kwin/kwin.notifyrc (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1525+++ workspace/kwin/kwin.notifyrc (.../branches/KDE/4.2/kdebase) (wersja 974231)
1526@@ -73,8 +73,8 @@
1527 Comment[uz]=KDE oyna boshqaruvchi
1528 Comment[uz@cyrillic]=KDE ойна бошқарувчи
1529 Comment[wa]=Li manaedjeu di purneas da KDE
1530+Comment[xh]=Umphathi we Window ye KDE
1531 Comment[x-test]=xxThe KDE Window Managerxx
1532-Comment[xh]=Umphathi we Window ye KDE
1533 Comment[zh_CN]=KDE 窗口管理器
1534 Comment[zh_TW]=KDE 視窗管理員
1535
1536@@ -151,8 +151,8 @@
1537 Name[uz]=Ish stoli 1ga oʻtish
1538 Name[uz@cyrillic]=Иш столи 1га ўтиш
1539 Name[wa]=Candjî viè Scribanne 1
1540+Name[xh]=Tshintshela kwi Desktop 1
1541 Name[x-test]=xxChange to Desktop 1xx
1542-Name[xh]=Tshintshela kwi Desktop 1
1543 Name[zh_CN]=更改到桌面 1
1544 Name[zh_TW]=切換到桌面 1
1545 Comment=Virtual desktop one is selected
1546@@ -303,8 +303,8 @@
1547 Name[uz]=Ish stoli 2ga oʻtish
1548 Name[uz@cyrillic]=Иш столи 2га ўтиш
1549 Name[wa]=Candjî viè Scribanne 2
1550+Name[xh]=Tshintshela kwi Desktop 2
1551 Name[x-test]=xxChange to Desktop 2xx
1552-Name[xh]=Tshintshela kwi Desktop 2
1553 Name[zh_CN]=更改到桌面 2
1554 Name[zh_TW]=切換到桌面 2
1555 Comment=Virtual desktop two is selected
1556@@ -456,8 +456,8 @@
1557 Name[uz]=Ish stoli 3ga oʻtish
1558 Name[uz@cyrillic]=Иш столи 3га ўтиш
1559 Name[wa]=Candjî viè Scribanne 3
1560+Name[xh]=Tshintshela kwi Desktop 3
1561 Name[x-test]=xxChange to Desktop 3xx
1562-Name[xh]=Tshintshela kwi Desktop 3
1563 Name[zh_CN]=更改到桌面 3
1564 Name[zh_TW]=切換到桌面 3
1565 Comment=Virtual desktop three is selected
1566@@ -609,8 +609,8 @@
1567 Name[uz]=Ish stoli 4ga oʻtish
1568 Name[uz@cyrillic]=Иш столи 4га ўтиш
1569 Name[wa]=Candjî viè Scribanne 4
1570+Name[xh]=Tshintshela kwi Desktop 4
1571 Name[x-test]=xxChange to Desktop 4xx
1572-Name[xh]=Tshintshela kwi Desktop 4
1573 Name[zh_CN]=更改到桌面 4
1574 Name[zh_TW]=切換到桌面 4
1575 Comment=Virtual desktop four is selected
1576@@ -761,8 +761,8 @@
1577 Name[uz]=Ish stoli 5ga oʻtish
1578 Name[uz@cyrillic]=Иш столи 5га ўтиш
1579 Name[wa]=Candjî viè Scribanne 5
1580+Name[xh]=Tshintshela kwi Desktop 5
1581 Name[x-test]=xxChange to Desktop 5xx
1582-Name[xh]=Tshintshela kwi Desktop 5
1583 Name[zh_CN]=更改到桌面 5
1584 Name[zh_TW]=切換到桌面 5
1585 Comment=Virtual desktop five is selected
1586@@ -914,8 +914,8 @@
1587 Name[uz]=Ish stoli 6ga oʻtish
1588 Name[uz@cyrillic]=Иш столи 6га ўтиш
1589 Name[wa]=Candjî viè Scribanne 6
1590+Name[xh]=Tshintshela kwi Desktop 6
1591 Name[x-test]=xxChange to Desktop 6xx
1592-Name[xh]=Tshintshela kwi Desktop 6
1593 Name[zh_CN]=更改到桌面 6
1594 Name[zh_TW]=切換到桌面 6
1595 Comment=Virtual desktop six is selected
1596@@ -1065,8 +1065,8 @@
1597 Name[uz]=Ish stoli 7ga oʻtish
1598 Name[uz@cyrillic]=Иш столи 7га ўтиш
1599 Name[wa]=Candjî viè Scribanne 7
1600+Name[xh]=Tshintshela kwi Desktop 7
1601 Name[x-test]=xxChange to Desktop 7xx
1602-Name[xh]=Tshintshela kwi Desktop 7
1603 Name[zh_CN]=更改到桌面 7
1604 Name[zh_TW]=切換到桌面 7
1605 Comment=Virtual desktop seven is selected
1606@@ -1218,8 +1218,8 @@
1607 Name[uz]=Ish stoli 8ga oʻtish
1608 Name[uz@cyrillic]=Иш столи 8га ўтиш
1609 Name[wa]=Candjî viè Scribanne 8
1610+Name[xh]=Tshintshela kwi Desktop 8
1611 Name[x-test]=xxChange to Desktop 8xx
1612-Name[xh]=Tshintshela kwi Desktop 8
1613 Name[zh_CN]=更改到桌面 8
1614 Name[zh_TW]=切換到桌面 8
1615 Comment=Virtual desktop eight is selected
1616@@ -3157,8 +3157,8 @@
1617 Name[uz]=Oynani aktivlashtirish
1618 Name[uz@cyrillic]=Ойнани активлаштириш
1619 Name[wa]=Disperter purnea
1620+Name[xh]=Yenza i window isebenze
1621 Name[x-test]=xxActivate Windowxx
1622-Name[xh]=Yenza i window isebenze
1623 Name[zh_CN]=激活窗口
1624 Name[zh_TW]=啟動視窗
1625 Comment=Another window is activated
1626@@ -3313,8 +3313,8 @@
1627 Name[uz@cyrillic]=Янги ойна
1628 Name[vi]=Cửa sổ mới
1629 Name[wa]=Novea purnea
1630+Name[xh]=Window Entsha
1631 Name[x-test]=xxNew Windowxx
1632-Name[xh]=Window Entsha
1633 Name[zh_CN]=新建窗口
1634 Name[zh_TW]=新視窗
1635 Comment=New window
1636@@ -3470,8 +3470,8 @@
1637 Name[uz]=Oynani oʻchirish
1638 Name[uz@cyrillic]=Ойнани ўчириш
1639 Name[wa]=Disfacer purnea
1640+Name[xh]=Cima i Window
1641 Name[x-test]=xxDelete Windowxx
1642-Name[xh]=Cima i Window
1643 Name[zh_CN]=删除窗口
1644 Name[zh_TW]=刪除視窗
1645 Comment=Delete window
1646@@ -3623,8 +3623,8 @@
1647 Name[uz]=Oynani yopish
1648 Name[uz@cyrillic]=Ойнани ёпиш
1649 Name[wa]=Clojhaedje di purnea
1650+Name[xh]=Window Iyavala
1651 Name[x-test]=xxWindow Closexx
1652-Name[xh]=Window Iyavala
1653 Name[zh_CN]=窗口关闭
1654 Name[zh_TW]=視窗關閉
1655 Comment=A window closes
1656@@ -3770,8 +3770,8 @@
1657 Name[tr]=Pencere Yukarı
1658 Name[uk]=Згортає вікно вгору
1659 Name[wa]=Ombion d' purnea
1660+Name[xh]=Window Yenza umthunzi Phezulu
1661 Name[x-test]=xxWindow Shade Upxx
1662-Name[xh]=Window Yenza umthunzi Phezulu
1663 Name[zh_CN]=窗口卷起
1664 Name[zh_TW]=視窗層級往上
1665 Comment=A window is shaded up
1666@@ -3907,8 +3907,8 @@
1667 Name[tr]=Pencere Aşağı
1668 Name[uk]=Згортає вікно вниз
1669 Name[wa]=Met a l' ombion l' purnea
1670+Name[xh]=Window Yenza umthunzi Ezantsi
1671 Name[x-test]=xxWindow Shade Downxx
1672-Name[xh]=Window Yenza umthunzi Ezantsi
1673 Name[zh_CN]=窗口展开
1674 Name[zh_TW]=視窗層級往下
1675 Comment=A window is shaded down
1676@@ -4341,8 +4341,8 @@
1677 Name[uz]=Oynani yoyish
1678 Name[uz@cyrillic]=Ойнани ёйиш
1679 Name[wa]=Purnea å pu grand
1680+Name[xh]=Window Yenza nkulu
1681 Name[x-test]=xxWindow Maximizexx
1682-Name[xh]=Window Yenza nkulu
1683 Name[zh_CN]=窗口最大化
1684 Name[zh_TW]=視窗最大化
1685 Comment=A window is maximized
1686@@ -4488,8 +4488,8 @@
1687 Name[tr]=Pencereyi Küçült
1688 Name[uk]=Скасувати максимізацію вікна
1689 Name[wa]=Purnea pus å pu grand
1690+Name[xh]=Window Sukwenza ubukhulu
1691 Name[x-test]=xxWindow Unmaximizexx
1692-Name[xh]=Window Sukwenza ubukhulu
1693 Name[zh_CN]=窗口取消最大化
1694 Name[zh_TW]=視窗解除最大化
1695 Comment=A window loses maximization
1696@@ -4918,8 +4918,8 @@
1697 Name[uz]=Yangi dialog
1698 Name[uz@cyrillic]=Янги диалог
1699 Name[wa]=Nouve divize
1700+Name[xh]=Incoko yababini Entsha
1701 Name[x-test]=xxNew Dialogxx
1702-Name[xh]=Incoko yababini Entsha
1703 Name[zh_CN]=新对话框
1704 Name[zh_TW]=新對話框
1705 Comment=Transient window (a dialog) appears
1706@@ -5061,8 +5061,8 @@
1707 Name[uz]=Dialogni oʻchirish
1708 Name[uz@cyrillic]=Диалогни ўчириш
1709 Name[wa]=Disfacer divize
1710+Name[xh]=Cima Incoko yababini
1711 Name[x-test]=xxDelete Dialogxx
1712-Name[xh]=Cima Incoko yababini
1713 Name[zh_CN]=删除对话框
1714 Name[zh_TW]=刪除對話框
1715 Comment=Transient window (a dialog) is removed
1716@@ -5200,8 +5200,8 @@
1717 Name[uz]=Oynani koʻchirishni boshlash
1718 Name[uz@cyrillic]=Ойнани кўчиришни бошлаш
1719 Name[wa]=Cominçmint do movmint do purnea
1720+Name[xh]=Isiqalo Sentshukumo ye Window
1721 Name[x-test]=xxWindow Move Startxx
1722-Name[xh]=Isiqalo Sentshukumo ye Window
1723 Name[zh_CN]=窗口移动开始
1724 Name[zh_TW]=視窗移動開始
1725 Comment=A window has begun moving
1726@@ -5340,8 +5340,8 @@
1727 Name[uz]=Oynani koʻchirishni tugatish
1728 Name[uz@cyrillic]=Ойнани кўчиришни тугатиш
1729 Name[wa]=Difén do movmint do purnea
1730+Name[xh]=Isiphelo Sentshukumo ye Window
1731 Name[x-test]=xxWindow Move Endxx
1732-Name[xh]=Isiphelo Sentshukumo ye Window
1733 Name[zh_CN]=窗口移动结束
1734 Name[zh_TW]=視窗移動結束
1735 Comment=A window has completed its moving
1736@@ -5481,8 +5481,8 @@
1737 Name[uz]=Oynaning oʻlchamini oʻzgartirish boshlandi
1738 Name[uz@cyrillic]=Ойнанинг ўлчамини ўзгартириш бошланди
1739 Name[wa]=Cominçmint do candjmint d' grandeu do purnea
1740+Name[xh]=Isiqalo Soniko kwakhona sobungakanani se Window
1741 Name[x-test]=xxWindow Resize Startxx
1742-Name[xh]=Isiqalo Soniko kwakhona sobungakanani se Window
1743 Name[zh_CN]=窗口重定义大小开始
1744 Name[zh_TW]=視窗調整大小開始
1745 Comment=A window has begun resizing
1746@@ -5621,8 +5621,8 @@
1747 Name[uz]=Oynaning oʻlchamini oʻzgartirish tugadi
1748 Name[uz@cyrillic]=Ойнанинг ўлчамини ўзгартириш тугади
1749 Name[wa]=Difén do candjmint d' grandeu do purnea
1750+Name[xh]=Isiphelo Sobungakanani kwakhona se Window
1751 Name[x-test]=xxWindow Resize Endxx
1752-Name[xh]=Isiphelo Sobungakanani kwakhona se Window
1753 Name[zh_CN]=窗口重定义大小结束
1754 Name[zh_TW]=視窗調整大小結束
1755 Comment=A window has finished resizing
1756--- workspace/kdm/kfrontend/sessions/ratpoison.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1757+++ workspace/kdm/kfrontend/sessions/ratpoison.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1758@@ -81,7 +81,7 @@
1759 Comment[ru]=Простой диспетчер окон, моделирующий Screen и управляемый с клавиатуры
1760 Comment[se]=Oktageardánis, boallobeavdestivrejuvvon lásegieđahalli, mas lea Screen ovdagovvan
1761 Comment[sk]=Jednoduchý správca okien ovládaný iba klávesami podľa programu Screen
1762-Comment[sl]=Preprost okenski uporavljalnik na osnovi Screen, upravlja se samo s tipkovnico
1763+Comment[sl]=Preprost upravljalnik oken na osnovi Screen, upravlja se samo s tipkovnico
1764 Comment[sr]=Једноставан менаџер прозора само за тастатуру, по угледу на Скрин
1765 Comment[sr@latin]=Jednostavan menadžer prozora samo za tastaturu, po ugledu na Screen
1766 Comment[sv]=Enkel fönsterhanterare bara för tangentbord modellerad efter Screen
1767--- workspace/ksysguard/example/ksysguard.notifyrc (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1768+++ workspace/ksysguard/example/ksysguard.notifyrc (.../branches/KDE/4.2/kdebase) (wersja 974231)
1769@@ -75,8 +75,8 @@
1770 Comment[uz]=KDE tizim nazoratchisi
1771 Comment[uz@cyrillic]=KDE тизим назоратчиси
1772 Comment[wa]=Gåre sistinme di KDE
1773+Comment[xh]=KDE Ukhuselo lendlela yokusebenza
1774 Comment[x-test]=xxKDE System Guardxx
1775-Comment[xh]=KDE Ukhuselo lendlela yokusebenza
1776 Comment[zh_CN]=KDE 系统卫士
1777 Comment[zh_TW]=KDE 系統守衛
1778
1779@@ -353,7 +353,7 @@
1780 Comment[uz]=Sensor havfli chegaradan oʻtdi
1781 Comment[uz@cyrillic]=Сенсор ҳавфли чегарадан ўтди
1782 Comment[wa]=Li sinteu a stî pus lon kel limite critike
1783+Comment[xh]=Umda wokufumana ingxaki ekhoyo woluvo
1784 Comment[x-test]=xxSensor exceeded critical limitxx
1785-Comment[xh]=Umda wokufumana ingxaki ekhoyo woluvo
1786 Comment[zh_CN]=传感器达到关键限制
1787 Comment[zh_TW]=感應器已超過限制
1788--- workspace/plasma/dataengines/hotplug/plasma-dataengine-hotplug.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1789+++ workspace/plasma/dataengines/hotplug/plasma-dataengine-hotplug.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1790@@ -32,7 +32,7 @@
1791 Name[lv]=Hotplug notikumi
1792 Name[ml]=ഹോട്ട്പ്ലഗ് സംഭവങ്ങള്‍
1793 Name[mr]=Hotplug घटना
1794-Name[nb]=Hendelsesdata
1795+Name[nb]=Tilkoblingshendelser
1796 Name[nds]=Tokoppel-Begeefnissen
1797 Name[nl]=Hotplug-gebeurtenissen
1798 Name[nn]=Hotplug-hendingar
1799--- workspace/plasma/dataengines/mouse/plasma-dataengine-mouse.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1800+++ workspace/plasma/dataengines/mouse/plasma-dataengine-mouse.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1801@@ -111,7 +111,7 @@
1802 Comment[sv]=Musdata för Plasmoider
1803 Comment[te]=Plasmoids కొరకు మౌస్ డాటా
1804 Comment[th]=ข้อมูลเมาส์สำหรับพลาสมอยด์
1805-Comment[tr]=Plasma programcıkları için fare verisi
1806+Comment[tr]=Plasma programcıkları için fare verileri
1807 Comment[uk]=Рушій даних мишки для плазмоїдів
1808 Comment[wa]=Dinêyes del sori po Plasmoids
1809 Comment[x-test]=xxMouse data for Plasmoidsxx
1810--- workspace/plasma/dataengines/places/plasma-dataengine-places.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1811+++ workspace/plasma/dataengines/places/plasma-dataengine-places.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1812@@ -94,7 +94,7 @@
1813 Comment[lv]=Vietu dati Plazmoīdiem
1814 Comment[ml]=പ്ലാസ്മോയിഡ്സിനുള്ള സ്ഥാനങ്ങളെക്കുറിച്ചുള്ള ഡാറ്റ
1815 Comment[mr]=Plasmoids करीता माहिती स्थित करतो
1816-Comment[nb]=Stedsdata for Plasmoids
1817+Comment[nb]=Stedsdata for Plasmoider
1818 Comment[nds]=Steeddaten för Lüttprogrammen
1819 Comment[ne]=प्लासमोइड्सका लागि स्थान डेटा
1820 Comment[nl]=Locatiegegevens voor Plasmoids
1821@@ -114,7 +114,7 @@
1822 Comment[sv]=Platsdata för Plasmoider
1823 Comment[te]=Plasmoids కొరకు డాటాను ఉంచుతోంది
1824 Comment[th]=ข้อมูลที่หลัก ๆ สำหรับพลาสมอยด์
1825-Comment[tr]=Plasma programcıkları için konumlar verisi
1826+Comment[tr]=Plasma programcıkları için konum verileri
1827 Comment[uk]=Рушій даних про місця для плазмоїдів
1828 Comment[wa]=Dinêyes d' eplaeçmints po Plasmoids
1829 Comment[x-test]=xxPlaces data for Plasmoidsxx
1830--- workspace/plasma/dataengines/rss/plasma-dataengine-rss.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1831+++ workspace/plasma/dataengines/rss/plasma-dataengine-rss.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1832@@ -44,7 +44,7 @@
1833 Comment[lv]=RSS ziņu datu dzinējs
1834 Comment[ml]=RSS ന്യൂസ് ഡേറ്റാ എഞ്ചിന്‍
1835 Comment[mr]=RSS समाचार Data Engine
1836-Comment[nb]=RSS nyhetsdata-motor
1837+Comment[nb]=RSS nyhets-datamotor
1838 Comment[nds]=RSS-Stroom-Datenkarn
1839 Comment[nl]=RSS-nieuws (gegevensengine)
1840 Comment[or]=RSS ଖବର ତଥ୍ୟ ଯନ୍ତ୍ର
1841--- workspace/plasma/shells/desktop/panelview.cpp (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1842+++ workspace/plasma/shells/desktop/panelview.cpp (.../branches/KDE/4.2/kdebase) (wersja 974231)
1843@@ -575,8 +575,10 @@
1844
1845 void PanelView::pinchContainmentToCurrentScreen()
401a794a 1846 {
7aab7511
AM		 1847+ disconnect(this, SIGNAL(sceneRectAboutToChange()), this, SLOT(pinchContainmentToCurrentScreen()));
1848 QRect screenRect = Kephal::ScreenUtils::screenGeometry(containment()->screen());
1849 pinchContainment(screenRect);
1850+ connect(this, SIGNAL(sceneRectAboutToChange()), this, SLOT(pinchContainmentToCurrentScreen()));
401a794a
AM		 1851 }
1852
7aab7511
AM		 1853 void PanelView::pinchContainment(const QRect &screenGeom)
1854--- workspace/plasma/runners/recentdocuments/recentdocuments.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1855+++ workspace/plasma/runners/recentdocuments/recentdocuments.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1856@@ -65,8 +65,8 @@
1857 Name[uz]=Yaqinda ochilgan hujjatlar
1858 Name[uz@cyrillic]=Яқинда очилган ҳужжатлар
1859 Name[vi]=Tài liệu gần đây
1860+Name[xh]=Uxwebhu Olusandukusebenziswa
1861 Name[x-test]=xxRecent Documentsxx
1862-Name[xh]=Uxwebhu Olusandukusebenziswa
1863 Name[zh_CN]=最近使用的文档
1864 Name[zh_TW]=最近的文件
1865 Icon=document-open-recent
1866--- workspace/plasma/runners/bookmarks/plasma-runner-bookmarks.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1867+++ workspace/plasma/runners/bookmarks/plasma-runner-bookmarks.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1868@@ -78,8 +78,8 @@
1869 Name[uz@cyrillic]=Хатчўплар
1870 Name[vi]=Dấu nhớ
1871 Name[wa]=Rimåkes
1872+Name[xh]=Amanqaku eencwadi
1873 Name[x-test]=xxBookmarksxx
1874-Name[xh]=Amanqaku eencwadi
1875 Name[zh_CN]=书签
1876 Name[zh_TW]=書籤
1877 Comment=Find and open bookmarks
1878--- workspace/plasma/runners/webshortcuts/plasma-runner-webshortcuts.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1879+++ workspace/plasma/runners/webshortcuts/plasma-runner-webshortcuts.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1880@@ -77,8 +77,8 @@
1881 Name[uz@cyrillic]=Веб-қисқартмалари
1882 Name[vi]=Lối tắt Mạng
1883 Name[wa]=Rascourtis waibe
1884+Name[xh]=Ezimfutshane ze Web
1885 Name[x-test]=xxWeb Shortcutsxx
1886-Name[xh]=Ezimfutshane ze Web
1887 Name[zh_CN]=网页快捷方式
1888 Name[zh_TW]=網頁捷徑
1889 Comment=Allows user to use Konqueror's Web shortcuts
1890--- workspace/plasma/containments/panel/plasma-containment-panel.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1891+++ workspace/plasma/containments/panel/plasma-containment-panel.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1892@@ -59,8 +59,8 @@
1893 Name[uz@cyrillic]=Панел
1894 Name[vi]=Bảng điều khiển
1895 Name[wa]=Sicriftôr
1896+Name[xh]=Iqela lenjongo ethile
1897 Name[x-test]=xxPanelxx
1898-Name[xh]=Iqela lenjongo ethile
1899 Name[zh_CN]=面板
1900 Name[zh_TW]=面板
1901 Comment=A containment for a panel
1902--- workspace/plasma/applets/webbrowser/plasma-applet-webbrowser.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1903+++ workspace/plasma/applets/webbrowser/plasma-applet-webbrowser.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1904@@ -77,8 +77,8 @@
1905 Name[uz@cyrillic]=Веб-браузер
1906 Name[vi]=Trình duyệt Mạng
1907 Name[wa]=Betchteu waibe
1908+Name[xh]=Umkhangeli zincwadi we Web
1909 Name[x-test]=xxWeb Browserxx
1910-Name[xh]=Umkhangeli zincwadi we Web
1911 Name[zh_CN]=Web 浏览器
1912 Name[zh_TW]=網頁瀏覽器
1913 Comment=A simple web browser
1914--- workspace/plasma/applets/systemtray/plasma-applet-systemtray.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1915+++ workspace/plasma/applets/systemtray/plasma-applet-systemtray.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1916@@ -72,8 +72,8 @@
1917 Name[uk]=Системний лоток
1918 Name[vi]=Khay hệ thống
1919 Name[wa]=Boesse ås imådjetes
1920+Name[xh]=Itreyi Yendlela yokusebenza
1921 Name[x-test]=xxSystem Trayxx
1922-Name[xh]=Itreyi Yendlela yokusebenza
1923 Name[zh_CN]=系统托盘
1924 Name[zh_TW]=系統匣
1925 Comment=Access hidden applications minimized in the system tray
1926--- workspace/plasma/applets/pager/plasma-pager-default.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1927+++ workspace/plasma/applets/pager/plasma-pager-default.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1928@@ -37,6 +37,7 @@
1929 Name[ml]=പേജര്‍
1930 Name[mr]=पेजर
1931 Name[nb]=Sidebytter
1932+Name[nds]=Schriefdisch-Översicht
1933 Name[ne]=पेजर
1934 Name[nn]=Skrivebordsbyttar
1935 Name[oc]=Recebedor d'apèl
1936--- workspace/plasma/wallpapers/image/plasma-wallpaper-image.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1937+++ workspace/plasma/wallpapers/image/plasma-wallpaper-image.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1938@@ -52,8 +52,8 @@
1939 Name[si]=පිංතූරය
1940 Name[sk]=Obrázok
1941 Name[sl]=Slika
1942-Name[sr]=Слика
1943-Name[sr@latin]=Slika
1944+Name[sr]=слика
1945+Name[sr@latin]=slika
1946 Name[sv]=Bild
1947 Name[tg]=Тасвир
1948 Name[th]=ภาพ
1949@@ -129,8 +129,8 @@
1950 Name[si]=පිංතූරය
1951 Name[sk]=Obrázok
1952 Name[sl]=Slika
1953-Name[sr]=Слика
1954-Name[sr@latin]=Slika
1955+Name[sr]=слика
1956+Name[sr@latin]=slika
1957 Name[sv]=Bild
1958 Name[tg]=Тасвир
1959 Name[th]=ภาพ
1960@@ -196,8 +196,8 @@
1961 Name[ru]=Слайд-шоу
1962 Name[sk]=Prezentácia
1963 Name[sl]=Menjanje slik
1964-Name[sr]=Слајд‑шоу
1965-Name[sr@latin]=Slajd‑šou
1966+Name[sr]=слајд‑шоу
1967+Name[sr@latin]=slajd‑šou
1968 Name[sv]=Bildspel
1969 Name[tg]=Намоиши слайдҳо
1970 Name[th]=นำเสนอภาพนิ่ง
1971--- workspace/plasma/wallpapers/color/plasma-wallpaper-color.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1972+++ workspace/plasma/wallpapers/color/plasma-wallpaper-color.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1973@@ -52,8 +52,8 @@
1974 Name[si]=වර්‍ණය
1975 Name[sk]=Farba
1976 Name[sl]=Barva
1977-Name[sr]=Боја
1978-Name[sr@latin]=Boja
1979+Name[sr]=боја
1980+Name[sr@latin]=boja
1981 Name[sv]=Färg
1982 Name[te]=రంగు
1983 Name[tg]=Ранг
1984--- workspace/plasma/scriptengines/python/plasma-scriptengine-applet-python.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1985+++ workspace/plasma/scriptengines/python/plasma-scriptengine-applet-python.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1986@@ -100,7 +100,7 @@
1987 Comment[sr@latin]=Podrška plasma vidžeta pisanih u Pythonu
1988 Comment[sv]=Stöd för grafisk Plasma-komponent skriven i Python
1989 Comment[th]=วิดเจ็ตพลาสมาที่ถูกเขียนด้วยภาษาไพธอน
1990-Comment[tr]=Python ile yazılmış Plasma programcık desteği
1991+Comment[tr]=Python ile yazılmış Plasma gereci desteği
1992 Comment[uk]=Віджет Плазми, написаний на Python
1993 Comment[x-test]=xxPlasma widget support written in Pythonxx
1994 Comment[zh_CN]=Plasma 部件支持用 Python 来编写
1995--- workspace/plasma/scriptengines/ruby/plasma-scriptengine-ruby-applet.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
1996+++ workspace/plasma/scriptengines/ruby/plasma-scriptengine-ruby-applet.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
1997@@ -101,7 +101,7 @@
1998 Comment[sr@latin]=Samosvojni plasma vidžet napisan u Rubyju
1999 Comment[sv]=Inbyggd grafisk Plasma-komponent skriven i Ruby
2000 Comment[th]=วิดเจ็ตพลาสมาแท้ที่ถูกเขียนด้วยภาษารูบี้
2001-Comment[tr]=Ruby ile yazılmış gerçek Plasma Programcığı
2002+Comment[tr]=Ruby ile yazılmış gerçek Plasma gereci
2003 Comment[uk]=Віджет Плазми, написаний на Ruby
2004 Comment[x-test]=xxNative Plasma widget written in Rubyxx
2005 Comment[zh_CN]=使用 Ruby 编写的原生 Plasma 部件
2006--- workspace/plasma/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
2007+++ workspace/plasma/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
2008@@ -101,7 +101,7 @@
2009 Comment[sr@latin]=Samosvojni plasma vidžet napisan u Rubyju
2010 Comment[sv]=Inbyggd grafisk Plasma-komponent skriven i Ruby
2011 Comment[th]=วิดเจ็ตพลาสมาแท้ที่ถูกเขียนด้วยภาษารูบี้
2012-Comment[tr]=Ruby ile yazılmış gerçek Plasma Programcığı
2013+Comment[tr]=Ruby ile yazılmış gerçek Plasma gereci
2014 Comment[uk]=Віджет Плазми, написаний на Ruby
2015 Comment[x-test]=xxNative Plasma widget written in Rubyxx
2016 Comment[zh_CN]=使用 Ruby 编写的原生 Plasma 部件
2017--- workspace/plasma/scriptengines/javascript/plasma-scriptengine-applet-simple-javascript.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974231)
2018+++ workspace/plasma/scriptengines/javascript/plasma-scriptengine-applet-simple-javascript.desktop (.../branches/KDE/4.2/kdebase) (wersja 974231)
850b7a80 2019@@ -107,7 +107,7 @@
7aab7511
AM		 2020 Comment[sv]=Inbyggd grafisk Plasma-komponent skriven i Javascript
2021 Comment[te]=జావాస్క్రిప్‍ట్‌లో వ్రాసిన నేటివ్ ప్లాజ్మా విడ్‍జ్‌ట్
2022 Comment[th]=วิดเจ็ตพลาสมาที่ถูกเขียนด้วยจาวาสคริปต์
2023-Comment[tr]=JavaScript ile yazılmış gerçek Plasma Programcığı
2024+Comment[tr]=JavaScript ile yazılmış gerçek Plasma gereci
2025 Comment[uk]=Віджет Плазми, написаний на JavaScript
2026 Comment[x-test]=xxNative Plasma widget written in JavaScriptxx
2027 Comment[zh_CN]=使用 JavaScript 编写的原生 Plasma 部件
KDE 4 base workspace components
This page took 0.404279 seconds and 4 git commands to generate.