Author: arekm Date: Thu May 28 19:40:44 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 4; branch diff update
---- Files affected:
packages/kde4-kdebase-workspace:
kde4-kdebase-workspace-branch.diff (1.11 -> 1.12) ,
kde4-kdebase-workspace.spec (1.158 -> 1.159)
---- Diffs:
================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff
diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff:1.11
packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff:1.12
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff:1.11
Sun Apr 19 18:52:36 2009
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff Thu May
28 21:40:38 2009
@@ -1,1204 +1,2027 @@
---- workspace/kcontrol/randr/krandrtray.desktop
(.../tags/KDE/4.2.2/kdebase) (wersja 956244)
-+++ workspace/kcontrol/randr/krandrtray.desktop
(.../branches/KDE/4.2/kdebase) (wersja 956244)
-@@ -20,7 +20,7 @@
- GenericName[ar]=إعادة تحجيم ودوران الشاشة
- GenericName[be]=Змена памераў экрана і перагортванне
- genericname...@latin]=aplet dla źmieny pamieraŭ i pavarotu ekrana
--GenericName[bg]=Размер и ротация на екрана
-+GenericName[bg]=Големина и завъртане на екрана
- GenericName[bn]=পর্দা মাপবদল ও আবর্তন
- GenericName[bn_IN]=পর্দা মাপবদল ও আবর্তন
- GenericName[br]=Adventañ ha treiñ ar skramm
---- workspace/kcontrol/randr/randr.desktop (.../tags/KDE/4.2.2/kdebase)
(wersja 956244)
-+++ workspace/kcontrol/randr/randr.desktop (.../branches/KDE/4.2/kdebase)
(wersja 956244)
-@@ -16,7 +16,7 @@
- Name[ar]=الحجم والاتجاه
- Name[be]=Памеры і арыентацыя
- name...@latin]=pamiery j pavarot
--Name[bg]=Размер и завъртане на екрана
-+Name[bg]=Големина и завъртане на екрана
- Name[bn]=আকৃতি এবং দিশা
- Name[bn_IN]=মাপ ও দিশা
- Name[br]=Ment ha reteradur
-@@ -97,7 +97,7 @@
- Comment[ar]=غيّر حجم العرض وأدِره
- Comment[be]=Змяняе памеры і перагортвае ваш экран
- comment...@latin]=Źmianieńnie pamieraŭ i pavarot ekrana
--Comment[bg]=Настройване на размера и завъртането на екрана
-+Comment[bg]=Настройване на големината и завъртането на екрана
- Comment[bn]=আপনার ডিসপ্লের আকৃতি এবং দিশা পরিবর্তন করুন
- Comment[bn_IN]=আপনার ডিসপ্লের আকৃতি এবং দিশা পরিবর্তন করুন
- Comment[br]=Adventañ ha treiñ ho skramm
---- workspace/kcontrol/keys/keys.desktop (.../tags/KDE/4.2.2/kdebase)
(wersja 956244)
-+++ workspace/kcontrol/keys/keys.desktop (.../branches/KDE/4.2/kdebase)
(wersja 956244)
-@@ -60,7 +60,7 @@
- Name[pt]=Atalhos Globais do Teclado
- Name[pt_BR]=Atalhos de teclado globais
- Name[ro]=Acceleratori de tastatură globali
--Name[ru]=Комбинации клавиш
-+Name[ru]=Основные действия
- Name[si]=ගෝලීය යතුරුපුවරු කෙටිමං
- Name[sk]=Globálne klávesové skratky
- Name[sl]=Globalne tipkovnične bližnjice
---- workspace/solid/kcm/kcm_solid.desktop (.../tags/KDE/4.2.2/kdebase)
(wersja 956244)
-+++ workspace/solid/kcm/kcm_solid.desktop (.../branches/KDE/4.2/kdebase)
(wersja 956244)
-@@ -12,6 +12,7 @@
- Name[ar]=العتاد
- Name[be]=Прылады
- name...@latin]=aparatura
-+Name[bg]=Хардуер
- Name[bn]=হার্ডওয়্যার
- Name[bn_IN]=হার্ডওয়্যার
- Name[br]=Periantel
---- workspace/powerdevil/daemon/PollSystemLoader.cpp
(.../tags/KDE/4.2.2/kdebase) (wersja 956244)
-+++ workspace/powerdevil/daemon/PollSystemLoader.cpp
(.../branches/KDE/4.2/kdebase) (wersja 956244)
-@@ -58,20 +58,21 @@
- tpl->deleteLater();
+--- workspace/ksmserver/kcm/kcmsmserver.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/ksmserver/kcm/kcmsmserver.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -87,8 +87,8 @@
+ name...@cyrillic]=Сеанс бошқарувчиси
+ Name[vi]=Bộ quản lý phiên chạy
+ Name[wa]=Manaedjeu di sessions
++Name[xh]=Umphathi wesiqendu
+ Name[x-test]=xxSession Managerxx
+-Name[xh]=Umphathi wesiqendu
+ Name[zh_CN]=会话管理器
+ Name[zh_TW]=工作階段管理程式
+
+@@ -167,8 +167,8 @@
+ comment...@cyrillic]=Сеанс бошқарувчисини ва чиқиш мосламаларини мослаш
+ Comment[vi]=Cấu hình trình quản lý phiên chạy và thiết lập đăng xuất
+ Comment[wa]=Apontiaedje do manaedjeu di sessions eyet apontiaedjes do
dislodjaedje
++Comment[xh]=Qwalasela umphathi wesiqendu nezicwangciso zokuphuma ngaphandle
+ Comment[x-test]=xxConfigure the session manager and logout settingsxx
+-Comment[xh]=Qwalasela umphathi wesiqendu nezicwangciso zokuphuma ngaphandle
+ Comment[zh_CN]=配置会话管理器和注销设置
+ Comment[zh_TW]=設定工作階段管理程式與登出設定值
+
+--- workspace/kcontrol/dateandtime/clock.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/dateandtime/clock.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -90,8 +90,8 @@
+ name...@cyrillic]=Сана ва вақт
+ Name[vi]=Ngày và Giờ
+ Name[wa]=Date et eure
++Name[xh]=Umhla & Ixesha
+ Name[x-test]=xxDate & Timexx
+-Name[xh]=Umhla & Ixesha
+ Name[zh_CN]=日期和时间
+ Name[zh_TW]=日期和時間
+
+@@ -173,8 +173,8 @@
+ comment...@cyrillic]=Сана ва вақтнинг мосламалари
+ Comment[vi]=Thiết lập ngày giờ
+ Comment[wa]=Apontiaedjes del date et l' eure
++Comment[xh]=Izicwangciso zomhla kunye nexesha
+ Comment[x-test]=xxDate and time settingsxx
+-Comment[xh]=Izicwangciso zomhla kunye nexesha
+ Comment[zh_CN]=日期和时间设置
+ Comment[zh_TW]=日期和時間設定值
+
+--- workspace/kcontrol/dateandtime/dtime.cpp (.../tags/KDE/4.2.3/kdebase)
(wersja 974231)
++++ workspace/kcontrol/dateandtime/dtime.cpp (.../branches/KDE/4.2/kdebase)
(wersja 974231)
+@@ -204,8 +204,6 @@
+
+ connect( &internalTimer, SIGNAL(timeout()), SLOT(timeout()) );
+
+- load();
+-
+ kclock->setEnabled(false);
}
--QMap<AbstractSystemPoller::PollingType, QString>
PollSystemLoader::getAvailableSystems()
-+QHash<AbstractSystemPoller::PollingType, QString>
PollSystemLoader::getAvailableSystems()
+@@ -262,6 +260,7 @@
+ // since there is nothing writing it.
+ KConfig _config( "kcmclockrc", KConfig::NoGlobals );
+ KConfigGroup config(&_config, "NTP");
++ timeServerList->clear();
+ timeServerList->addItems(config.readEntry("servers",
+ i18n("Public Time Server (pool.ntp.org),\
+ asia.pool.ntp.org,\
+--- workspace/kcontrol/kfontinst/kcmfontinst/fontinst.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/kfontinst/kcmfontinst/fontinst.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -87,8 +87,8 @@
+ name...@cyrillic]=Шрифт ўрнатгич
+ Name[vi]=Cài đặt Phông chữ
+ Name[wa]=Astaleu di fontes
++Name[xh]=Umfaki Wohlobo lwegama
+ Name[x-test]=xxFont Installerxx
+-Name[xh]=Umfaki Wohlobo lwegama
+ Name[zh_CN]=字体安装程序
+ Name[zh_TW]=字型安裝程式
+
+--- workspace/kcontrol/kfontinst/viewpart/kfontviewpart.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/kfontinst/viewpart/kfontviewpart.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -77,8 +77,8 @@
+ name...@cyrillic]=Шрифт кўрувчи
+ Name[vi]=Bộ xem Phông chữ
+ Name[wa]=Håyneu d' fontes
++Name[xh]=Imboniselo Yohlobo lwegama
+ Name[x-test]=xxFont Viewerxx
+-Name[xh]=Imboniselo Yohlobo lwegama
+ Name[zh_CN]=字体查看器
+ Name[zh_TW]=字型檢視器
+
MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-pcf;application/x-font-bdf;fonts/package;
+--- workspace/kcontrol/kfontinst/kio/fonts.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/kfontinst/kio/fonts.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -81,8 +81,8 @@
+ name...@cyrillic]=Шрифтлар
+ Name[vi]=Phông chữ
+ Name[wa]=Fontes
++Name[xh]=Uhlobo lwamagama
+ Name[x-test]=xxFontsxx
+-Name[xh]=Uhlobo lwamagama
+ Name[zh_CN]=字体
+ Name[zh_TW]=字型
+ Open=false
+--- workspace/kcontrol/kfontinst/thumbnail/fontthumbnail.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/kfontinst/thumbnail/fontthumbnail.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -79,8 +79,8 @@
+ name...@cyrillic]=Шрифт-файллари
+ Name[vi]=Tập tin Phông chữ
+ Name[wa]=Fitchîs fontes
++Name[xh]=Iifayile Zohlobo lwamagama
+ Name[x-test]=xxFont Filesxx
+-Name[xh]=Iifayile Zohlobo lwamagama
+ Name[zh_CN]=字体文件
+ Name[zh_TW]=字型檔案
+ X-KDE-ServiceTypes=ThumbCreator
+--- workspace/kcontrol/smartcard/smartcard.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/smartcard/smartcard.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -154,8 +154,8 @@
+ comment...@cyrillic]=smartcard'ни мослаш
+ Comment[vi]=Cấu hình khả năng hỗ trợ thẻ thông minh
+ Comment[wa]=Apontyî li sopoirt smartcard
++Comment[xh]=Qwalasela inkxaso ye smartcard
+ Comment[x-test]=xxConfigure smartcard supportxx
+-Comment[xh]=Qwalasela inkxaso ye smartcard
+ Comment[zh_CN]=配置智能卡支持
+ Comment[zh_TW]=設定智慧卡 (SmartCard) 支援
+ X-KDE-Keywords=Smartcard,PKCS,SSL,reader,smart,card
+--- workspace/kcontrol/screensaver/screensaver.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/screensaver/screensaver.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -86,8 +86,8 @@
+ name...@cyrillic]=Экран сақловчиси
+ Name[vi]=Bảo vệ Màn hình
+ Name[wa]=Sipårgneu di waitroûle
++Name[xh]=Umgcini Wekhusi
+ Name[x-test]=xxScreen Saverxx
+-Name[xh]=Umgcini Wekhusi
+ Name[zh_CN]=屏幕保护程序
+ Name[zh_TW]=螢幕保護程式
+
+@@ -168,8 +168,8 @@
+ comment...@cyrillic]=Экран сақловчисининг мосламалари
+ Comment[vi]=Thiết lập Trình bảo vệ Màn hình
+ Comment[wa]=Apontiaedjes do spårgneu di waitroûle
++Comment[xh]=Izicwangciso Zomgcini Wekhusi
+ Comment[x-test]=xxScreen Saver Settingsxx
+-Comment[xh]=Izicwangciso Zomgcini Wekhusi
+ Comment[zh_CN]=屏幕保护程序设置
+ Comment[zh_TW]=螢幕保護程式設定
+
+--- workspace/kcontrol/autostart/autostart.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/autostart/autostart.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -76,8 +76,8 @@
+ name...@cyrillic]=Авто-бошлаш
+ Name[vi]=Tự khởi chạy
+ Name[wa]=Enondaedje tot seu
++Name[xh]=Isiqalo esizenzekelayo
+ Name[x-test]=xxAutostartxx
+-Name[xh]=Isiqalo esizenzekelayo
+ Name[zh_CN]=自动启动
+ Name[zh_TW]=自動啟動
+
+--- workspace/kcontrol/energy/energy.desktop (.../tags/KDE/4.2.3/kdebase)
(wersja 974231)
++++ workspace/kcontrol/energy/energy.desktop (.../branches/KDE/4.2/kdebase)
(wersja 974231)
+@@ -90,8 +90,8 @@
+ name...@cyrillic]=Электр таъминотни бошқариш
+ Name[vi]=Điều khiển nguồn điện
+ Name[wa]=Controle di l' alimintåcion
++Name[xh]=Ulawulo Lwamandla
+ Name[x-test]=xxPower Controlxx
+-Name[xh]=Ulawulo Lwamandla
+ Name[zh_CN]=电源控制
+ Name[zh_TW]=電源控制
+
+@@ -172,8 +172,8 @@
+ comment...@cyrillic]=Дисплейнинг электр таъминоти учун мосламалар
+ Comment[vi]=Thiết lập để quản lý nguồn điện của màn hình
+ Comment[wa]=Tchuzes po håyner l' manaedjmint d' enerdjeye
++Comment[xh]=Izicwangciso zoboniso lophatho lwamandla
+ Comment[x-test]=xxSettings for display power managementxx
+-Comment[xh]=Izicwangciso zoboniso lophatho lwamandla
+ Comment[zh_CN]=显示器电源管理设置
+ Comment[zh_TW]=顯示器電源管理的設定值
+
+--- workspace/kcontrol/fonts/fonts.desktop (.../tags/KDE/4.2.3/kdebase)
(wersja 974231)
++++ workspace/kcontrol/fonts/fonts.desktop (.../branches/KDE/4.2/kdebase)
(wersja 974231)
+@@ -90,8 +90,8 @@
+ name...@cyrillic]=Шрифтлар
+ Name[vi]=Phông chữ
+ Name[wa]=Fontes
++Name[xh]=Uhlobo lwamagama
+ Name[x-test]=xxFontsxx
+-Name[xh]=Uhlobo lwamagama
+ Name[zh_CN]=字体
+ Name[zh_TW]=字型
+
+@@ -174,8 +174,8 @@
+ comment...@cyrillic]=Шрифтларни мослаш
+ Comment[vi]=Thiết lập phông chữ
+ Comment[wa]=Apontiaedje des fontes
++Comment[xh]=Izicwangciso zohlobo lwamagama
+ Comment[x-test]=xxFont settingsxx
+-Comment[xh]=Izicwangciso zohlobo lwamagama
+ Comment[zh_CN]=字体设置
+ Comment[zh_TW]=字型設定
+
+--- workspace/kcontrol/hardware/joystick/joystick.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/hardware/joystick/joystick.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -177,8 +177,8 @@
+ name...@cyrillic]=Жойстик
+ Name[vi]=Cần điều khiển
+ Name[wa]=Djîsse di djeu
++Name[xh]=Uvuyo
+ Name[x-test]=xxJoystickxx
+-Name[xh]=Uvuyo
+ Name[zh_CN]=游戏杆
+ Name[zh_TW]=搖桿
+
+--- workspace/kcontrol/kxkb/keyboard_layout.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/kxkb/keyboard_layout.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -92,8 +92,8 @@
+ name...@cyrillic]=Тугмалар тартиби
+ Name[vi]=Bố trí bàn phím
+ Name[wa]=Adjinçmint del taprece
++Name[xh]=Ubeko Lwebhodi yezitshixo
+ Name[x-test]=xxKeyboard Layoutxx
+-Name[xh]=Ubeko Lwebhodi yezitshixo
+ Name[zh_CN]=键盘布局
+ Name[zh_TW]=鍵盤配置
+
+@@ -175,8 +175,8 @@
+ comment...@cyrillic]=Тугмалар тартиби
+ Comment[vi]=Bố trí bàn phím
+ Comment[wa]=Adjinçmint des tapes del taprece
++Comment[xh]=Ubeko Lwebhodi yezitshixo
+ Comment[x-test]=xxKeyboard Layoutxx
+-Comment[xh]=Ubeko Lwebhodi yezitshixo
+ Comment[zh_CN]=键盘布局
+ Comment[zh_TW]=鍵盤配置
+
+--- workspace/kcontrol/kxkb/plasma-applet-kxkb.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/kxkb/plasma-applet-kxkb.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -74,8 +74,8 @@
+ name...@cyrillic]=Тугмалар тартиби учун восита
+ Name[vi]=Công cụ Ánh xạ Bàn phím
+ Name[wa]=Adjinçmint del taprece
++Name[xh]=Isixhobo semaphu yebhodi enezitshixo
+ Name[x-test]=xxKeyboard Map Toolxx
+-Name[xh]=Isixhobo semaphu yebhodi enezitshixo
+ Name[zh_CN]=键盘映射工具
+ Name[zh_TW]=鍵盤映射工具
+ Icon=keyboard_layout
+--- workspace/kcontrol/kxkb/kxkb.desktop (.../tags/KDE/4.2.3/kdebase)
(wersja 974231)
++++ workspace/kcontrol/kxkb/kxkb.desktop (.../branches/KDE/4.2/kdebase)
(wersja 974231)
+@@ -83,7 +83,7 @@
+ name...@cyrillic]=Тугмалар тартиби учун восита
+ Name[vi]=Công cụ Ánh xạ Bàn phím
+ Name[wa]=Adjinçmint del taprece
++Name[xh]=Isixhobo semaphu yebhodi enezitshixo
+ Name[x-test]=xxKeyboard Map Toolxx
+-Name[xh]=Isixhobo semaphu yebhodi enezitshixo
+ Name[zh_CN]=键盘映射工具
+ Name[zh_TW]=鍵盤映射工具
+--- workspace/kcontrol/input/mouse.desktop (.../tags/KDE/4.2.3/kdebase)
(wersja 974231)
++++ workspace/kcontrol/input/mouse.desktop (.../branches/KDE/4.2/kdebase)
(wersja 974231)
+@@ -171,8 +171,8 @@
+ comment...@cyrillic]=Сичқончанинг мосламалари
+ Comment[vi]=Thiết lập con chuột
+ Comment[wa]=Apontiaedjes del sori
++Comment[xh]=Izicwangciso ze mouse
+ Comment[x-test]=xxMouse settingsxx
+-Comment[xh]=Izicwangciso ze mouse
+ Comment[zh_CN]=鼠标设置
+ Comment[zh_TW]=滑鼠設定
+
+--- workspace/kcontrol/style/style.desktop (.../tags/KDE/4.2.3/kdebase)
(wersja 974231)
++++ workspace/kcontrol/style/style.desktop (.../branches/KDE/4.2/kdebase)
(wersja 974231)
+@@ -90,8 +90,8 @@
+ name...@cyrillic]=Услуб
+ Name[vi]=Kiểu dáng
+ Name[wa]=Stîle
++Name[xh]=Uhlobo
+ Name[x-test]=xxStylexx
+-Name[xh]=Uhlobo
+ Name[zh_CN]=风格
+ Name[zh_TW]=風格
+ Comment=Allows the manipulation of widget behavior and changing the Style for
KDE
+@@ -167,8 +167,8 @@
+ Comment[uk]=Керування поведінкою віджетів та зміна стилю KDE
+ 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
+ Comment[wa]=Permete di candjî l' dujhance et li stîle des ahesses po KDE
++Comment[xh]=Ivumela uhanahaniso lokuziphatha kwe widget kwaye itshintsha
Uhlobo lwe KDE
+ Comment[x-test]=xxAllows the manipulation of widget behavior and changing the
Style for KDExx
+-Comment[xh]=Ivumela uhanahaniso lokuziphatha kwe widget kwaye itshintsha
Uhlobo lwe KDE
+ Comment[zh_CN]=允许操纵修饰行为和更改 KDE 的样式
+ Comment[zh_TW]=讓您控制視窗元件 (widget) 的操作方式，以及更改 KDE 的風格
+
+--- workspace/kcontrol/keyboard/kcm_keyboard.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/keyboard/kcm_keyboard.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -91,8 +91,8 @@
+ name...@cyrillic]=Тугматаг
+ Name[vi]=Bàn phím
+ Name[wa]=Taprece
++Name[xh]=Ibhodi enezitshixo
+ Name[x-test]=xxKeyboardxx
+-Name[xh]=Ibhodi enezitshixo
+ Name[zh_CN]=键盘
+ Name[zh_TW]=鍵盤
+
+@@ -174,8 +174,8 @@
+ comment...@cyrillic]=Тугматагнинг мосламалари
+ Comment[vi]=Thiết lập bàn phím
+ Comment[wa]=Apontiaedje del taprece
++Comment[xh]=Izicwangciso zebhodi enezitshixo
+ Comment[x-test]=xxKeyboard settingsxx
+-Comment[xh]=Izicwangciso zebhodi enezitshixo
+ Comment[zh_CN]=键盘设置
+ Comment[zh_TW]=鍵盤設定
+
+--- workspace/kcontrol/keyboard/keyboard.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/keyboard/keyboard.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -93,8 +93,8 @@
+ name...@cyrillic]=Тугматаг
+ Name[vi]=Bàn phím
+ Name[wa]=Taprece
++Name[xh]=Ibhodi enezitshixo
+ Name[x-test]=xxKeyboardxx
+-Name[xh]=Ibhodi enezitshixo
+ Name[zh_CN]=键盘
+ Name[zh_TW]=鍵盤
+
+@@ -176,8 +176,8 @@
+ comment...@cyrillic]=Тугматагнинг мосламалари
+ Comment[vi]=Thiết lập bàn phím
+ Comment[wa]=Apontiaedje del taprece
++Comment[xh]=Izicwangciso zebhodi enezitshixo
+ Comment[x-test]=xxKeyboard settingsxx
+-Comment[xh]=Izicwangciso zebhodi enezitshixo
+ Comment[zh_CN]=键盘设置
+ Comment[zh_TW]=鍵盤設定
+
+--- workspace/kcontrol/colors/colors.desktop (.../tags/KDE/4.2.3/kdebase)
(wersja 974231)
++++ workspace/kcontrol/colors/colors.desktop (.../branches/KDE/4.2/kdebase)
(wersja 974231)
+@@ -89,8 +89,8 @@
+ name...@cyrillic]=Ранглар
+ Name[vi]=Màu sắc
+ Name[wa]=Coleurs
++Name[xh]=Imibala
+ Name[x-test]=xxColorsxx
+-Name[xh]=Imibala
+ Name[zh_CN]=颜色
+ Name[zh_TW]=顏色
+
+@@ -173,8 +173,8 @@
+ comment...@cyrillic]=Рангларнинг мосламалари
+ Comment[vi]=Thiết lập màu
+ Comment[wa]=Apontiaedje des coleurs
++Comment[xh]=Izicwangciso zombala
+ Comment[x-test]=xxColor settingsxx
+-Comment[xh]=Izicwangciso zombala
+ Comment[zh_CN]=颜色设置
+ Comment[zh_TW]=顏色設定
+
+--- workspace/kcontrol/access/kcmaccess.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/access/kcmaccess.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -91,8 +91,8 @@
+ name...@cyrillic]=Қулайликлар
+ Name[vi]=Khả năng truy cập
+ Name[wa]=Accessibilité
++Name[xh]=Unikezelo
+ Name[x-test]=xxAccessibilityxx
+-Name[xh]=Unikezelo
+ Name[zh_CN]=辅助
+ Name[zh_TW]=無障礙輔助
+
+@@ -171,8 +171,8 @@
+ comment...@cyrillic]=Ногирон кишилар учун қулайликлар
+ 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.
+ Comment[wa]=Rind pus åjhey l' accessibilité po les sakîs k' ont des andicapes
++Comment[xh]=Phucula unikekezeleko lwabantu abakhubazekileyo
+ Comment[x-test]=xxImprove accessibility for disabled personsxx
+-Comment[xh]=Phucula unikekezeleko lwabantu abakhubazekileyo
+ Comment[zh_CN]=方便残疾人使用的辅助功能
+ Comment[zh_TW]=方便傷殘人士使用
+
+--- workspace/kcontrol/randr/krandrmodule.cpp (.../tags/KDE/4.2.3/kdebase)
(wersja 974231)
++++ workspace/kcontrol/randr/krandrmodule.cpp (.../branches/KDE/4.2/kdebase)
(wersja 974231)
+@@ -86,6 +86,9 @@
+
+ void KRandRModule::defaults()
{
- // Cached
- return m_availableSystems;
- }
++ if (!m_display->isValid()) {
++ return;
++ }
+ #ifdef HAS_RANDR_1_2
+ if (RandR::has_1_2)
+ m_config->defaults();
+@@ -98,6 +101,9 @@
+ {
+ kDebug() << "Loading KRandRModule...";
+
++ if (!m_display->isValid()) {
++ return;
++ }
+ #ifdef HAS_RANDR_1_2
+ if (RandR::has_1_2)
+ m_config->load();
+@@ -110,6 +116,9 @@
--QMap<int, QString> PollSystemLoader::getAvailableSystemsAsInt()
-+QHash<int, QString> PollSystemLoader::getAvailableSystemsAsInt()
+ void KRandRModule::save()
{
- // Cached
++ if (!m_display->isValid()) {
++ return;
++ }
+ #ifdef HAS_RANDR_1_2
+ if (RandR::has_1_2)
+ m_config->save();
+@@ -121,6 +130,9 @@
-- QMap<int, QString> retlist;
-+ QHash<int, QString> retlist;
+ void KRandRModule::apply()
+ {
++ if (!m_display->isValid()) {
++ return;
++ }
+ #ifdef HAS_RANDR_1_2
+ if (RandR::has_1_2)
+ m_config->apply();
+--- workspace/kcontrol/kthememanager/kthememanager.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/kthememanager/kthememanager.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -87,8 +87,8 @@
+ name...@cyrillic]=Мавзу бошқарувчиси
+ Name[vi]=Bộ quản lý sắc thái
+ Name[wa]=Manaedjeu d' tinmes
++Name[xh]=Umphathi Womxholo
+ Name[x-test]=xxTheme Managerxx
+-Name[xh]=Umphathi Womxholo
+ Name[zh_CN]=主题管理器
+ Name[zh_TW]=佈景管理程式
+
+--- workspace/kcontrol/launch/kcmlaunch.desktop
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/launch/kcmlaunch.desktop
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -72,8 +72,8 @@
+ Name[se]=Prográmmaálggahan ávaštus
+ Name[sk]=Odozva na štart programov
+ Name[sl]=Povratna informacija zagona
+-Name[sr]=Одзив покретања
+-name...@latin]=odziv pokretanja
++Name[sr]=Одзив при покретању
++name...@latin]=odziv pri pokretanju
+ Name[sv]=Gensvar vid programstart
+ Name[ta]=கருத்தை தொடங்கு
+ Name[te]=లాంచ్ ప్రతిస్పందన
+@@ -150,8 +150,8 @@
+ Comment[se]=Vállje makkár ávaštus galga leat prográmmaid álggahettiin
+ Comment[sk]=Vyberte štýl odozvy pri štarte aplikácií
+ Comment[sl]=Izberite program - stil pošiljanja povratne informacije
+-Comment[sr]=Изаберите како се јавља покретање програма
+-comment...@latin]=izaberite kako se javlja pokretanje programa
++Comment[sr]=Изаберите стил одзива при покретању програма
++comment...@latin]=izaberite stil odziva pri pokretanju programa
+ Comment[sv]=Välj typ av gensvar vid programstart
+ Comment[ta]=பயன்பாடு-தொடக்கத்துக்கான கருத்து பாணியை தேர்ந்தெடு
+ Comment[te]=అనువర్తనం-లాంచ్ ప్రతిస్పందన శైలిని ఎంచుకొనుము
+@@ -162,8 +162,8 @@
+ comment...@cyrillic]=Дастур ишга тушиш хабарномасининг турини танлаш
+ Comment[vi]=Chọn kiểu mà chương trình sẽ gửi phản hồi về khi khởi động
+ Comment[wa]=Tchoezi l' stile di ritoû d' enondaedje di programe
++Comment[xh]=Khetha isicelo-yenza uhlobo lwesiphumo seLaunch
+ Comment[x-test]=xxChoose application-launch feedback stylexx
+-Comment[xh]=Khetha isicelo-yenza uhlobo lwesiphumo seLaunch
+ Comment[zh_CN]=选择程序启动反馈风格
+ Comment[zh_TW]=選擇程式啟動時的回饋風格
+
+--- workspace/kcontrol/keys/keys.desktop (.../tags/KDE/4.2.3/kdebase)
(wersja 974231)
++++ workspace/kcontrol/keys/keys.desktop (.../branches/KDE/4.2/kdebase)
(wersja 974231)
+@@ -154,8 +154,8 @@
+ comment...@cyrillic]=Тугмалар бирикмасини мослаш
+ Comment[vi]=Cấu hình các tổ hợp phím
+ Comment[wa]=Apontiaedje des rascourtis di tapes
++Comment[xh]=Uqwalaselo lwezibopheleo zesitshixo
+ Comment[x-test]=xxConfiguration of keybindingsxx
+-Comment[xh]=Uqwalaselo lwezibopheleo zesitshixo
+ Comment[zh_CN]=键绑定配置
+ Comment[zh_TW]=按鍵關聯設定
+
+--- workspace/kcontrol/keys/schemes/mac4.kksrc (.../tags/KDE/4.2.3/kdebase)
(wersja 974231)
++++ workspace/kcontrol/keys/schemes/mac4.kksrc (.../branches/KDE/4.2/kdebase)
(wersja 974231)
+@@ -76,8 +76,8 @@
+ name...@cyrillic]=mac мавзуси
+ Name[vi]=Phối hợp của Mac
+ Name[wa]=Djeu d' rascourtis Mac
++Name[xh]=Udweliso lwe Mac
+ Name[x-test]=xxMac Schemexx
+-Name[xh]=Udweliso lwe Mac
+ Name[zh_CN]=Mac 方案
+ Name[zh_TW]=Mac 機制
+ Uses Win Modifier=true
+--- workspace/kcontrol/keys/schemes/kde3.kksrc (.../tags/KDE/4.2.3/kdebase)
(wersja 974231)
++++ workspace/kcontrol/keys/schemes/kde3.kksrc (.../branches/KDE/4.2/kdebase)
(wersja 974231)
+@@ -67,8 +67,8 @@
+ Name[uk]=Типова для KDE з 3 клавішами-модифікаторами
+ Name[vi]=Mặc định KDE cho 3 Phím Bổ trợ
+ Name[wa]=Prémetou KDE (3 tapes modifieueses)
++Name[xh]=KDE Engagqibekanga ye 3 Izitsixo Mofifier
+ Name[x-test]=xxKDE Default for 3 Modifier Keysxx
+-Name[xh]=KDE Engagqibekanga ye 3 Izitsixo Mofifier
+ Name[zh_CN]=三个修饰键的 KDE 默认值
+ Name[zh_TW]=KDE 預設 3 個變更鍵
+ Uses Win Modifier=false
+--- workspace/kcontrol/keys/schemes/unix3.kksrc
(.../tags/KDE/4.2.3/kdebase) (wersja 974231)
++++ workspace/kcontrol/keys/schemes/unix3.kksrc
(.../branches/KDE/4.2/kdebase) (wersja 974231)
+@@ -76,8 +76,8 @@
+ name...@cyrillic]=unix мавзуси
+ Name[vi]=Phối hợp của Unix
+ Name[wa]=Djeu d' rascourtis Unix
++Name[xh]=Udweliso lwe UNIX
+ Name[x-test]=xxUNIX Schemexx
+-Name[xh]=Udweliso lwe UNIX
+ Name[zh_CN]=Unix 方案
+ Name[zh_TW]=UNIX 機制
+ Uses Win Modifier=false
+--- workspace/kcontrol/keys/schemes/kde4.kksrc (.../tags/KDE/4.2.3/kdebase)
(wersja 974231)
++++ workspace/kcontrol/keys/schemes/kde4.kksrc (.../branches/KDE/4.2/kdebase)
(wersja 974231)
+@@ -67,8 +67,8 @@
+ Name[uk]=Типова для KDE з 4 клавішами-модифікаторами
+ Name[vi]=Mặc định KDE cho 4 Phím Bổ trợ
+ Name[wa]=Prémetou KDE (4 tapes modifieueses)
++Name[xh]=KDE Engagqibekanga ye 4 Izitsixo Mofifier
+ Name[x-test]=xxKDE Default for 4 Modifier Keysxx
+-Name[xh]=KDE Engagqibekanga ye 4 Izitsixo Mofifier
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec?r1=1.158&r2=1.159&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
