---- runtime/kcontrol/locale/language.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kcontrol/locale/language.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -88,8 +88,8 @@
- Name[uz@cyrillic]=Давлат/регион ва тил
- Name[vi]=Quốc gia và Ngôn ngữ
- Name[wa]=Payis & lingaedje
-+Name[xh]=Ilizwe/Ummandla & Ulwimi
- Name[x-test]=xxCountry/Region & Languagexx
--Name[xh]=Ilizwe/Ummandla & Ulwimi
- Name[zh_CN]=国家/地区和语言
- Name[zh_TW]=國家/地區與語言
-
-@@ -168,8 +168,8 @@
- Comment[uz@cyrillic]=Давлатингиз учун тил, сон ва вақт мосламалари
- Comment[vi]=Ngôn ngữ, số và các thiết lập về thời gian cho vùng cụ thể
- Comment[wa]=Apontiaedje do lingaedje et des preferinces (prezintaedje des limeros, des dates, evnd.) po vosse payis
-+Comment[xh]=Ulwimi, amanani, kunye nezicwangciso zexesha zommandla wakho
- Comment[x-test]=xxLanguage, numeric, and time settings for your particular regionxx
--Comment[xh]=Ulwimi, amanani, kunye nezicwangciso zexesha zommandla wakho
- Comment[zh_CN]=您所在地区的语言、数字和时间设置
- Comment[zh_TW]=您所在地區的語言、數字和時間設定
-
---- runtime/kcontrol/emoticons/emoticonslist.cpp (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kcontrol/emoticons/emoticonslist.cpp (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -317,7 +317,7 @@
-
- KEmoticonsTheme theme = emoMap.value(themeList->currentItem()->text());
- QString path = theme.emoticonsMap().key(emoList->currentItem()->text().split(' '));
-- QString f = QFileInfo(path).baseName();
-+ QString f = QFileInfo(path).fileName();
- EditDialog *dlg = new EditDialog(this, i18n("Edit Emoticon"), emoList->currentItem(), path);
-
- if (dlg->exec() == QDialog::Rejected) {
-@@ -340,6 +340,10 @@
- emo = dir->findResource("emoticons", themeList->currentItem()->text() + QDir::separator() + f + ".png");
- if (emo.isNull())
- emo = dir->findResource("emoticons", themeList->currentItem()->text() + QDir::separator() + f + ".gif");
-+ if (emo.isNull())
-+ emo = dir->findResource("emoticons", themeList->currentItem()->text() + QDir::separator() + f + ".jpg");
-+ if (emo.isNull())
-+ emo = dir->findResource("emoticons", themeList->currentItem()->text() + QDir::separator() + f + ".jpeg");
- if (emo.isNull()) {
- delete dlg;
- return;
---- runtime/kcontrol/knotify/kcmnotify.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kcontrol/knotify/kcmnotify.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -88,8 +88,8 @@
- Name[uz@cyrillic]=Тизимнинг хабарномалари
- Name[vi]=Thông báo Hệ thống
- Name[wa]=Notifiaedjes do sistinme
-+Name[xh]=Izaziso Zendlela esetyenziswayo
- Name[x-test]=xxSystem Notificationsxx
--Name[xh]=Izaziso Zendlela esetyenziswayo
- Name[zh_CN]=系统通知
- Name[zh_TW]=系統通知
-
-@@ -170,8 +170,8 @@
- Comment[uz@cyrillic]=Тизимнинг хабарномаларини мослаш
- Comment[vi]=Cấu hình Thông báo Hệ thống
- Comment[wa]=Apontiaedje po les notifiaedjes do sistinme
-+Comment[xh]=Uqwalaselo Lwezaziso Zendlela yokusebenza
- Comment[x-test]=xxSystem Notification Configurationxx
--Comment[xh]=Uqwalaselo Lwezaziso Zendlela yokusebenza
- Comment[zh_CN]=系统通知配置
- Comment[zh_TW]=系統通知組態
-
---- runtime/kcontrol/componentchooser/componentchooser.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kcontrol/componentchooser/componentchooser.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -160,8 +160,8 @@
- Comment[uz@cyrillic]=Турли хизматлар учун андоза компонентларни танлаш
- Comment[vi]=Chọn các thành phần mặc định cho các dịch vụ khác nhau
- Comment[wa]=Tchoezi les prémetous compôzants po sacwants siervices
-+Comment[xh]=Khetha ingxenye zokungagqibekanga kweenkonzo eziliqela
- Comment[x-test]=xxChoose the default components for various servicesxx
--Comment[xh]=Khetha ingxenye zokungagqibekanga kweenkonzo eziliqela
- Comment[zh_CN]=选择各种服务的默认组件
- Comment[zh_TW]=選擇各種服務的預設元件
-
---- runtime/kcontrol/componentchooser/EXAMPLE.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kcontrol/componentchooser/EXAMPLE.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -73,8 +73,8 @@
- Name[uz@cyrillic]=Интерфейсингиз учун чиройли ном
- Name[vi]=Một cái tên đẹp bạn đã chọn cho giao diện của mình
- Name[wa]=On clapant no ki vos avoz tchoezi po voste eterface
-+Name[xh]=Igama elihle olikhetileyo kujongano lwakho
- Name[x-test]=xxA nice name you have chosen for your interfacexx
--Name[xh]=Igama elihle olikhetileyo kujongano lwakho
- Name[zh_CN]=选择您的界面的好名字
- Name[zh_TW]=您為您的界面選擇的好名字
- Comment=A helpful description of the interface for the top right info box
-@@ -149,8 +149,8 @@
- Comment[uk]=Допоміжний опис інтерфейсу для віконця інформації вгорі праворуч
- Comment[vi]=Một mô tả giao diện có ích cho hộp thông tin ở trên cùng bên phải
- Comment[wa]=Èn ahessåve discrijhaedje di l' eterface, pol boesse d' infôrmåcion del coine å dzeu a droete
-+Comment[xh]=Uchazo oluluncedo lojongano olungaphezulu ekunene kwebhokisi yolwazi
- Comment[x-test]=xxA helpful description of the interface for the top right info boxxx
--Comment[xh]=Uchazo oluluncedo lojongano olungaphezulu ekunene kwebhokisi yolwazi
- Comment[zh_CN]=右上方信息框中界面的帮助描述
- Comment[zh_TW]=用於右上方資訊方塊界面的有用敘述
-
---- runtime/kcontrol/componentchooser/componentservices/kcm_kemail.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kcontrol/componentchooser/componentservices/kcm_kemail.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -75,8 +75,8 @@
- Name[uz@cyrillic]=Хат-хабар клиенти
- Name[vi]=Trình thư
- Name[wa]=Cliyint d' emilaedje
-+Name[xh]=Umxhasi we Email
- Name[x-test]=xxEmail Clientxx
--Name[xh]=Umxhasi we Email
- Name[zh_CN]=电子邮件客户端程序
- Name[zh_TW]=電子郵件客戶端程式
- Comment=This service allows you to configure your default email client. All KDE applications which need access to an email client application should honor this setting.
-@@ -154,8 +154,8 @@
- Comment[uz@cyrillic]=Бу хизмат андоза хат-хабар клиентингизни мослаш учун имконият яратади. Хат-хабар клиенти керак бўлган ҳамма KDE дастурлари шу мосламадан фойдаланиши керак.
- Comment[vi]=Dịch vụ này cho phép bạn cấu hình trình thư mặc định. Tất cả các chương trình của KDE cần gửi thư điện tử đều dựa vào thiết lập này.
- Comment[wa]=Ci siervice vos permete d' apontyî vosse prémetou cliyint d' emile. Tos les programes KDE k' åront dandjî d' aveur accès a on cliyint emile duvrént shure cisse tchuze.
-+Comment[xh]=Lenkonzo ikuvumela ukuba uqwalasele umxhasi wakho we email. Zonke izicelo ezidinga unikezelo kumxhasi we email wesicelo kufuneka yamkele esisicelo.
- Comment[x-test]=xxThis service allows you to configure your default email client. All KDE applications which need access to an email client application should honor this setting.xx
--Comment[xh]=Lenkonzo ikuvumela ukuba uqwalasele umxhasi wakho we email. Zonke izicelo ezidinga unikezelo kumxhasi we email wesicelo kufuneka yamkele esisicelo.
- Comment[zh_CN]=此服务允许您配置您的默认电子邮件客户端程序。所有需要访问电子邮件客户端程序的 KDE 应用程序都遵从此设置。
- Comment[zh_TW]=這個服務允許您設定您的預設電子郵件客戶端程式。所有需要使用電子郵件客戶端應用程式的 KDE 應用程式都應該遵從這個設定。
- configurationType=internal_email
---- runtime/kcontrol/componentchooser/componentservices/kcm_browser.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kcontrol/componentchooser/componentservices/kcm_browser.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -75,8 +75,8 @@
- Name[uz@cyrillic]=Веб-браузер
- Name[vi]=Trình duyệt Mạng
- Name[wa]=Betchteu waibe
-+Name[xh]=Umkhangeli zincwadi we Web
- Name[x-test]=xxWeb Browserxx
--Name[xh]=Umkhangeli zincwadi we Web
- Name[zh_CN]=Web 浏览器
- Name[zh_TW]=網頁瀏覽器
- Comment=Here you can configure your default web browser. All KDE applications in which you can select hyperlinks should honor this setting.
---- runtime/kcontrol/componentchooser/componentservices/kcm_filemanager.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kcontrol/componentchooser/componentservices/kcm_filemanager.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -76,8 +76,8 @@
- Name[uz@cyrillic]=Файл бошқарувчиси
- Name[vi]=Bộ quản lý tập tin
- Name[wa]=Manaedjeu di fitchîs
-+Name[xh]=Umphathi Wefayile
- Name[x-test]=xxFile Managerxx
--Name[xh]=Umphathi Wefayile
- Name[zh_CN]=文件管理器
- Name[zh_TW]=檔案管理程式
- Comment=Here you can configure your default file manager. The entries in the K menu and all KDE applications in which you can open folders will use this file manager.
---- runtime/kcontrol/componentchooser/componentservices/kcm_terminal.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kcontrol/componentchooser/componentservices/kcm_terminal.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -75,8 +75,8 @@
- Name[uz@cyrillic]=Терминал эмулятори
- Name[vi]=Mô phỏng thiết bị cuối
- Name[wa]=Programes terminås
-+Name[xh]=Umzami kulinganisela ngokulinganayo Wendlela yesiphelo
- Name[x-test]=xxTerminal Emulatorxx
--Name[xh]=Umzami kulinganisela ngokulinganayo Wendlela yesiphelo
- Name[zh_CN]=终端仿真器
- Name[zh_TW]=終端機模擬程式
- Comment=This service allows you to configure your default terminal emulator. All KDE applications which invoke a terminal emulator application should honor this setting.
-@@ -154,8 +154,8 @@
- Comment[uz@cyrillic]=Бу хизмат андоза терминал эмуляторингизни мослаш учун имконият яратади. Терминал эмулятори керак бўлган ҳамма KDE дастурлари шу мосламадан фойдаланиши керак.
- Comment[vi]=Dịch vụ này cho phép bạn cấu hình trình mô phỏng thiết bị cuối mặc định. Tất cả các chương trình của KDE cần mở thiết bị đầu cuối đều dựa vào thiết lập này.
- Comment[wa]=Ci siervice vos permete d' apontyî vosse prémetou terminå. Tos les programes KDE ki dmandront on terminå duvrént shure cisse tchuze.
-+Comment[xh]=Lenkonzo ikuvumela ukuba ukwazi ukuqwalasela isiphelo esingagqibekanga sendlela yokulinganisa.Zonke izicelo ze KDE eziqalisa isicelo sesiphelo sendlela yokulinganisa kumele zisamkele esisicwangciso.
- Comment[x-test]=xxThis service allows you to configure your default terminal emulator. All KDE applications which invoke a terminal emulator application should honor this setting.xx
--Comment[xh]=Lenkonzo ikuvumela ukuba ukwazi ukuqwalasela isiphelo esingagqibekanga sendlela yokulinganisa.Zonke izicelo ze KDE eziqalisa isicelo sesiphelo sendlela yokulinganisa kumele zisamkele esisicwangciso.
- Comment[zh_CN]=此服务允许您配置您的默认终端仿真器。所有调用终端仿真程序的 KDE 应用程序都遵从此设置。
- Comment[zh_TW]=這個服務允許您設定您的預設終端機模擬程式。所有呼叫終端機模擬程式的 KDE 應用程式都應該遵從這個設定。
- configurationType=internal_terminal
---- runtime/kcontrol/kded/kcmkded.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kcontrol/kded/kcmkded.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -85,8 +85,8 @@
- Name[uz@cyrillic]=Хизмат бошқарувчиси
- Name[vi]=Bộ quản lý dịch vụ
- Name[wa]=Manaedjeu di siervices
-+Name[xh]=Umphathi Wenkonzo
- Name[x-test]=xxService Managerxx
--Name[xh]=Umphathi Wenkonzo
- Name[zh_CN]=服务管理器
- Name[zh_TW]=服務管理程式
- Comment=KDE Services Configuration
---- runtime/kcontrol/menus/kde-information.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kcontrol/menus/kde-information.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,8 +77,8 @@
- Name[uz@cyrillic]=Маълумот
- Name[vi]=Thông tin
- Name[wa]=Infôrmåcions
-+Name[xh]=Ulwazi
- Name[x-test]=xxInformationxx
--Name[xh]=Ulwazi
- Name[zh_CN]=信息
- Name[zh_TW]=資訊
- Icon=hwinfo
---- runtime/kcontrol/icons/icons.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kcontrol/icons/icons.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -91,8 +91,8 @@
- Name[uz@cyrillic]=Нишончалар
- Name[vi]=Biểu tượng
- Name[wa]=Imådjetes
-+Name[xh]=Imphawu zemmifanekiso
- Name[x-test]=xxIconsxx
--Name[xh]=Imphawu zemmifanekiso
- Name[zh_CN]=图标
- Name[zh_TW]=圖示
-
-@@ -174,8 +174,8 @@
- Comment[uz@cyrillic]=KDE нишончаларини мослаш
- Comment[vi]=Tuỳ chỉnh các biểu tượng của KDE
- Comment[wa]=Mete les imådjetes KDE a vosse môde
-+Comment[xh]=Yenza Imphawu zomfanekiso ze KDE Ngokwemfuneko
- Comment[x-test]=xxCustomize KDE Iconsxx
--Comment[xh]=Yenza Imphawu zomfanekiso ze KDE Ngokwemfuneko
- Comment[zh_CN]=自定义 KDE 图标
- Comment[zh_TW]=自訂 KDE 圖示
-
---- runtime/kcontrol/spellchecking/spellchecking.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kcontrol/spellchecking/spellchecking.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -82,8 +82,8 @@
- Name[uz]=Imloni tekshiruvchi
- Name[uz@cyrillic]=Имлони текширувчи
- Name[wa]=Coridjrece ortografike
-+Name[xh]=Umkhangeki Wopelo
- Name[x-test]=xxSpell Checkerxx
--Name[xh]=Umkhangeki Wopelo
- Name[zh_CN]=拼写检查器
- Name[zh_TW]=拼字檢查器
-
-@@ -156,8 +156,8 @@
- Comment[uz]=Imlo tekshiruvchini moslash
- Comment[uz@cyrillic]=Имло текширувчини мослаш
- Comment[wa]=Apontyî l' coridjrece ortografike
-+Comment[xh]=Qwalasela umkhangelo wopelo
- Comment[x-test]=xxConfigure the spell checkerxx
--Comment[xh]=Qwalasela umkhangelo wopelo
- Comment[zh_CN]=配置拼写检查器
- Comment[zh_TW]=設定拼字檢查器
-
---- runtime/phonon/kcm/kcm_phonon.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/phonon/kcm/kcm_phonon.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -69,8 +69,8 @@
- Name[uk]=Мультимедіа
- Name[uz@cyrillic]=Мултимедиа
- Name[vi]=Nhạc/Ảnh
-+Name[xh]=Iindlela ezininzi zokwenza
- Name[x-test]=xxMultimediaxx
--Name[xh]=Iindlela ezininzi zokwenza
- Name[zh_CN]=多媒体
- Name[zh_TW]=多媒體
- Comment=Sound and Video Configuration
---- runtime/menu/desktop/kde-utilities.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-utilities.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -80,8 +80,8 @@
- Name[uz@cyrillic]=Воситалар
- Name[vi]=Tiện ích
- Name[wa]=Usteyes
-+Name[xh]=Izinto eziluncedo
- Name[x-test]=xxUtilitiesxx
--Name[xh]=Izinto eziluncedo
- Name[zh_CN]=工具
- Name[zh_TW]=實用工具
- Icon=applications-utilities
-@@ -163,7 +163,7 @@
- Comment[uz@cyrillic]=Воситалар
- Comment[vi]=Các tiện ích
- Comment[wa]=Usteyes
-+Comment[xh]=Izinto eziluncedo
- Comment[x-test]=xxUtilitiesxx
--Comment[xh]=Izinto eziluncedo
- Comment[zh_CN]=实用工具
- Comment[zh_TW]=實用工具
---- runtime/menu/desktop/kde-games-kids.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-games-kids.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -80,8 +80,8 @@
- Name[uz@cyrillic]=Кичкинтойлар учун ўйинлар
- Name[vi]=Trò chơi cho Trẻ
- Name[wa]=Djeus po ls efants
-+Name[xh]=Imidlalo Yabantwana
- Name[x-test]=xxGames for Kidsxx
--Name[xh]=Imidlalo Yabantwana
- Name[zh_CN]=儿童游戏
- Name[zh_TW]=小孩的遊戲
- Icon=applications-games-children
---- runtime/menu/desktop/kde-multimedia.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-multimedia.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -61,8 +61,8 @@
- Name[uk]=Мультимедіа
- Name[uz@cyrillic]=Мултимедиа
- Name[vi]=Nhạc/Ảnh
-+Name[xh]=Iindlela ezininzi zokwenza
- Name[x-test]=xxMultimediaxx
--Name[xh]=Iindlela ezininzi zokwenza
- Name[zh_CN]=多媒体
- Name[zh_TW]=多媒體
- Icon=applications-multimedia
---- runtime/menu/desktop/kde-office.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-office.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -80,8 +80,8 @@
- Name[uz@cyrillic]=Идора учун дастурлар
- Name[vi]=Văn phòng
- Name[wa]=Buro
-+Name[xh]=Ofisi
- Name[x-test]=xxOfficexx
--Name[xh]=Ofisi
- Name[zh_CN]=办公
- Name[zh_TW]=辦公軟體
- Icon=applications-office
---- runtime/menu/desktop/kde-games.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-games.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -81,8 +81,8 @@
- Name[uz@cyrillic]=Ўйинлар
- Name[vi]=Trò chơi
- Name[wa]=Djeus
-+Name[xh]=Imidlalo
- Name[x-test]=xxGamesxx
--Name[xh]=Imidlalo
- Name[zh_CN]=游戏
- Name[zh_TW]=遊戲
- Icon=applications-games
---- runtime/menu/desktop/kde-toys.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-toys.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -79,8 +79,8 @@
- Name[uz@cyrillic]=Ўйинчоқлар
- Name[vi]=Đồ chơi
- Name[wa]=Amuzmints
-+Name[xh]=Izinto zokudlala
- Name[x-test]=xxToysxx
--Name[xh]=Izinto zokudlala
- Name[zh_CN]=玩具
- Name[zh_TW]=玩具
- Icon=applications-toys
---- runtime/menu/desktop/kde-utilities-accessibility.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-utilities-accessibility.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -81,8 +81,8 @@
- Name[uz@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]=無障礙輔助
- Icon=preferences-desktop-accessibility
---- runtime/menu/desktop/kde-graphics.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-graphics.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -81,8 +81,8 @@
- Name[uz@cyrillic]=Графика
- Name[vi]=Đồ hoạ
- Name[wa]=Grafikes
-+Name[xh]=Imizobo
- Name[x-test]=xxGraphicsxx
--Name[xh]=Imizobo
- Name[zh_CN]=图像
- Name[zh_TW]=圖形
- Icon=applications-graphics
---- runtime/menu/desktop/kde-internet-terminal.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-internet-terminal.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -80,8 +80,8 @@
- Name[uz@cyrillic]=Терминал учун дастурлар
- Name[vi]=Trình đầu cuối
- Name[wa]=Programes terminås
-+Name[xh]=Izicelo Zesiphelo sendlela
- Name[x-test]=xxTerminal Applicationsxx
--Name[xh]=Izicelo Zesiphelo sendlela
- Name[zh_CN]=终端应用程序
- Name[zh_TW]=終端機程式
- Icon=utilities-terminal
---- runtime/menu/desktop/kde-games-arcade.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-games-arcade.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -69,8 +69,8 @@
- Name[uz@cyrillic]=Аркада
- Name[vi]=Mái vòm
- Name[wa]=Årcåde
-+Name[xh]=Umqolo wesakhiwo esiphatha ubunzima bento
- Name[x-test]=xxArcadexx
--Name[xh]=Umqolo wesakhiwo esiphatha ubunzima bento
- Name[zh_CN]=街机
- Name[zh_TW]=大型遊戲機遊戲
- Icon=applications-games-arcade
---- runtime/menu/desktop/kde-development.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-development.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -81,8 +81,8 @@
- Name[uz@cyrillic]=Тузиш
- Name[vi]=Phát triển
- Name[wa]=Programaedje
-+Name[xh]=Ubhekiso phambili
- Name[x-test]=xxDevelopmentxx
--Name[xh]=Ubhekiso phambili
- Name[zh_CN]=开发
- Name[zh_TW]=程式開發
- Icon=applications-development
---- runtime/menu/desktop/kde-system.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-system.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -74,8 +74,8 @@
- Name[uz@cyrillic]=Тизим
- Name[vi]=Hệ thống
- Name[wa]=Sistinme
-+Name[xh]=Indlela esestyenziswayo
- Name[x-test]=xxSystemxx
--Name[xh]=Indlela esestyenziswayo
- Name[zh_CN]=系统
- Name[zh_TW]=系統
- Icon=applications-system
---- runtime/menu/desktop/kde-utilities-peripherals.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-utilities-peripherals.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -79,8 +79,8 @@
- Name[uz@cyrillic]=Уланган ускуналар
- Name[vi]=Ngoại vi
- Name[wa]=Periferikes
-+Name[xh]=Iilayini zomda
- Name[x-test]=xxPeripheralsxx
--Name[xh]=Iilayini zomda
- Name[zh_CN]=外设
- Name[zh_TW]=週邊設備
- Icon=preferences-desktop-peripherals
---- runtime/menu/desktop/kde-games-strategy.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-games-strategy.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,8 +78,8 @@
- Name[uz@cyrillic]=Тактика ва стратегия
- Name[vi]=Chiến thuật và Chiến lược
- Name[wa]=Tactike eyet stratedjeye
-+Name[xh]=Amacebo okufumana iinjongo & Amacebo okuzoba
- Name[x-test]=xxTactics & Strategyxx
--Name[xh]=Amacebo okufumana iinjongo & Amacebo okuzoba
- Name[zh_CN]=策略游戏
- Name[zh_TW]=戰略及策略
- Icon=applications-games-strategy
---- runtime/menu/desktop/kde-system-terminal.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-system-terminal.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -80,8 +80,8 @@
- Name[uz@cyrillic]=Терминал учун дастурлар
- Name[vi]=Trình đầu cuối
- Name[wa]=Programes terminås
-+Name[xh]=Izicelo Zesiphelo sendlela
- Name[x-test]=xxTerminal Applicationsxx
--Name[xh]=Izicelo Zesiphelo sendlela
- Name[zh_CN]=终端应用程序
- Name[zh_TW]=終端機程式
- Icon=utilities-terminal
---- runtime/menu/desktop/kde-utilities-xutils.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-utilities-xutils.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,8 +77,8 @@
- Name[uz@cyrillic]=X учун воситалар
- Name[vi]=Tiện ích X
- Name[wa]=Usteyes X
-+Name[xh]=Izinto eziluncedo ze-X
- Name[x-test]=xxX-Utilitiesxx
--Name[xh]=Izinto eziluncedo ze-X
- Name[zh_CN]=X 工具
- Name[zh_TW]=X-實用工具
- Comment=X Window Utilities
-@@ -158,7 +158,7 @@
- Comment[uz@cyrillic]=X Windows воситалари
- Comment[vi]=Các tiện ích của cửa sổ X
- Comment[wa]=Usteyes pol sistinme grafike X11
-+Comment[xh]=X Windows Izinto eziluncedo
- Comment[x-test]=xxX Window Utilitiesxx
--Comment[xh]=X Windows Izinto eziluncedo
- Comment[zh_CN]=X Window 实用工具
- Comment[zh_TW]=X 視窗實用工具
---- runtime/menu/desktop/kde-games-roguelikes.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-games-roguelikes.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,7 +78,7 @@
- Name[uz@cyrillic]=Rogue ўйинига ўхшаш ўйинлар
- Name[vi]=Trò chơi giống Rogue
- Name[wa]=Djeus ki rshonnèt-st a « rogue »
-+Name[xh]=Imidlalo efana ne Rogue
- Name[x-test]=xxRogue-like Gamesxx
--Name[xh]=Imidlalo efana ne Rogue
- Name[zh_CN]=恶作剧游戏
- Name[zh_TW]=冒險類遊戲
---- runtime/menu/desktop/kde-editors.directory (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/menu/desktop/kde-editors.directory (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,8 +78,8 @@
- Name[uz@cyrillic]=Таҳрирчилар
- Name[vi]=Trình biên tập
- Name[wa]=Aspougneus d' tecse
-+Name[xh]=Abahleli
- Name[x-test]=xxEditorsxx
--Name[xh]=Abahleli
- Name[zh_CN]=编辑器
- Name[zh_TW]=編輯器
- Icon=accessories-text-editor
---- runtime/khelpcenter/kcmhelpcenter.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/kcmhelpcenter.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -86,8 +86,8 @@
- Name[uz@cyrillic]=Ёрдам индекси
- Name[vi]=Chỉ mục Trợ giúp
- Name[wa]=Indecse di l' aidance
-+Name[xh]=Uncedo Lwesalathisi
- Name[x-test]=xxHelp Indexxx
--Name[xh]=Uncedo Lwesalathisi
- Name[zh_CN]=帮助索引
- Name[zh_TW]=說明索引
-
-@@ -166,8 +166,8 @@
- Comment[uz@cyrillic]=Ёрдам марказининг қидирув индексини яратиш ва мослаш
- Comment[vi]=Cấu hình và tạo ra chỉ mục tìm kiếm của trung tâm trợ giúp
- Comment[wa]=Fijhaedje eyet apontiaedje di l' indecse di cweraedje do cinte d' aidance
-+Comment[xh]=Uqwalaselo lophendlo loncedo osembindi nolwenziwo
- Comment[x-test]=xxHelp center search index configuration and generationxx
--Comment[xh]=Uqwalaselo lophendlo loncedo osembindi nolwenziwo
- Comment[zh_CN]=帮助中心搜索索引配置和生成
- Comment[zh_TW]=求助中心搜尋索引的組態與產生
-
---- runtime/khelpcenter/khelpcenter.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/khelpcenter.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -121,8 +121,8 @@
- Comment[uz@cyrillic]=KDE ёрдам маркази
- Comment[vi]=Trung tâm Trợ giúp KDE
- Comment[wa]=Li cinte d' aidance di KDE
-+Comment[xh]=Umbindi woncedo lwe KDE
- Comment[x-test]=xxThe KDE Help Centerxx
--Comment[xh]=Umbindi woncedo lwe KDE
- Comment[zh_CN]=KDE 帮助中心
- Comment[zh_TW]=KDE 求助中心
- Icon=help-browser
---- runtime/khelpcenter/plugins/faq.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/plugins/faq.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -76,8 +76,8 @@
- Name[uz@cyrillic]=KDE ТСС
- Name[vi]=Các câu hỏi hay gặp của KDE
- Name[wa]=Li FÅK di KDE
-+Name[xh]=KDE FAQ
- Name[x-test]=xxThe KDE FAQxx
--Name[xh]=KDE FAQ
- Name[zh_CN]=KDE FAQ
- Name[zh_TW]=KDE 常見問題
-
---- runtime/khelpcenter/plugins/support.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/plugins/support.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,8 +77,8 @@
- Name[uz@cyrillic]=KDE'ни қўллаб-қувватлаш
- Name[vi]=Hỗ trợ KDE
- Name[wa]=Sopoirter KDE
-+Name[xh]=Ixhasa i KDE
- Name[x-test]=xxSupporting KDExx
--Name[xh]=Ixhasa i KDE
- Name[zh_CN]=支持 KDE
- Name[zh_TW]=支援 KDE
-
---- runtime/khelpcenter/plugins/Tutorials/visualdict.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/plugins/Tutorials/visualdict.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -73,8 +73,8 @@
- Name[uk]=Наочний підручник з KDE
- Name[vi]=Hướng dẫn Sinh động cho KDE
- Name[wa]=On guide di KDE po ls ouys
-+Name[xh]=Isikhombisi esibonakalayo se KDE
- Name[x-test]=xxA Visual Guide to KDExx
--Name[xh]=Isikhombisi esibonakalayo se KDE
- Name[zh_CN]=KDE 可视化指南
- Name[zh_TW]=KDE 視覺指南
- Comment=Guide to KDE widgets
-@@ -152,8 +152,8 @@
- Comment[uz@cyrillic]=KDE виджетлари бўйича йўлкўрсатгич
- Comment[vi]=Hướng dẫn cho ô điều khiển của KDE
- Comment[wa]=Guide des ahesses di KDE
-+Comment[xh]=Isikhombisi esiya kwi KDE widgets
- Comment[x-test]=xxGuide to KDE widgetsxx
--Comment[xh]=Isikhombisi esiya kwi KDE widgets
- Comment[zh_CN]=KDE 窗口部件指南
- Comment[zh_TW]=KDE 視窗元件 (widget) 指南
- Icon=text-plain
---- runtime/khelpcenter/plugins/Tutorials/quickstart.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/plugins/Tutorials/quickstart.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -76,8 +76,8 @@
- Name[uz@cyrillic]=KDE бўйича йўлкўрсатгич
- Name[vi]=Hướng dẫn bắt đầu nhanh
- Name[wa]=Guide d' enondaedje abeye
-+Name[xh]=Isikhombisi Sesiqalo esikhawulezayo
- Name[x-test]=xxQuickstart Guidexx
--Name[xh]=Isikhombisi Sesiqalo esikhawulezayo
- Name[zh_CN]=速成指南
- Name[zh_TW]=快速入門指南
- Comment=KDE quickstart guide.
---- runtime/khelpcenter/plugins/Manpages/mann.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/plugins/Manpages/mann.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -76,8 +76,8 @@
- Name[uz@cyrillic]=(n) Янги
- Name[vi]=(n) Mới
- Name[wa]=(n) Noveas
-+Name[xh]=(n) Entsha
- Name[x-test]=xx(n) Newxx
--Name[xh]=(n) Entsha
- Name[zh_CN]=(n) 新建
- Name[zh_TW]=(n) 新
-
---- runtime/khelpcenter/plugins/Manpages/man3.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/plugins/Manpages/man3.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -71,8 +71,8 @@
- Name[uk]=(3) Підпрограми
- Name[vi]=(3) Chương trình con
- Name[wa]=(3) Fonccions di programaedje
-+Name[xh]=(3) Ulwenzeko rhoqo olusezantsi
- Name[x-test]=xx(3) Subroutinesxx
--Name[xh]=(3) Ulwenzeko rhoqo olusezantsi
- Name[zh_CN]=(3) 子例程
- Name[zh_TW]=(3) 子程式
-
---- runtime/khelpcenter/plugins/Manpages/man4.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/plugins/Manpages/man4.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,8 +77,8 @@
- Name[uz@cyrillic]=(4) Ускуналар
- Name[vi]=(4) Thiết bị
- Name[wa]=(4) Éndjins
-+Name[xh]=(4) Amacebo
- Name[x-test]=xx(4) Devicesxx
--Name[xh]=(4) Amacebo
- Name[zh_CN]=(4) 设备
- Name[zh_TW]=(4) 裝置
-
---- runtime/khelpcenter/plugins/Manpages/man5.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/plugins/Manpages/man5.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,8 +77,8 @@
- Name[uz@cyrillic]=(5) Файл форматлари
- Name[vi]=(5) Định dạng Tập tin
- Name[wa]=(5) Sôres di fitchîs
-+Name[xh]=(5) Ifomati Yeefayile
- Name[x-test]=xx(5) File Formatsxx
--Name[xh]=(5) Ifomati Yeefayile
- Name[zh_CN]=(5) 文件格式
- Name[zh_TW]=(5) 檔案格式
-
---- runtime/khelpcenter/plugins/Manpages/man6.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/plugins/Manpages/man6.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,8 +77,8 @@
- Name[uz@cyrillic]=(6) Ўйинлар
- Name[vi]=(6) Trò chơi
- Name[wa]=(6) Djeus
-+Name[xh]=(6) Imidlalo
- Name[x-test]=xx(6) Gamesxx
--Name[xh]=(6) Imidlalo
- Name[zh_CN]=(6) 游戏
- Name[zh_TW]=(6) 遊戲
-
---- runtime/khelpcenter/plugins/Manpages/man7.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/plugins/Manpages/man7.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,8 +77,8 @@
- Name[uz@cyrillic]=(7) Ҳар хил
- Name[vi]=(7) Lặt vặt
- Name[wa]=(7) Totès sôres
-+Name[xh]=(7) Ezixubeneyo
- Name[x-test]=xx(7) Miscellaneousxx
--Name[xh]=(7) Ezixubeneyo
- Name[zh_CN]=(7) 杂项
- Name[zh_TW]=(7) 雜項
-
---- runtime/khelpcenter/plugins/kcontrolmodules.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/plugins/kcontrolmodules.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,8 +77,8 @@
- Name[uz@cyrillic]=Бошқарув марказининг модуллари
- Name[vi]=Mô-đun Trung tâm Điều khiển
- Name[wa]=Modules do cinte di controle di KDE
-+Name[xh]=Izicatshulwa Zolawulo Ezisembindini
- Name[x-test]=xxControl Center Modulesxx
--Name[xh]=Izicatshulwa Zolawulo Ezisembindini
- Name[zh_CN]=控制中心模块
- Name[zh_TW]=控制中心模組
-
---- runtime/khelpcenter/plugins/contact.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/plugins/contact.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,8 +78,8 @@
- Name[uz@cyrillic]=Боғланиш учун маълумот
- Name[vi]=Thông tin Liên lạc
- Name[wa]=Infôrmåcion d' contak
-+Name[xh]=Qhagamshelana Nolwazi
- Name[x-test]=xxContact Informationxx
--Name[xh]=Qhagamshelana Nolwazi
- Name[zh_CN]=联系信息
- Name[zh_TW]=聯絡資訊
-
---- runtime/khelpcenter/plugins/welcome.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/plugins/welcome.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,8 +77,8 @@
- Name[uz@cyrillic]=KDE'га марҳамат
- Name[vi]=Chào mừng bạn đến với KDE
- Name[wa]=Bénvnowe dins KDE
-+Name[xh]=Wamkelekile kwi KDE
- Name[x-test]=xxWelcome to KDExx
--Name[xh]=Wamkelekile kwi KDE
- Name[zh_CN]=欢迎使用 KDE
- Name[zh_TW]=歡迎使用 KDE
-
---- runtime/khelpcenter/plugins/userguide.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/plugins/userguide.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -64,8 +64,8 @@
- Name[se]=KDE giehtagirji
- Name[sk]=Používateľský manuál KDE
- Name[sl]=Uporabniški priročnik KDE
--Name[sr]=Упутство за кориснике КДЕ‑а
--Name[sr@latin]=Uputstvo za korisnike KDE‑a
-+Name[sr]=Кориснички приручник КДЕ‑а
-+Name[sr@latin]=Korisnički priručnik KDE‑a
- Name[sv]=KDE:s användarhandbok
- Name[ta]=KDE பயனர்களின் கையேடு
- Name[te]=కెడిఈ యూజర్ మెన్యువల్
---- runtime/khelpcenter/plugins/kicmodules.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/plugins/kicmodules.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,8 +77,8 @@
- Name[uz@cyrillic]=KInfoCenter модуллари
- Name[vi]=Mô-đun Trung tâm Thông tin của KDE
- Name[wa]=Modules do cinte d' infôrmåcions di KDE
-+Name[xh]=Izicatshulwa ze KInfoCenter
- Name[x-test]=xxKInfoCenter Modulesxx
--Name[xh]=Izicatshulwa ze KInfoCenter
- Name[zh_CN]=KInfoCenter 模块
- Name[zh_TW]=KInfoCenter 模組
-
---- runtime/khelpcenter/htmlsearch/htmlsearch.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/htmlsearch/htmlsearch.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -82,8 +82,8 @@
- Name[uz@cyrillic]=Индекс
- Name[vi]=chỉ mục
- Name[wa]=Indecse
-+Name[xh]=Isalathiso
- Name[x-test]=xxIndexxx
--Name[xh]=Isalathiso
- Name[zh_CN]=索引
- Name[zh_TW]=索引
-
-@@ -164,8 +164,8 @@
- Comment[uz@cyrillic]=Индексни яратиш
- Comment[vi]=Tạo ra chỉ mục
- Comment[wa]=Fijhaedje d' indecse
-+Comment[xh]=Ulwenziwo Lwesalathiso
- Comment[x-test]=xxIndex generationxx
--Comment[xh]=Ulwenziwo Lwesalathiso
- Comment[zh_CN]=索引生成
- Comment[zh_TW]=產生索引
-
---- runtime/khelpcenter/Help.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/khelpcenter/Help.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -82,8 +82,8 @@
- Name[uz@cyrillic]=Ёрдам
- Name[vi]=Trợ giúp
- Name[wa]=Aidance
-+Name[xh]=Uncedo
- Name[x-test]=xxHelpxx
--Name[xh]=Uncedo
- Name[zh_CN]=帮助
- Name[zh_TW]=求助
- Categories=Qt;KDE;Core;
---- runtime/CMakeLists.txt (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/CMakeLists.txt (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -4,7 +4,7 @@
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )
-
- #search packages used by KDE
--find_package(KDE4 REQUIRED)
-+find_package(KDE4 4.2.4 REQUIRED)
- find_package(Strigi REQUIRED)
- # I don't see any package requiring it. please explain why this dependency
- # is necessary (dirk)
---- runtime/kioslave/trash/kcmtrash.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kioslave/trash/kcmtrash.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -67,8 +67,8 @@
- Name[uk]=Смітник
- Name[vi]=Thùng rác
- Name[wa]=Batch
-+Name[xh]=Inkukumo
- Name[x-test]=xxTrashxx
--Name[xh]=Inkukumo
- Name[zh_CN]=回收站
- Name[zh_TW]=資源回收筒
- Comment=This service allows configuration of the trash.
-@@ -213,8 +213,8 @@
- Name[uk]=Смітник
- Name[vi]=Thùng rác
- Name[wa]=Batch
-+Name[xh]=Inkukumo
- Name[x-test]=xxTrashxx
--Name[xh]=Inkukumo
- Name[zh_CN]=回收站
- Name[zh_TW]=資源回收筒
- Comment=Configure trash settings
---- runtime/kioslave/smb/smb-network.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kioslave/smb/smb-network.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -75,8 +75,8 @@
- Name[uk]=Спільні ресурси Samba
- Name[vi]=Chia sẻ Samba
- Name[wa]=Pårtaedjes Samba
-+Name[xh]=Izahlulo ze Samba
- Name[x-test]=xxSamba Sharesxx
--Name[xh]=Izahlulo ze Samba
- Name[zh_CN]=Samba 共享
- Name[zh_TW]=Samba 資源分享
- Open=false
---- runtime/kioslave/thumbnail/htmlthumbnail.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kioslave/thumbnail/htmlthumbnail.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,8 +78,8 @@
- Name[uz@cyrillic]=HTML-файллари
- Name[vi]=Tập tin HTML
- Name[wa]=Fitchîs HTML
-+Name[xh]=Iifayile ze HTML
- Name[x-test]=xxHTML Filesxx
--Name[xh]=Iifayile ze HTML
- Name[zh_CN]=HTML 文件
- Name[zh_TW]=HTML 檔案
- X-KDE-ServiceTypes=ThumbCreator
---- runtime/kioslave/thumbnail/imagethumbnail.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kioslave/thumbnail/imagethumbnail.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,8 +77,8 @@
- Name[uz@cyrillic]=Расмлар
- Name[vi]=Ảnh
- Name[wa]=Imådjes
-+Name[xh]=Imifanekiso
- Name[x-test]=xxImagesxx
--Name[xh]=Imifanekiso
- Name[zh_CN]=图像
- Name[zh_TW]=影像
- X-KDE-ServiceTypes=ThumbCreator
---- runtime/kioslave/thumbnail/textthumbnail.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kioslave/thumbnail/textthumbnail.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,8 +78,8 @@
- Name[uz@cyrillic]=Матн файллари
- Name[vi]=Tập tin Văn bản
- Name[wa]=Fitchîs tecse
-+Name[xh]=Iifayile Zombhalo
- Name[x-test]=xxText Filesxx
--Name[xh]=Iifayile Zombhalo
- Name[zh_CN]=文本文件
- Name[zh_TW]=文字檔案
- X-KDE-ServiceTypes=ThumbCreator
---- runtime/kioslave/thumbnail/thumbcreator.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kioslave/thumbnail/thumbcreator.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -72,8 +72,8 @@
- Comment[uk]=Маніпулятор мініатюр
- Comment[vi]=Thao tác Hình nhỏ
- Comment[wa]=Apougneu des prévoeyaedjes
-+Comment[xh]=Umqheba Wozipho lobhontsi
- Comment[x-test]=xxThumbnail Handlerxx
--Comment[xh]=Umqheba Wozipho lobhontsi
- Comment[zh_CN]=缩略图处理程序
- Comment[zh_TW]=縮圖處理器
-
---- runtime/kioslave/cgi/kcmcgi/kcmcgi.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kioslave/cgi/kcmcgi/kcmcgi.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -84,8 +84,8 @@
- Name[uz@cyrillic]=CGI скриптлар
- Name[vi]=Văn lệnh CGI
- Name[wa]=Sicripes CGI
-+Name[xh]=Amagama ashicilelwe phantsi CGI
- Name[x-test]=xxCGI Scriptsxx
--Name[xh]=Amagama ashicilelwe phantsi CGI
- Name[zh_CN]=CGI 脚本
- Name[zh_TW]=CGI 命令稿
- Comment=Configure the CGI KIO slave
-@@ -164,8 +164,8 @@
- Comment[uz@cyrillic]=CGI KIO слейвни мослаш
- Comment[vi]=Cấu hình đày tớ KIO kiểu CGI
- Comment[wa]=Apontyî l' vårlet d' I/R des CGI
-+Comment[xh]=Qwlalsela i CGI KIO slave
- Comment[x-test]=xxConfigure the CGI KIO slavexx
--Comment[xh]=Qwlalsela i CGI KIO slave
- Comment[zh_CN]=配置 CGI KIO slave
- Comment[zh_TW]=設定 CGI KIO slave
-
---- runtime/kioslave/desktop/Home.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kioslave/desktop/Home.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,8 +77,8 @@
- Name[uz@cyrillic]=Уй
- Name[vi]=Nhà
- Name[wa]=Måjhon
-+Name[xh]=Ikhaya
- Name[x-test]=xxHomexx
--Name[xh]=Ikhaya
- Name[zh_CN]=主文件夹
- Name[zh_TW]=家目錄
- GenericName=Personal Files
-@@ -159,8 +159,8 @@
- GenericName[uz@cyrillic]=Шахсий файллар
- GenericName[vi]=Tập tin Cá nhân
- GenericName[wa]=Fitchîs da vosse
-+GenericName[xh]=Iifayile Zobuqu
- GenericName[x-test]=xxPersonal Filesxx
--GenericName[xh]=Iifayile Zobuqu
- GenericName[zh_CN]=个人文件
- GenericName[zh_TW]=個人檔案
- URL[$e]=$HOME
---- runtime/kioslave/desktop/directory.trash (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kioslave/desktop/directory.trash (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -69,8 +69,8 @@
- Name[uk]=Смітник
- Name[vi]=Thùng rác
- Name[wa]=Batch
-+Name[xh]=Inkukumo
- Name[x-test]=xxTrashxx
--Name[xh]=Inkukumo
- Name[zh_CN]=回收站
- Name[zh_TW]=資源回收筒
- Comment=Contains removed files
-@@ -138,8 +138,8 @@
- Comment[uz@cyrillic]=Олиб ташланган файллардан иборат
- Comment[vi]=Chứa tập tin bị gỡ bỏ
- Comment[wa]=I gn a dvins des fitchîs oistés
-+Comment[xh]=Iqulathe iifayile ezisusiweyo
- Comment[x-test]=xxContains removed filesxx
--Comment[xh]=Iqulathe iifayile ezisusiweyo
- Comment[zh_CN]=储存已删除的文件
- Comment[zh_TW]=包含已移除的檔案
- Icon=user-trash-full
---- runtime/kioslave/man/kmanpart.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kioslave/man/kmanpart.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -76,8 +76,8 @@
- Comment[uz@cyrillic]=Ичига ўрнатиб бўладиган Troff-файлини кўрувчи
- Comment[vi]=Bộ xem Troff nhúng được
- Comment[wa]=Ravalåve håyneu di fitchîs Troff
-+Comment[xh]=Umboniseli we Troff Elungiselekayo
- Comment[x-test]=xxEmbeddable Troff Viewerxx
--Comment[xh]=Umboniseli we Troff Elungiselekayo
- Comment[zh_CN]=嵌入的 Troff 查看器
- Comment[zh_TW]=可嵌入的 Troff 檢視元件
- MimeType=text/troff;application/x-troff-man;
---- runtime/nepomuk/services/storage/repository.cpp (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/nepomuk/services/storage/repository.cpp (.../branches/KDE/4.2/kdebase) (wersja 974232)
+--- runtime/kuiserver/kuiserver.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kuiserver/kuiserver.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -39,6 +39,7 @@
+ Comment[he]=שרת ממשק משתמש של KDE למידע לגבי התקדמות
+ Comment[hi]=केडीई की प्रगति जानकारी यूआई सर्वर
+ Comment[hne]=केडीई के प्रगति जानकारी यूआई सर्वर
++Comment[hr]=Poslužitelj KDE-ovog grafičkog elementa za prikaz napretka
+ Comment[hsb]=KDE-serwer za informaciju wo pokročowanju
+ Comment[hu]=KDE állapotkijelző szolgáltatás
+ Comment[is]=Framvinda miðlunar KDE notendviðmóts
+--- runtime/knotify/kde.notifyrc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/knotify/kde.notifyrc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -248,6 +248,7 @@
+ Name[he]=השלמת טקסט: סיבוב
+ Name[hi]=पाठ-पूर्णता: रोटेशन
+ Name[hne]=पाठ-पूराकरना: घुमाना
++Name[hr]=Dovršetak teksta: rotacija
+ Name[hsb]=Wudospołnjenje teksta: rotacija
+ Name[hu]=Szövegkiegészítés: rotáció
+ Name[is]=Textaklárun: snúningur
+@@ -317,6 +318,7 @@
+ Comment[he]=הסוף של רשימת ההתאמות הושג
+ Comment[hi]=मिलान सूची का अंतिम आ पंहुचा.
+ Comment[hne]=मिलाए वाले सूची के आखरी आ गिस
++Comment[hr]=Dosegnut je kraj popisa podudarnosti
+ Comment[hsb]=Kónc lisćiny wudospołnjenjow
+ Comment[hu]=A találatok végére értem
+ Comment[is]=Enda hefur verið náð á lista yfir samsvaranir
+@@ -391,6 +393,7 @@
+ Name[he]=השלמת טקסט: אין התאמה
+ Name[hi]=पाठ-पूर्णता: मिलान नहीं
+ Name[hne]=पाठ-पूराकरना: कोइ नइ मिलत हे
++Name[hr]=Dovršetak teksta: nema podudarnosti
+ Name[hsb]=Wudospołnjenje teksta: žane
+ Name[hu]=Szövegkiegészítés: nincs találat
+ Name[is]=Textaklárun: engin samsvörun
+@@ -460,6 +463,7 @@
+ Comment[he]=לא מצאה התאמת השלמה
+ Comment[hi]=कोई मिलता-जुलता पूर्णता नहीं मिला
+ Comment[hne]=पूरा करइया कोइ नइ मिलत हे
++Comment[hr]=Nije pronađen podudardni dovršetak
+ Comment[hsb]=Žane wudospołnjenje namakane
+ Comment[hu]=Nincs illeszthető szó
+ Comment[is]=Engin samsvarandi ending fannst
+@@ -535,6 +539,7 @@
+ Name[he]=השלמת טקסט: התאמה חלקית
+ Name[hi]=पाठ-पूर्णता: अधूरा मिलान
+ Name[hne]=पाठपूराकरना: आधा-थोड़ा मिलत हे
++Name[hr]=Dovršetak teksta: djelomična podudarnost
+ Name[hsb]=Wudospołnjenje teksta: dźělna namakanka
+ Name[hu]=Szövegkiegészítés: részleges találat
+ Name[is]=Textaklárun: samsvörun á hluta
+@@ -604,6 +609,7 @@
+ Comment[he]=יש יותר מהתאמה מתאימה אחת
+ Comment[hi]=वहाँ पर एक से अघिक संभव जोड़ मिले हैं
+ Comment[hne]=इहां एक से जादा संभावित मेच हे
++Comment[hr]=Postoji više od jedne moguće podudarnosti
+ Comment[hsb]=Wjace hač jedne móžne wudospołnjenje
+ Comment[hu]=Egynél több szó illeszkedik
+ Comment[is]=Það eru fleiri en ein möguleg samsvörun
+@@ -752,6 +758,7 @@
+ Comment[he]=התרחשה שגיאה חמורה שגרמה לתכנית להיסגר
+ Comment[hi]=एक अति गंभीर त्रुटि हुई जिसके कारण प्रोग्राम बाहर हो गया
+ Comment[hne]=इहां एक गंभीर गलती हो गिस जे हर प्रोग्राम ल बाहिर कर दिस
++Comment[hr]=Došlo je do ozbiljne pogreške koja je uzrokovala završetak programa
+ Comment[hsb]=Chutny zmylk je program zakónčił
+ Comment[hu]=Olyan hiba történt a programban, melynek hatására a program futása befejeződött
+ Comment[is]=Alvarleg villa átti sér stað sem olli því að forritið slökkti á sér
+@@ -905,6 +912,7 @@
+ Comment[he]=משהו מיוחד התרחש בתכנית
+ Comment[hi]=प्रोग्राम में कुछ महत्वपूर्ण घटित हुआ
+ Comment[hne]=प्रोग्राम मं कुछ विसेस हो गिस
++Comment[hr]=Nešto posebno se je dogodilo u programu
+ Comment[hsb]=Něšto wosebite je so z programom stało
+ Comment[hu]=Valamilyen esemény következett be a programban
+ Comment[is]=Eitthvað sérstakt gerðist í keyrslu forritsins
+@@ -1057,6 +1065,7 @@
+ Comment[he]=הייתה שגיאה בתכנית שאולי גרמה לבעיות
+ Comment[hi]=प्रोग्राम में त्रुटि है जिससे समस्या उत्पन्न हो सकती है
+ Comment[hne]=प्रोग्राम मं एक गलती हो गिस जे हर समस्या दे सकही
++Comment[hr]=Došlo je do pogreške u programu koja bi mogla uzrokovati probleme
+ Comment[hsb]=Zmylk w programje móže hišće problemy zawinić
+ Comment[hu]=Hiba történt a programban, de a program futása folytatódhat
+ Comment[is]=Villa varð í forritinu og gætið það valdið vandamálum
+@@ -1196,6 +1205,7 @@
+ Comment[he]=שגיאה חמורה מאוד התרחשה, שגרמה לתוכנה להיסגר.
+ Comment[hi]=एक अति गंभीर त्रुटि हुई, जिससे प्रोग्राम बाहर हो गया
+ Comment[hne]=एक बहुत बड़े गलती हो गिस जे हर प्रोग्राम ल बाहिर कर दिस.
++Comment[hr]=Dogodila se je vrlo ozbiljna pogreška, koja je uzrokovala završetak barem jednog programa
+ Comment[hsb]=Jara chutny zmylk je znajmjeńša program wottřělił.
+ Comment[hu]=Hiba történt a programban, a program futása befejeződött
+ Comment[is]=Mjög alvarleg villa átti sér stað, a.m.k. næg til að forritið slökkti á sér
+@@ -1584,6 +1594,7 @@
+ Name[he]=היצאה בוטלה
+ Name[hi]=लॉगआउट रद्द
+ Name[hne]=लागआउट खारिज
++Name[hr]=Odjava prekinuta
+ Name[hsb]=Wotzjewjenje přetorhnjene
+ Name[hu]=Kijelentkezés megszakítva
+ Name[is]=Hætt við útskráningu
+@@ -1659,6 +1670,7 @@
+ Comment[he]=היציאה מ־KDE בוטלה
+ Comment[hi]=केडीई लॉगआउट रद्द किया गया
+ Comment[hne]=केडीई के लागआउट खारिज
++Comment[hr]=Odjava iz KDE-a je prekinuta
+ Comment[hsb]=Wotzjewjenje w KDE je so přetorhnyło
+ Comment[hu]=A KDE kijelentkezési folyamata megszakadt
+ Comment[is]=Hætt var við útskráningu úr KDE
+--- runtime/kcontrol/locale/kcmlocale.h (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kcontrol/locale/kcmlocale.h (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -66,6 +66,7 @@
+ private:
+ enum Direction {Up,Down};
+ void languageMove(Direction direcition);
++ int selectedRow() const;
+
+
+ // NOTE: we need to mantain our own language list instead of using KLocale's
+--- runtime/kcontrol/locale/kcmlocale.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kcontrol/locale/kcmlocale.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -101,9 +101,19 @@
+ m_languageList = configGroup.readEntry("Language").split(':',QString::SkipEmptyParts);
+ }
+
++int KLocaleConfig::selectedRow() const
++{
++ QList<QListWidgetItem *>selectedItems = m_languages->selectedItems();
++
++ if ( selectedItems.isEmpty() ) {
++ return -1;
++ }
++ return m_languages->row( selectedItems.at(0) );
++}
++
+ void KLocaleConfig::slotAddLanguage(const QString & code)
+ {
+- int pos = m_languages->currentRow();
++ int pos = selectedRow();
+ if ( pos < 0 )
+ pos = 0;
+
+@@ -126,7 +136,7 @@
+
+ void KLocaleConfig::slotRemoveLanguage()
+ {
+- int pos = m_languages->currentRow();
++ int pos = selectedRow();
+
+ if (pos != -1)
+ {
+@@ -142,7 +152,7 @@
+
+ void KLocaleConfig::languageMove(Direction direcition)
+ {
+- int pos = m_languages->currentRow();
++ int pos = selectedRow();
+
+ QStringList::Iterator it1 = m_languageList.begin() + pos - 1*(direcition==Up);
+ QStringList::Iterator it2 = m_languageList.begin() + pos + 1*(direcition==Down);
+@@ -194,10 +204,10 @@
+
+ void KLocaleConfig::slotCheckButtons()
+ {
+- languageRemove->setEnabled( m_languages->currentRow() != -1 && m_languages->count() > 1 );
+- m_upButton->setEnabled( m_languages->currentRow() > 0 );
+- m_downButton->setEnabled( m_languages->currentRow() != -1 &&
+- m_languages->currentRow() < (signed)(m_languages->count() - 1) );
++ languageRemove->setEnabled( selectedRow() != -1 && m_languages->count() > 1 );
++ m_upButton->setEnabled( selectedRow() > 0 );
++ m_downButton->setEnabled( selectedRow() != -1 &&
++ selectedRow() < (signed)(m_languages->count() - 1) );
+ }
+
+ void KLocaleConfig::slotLocaleChanged()
+--- runtime/kcontrol/componentchooser/windowmanagers/compiz-custom.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kcontrol/componentchooser/windowmanagers/compiz-custom.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -22,6 +22,7 @@
+ Name[he]=Compiz מותאם אישית (צור תסריט מעטפת בשם "compiz-kde-launcher" כדי להפעיל אותו)
+ Name[hi]=मनमाफ़िक कॉम्पिज़ (रैपर स्क्रिप्ट 'compiz-kde-launcher' चलाने के लिए बनाएं)
+ Name[hne]=काम्पिज मनपसंद ( लपेट स्क्रिपट 'compiz-kde-launcher' चलाय बर बनाव)
++Name[hr]=Compiz prilagođeno (napravite skriptu-ovojnicu 'compiz-kde-launcher' za pokretanje=
+ Name[hsb]=Compizowe wašnje (napišće wobalkowy skript 'compiz-kde-launcher' za wuwjedźenje)
+ Name[hu]=Egyedi Compiz (indításához egy "compiz-kde-launcher" nevű szkript szükséges)
+ Name[is]=Compiz sérsniðið (búa til wrapper skrituna 'compiz-kde-launcher' til að ræsa það)
+--- runtime/kcontrol/componentchooser/componentservices/kcm_kemail.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_kemail.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -16,6 +16,7 @@
+ Name[gl]=Cliente de correo
+ Name[gu]=ઇમેલ ક્લાયન્ટ
+ Name[hi]=ईमेल क्लाइंट
++Name[hr]=Klijent e-pošte
+ Name[hu]=Levelezőprogram
+ Name[is]=Póstforrit
+ Name[it]=Programma di posta elettronica
+--- runtime/kcontrol/componentchooser/componentservices/kcm_browser.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_browser.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -16,6 +16,7 @@
+ Name[gl]=Navegador Web
+ Name[gu]=વેબ બ્રાઉઝર
+ Name[hi]=वेब ब्राउज़र
++Name[hr]=Web preglednik
+ Name[hu]=Webböngésző
+ Name[is]=Vafri
+ Name[it]=Browser Web
+--- runtime/kcontrol/componentchooser/componentservices/kcm_wm.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_wm.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -17,6 +17,7 @@
+ Name[gl]=Xestor de fiestras
+ Name[gu]=વિન્ડો વ્યવસ્થાપક
+ Name[hi]=विंडो प्रबंधक
++Name[hr]=Upravitelj prozorima
+ Name[hu]=Ablakkezelő
+ Name[is]=Gluggastjóri
+ Name[it]=Window manager
+@@ -75,6 +76,7 @@
+ Comment[he]=כאן באפשרותך להגדיר את מנהל החלונות שיהיה בשימוש בהפעלת KDE במחשב שלך.
+ Comment[hi]=यहाँ आप विंडो प्रबंधक को चुन सकते हैं जिसे आपके KDE सत्र में चलाया जाना है.
+ Comment[hne]=इहां आप मन विंडो प्रबंधक ल चुन सकथो जे हर आपके केडीई सत्र मं चलही.
++Comment[hr]=Ovdje možete odabrati upravitelj prozorima koji će se izvoditi u vašoj KDE sjednici
+ Comment[hsb]=Tule móžeće woknowy manager za swoje KDE-posedźenje wubrać.
+ Comment[hu]=Itt lehet kiválasztani, melyik ablakkezelőt használja a KDE.
+ Comment[is]=Hér geturðu valið gluggastjóra til keyrslu í KDE setum.
+--- runtime/kcontrol/componentchooser/componentservices/kcm_filemanager.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_filemanager.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -16,6 +16,7 @@
+ Name[gl]=Xestor de ficheiros
+ Name[gu]=ફાઇલ વ્યવસ્થાપક
+ Name[hi]=फ़ाइल प्रबंधक
++Name[hr]=Upravitelj datotekama
+ Name[hu]=Fájlkezelő
+ Name[is]=Skráastjóri
+ Name[it]=Gestore file
+@@ -74,6 +75,7 @@
+ Comment[he]=כאן באפשרותך להגדיר את מנהל הקבצים שישמש כברירת מחדל. הכניסות בתפריט ה־K יבכל יישומי KDE שבאמצעותם תוכל לפתוח תיקיות ישתמשו במנהל קבצים זה.
+ Comment[hi]=यहाँ पर आप अपने डिफ़ॉल्ट वेब ब्राउज़र को विन्यस्त कर सकते हैं. सभी केडीई अनुप्रयोगों में जिसमें हायपरलिंक चुन सकते हैं, वे इस विन्यास का इस्तेमाल करेंगे.
+ Comment[hne]=इहां आप मन अपन डिफाल्ट फाइल प्रबंधक ल कान्फिगर कर सकथो. केमेन्यू प्रविस्टि अउ सब्बो केडीई अनुपरयोग मन मं जेमां आप फोल्डर खोल सकथो , ओ मन ए फाइल प्रबंधक ल उपयोग करहीं.
++Comment[hr]=Ovdje možete konfigurirati vaš početni preglednik datoteka. Stavke K izbornika i sve KDE aplikacije u kojima možete otvoriti mape, koristiti će ovaj upravitelj datotekama.
+ Comment[hsb]=Tule móžeće swój standardny datajowy manager připrawić. Zapisy w K-meniju a wšitke KDE-aplikacije, w kotrychž móžeće zapiski wočinić, budu tutón datajowy manager wužiwać.
+ Comment[hu]=Itt lehet beállítani, mi legyen az alapértelmezett fájlkezelő. A KDE menüben és a KDE-alkalmazásokban ez a program fog megnyílni, ha megnyit egy mappát.
+ Comment[is]=Þessi þjónusta leyfir þér að skilgreina sjálfgefinn skráastjóra. K-aðalvalmyndin og öll KDE forrit sem gera þér kleift að opna möppur ættu að virða þessa stillingu.
+--- runtime/kcontrol/componentchooser/componentservices/kcm_terminal.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_terminal.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -17,6 +17,7 @@
+ Name[gl]=Emulador de terminal
+ Name[gu]=ટર્મિનલ ઇમ્યુલેટર
+ Name[hi]=टर्मिनल एमुलेटर
++Name[hr]=Emulator terminala
+ Name[hu]=Terminál
+ Name[is]=Skjáhermir
+ Name[it]=Emulatore di terminale
+--- runtime/kcontrol/kded/kcmkded.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kcontrol/kded/kcmkded.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -382,7 +382,7 @@
+ if ( !current.isEmpty() )
+ {
+ int count = _lvStartup->topLevelItemCount();
+- for( int i = 0; !i < count; ++i )
++ for( int i = 0; i < count; ++i )
+ {
+ QTreeWidgetItem *treeitem = _lvStartup->topLevelItem( i );
+ if ( treeitem->data( StartupService, LibraryRole ).toString() == current )
+--- runtime/desktoptheme/oxygen/metadata.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/desktoptheme/oxygen/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -53,6 +53,7 @@
+ Comment[he]=ערכת נושא שמשתמשת בסגנון Oxygen
+ Comment[hi]=प्रसंग को ऑक्सीजन शैली में किया गया है
+ Comment[hne]=प्रसंग ल आक्सीजन सैली मं कर दे गे हे
++Comment[hr]=Tema je urađena u Oxygen stilu
+ Comment[hu]=Oxygen-stílusú téma
+ Comment[is]=Þema sem gert er í 'Oxygen' stíl
+ Comment[it]=Tema in stile Oxygen
+--- runtime/desktoptheme/air/metadata.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/desktoptheme/air/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -11,6 +11,7 @@
+ Name[gl]=Aire
+ Name[gu]=હવા
+ Name[he]=אוויר
++Name[hr]=Zrak
+ Name[hu]=Levegő
+ Name[is]=Loft
+ Name[it]=Aria
+@@ -55,6 +56,7 @@
+ Comment[fy]=it sykheljen yn de frisse lucht
+ Comment[gl]=Un folgo de ar fresco
+ Comment[hi]=ताज़ा हवा का एक झौंका
++Comment[hr]=Malo svježeg zraka
+ Comment[hu]=Friss fuvallat
+ Comment[is]=Ferskir vindar
+ Comment[it]=Un soffio d'aria fresca
+--- runtime/pics/hicolor/index.theme (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/pics/hicolor/index.theme (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -60,6 +60,7 @@
+ Comment[he]=ערכת סמלים לגיבוי
+ Comment[hi]=फालबैक प्रतीक प्रसंग
+ Comment[hne]=फालबैक चिनहा थीम
++Comment[hr]=Pričuvna tema ikona
+ Comment[hsb]=Nuzowa piktogramowa tema
+ Comment[hu]=Másodlagos ikontéma
+ Comment[is]=Táknmyndaþema til vara
+--- runtime/phonon/platform_kde/phononbackend.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/phonon/platform_kde/phononbackend.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -24,6 +24,7 @@
+ Name[gu]=KDE મલ્ટિમીડિઆ પાશ્વભાગ
+ Name[hi]=केडीई मल्टीमीडिया बैकएण्ड
+ Name[hne]=केडीई मल्टीमीडिया बैकएन्ड
++Name[hr]=KDE podrška za multimediju
+ Name[hsb]=KDE Multimedijowy backend
+ Name[hu]=KDE multimédiakezelő
+ Name[is]=KDE margmiðlunarbakendi
+--- runtime/phonon/platform_kde/phonon.notifyrc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/phonon/platform_kde/phonon.notifyrc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -25,6 +25,7 @@
+ Comment[he]=Phonon: סיפריית המולטימדיה של KDE
+ Comment[hi]=फ़ोनॉन: केडीई का मल्टीमीडिया लाइब्रेरी
+ Comment[hne]=फोनान : केडीई के मल्टीमीडिया लाइब्रेरी
++Comment[hr]=Phonon: KDE-ova biblioteka multimedije
+ Comment[hsb]=Phonon: KDE multimedijowa biblioteka
+ Comment[hu]=Phonon: KDE multimédiakezelő
+ Comment[is]=Phonon: margmiðlunarforritasafn KDE
+@@ -164,6 +165,7 @@
+ Name[gu]=ધ્વનિ ઉપકરણ પડતીઆધાર
+ Name[hi]=ऑडियो उपकरण फालबैक
+ Name[hne]=आडियो उपकरन फालबैक
++Name[hr]=Pričuvni zvučni uređaj
+ Name[hsb]=Nuzowe rozrisanje za zwukowy grat
+ Name[hu]=Másodlagos hangeszköz
+ Name[is]=Varahljóðtæki
+@@ -223,6 +225,7 @@
+ Comment[gl]=Notificación ao recorrer á reserva se o dispositivo preferido non está dispoñíbel
+ Comment[gu]=જો પસંદ કરેલ ઉપકરણ પ્રાપ્ત ન હોય તો આપમેળે બીજી પસંદગી પર નોંધણી
+ Comment[hi]=यदि वांछित उपकरण उपलब्ध नहीं हो तो स्वचालित फ़ालबैक पर सूचना
++Comment[hr]=Obavijest u slučaju automatskog korištenja pričuvnog uređaja ako prvenstven uređaj nije dostupan
+ Comment[hsb]=Zdźělenka wo awtomatiskim wužiwanju nuzoweho rozrisanja, hdyž preferowany grat njeje přistupny
+ Comment[hu]=Értesítés, ha az elsődleges eszköz valamilyen problémája miatt a másodlagos válik aktívvá
+ Comment[is]=Aðvörun um sjálfvirkjun varatækis ef valið tæki er ekki tiltækt
+--- runtime/phonon/kcm/xine/kcm_phononxine.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/phonon/kcm/xine/kcm_phononxine.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -58,6 +58,7 @@
+ Comment[gu]=Xine પાશ્વભાગ રૂપરેખાંકન
+ Comment[he]=תצורת מנוע Xine
+ Comment[hi]=Xine बैकेंड विन्यास
++Comment[hr]=Konfiguracija Xine podrške
+ Comment[hu]=A Xine modul beállításai
+ Comment[is]=Stillingar Xine bakenda
+ Comment[it]=Configurazione motore Xine
+--- runtime/phonon/kcm/kcm_phonon.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/phonon/kcm/kcm_phonon.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -99,6 +99,7 @@
+ Comment[he]=הגדרות צליל ווידאו
+ Comment[hi]=आवाज तथा वीडियो कॉन्फ़िगुरेशन
+ Comment[hne]=अवाज अउ वीडियो कान्फिगरेसन
++Comment[hr]=Konfiguracija Zvuka i Videa
+ Comment[hsb]=Připrawjenje zwuka a wideja
+ Comment[hu]=Hang- és videobeállítások
+ Comment[is]=Stillingar hljóð- og vídeó
+--- runtime/phonon/kded-module/phononserver.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/phonon/kded-module/phononserver.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -28,6 +28,7 @@
+ Name[gu]=ધ્વનિ નિતી સર્વર
+ Name[hi]=ध्वनि नियम सर्वर
+ Name[hne]=अवाज पालिसी सर्वर
++Name[hr]=Poslužitelj zvučnih pravila
+ Name[hsb]=Serwer za zadźerženje zwuka
+ Name[hu]=Hangrendszer-kezelő
+ Name[is]=Þjónn sem stýrir hljóðmeðhöndlun
+@@ -85,6 +86,7 @@
+ Comment[ga]=Freastalaí a láraíonn cinntí agus sonraí d'fheidhmchláir a bhaineann úsáid as Phonon
+ Comment[gl]=Un servidor para centralizar as decisión e datos de programas mediante Phonon
+ Comment[gu]=નિર્ણયો કેન્દ્રિત કરવા અને ફોનોન ઉપયોગ કરતાં કાર્યક્રમોની માહિતી માટે સર્વર
++Comment[hr]=Poslužitelj koji centralizira odluke i podatke aplikacija koje koriste Phonon
+ Comment[hsb]=Serwer, kiž rozsudy a daty programow, kotrež Phonon wužiwaja, zjednoći
+ Comment[hu]=Adatkezelő szolgáltatás a Phonon keretrendszert használó alkalmazásoknak
+ Comment[is]=Miðlari sem safnar sillingum og gögnum forrita sem nota Phonon
+--- runtime/kpasswdserver/kpasswdserver.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kpasswdserver/kpasswdserver.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -100,6 +100,7 @@
+ Comment[he]=תמיכה במטמון ססמאות
+ Comment[hi]=पासवर्ड कैचिंग समर्थन
+ Comment[hne]=पासवर्ड केचिंग सपोर्ट
++Comment[hr]=Podrška za predmemoriranje lozinke
+ Comment[hsb]=Podpěra za spomjatkowanje hesłow
+ Comment[hu]=Jelszómentési támogatás
+ Comment[is]=Skyndiminni fyrir lykilorð
+--- runtime/khelpcenter/plugins/plasma.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/khelpcenter/plugins/plasma.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -26,6 +26,7 @@
+ Name[he]=המדריך של Plasma
+ Name[hi]=प्लाज़्मा मैनुअल
+ Name[hne]=प्लाज्मा मेनुअल
++Name[hr]=Upute za uporabu Plasme
+ Name[hsb]=Přiručka za Plasma
+ Name[hu]=Plasma kézikönyv
+ Name[is]=Plasma handbók
+--- runtime/khelpcenter/plugins/Tutorials/.directory (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/khelpcenter/plugins/Tutorials/.directory (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -106,6 +106,7 @@
+ Comment[he]=מסמכי הדרכה ומבוא.
+ Comment[hi]=शिक्षण पाठ तथा परिचय दस्तावेज़
+ Comment[hne]=सिक्छन पाठ अउ परिचय कागद
++Comment[hr]=Dokumenti s vodičima i uvodom.
+ Comment[hsb]=Tutorije a zawody
+ Comment[hu]=Bevezető jellegű dokumentumok.
+ Comment[is]=Leiðbeiningar og kynningarskjöl.
+--- runtime/khelpcenter/plugins/Manpages/.directory (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/khelpcenter/plugins/Manpages/.directory (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -26,6 +26,7 @@
+ Name[he]=דפי הוראות של יוניקס
+ Name[hi]=यूनिक्स निर्देशिका पृष्ठ
+ Name[hne]=यूनिक्स निर्देसिका पेज
++Name[hr]=UNIX stranice s uputama
+ Name[hu]=UNIX man oldalak
+ Name[is]=UNIX handbókin
+ Name[it]=Pagine di manuale UNIX
+--- runtime/menu/desktop/kde-games-logic.directory (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/menu/desktop/kde-games-logic.directory (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -27,6 +27,7 @@
+ Name[he]=משחקי לוגיקה
+ Name[hi]=तर्क-शक्ति के खेल
+ Name[hne]=तर्क वाले खेल
++Name[hr]=Logičke igra
+ Name[hsb]=Logikowe hry
+ Name[hu]=Logikai
+ Name[is]=Kænskuleikir
+--- runtime/menu/desktop/kde-edu-mathematics.directory (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/menu/desktop/kde-edu-mathematics.directory (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -32,6 +32,7 @@
+ Name[he]=מתמטיקה
+ Name[hi]=गणित
+ Name[hne]=गनित
++Name[hr]=Matematika
+ Name[hsb]=Matematika
+ Name[hu]=Matematika
+ Name[is]=Stærðfræði
+--- runtime/platforms/win/config/platform.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/platforms/win/config/platform.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -27,6 +27,7 @@
+ Name[gl]=Plataforma
+ Name[gu]=પ્લેટફોર્મ
+ Name[hi]=प्लैटफॉर्म
++Name[hr]=Platforma
+ Name[is]=Stýrikerfi
+ Name[it]=Piattaforma
+ Name[ja]=プラットフォーム
+@@ -78,6 +79,7 @@
+ Comment[gl]=Xestor da plataforma Windows
+ Comment[gu]=વિન્ડોસ પ્લેટફોર્મ સંચાલક
+ Comment[hi]=विंडो प्लैटफॉर्म प्रबंधक
++Comment[hr]=Upravitelj platformom Windows
+ Comment[hu]=Windows platformkezelő
+ Comment[is]=Windows stýrikerfastjóri
+ Comment[it]=Gestore della piattaforma Windows
+--- runtime/platforms/win/kwinstartmenu/winstartmenu.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/platforms/win/kwinstartmenu/winstartmenu.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -22,6 +22,7 @@
+ Name[he]=מודול תפריט ההתחל של KDED
+ Name[hi]=केडीईडी विंडोज स्टार्ट मेन्यू मॉड्यूल
+ Name[hne]=केडीईडी विंडोज स्टार्ट मेन्यू माड्यूल
++Name[hr]=KDED Windows Start Izbornik Modul
+ Name[hsb]=KDED modul za startowanski meni woknow
+ Name[hu]=KDED Windows Startmenü-kezelő
+ Name[is]=KDED Windows ræsivalmyndareining
+--- runtime/kwalletd/kwalletd.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kwalletd/kwalletd.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -28,6 +28,7 @@
+ Name[gu]=વોલેટ સર્વર
+ Name[hi]=वालेट सर्वर
+ Name[hne]=वालेट सर्वर
++Name[hr]=Poslužitelj novčanika
+ Name[hsb]=Móšnjowy serwer
+ Name[hu]=Jelszótároló szolgáltatás
+ Name[is]=Veskisþjónn
+@@ -90,6 +91,7 @@
+ Comment[gu]=વોલેટ સર્વર
+ Comment[hi]=वालेट सर्वर
+ Comment[hne]=वालेट सर्वर
++Comment[hr]=Poslužitelj novčanika
+ Comment[hsb]=Móšnjowy serwer
+ Comment[hu]=Jelszótároló szolgáltatás
+ Comment[is]=Veskisþjónn
+--- runtime/kwalletd/kwalletd.notifyrc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kwalletd/kwalletd.notifyrc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -21,6 +21,7 @@
+ Comment[gl]=O daemon de carteiras de KDE
+ Comment[gu]=KDE વોલેટ ડેમન
+ Comment[hi]=केडीई वालेट डेमन
++Comment[hr]=Servis KDE lisnice
+ Comment[hu]=KDE jelszótároló szolgáltatás
+ Comment[is]=KDE Veskispúkinn
+ Comment[it]=Demone dei portafogli di KDE
+@@ -55,6 +56,7 @@
+ Comment[zh_TW]=KDE 錢包伺服程式
+ Name=kwalletd
+ Name[hi]=केवालेट
++Name[hr]=kwalletd – KNovčanik daemon
+ Name[mai]=केवालेट्ड
+ Name[ml]=കെവാലറ്റ്ഡി
+ Name[nds]=Kwalletd
+@@ -81,6 +83,7 @@
+ Name[gl]=Precisa dun contrasinal
+ Name[gu]=પાસવર્ડ જરૂરી છે
+ Name[hi]=पासवर्ड की जरूरत है
++Name[hr]=Potrebna lozinka
+ Name[hu]=Jelszó megadása szükséges
+ Name[is]=Þarf lykilorð
+ Name[it]=Necessita di una password
+@@ -134,6 +137,7 @@
+ Comment[ga]=Tá Deamhan Sparáin KDE ag iarraidh focal faire
+ Comment[gl]=O Daemon de carteiras de KDE pide un contrasinal
+ Comment[hi]=KDE वालेट डेमॉन एक पासवर्ड के लिए आग्रह करता है
++Comment[hr]=KDE-ov novčanik daemon zahtijeva lozinku
+ Comment[hu]=A KDE jelszótároló szolgáltatás jelszót kér
+ Comment[is]=KDE Veskispúkinn biður um lykilorð
+ Comment[it]=Il demone dei portafogli di KDE richiede una password
+--- runtime/ktimezoned/ktimezoned.h (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/ktimezoned/ktimezoned.h (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -21,6 +21,8 @@
+ #ifndef KTIMEZONED_H
+ #define KTIMEZONED_H
+
++#include "ktimezonedbase.h"
++
+ #include <QString>
+ #include <QByteArray>
+ class QFile;
+@@ -30,35 +32,14 @@
+ #include <ksystemtimezone.h>
+
+
+-class KTimeZoned : public KDEDModule
++class KTimeZoned : public KTimeZonedBase
+ {
+ Q_OBJECT
+- Q_CLASSINFO("D-Bus Interface", "org.kde.KTimeZoned")
+
+ public:
+ KTimeZoned(QObject* parent, const QList<QVariant>&);
+ ~KTimeZoned();
+
+- public Q_SLOTS:
+- /** D-Bus call to initialize the module.
+- * @param reinit determines whether to reinitialize if the module has already
+- * initialized itself
+- */
+- Q_SCRIPTABLE void initialize(bool reinit);
+-
+- Q_SIGNALS:
+- /** D-Bus signal emitted when the time zone configuration file has changed. */
+- void configChanged();
+- /** D-Bus signal emitted when zone.tab contents have changed.
+- * @param zonetab path to zone.tab
+- */
+- void zonetabChanged(const QString &zonetab);
+- /** D-Bus signal emitted when the definition (not the identity) of the local
+- * system time zone has changed.
+- * @param zone path to time zone definition file
+- */
+- void zoneDefinitionChanged(const QString &zone);
+-
+ private Q_SLOTS:
+ void zonetab_Changed(const QString& path);
+ void localChanged(const QString& path);
+@@ -90,6 +71,7 @@
+ };
+ typedef QMap<QString, QString> MD5Map; // zone name, checksum
+
++ /** reimp */
+ void init(bool restart);
+ bool findZoneTab(QFile& f);
+ void readZoneTab(QFile& f);
+@@ -110,8 +92,6 @@
+ QByteArray mSavedTZ; // last value of TZ if it's used to set local zone
+ KSystemTimeZoneSource *mSource;
+ KTimeZones mZones; // time zones collection
+- QString mLocalZone; // local system time zone name
+- QString mConfigLocalZone; // local system time zone name as stored in config file
+ QString mLocalIdFile; // file containing pointer to local time zone definition
+ QString mLocalZoneDataFile; // zoneinfo file containing local time zone definition
+ QString mLocaltimeMd5Sum; // MD5 checksum of /etc/localtime
+--- runtime/ktimezoned/ktimezoned.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/ktimezoned/ktimezoned.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -110,6 +110,7 @@
+ Comment[he]=שירות איזורי זמן עבור KDE
+ Comment[hi]=केडीई के लिए समय क्षेत्र डेमन
+ Comment[hne]=केडीई बर समय छेत्र डेमन
++Comment[hr]=Daemon vremenske zone za KDE
+ Comment[hsb]=KDE demon za časowe pasma
+ Comment[hu]=Időzóna-kezelő szolgáltatás a KDE-hez
+ Comment[is]=Tímabeltaþjónn fyrir KDE
+--- runtime/ktimezoned/ktimezoned_win.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 0)
++++ runtime/ktimezoned/ktimezoned_win.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -0,0 +1,151 @@
++/*
++ This file is part of the KDE libraries
++ Copyright (c) 2009 Till Adam <adam@kde.org>
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
++*/
++
++#include "ktimezoned_win.moc"
++#include "ktimezonedbase.moc"
++
++#include <climits>
++#include <cstdlib>
++
++#include <QStringList>
++#include <QTextStream>
++#include <QtDBus/QtDBus>
++#include <QThread>
++#include <QDebug>
++
++#include <kglobal.h>
++#include <klocale.h>
++#include <kcodecs.h>
++#include <kdebug.h>
++#include <kconfiggroup.h>
++
++#include <kpluginfactory.h>
++#include <kpluginloader.h>
++
++#ifdef Q_OS_WIN
++#include <Windows.h>
++#endif
++
++K_PLUGIN_FACTORY(KTimeZonedFactory,
++ registerPlugin<KTimeZoned>();
++ )
++K_EXPORT_PLUGIN(KTimeZonedFactory("ktimezoned"))
++
++
++// Config file entry names
++const char LOCAL_ZONE[] = "LocalZone"; // name of local time zone
++static const TCHAR currentTimeZoneKey[] = TEXT("System\\CurrentControlSet\\Control\\TimeZoneInformation");
++
++class RegistryWatcherThread : public QThread
++{
++ public:
++ RegistryWatcherThread(KTimeZoned* parent)
++ :QThread(parent),q(parent)
++ {
++ }
++
++ ~RegistryWatcherThread()
++ {
++ RegCloseKey(key);
++ }
++
++ void run()
++ {
++ if ( RegOpenKeyEx( HKEY_LOCAL_MACHINE, currentTimeZoneKey, 0, KEY_READ, &key ) == ERROR_SUCCESS )
++ {
++ while(true)
++ {
++ RegNotifyChangeKeyValue( key, true, REG_NOTIFY_CHANGE_LAST_SET,
++ NULL, false /*async, we want it to block*/ );
++ q->updateLocalZone();
++ }
++ }
++ }
++ private:
++ KTimeZoned* q;
++ HKEY key;
++};
++
++KTimeZoned::KTimeZoned(QObject* parent, const QList<QVariant>& l)
++ : KTimeZonedBase(parent, l), mRegistryWatcherThread(0)
++{
++ init(false);
++}
++
++KTimeZoned::~KTimeZoned()
++{
++ if (mRegistryWatcherThread)
++ {
++ mRegistryWatcherThread->quit();
++ mRegistryWatcherThread->wait(100);
++ }
++ delete mRegistryWatcherThread;
++}
++
++void KTimeZoned::init(bool restart)
++{
++ if (restart)
++ {
++ kDebug(1221) << "KTimeZoned::init(restart)";
++ delete mRegistryWatcherThread;
++ mRegistryWatcherThread = 0;
++ }
++
++ KConfig config(QLatin1String("ktimezonedrc"));
++ if (restart)
++ config.reparseConfiguration();
++ KConfigGroup group(&config, "TimeZones");
++ mConfigLocalZone = group.readEntry(LOCAL_ZONE);
++
++ updateLocalZone();
++ if (!mRegistryWatcherThread)
++ {
++ mRegistryWatcherThread = new RegistryWatcherThread(this);
++ mRegistryWatcherThread->start();
++ }
++}
++
++// Check if the local zone has been updated, and if so, write the new
++// zone to the config file and notify interested parties.
++void KTimeZoned::updateLocalZone()
++{
++ // On Windows, HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones
++ // holds the time zone database. The TZI binary value is the TIME_ZONE_INFORMATION structure.
++
++ TIME_ZONE_INFORMATION tzinfo;
++ DWORD res = GetTimeZoneInformation(&tzinfo);
++ if (res == TIME_ZONE_ID_INVALID) return; // hm
++ mLocalZone = QString::fromUtf16( reinterpret_cast<ushort*>( tzinfo.StandardName ) );
++
++ if (mConfigLocalZone != mLocalZone)
++ {
++ kDebug(1221) << "Local timezone is now: " << mLocalZone;
++ KConfig config(QLatin1String("ktimezonedrc"));
++ KConfigGroup group(&config, "TimeZones");
++ mConfigLocalZone = mLocalZone;
++ group.writeEntry(LOCAL_ZONE, mConfigLocalZone);
++ group.sync();
++
++ QDBusMessage message = QDBusMessage::createSignal("/Daemon", "org.kde.KTimeZoned", "configChanged");
++ QDBusConnection::sessionBus().send(message);
++ }
++}
++
++
+--- runtime/ktimezoned/ktimezoned.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/ktimezoned/ktimezoned.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -20,6 +20,7 @@
+ */
+
+ #include "ktimezoned.moc"
++#include "ktimezonedbase.moc"
+
+ #include <climits>
+ #include <cstdlib>
+@@ -57,8 +58,8 @@
+ const char LOCAL_ZONE[] = "LocalZone"; // name of local time zone
+
+
+-KTimeZoned::KTimeZoned(QObject* parent, const QList<QVariant>&)
+- : KDEDModule(parent),
++KTimeZoned::KTimeZoned(QObject* parent, const QList<QVariant>& l)
++ : KTimeZonedBase(parent, l),
+ mSource(0),
+ mZonetabWatch(0),
+ mDirWatch(0)
+@@ -76,14 +77,6 @@
+ mDirWatch = 0;
+ }
+
+-void KTimeZoned::initialize(bool reinit)
+-{
+- // If we reach here, the module has already been constructed and therefore
+- // initialized. So only do anything if reinit is true.
+- if (reinit)
+- init(true);
+-}
+-
+ void KTimeZoned::init(bool restart)
+ {
+ if (restart)
+@@ -97,11 +90,6 @@
+ mDirWatch = 0;
+ }
+
+-#ifdef Q_OS_WIN
+- // On Windows, HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones
+- // holds the time zone database. The TZI binary value is the TIME_ZONE_INFORMATION structure.
+-#else
+- // For Unix, read zone.tab.
+ KConfig config(QLatin1String("ktimezonedrc"));
+ if (restart)
+ config.reparseConfiguration();
+@@ -111,6 +99,9 @@
+ mConfigLocalZone = group.readEntry(LOCAL_ZONE);
+ QString ztc = group.readEntry(ZONE_TAB_CACHE, QString());
+ mZoneTabCache = (ztc == "Solaris") ? Solaris : NoCache;
++
++ // For Unix, read zone.tab.
++
+ QString oldZoneinfoDir = mZoneinfoDir;
+ QString oldZoneTab = mZoneTab;
+ CacheType oldCacheType = mZoneTabCache;
+@@ -164,7 +155,6 @@
+ mZonetabWatch = new KDirWatch(this);
+ mZonetabWatch->addFile(mZoneTab);
+ connect(mZonetabWatch, SIGNAL(dirty(const QString&)), SLOT(zonetab_Changed(const QString&)));
+-#endif
+
+ // Find the local system time zone and set up file monitors to detect changes
+ findLocalZone();
+--- runtime/ktimezoned/ktimezonedbase.h (.../tags/KDE/4.3.0/kdebase) (wersja 0)
++++ runtime/ktimezoned/ktimezonedbase.h (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -0,0 +1,73 @@
++/*
++ This file is part of the KDE libraries
++ Copyright (c) 2007-2009 David Jarvie <djarvie@kde.org>
++ Copyright (c) 2009 Till Adam <adam@kde.org>
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
++*/
++
++#ifndef KTIMEZONEDBASE_H
++#define KTIMEZONEDBASE_H
++
++#include <kdedmodule.h>
++
++
++class KTimeZonedBase : public KDEDModule
++{
++ Q_OBJECT
++ Q_CLASSINFO("D-Bus Interface", "org.kde.KTimeZoned")
++ public:
++ KTimeZonedBase(QObject* parent, const QList<QVariant>&)
++ :KDEDModule(parent) {}
++ virtual ~KTimeZonedBase() {};
++
++ public Q_SLOTS:
++ /** D-Bus call to initialize the module.
++ * @param reinit determines whether to reinitialize if the module has already
++ * initialized itself
++ */
++ Q_SCRIPTABLE void initialize(bool reinit)
++ {
++ // If we reach here, the module has already been constructed and therefore
++ // initialized. So only do anything if reinit is true.
++ if (reinit)
++ init(true);
++ }
++
++ Q_SIGNALS:
++ /** D-Bus signal emitted when the time zone configuration has changed. */
++ void configChanged();
++
++ /** D-Bus signal emitted when zone.tab contents have changed.
++ * @param zonetab path to zone.tab
++ */
++ void zonetabChanged(const QString &zonetab);
++
++ /** D-Bus signal emitted when the definition (not the identity) of the local
++ * system time zone has changed.
++ * @param zone path to time zone definition file
++ */
++ void zoneDefinitionChanged(const QString &zone);
++
++ protected:
++ virtual void init(bool) = 0;
++
++ QString mLocalZone; // local system time zone name
++ QString mConfigLocalZone; // local system time zone name as stored in config file
++};
++
++
++#endif
+--- runtime/ktimezoned/ktimezoned_win.h (.../tags/KDE/4.3.0/kdebase) (wersja 0)
++++ runtime/ktimezoned/ktimezoned_win.h (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -0,0 +1,45 @@
++/*
++ This file is part of the KDE libraries
++ Copyright (c) 2009 Till Adam <adam@kde.org>
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
++*/
++
++#ifndef KTIMEZONED_H
++#define KTIMEZONED_H
++
++#include "ktimezonedbase.h"
++
++class RegistryWatcherThread;
++
++class KTimeZoned : public KTimeZonedBase
++{
++ Q_OBJECT
++ friend class RegistryWatcherThread;
++
++ public:
++ KTimeZoned(QObject* parent, const QList<QVariant>&);
++ ~KTimeZoned();
++
++ private:
++ /** reimp */
++ void init(bool);
++ void updateLocalZone();
++
++ RegistryWatcherThread *mRegistryWatcherThread; // thread that watches the timezone registry key
++};
++
++#endif
+--- runtime/ktimezoned/CMakeLists.txt (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/ktimezoned/CMakeLists.txt (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -1,6 +1,9 @@
+-set(kded_ktimezoned_SRCS ktimezoned.cpp)
++if (WIN32)
++ set(kded_ktimezoned_SRCS ktimezoned_win.cpp)
++else (WIN32)
++ set(kded_ktimezoned_SRCS ktimezoned.cpp)
++endif (WIN32)
+
+-
+ kde4_add_plugin(kded_ktimezoned ${kded_ktimezoned_SRCS})
+
+ #qt4_add_dbus_adaptor(kded_ktimezoned_SRCS org.kde.KTimeZoned ktimezonedbus.h DBusHandler)
+@@ -13,3 +16,5 @@
+
+ install( FILES ktimezoned.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
+ install( FILES org.kde.KTimeZoned.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
++
++
+--- runtime/CMakeLists.txt (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/CMakeLists.txt (.../branches/KDE/4.3/kdebase) (wersja 1013412)
@@ -16,7 +16,7 @@
- #include "nepomukstorage-config.h"
- #include "modelcopyjob.h"
+ include(CheckFunctionExists)
+ include(CheckIncludeFiles)
+
+-set(SOPRANO_MIN_VERSION "2.2.69")
++set(SOPRANO_MIN_VERSION "2.3.0")
+ macro_optional_find_package(Soprano)
+ macro_optional_find_package(Nepomuk)
+ macro_log_feature(Soprano_FOUND "Soprano" "Soprano Libraries" "kdesupport" FALSE "" "Required to build Nepomuk.")
+--- runtime/kioslave/trash/kcmtrash.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kioslave/trash/kcmtrash.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -25,6 +25,7 @@
+ Name[he]=אשפה
+ Name[hi]=रद्दी
+ Name[hne]=घुरुवा
++Name[hr]=Otpad
+ Name[hsb]=Papjernik
+ Name[hu]=Szemétkosár
+ Name[is]=Rusl
+@@ -94,6 +95,7 @@
+ Comment[he]=שירות זה מאפשר הגדרות האשפה.
+ Comment[hi]=यह सेवा आपको रद्दी की टोकरी को विन्यस्त करने देता है.
+ Comment[hne]=ए सेवा घुरवा ल कानफिगर करे बर देथे.
++Comment[hr]=Ovaj servis dozvoljava konfiguraciju smeća.
+ Comment[hsb]=Tuta słužba dowoli připrawjenje papjernika.
+ Comment[hu]=A törölt fájlok kezelését lehet itt beállítani.
+ Comment[is]=Þessi þjónusta leyfir stillingar á ruslafötu.
+@@ -173,6 +175,7 @@
+ Name[he]=אשפה
+ Name[hi]=रद्दी
+ Name[hne]=घुरुवा
++Name[hr]=Otpad
+ Name[hsb]=Papjernik
+ Name[hu]=Szemétkosár
+ Name[is]=Rusl
+@@ -243,6 +246,7 @@
+ Comment[he]=הגדר את האשפה
+ Comment[hi]=रद्दी की टोकरी का विन्यास विन्यस्त करें
+ Comment[hne]=कचरापेटी सेटिंग कान्फिगर करव
++Comment[hr]=Konfiguriranje postavki otpada
+ Comment[hsb]=Nastajenja papjernika připrawić
+ Comment[hu]=A törölt fájlok beállításai
+ Comment[is]=Stillingar ruslafötu
+--- runtime/kioslave/trash/tests/testtrash.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kioslave/trash/tests/testtrash.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -208,6 +208,14 @@
+ removeDirRecursive( m_trashDir );
+ }
+
++void TestTrash::cleanupTestCase()
++{
++ // Clean up
++ removeDirRecursive( homeTmpDir() );
++ removeDirRecursive( otherTmpDir() );
++ removeDirRecursive( m_trashDir );
++}
++
+ void TestTrash::urlTestFile()
+ {
+ const KUrl url = TrashImpl::makeURL(1, QString::fromLatin1("fileId"), QString());
+--- runtime/kioslave/trash/tests/testtrash.h (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kioslave/trash/tests/testtrash.h (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -31,6 +31,7 @@
+
+ private Q_SLOTS:
+ void initTestCase();
++ void cleanupTestCase();
+
+ void testIcons();
+
+--- runtime/kioslave/thumbnail/directorythumbnail.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kioslave/thumbnail/directorythumbnail.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -20,6 +20,7 @@
+ Name[gl]=Cartafoles
+ Name[gu]=ડિરેક્ટરીઓ
+ Name[hi]=निर्देशिका
++Name[hr]=Direktoriji
+ Name[hu]=Mappák
+ Name[is]=Möppur
+ Name[it]=Cartelle
+--- runtime/kioslave/thumbnail/jpegthumbnail.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kioslave/thumbnail/jpegthumbnail.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -9,6 +9,7 @@
+ Name[ga]=JPEG
+ Name[hi]=जेपीईजी
+ Name[hne]=जेपीईजी
++Name[hr]=jpeg
+ Name[hu]=JPEG
+ Name[is]=JPEG
+ Name[ja]=JPEG
+--- runtime/kioslave/thumbnail/thumbnail.h (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kioslave/thumbnail/thumbnail.h (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -56,6 +56,12 @@
+ bool createSubThumbnail(QImage& thumbnail, const QString& filePath,
+ int segmentWidth, int segmentHeight);
+
++ /**
++ * Scales down the image \p img in a way that it fits into the
++ * given maximum width and height.
++ */
++ void scaleDownImage(QImage& img, int maxWidth, int maxHeight);
++
+ private:
+ QString m_mimeType;
+ int m_width;
+@@ -70,6 +76,7 @@
+ QStringList m_enabledPlugins;
+ QSet<QString> m_propagationDirectories;
+ QString m_thumbBasePath;
++ qint64 m_maxFileSize;
+ };
--#ifdef HAVE_CLUCENE
-+#if defined(HAVE_CLUCENE) && defined(HAVE_SOPRANO_INDEX)
- #include "cluceneanalyzer.h"
#endif
+--- runtime/kioslave/thumbnail/desktopthumbnail.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kioslave/thumbnail/desktopthumbnail.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -18,6 +18,7 @@
+ Name[gl]=Ficheiros do escritorio
+ Name[gu]=ડેસ્કટોપ ફાઇલો
+ Name[hi]=डेस्कटॉप फ़ाइल
++Name[hr]=Datoteke radne površine
+ Name[hu]=Asztali fájlok
+ Name[is]=Skjáborðsskrár
+ Name[it]=File desktop
+--- runtime/kioslave/thumbnail/thumbnail.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kioslave/thumbnail/thumbnail.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -139,9 +139,11 @@
+ }
---- runtime/kurifilter-plugins/ikws/kuriikwsfilter.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/kuriikwsfilter.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -54,8 +54,8 @@
- Name[uz@cyrillic]=Интернет калит сўзлар филтери
- Name[vi]=Bộ lọc từ khoá Mạng
- Name[wa]=PasseteMotsclésDaegntoele
-+Name[xh]=Amagama Angundoqo ecebo lokucoca ulwelo e Internet
- Name[x-test]=xxInternetKeywordsFilterxx
--Name[xh]=Amagama Angundoqo ecebo lokucoca ulwelo e Internet
- Name[zh_CN]=互联网关键字过滤
- Name[zh_TW]=網際網路關鍵字過濾
- X-KDE-Library=kuriikwsfilter
---- runtime/kurifilter-plugins/ikws/searchprovider.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchprovider.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,8 +77,8 @@
- Comment[uz@cyrillic]=Қидириш воситаси
- Comment[vi]=Cơ chế Tìm kiếm
- Comment[wa]=Ricwerrece
-+Comment[xh]=Phendla Injini
- Comment[x-test]=xxSearch Enginexx
--Comment[xh]=Phendla Injini
- Comment[zh_CN]=搜索引擎
- Comment[zh_TW]=搜索引擎
-
---- runtime/kurifilter-plugins/ikws/searchproviders/alltheweb.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/alltheweb.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -44,8 +44,8 @@
- Name[uz@cyrillic]=Бутун вебни (тез)
- Name[vi]=Tìm mọi trang mạng nhanh
- Name[wa]=AllTheWeb roed
-+Name[xh]=Yonke i Web ngokukhawuleza
- Name[x-test]=xxAllTheWeb fastxx
--Name[xh]=Yonke i Web ngokukhawuleza
- X-KDE-ServiceTypes=SearchProvider
- Keys=atw,alltheweb
- Query=http://www.alltheweb.com/search?exec=FAST+Search&type=all&query=\\{@}&cat=web
---- runtime/kurifilter-plugins/ikws/searchproviders/bugft.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/bugft.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -72,8 +72,8 @@
- Name[uz@cyrillic]=KDE хато маълумот базаси (бутун матнни қидириш)
- Name[vi]=Tìm kiếm cơ sở dữ liệu lỗi của KDE, dùng toàn bộ dòng từ khoá đã nhập
- Name[wa]=Båze di dnêyes pol cweraedje di bugs di KDE dvins l' tecse
-+Name[xh]=Uphendlo lwesiseko sedata ye KDE Bug Olubhaliweyo ngokupheleleyo
- Name[x-test]=xxKDE Bug Database Fulltext Searchxx
--Name[xh]=Uphendlo lwesiseko sedata ye KDE Bug Olubhaliweyo ngokupheleleyo
+ ThumbnailProtocol::ThumbnailProtocol(const QByteArray &pool, const QByteArray &app)
+- : SlaveBase("thumbnail", pool, app)
++ : SlaveBase("thumbnail", pool, app),
++ m_iconSize(0),
++ m_maxFileSize(0)
+ {
+- m_iconSize = 0;
++
+ }
+
+ ThumbnailProtocol::~ThumbnailProtocol()
+@@ -280,14 +282,7 @@
+ }
+ }
+
+- if (img.width() > m_width || img.height() > m_height) {
+- double imgRatio = (double)img.height() / (double)img.width();
+- if (imgRatio > (double)m_height / (double)m_width) {
+- img = img.scaled( int(qMax((double)m_height / imgRatio, 1.0)), m_height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+- } else {
+- img = img.scaled(m_width, int(qMax((double)m_width * imgRatio, 1.0)), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+- }
+- }
++ scaleDownImage(img, m_width, m_height);
+
+ // ### FIXME
+ #ifndef USE_KINSTANCE
+@@ -499,6 +494,7 @@
+ // Directories that the directory preview will be propagated into if there is no direct sub-directories
+ const KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings");
+ m_propagationDirectories = globalConfig.readEntry("PropagationDirectories", QStringList() << "VIDEO_TS").toSet();
++ m_maxFileSize = globalConfig.readEntry("MaximumSize", 5 * 1024 * 1024); // 5 MByte default
+ }
+
+ const int tiles = 2; //Count of items shown on each dimension
+@@ -572,6 +568,12 @@
+ break; // Never show the same thumbnail twice
+ }
+
++ if (dir.fileInfo().size() > m_maxFileSize) {
++ // don't create thumbnails for files that exceed
++ // the maximum set file size
++ continue;
++ }
++
+ QImage subThumbnail;
+ if (!createSubThumbnail(subThumbnail, dir.filePath(), segmentWidth, segmentHeight)) {
+ continue;
+@@ -739,6 +741,8 @@
+ QString tempFileName;
+ bool savedCorrectly = false;
+ if (subCreator->create(filePath, cacheSize, cacheSize, thumbnail)) {
++ scaleDownImage(thumbnail, cacheSize, cacheSize);
++
+ // The thumbnail has been created successfully. Store the thumbnail
+ // to the cache for future access.
+ KTemporaryFile temp;
+@@ -764,4 +768,16 @@
+ return true;
+ }
+
++void ThumbnailProtocol::scaleDownImage(QImage& img, int maxWidth, int maxHeight)
++{
++ if (img.width() > maxWidth || img.height() > maxHeight) {
++ const double imgRatio = (double)img.height() / (double)img.width();
++ if (imgRatio > (double)maxHeight / (double)maxWidth) {
++ img = img.scaled( int(qMax((double)maxHeight / imgRatio, 1.0)), maxHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
++ } else {
++ img = img.scaled(maxWidth, int(qMax((double)maxWidth * imgRatio, 1.0)), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
++ }
++ }
++}
+
++
+--- runtime/kioslave/network/ioslave/network.protocol (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kioslave/network/ioslave/network.protocol (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -23,6 +23,7 @@
+ Description[fy]=In kioslave om it network troch te blêdzjen
+ Description[gl]=Un kioslave para navegar pola rede
+ Description[hi]=संजाल ब्राउज करने के लिए किओस्लेव
++Description[hr]=Kioslave za kretanje po mreži
+ Description[hu]=KDE-protokoll hálózatböngészéshez
+ Description[is]=kioslave fyrir flakk um netið
+ Description[it]=Un kioslave per navigare la rete
+--- runtime/kioslave/network/kded/networkwatcher.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kioslave/network/kded/networkwatcher.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -24,6 +24,7 @@
+ Name[gl]=Vixilante da rede
+ Name[gu]=નેટવર્ક દેખરેખ
+ Name[hi]=नेटवर्क वाचर
++Name[hr]=Nadzornik mreže
+ Name[hu]=Hálózatfigyelő
+ Name[is]=Netskoðunartól
+ Name[it]=Analizzatore di rete
+@@ -69,6 +70,7 @@
+ Comment[fr]=Conserve des enregistrements du réseaux et met à jours les contenus des dossiers pour le protocole « network:/ »
+ Comment[fy]=Hâld de netwurk en fernijings triemtafel listen fan it network:/ protocol yn de gaten
+ Comment[gl]=Vixía a rede e actualiza as listaxes de cartafoles do protocolo network:/
++Comment[hr]=Pazi na mrežu i ažurira popis direktorija protokola network:/
+ Comment[hu]=Figyeli a hálózat állapotát és frissíti a mappalistákat a network:/ protokollal
+ Comment[is]=Fylgist með netvirkni og uppfærir möppubreytingar með network:/ samskiptareglunni
+ Comment[it]=Tiene traccia della rete e aggiorna la lista delle cartelle del protocollo network:/
+--- runtime/kioslave/fish/fish.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kioslave/fish/fish.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -518,8 +518,7 @@
+ myDebug( << "select failed, rc: " << rc << ", error: " << strerror(errno) << endl);
+ return true;
+ }
+- while (FD_ISSET(childFd,&wfds) && outBufPos >= 0)
+- {
++ if (FD_ISSET(childFd,&wfds) && outBufPos >= 0) {
+ if (outBuf) rc = ::write(childFd,outBuf+outBufPos,outBufLen-outBufPos);
+ else rc = 0;
+ if (rc >= 0) outBufPos += rc;
+@@ -536,8 +535,7 @@
+ outBufLen = 0;
+ }
+ }
+- if (FD_ISSET(childFd,&rfds))
+- {
++ else if (FD_ISSET(childFd,&rfds)) {
+ rc = ::read(childFd,buf+offset,32768-offset);
+ if (rc > 0) {
+ int noff = establishConnection(buf,rc+offset);
+@@ -1445,19 +1443,13 @@
+ shutdownConnection();
+ return;
+ }
+- // We first write the complete buffer, including all newlines.
+- // Do: send command and newlines, expect response then
+- // Do not: send commands, expect response, send newlines, expect response on newlines
+- // Newlines do not trigger a response.
+- while (FD_ISSET(childFd,&wfds) && outBufPos >= 0)
+- {
++ if (FD_ISSET(childFd,&wfds) && outBufPos >= 0) {
+ #else
+- while (outBufPos >= 0)
+- {
++ if (outBufPos >= 0) {
+ #endif
+ #if 0
+ QString debug = QString::fromLatin1(outBuf+outBufPos,outBufLen-outBufPos);
+- myDebug( << "now writing " << (outBufLen-outBufPos) << " " << debug << endl);
++ myDebug( << "now writing " << (outBufLen-outBufPos) << " " << debug.left(40) << "..." << endl);
+ #endif
+ #ifndef Q_WS_WIN
+ if (outBufLen-outBufPos > 0) rc = ::write(childFd,outBuf+outBufPos,outBufLen-outBufPos);
+@@ -1487,10 +1479,10 @@
+ }
+ }
+ #ifndef Q_WS_WIN
+- if (FD_ISSET(childFd,&rfds)) {
++ else if (FD_ISSET(childFd,&rfds)) {
+ rc = ::read(childFd,buf+offset,32768-offset);
+ #else
+- if (childPid->waitForReadyRead(1000)) {
++ else if (childPid->waitForReadyRead(1000)) {
+ rc = childPid->read(buf+offset,32768-offset);
+ #endif
+ //myDebug( << "read " << rc << " bytes" << endl);
+--- runtime/kioslave/desktop/desktopnotifier.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kioslave/desktop/desktopnotifier.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -24,6 +24,7 @@
+ Name[gu]=KDE ડેસ્કટોપ ફોલ્ડર નોટિફાયર
+ Name[hi]=केडीईडी डेस्कटॉप फ़ोल्डर नोटिफ़ायर
+ Name[hne]=केडीईडी डेस्कटाप फोल्डर नोटिफायर
++Name[hr]=KDED Obavještavaoc mape radne površine
+ Name[hsb]=KDED notifier za zapisk 'Dźěłowy powjerch'
+ Name[hu]=KDED értesítő asztali mappákhoz
+ Name[is]=KDED skjáborðsmöpputilkynningar
+--- runtime/kioslave/desktop/directory.trash (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kioslave/desktop/directory.trash (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -27,6 +27,7 @@
+ Name[he]=אשפה
+ Name[hi]=रद्दी
+ Name[hne]=घुरुवा
++Name[hr]=Otpad
+ Name[hsb]=Papjernik
+ Name[hu]=Szemétkosár
+ Name[is]=Rusl
+--- runtime/solidautoeject/solidautoeject.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/solidautoeject/solidautoeject.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -19,6 +19,7 @@
+ Name[ga]=Seirbhís Díchurtha Uathoibríoch Solid
+ Name[gl]=Servizo de expulsión automática de Solid
+ Name[hi]=ठोस स्वतः बाहर निकालें सेवा
++Name[hr]=Solid usluga automatskog izbacivanja
+ Name[hu]=Solid automatikus lemezkilökő
+ Name[is]=Solid þjónusta fyrir sjálfvirka útspýtingu
+ Name[it]=Servizio di auto espulsione di Solid
+@@ -58,10 +59,11 @@
+ Comment[el]=Επιτρέπει την αυτόματη εξαγωγή μέσων σε οδηγούς όπου πιέστηκε το πλήκτρο εξαγωγής
+ Comment[es]=Permite liberar automáticamente los discos cuando se pulsa el botón de expulsión
+ Comment[et]=Võimaldab plaatidel automaatselt väljuda, kui vajutatakse väljastamisnuppu
+-Comment[fr]=Permet de libérer automatiquement les lecteurs de disque quand leur boutton d'éjection est pressé
++Comment[fr]=Permet de libérer automatiquement les lecteurs de disque quand leur bouton d'éjection est pressé
+ Comment[fy]=Stiet it automatysk ferlossen fan stjoerprogramma's ta as der op har útsmyt knop drukt wurdt
+ Comment[ga]=Ceadaíonn sé seo tiomántán a scaoileadh nuair a bhrúitear a chnaipe díchurtha
+ Comment[gl]=Permite expulsar automaticamente os dispositivos cando se lles preme o botón de abrir
++Comment[hr]=Dozvoljava automatsko izbacivanje uređaja nakon pritiska na njihovu tipku za izbacivanje
+ Comment[hu]=Lehetővé teszi meghajtók leválasztását a kilökés gombbal
+ Comment[is]=Leyfir að drif séu aftengd sjálfvirkt þegar ýtt er á útspýtingarhnapp þeirra
+ Comment[it]=Permette di liberare automaticamente i dispositivo rimovibili quando viene premuto il pulsante espelli
+--- runtime/nepomuk/kioslaves/search/searchfolder.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/nepomuk/kioslaves/search/searchfolder.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -27,7 +27,8 @@
+ #include <Soprano/Node> // for qHash( QUrl )
+
+ #include <Nepomuk/Variant>
+-
++#include <Nepomuk/Thing>
++#include <nepomuk/class.h>
+ #include <QtCore/QMutexLocker>
+
+ #include <KUrl>
+@@ -46,11 +47,11 @@
+ int start = name.lastIndexOf('.');
+ if (start != -1) {
+ // has a . somewhere, e.g. it has an extension
+- newName.insert(start, QString::number( i ));
++ newName.insert(start, QString( " (%1)" ).arg( i ));
+ }
+ else {
+ // no extension, just tack it on to the end
+- newName += QString::number( i );
++ newName += QString( " (%1)" ).arg( i );
+ }
+ return newName;
+ }
+@@ -78,8 +79,7 @@
+ m_query( query ),
+ m_initialListingFinished( false ),
+ m_slave( slave ),
+- m_listEntries( false ),
+- m_statingStarted( false )
++ m_listEntries( false )
+ {
+ kDebug() << name << QThread::currentThread();
+ Q_ASSERT( !name.isEmpty() );
+@@ -106,7 +106,7 @@
+
+ m_client = new Nepomuk::Search::QueryServiceClient();
+
+- // results signals are connected directly to update the results cache m_results
++ // results signals are connected directly to update the results cache m_resultsQueue
+ // and the entries cache m_entries, as well as emitting KDirNotify signals
+ // a queued connection is not possible since we have no event loop after the
+ // initial listing which means that queued signals would never get delivered
+@@ -116,11 +116,9 @@
+ connect( m_client, SIGNAL( entriesRemoved( const QList<QUrl>& ) ),
+ this, SLOT( slotEntriesRemoved( const QList<QUrl>& ) ),
+ Qt::DirectConnection );
+-
+- // slotFinishedListing needs to be called in the GUi thread
+ connect( m_client, SIGNAL( finishedListing() ),
+ this, SLOT( slotFinishedListing() ),
+- Qt::QueuedConnection );
++ Qt::DirectConnection );
+
+ m_client->query( m_query );
+ exec();
+@@ -134,38 +132,28 @@
+ {
+ kDebug() << m_name << QThread::currentThread();
+
+- m_listEntries = !m_initialListingFinished;
+- m_statEntry = false;
++ m_listEntries = true;
+
+ if ( !isRunning() ) {
+ start();
+ }
+- else {
+- // list all cached entries
+- for ( QHash<QString, SearchEntry*>::const_iterator it = m_entries.constBegin();
+- it != m_entries.constEnd(); ++it ) {
+- m_slave->listEntry( ( *it )->entry(), false );
+- }
+
+- // if there is nothing more to list...
+- if ( m_initialListingFinished &&
+- m_results.isEmpty() ) {
+- m_slave->listEntry( KIO::UDSEntry(), true );
+- m_slave->finished();
+- }
+- else {
+- m_listEntries = true;
+- }
++ // list all cached entries
++ kDebug() << "listing" << m_entries.count() << "cached entries";
++ for ( QHash<QString, SearchEntry*>::const_iterator it = m_entries.constBegin();
++ it != m_entries.constEnd(); ++it ) {
++ m_slave->listEntry( ( *it )->entry(), false );
+ }
+
+- // if we have more to list
+- if ( m_listEntries ) {
+- if ( !m_statingStarted ) {
+- QTimer::singleShot( 0, this, SLOT( slotStatNextResult() ) );
+- }
+- kDebug() << "entering loop" << m_name << QThread::currentThread();
+- m_loop.exec();
+- }
++ // list all results
++ statResults();
++
++ kDebug() << "listing done";
++
++ m_listEntries = false;
++
++ m_slave->listEntry( KIO::UDSEntry(), true );
++ m_slave->finished();
+ }
+
+
+@@ -173,37 +161,34 @@
+ {
+ kDebug() << name;
+
++ m_listEntries = false;
++
+ if ( SearchEntry* entry = findEntry( name ) ) {
+ m_slave->statEntry( entry->entry() );
+ m_slave->finished();
+ }
+- else if ( !isRunning() ||
+- !m_results.isEmpty() ) {
+- m_nameToStat = name;
+- m_statEntry = true;
+- m_listEntries = false;
+-
+- if ( !isRunning() ) {
+- start();
+- }
+-
+- if ( !m_statingStarted ) {
+- QTimer::singleShot( 0, this, SLOT( slotStatNextResult() ) );
+- }
+- m_loop.exec();
+- }
+ else {
+ m_slave->error( KIO::ERR_DOES_NOT_EXIST, "nepomuksearch:/" + m_name + '/' + name );
+ }
+ }
+
+
+-Nepomuk::SearchEntry* Nepomuk::SearchFolder::findEntry( const QString& name ) const
++Nepomuk::SearchEntry* Nepomuk::SearchFolder::findEntry( const QString& name )
+ {
+ kDebug() << name;
+
+- QHash<QString, SearchEntry*>::const_iterator it = m_entries.find( name );
+- if ( it != m_entries.end() ) {
++ //
++ // get all results in case we do not have them already
++ //
++ if ( !isRunning() )
++ start();
++ statResults();
++
++ //
++ // search for the one we need
++ //
++ QHash<QString, SearchEntry*>::const_iterator it = m_entries.constFind( name );
++ if ( it != m_entries.constEnd() ) {
+ kDebug() << "-----> found";
+ return *it;
+ }
+@@ -214,7 +199,7 @@
+ }
+
+
+-Nepomuk::SearchEntry* Nepomuk::SearchFolder::findEntry( const KUrl& url ) const
++Nepomuk::SearchEntry* Nepomuk::SearchFolder::findEntry( const KUrl& url )
+ {
+ // FIXME
+ return 0;
+@@ -227,7 +212,7 @@
+ kDebug() << m_name << QThread::currentThread();
+
+ m_resultMutex.lock();
+- m_results += results;
++ m_resultsQueue += results;
+ m_resultMutex.unlock();
+
+ if ( m_initialListingFinished ) {
+@@ -235,6 +220,10 @@
+ kDebug() << ( "Informing about change in folder nepomuksearch:/" + m_name );
+ org::kde::KDirNotify::emitFilesAdded( "nepomuksearch:/" + m_name );
+ }
++ else {
++ kDebug() << "Waking main thread";
++ m_resultWaiter.wakeAll();
++ }
+ }
+
+
+@@ -263,25 +252,19 @@
+ void Nepomuk::SearchFolder::slotFinishedListing()
+ {
+ kDebug() << m_name << QThread::currentThread();
++ QMutexLocker lock( &m_resultMutex );
+ m_initialListingFinished = true;
+- wrap();
++ m_resultWaiter.wakeAll();
+ }
+
+
+ // always called in main thread
+-void Nepomuk::SearchFolder::slotStatNextResult()
++void Nepomuk::SearchFolder::statResults()
+ {
+-// kDebug();
+- m_statingStarted = true;
+-
+ while ( 1 ) {
+- // never lock the mutex for the whole duration of the method
+- // since it may start an event loop which can result in more
+- // newEntries signals to be delivered which would result in
+- // a deadlock
+ m_resultMutex.lock();
+- if( !m_results.isEmpty() ) {
+- Search::Result result = m_results.dequeue();
++ if ( !m_resultsQueue.isEmpty() ) {
++ Search::Result result = m_resultsQueue.dequeue();
+ m_resultMutex.unlock();
+ SearchEntry* entry = statResult( result );
+ if ( entry ) {
+@@ -289,74 +272,73 @@
+ kDebug() << "listing" << entry->resource();
+ m_slave->listEntry( entry->entry(), false );
+ }
+- else if ( m_statEntry ) {
+- if ( m_nameToStat == entry->entry().stringValue( KIO::UDSEntry::UDS_NAME ) ) {
+- kDebug() << "stating" << entry->resource();
+- m_nameToStat.clear();
+- m_slave->statEntry( entry->entry() );
+- }
+- }
+ }
+ }
++ else if ( !m_initialListingFinished ) {
++ m_resultWaiter.wait( &m_resultMutex );
++ m_resultMutex.unlock();
++ }
+ else {
+- m_resultMutex.unlock();
+ break;
+ }
+ }
+-
+- if ( !m_results.isEmpty() ||
+- !m_initialListingFinished ) {
+- // we need to use the timer since statResource does only create an event loop
+- // for files, not for arbitrary resources.
+- QTimer::singleShot( 0, this, SLOT( slotStatNextResult() ) );
+- }
+- else {
+- m_statingStarted = false;
+- wrap();
+- }
+ }
+
+
+-// always called in main thread
+-void Nepomuk::SearchFolder::wrap()
+-{
+- kDebug() << m_name << QThread::currentThread();
++namespace {
++ /**
++ * Stat a file.
++ *
++ * \param url The url of the file
++ * \param success will be set to \p true if the stat was successful
++ */
++ KIO::UDSEntry statFile( const KUrl& url, bool& success )
++ {
++ success = false;
++ KIO::UDSEntry uds;
+
+- if ( m_results.isEmpty() &&
+- m_initialListingFinished &&
+- m_loop.isRunning() ) {
+- if ( m_listEntries ) {
+- kDebug() << "listing done";
+- m_slave->listEntry( KIO::UDSEntry(), true );
+- m_slave->finished();
+- }
+- else if ( m_statEntry ) {
+- if ( !m_nameToStat.isEmpty() ) {
+- // if m_nameToStat is not empty the name was not found during listing which means that
+- // it does not exist
+- m_slave->error( KIO::ERR_DOES_NOT_EXIST, "nepomuksearch:/" + m_name + '/' + m_nameToStat );
+- m_nameToStat.clear();
++ if ( !url.isEmpty() &&
++ url.scheme() != "akonadi" &&
++ url.scheme() != "nepomuk" ) { // do not stat akonadi resouces here, way too slow, even hangs if akonadi is not running
++ kDebug() << "listing file" << url;
++ if ( KIO::StatJob* job = KIO::stat( url, KIO::HideProgressInfo ) ) {
++ job->setAutoDelete( false );
++ if ( KIO::NetAccess::synchronousRun( job, 0 ) ) {
++ uds = job->statResult();
++ if ( url.isLocalFile() ) {
++ uds.insert( KIO::UDSEntry::UDS_LOCAL_PATH, url.toLocalFile() );
++ }
++ success = true;
++ }
++ else {
++ kDebug() << "failed to stat" << url;
++ }
++ delete job;
+ }
+- else
+- m_slave->finished();
+ }
+
+- m_statingStarted = false;
+- m_listEntries = false;
+- m_statEntry = false;
+- kDebug() << m_name << QThread::currentThread() << "exiting loop";
+- m_loop.exit();
++ return uds;
+ }
++
++
++ /**
++ * Workaround a missing Nepomuk::Variant feature which is in trunk but not in 4.3.0.
++ */
++ QUrl extractUrl( const Nepomuk::Variant& v ) {
++ QList<Nepomuk::Resource> rl = v.toResourceList();
++ if ( !rl.isEmpty() )
++ return rl.first().resourceUri();
++ return QUrl();
++ }
+ }
+
+-
+ // always called in main thread
+ Nepomuk::SearchEntry* Nepomuk::SearchFolder::statResult( const Search::Result& result )
+ {
+- kDebug() << result.resourceUri();
+-
+- KIO::UDSEntry uds;
+-
++ //
++ // First we check if the resource is a file itself. For that we first get
++ // the URL (being backwards compatible with Xesam data) and then stat that URL
++ //
+ KUrl url = result[Nepomuk::Vocabulary::NIE::url()].uri();
+ if ( url.isEmpty() ) {
+ url = result[Soprano::Vocabulary::Xesam::url()].uri();
+@@ -364,36 +346,49 @@
+ url = result.resourceUri();
+ }
+ bool isFile = false;
+- if ( !url.isEmpty() && url.scheme() != "akonadi" ) { // do not stat akonadi resouces here, way too slow, even hangs if akonadi is not running
+- kDebug() << "listing file" << url;
+- if ( KIO::StatJob* job = KIO::stat( url, KIO::HideProgressInfo ) ) {
+- job->setAutoDelete( false );
+- if ( KIO::NetAccess::synchronousRun( job, 0 ) ) {
+- uds = job->statResult();
+- if ( url.isLocalFile() ) {
+- uds.insert( KIO::UDSEntry::UDS_LOCAL_PATH, url.toLocalFile() );
+- }
+- isFile = true;
+- }
+- else {
+- kDebug() << "failed to stat" << url;
+- }
+- delete job;
+- }
++ KIO::UDSEntry uds = statFile( url, isFile );
++
++
++ if ( isFile ) {
++ uds.insert( KIO::UDSEntry::UDS_TARGET_URL, url.url() );
+ }
+
+ //
+- // The nepomuk resource listing is the same as in the nepomuk kio slave.
+- // So either only depend on that or let the nepomuk kio slave fail on each
+- // stat. (the latter means that we need the nepomuk kio slave in kdebase)
++ // If it is not a file we get inventive:
++ // In case it is a pimo thing, we see if it has a grounding occurrence
++ // which is a file. If so, we merge the two by taking the file URL and the thing's
++ // label and icon if set
+ //
+- if ( !isFile ) {
++ else {
+ kDebug() << "listing resource" << result.resourceUri();
+
++ //
++ // We only create a resource here since this is a rather slow process and
++ // a lot of file results could become slow then.
++ //
+ Nepomuk::Resource res( result.resourceUri() );
+
+- QString name = res.genericLabel();
++ //
++ // let's see if it is a pimo thing which refers to a file
++ //
++ bool isPimoThingLinkedFile = false;
++ if ( res.pimoThing() == res ) {
++ if ( !res.pimoThing().groundingOccurrences().isEmpty() ) {
++ Nepomuk::Resource fileRes = res.pimoThing().groundingOccurrences().first();
++ url = extractUrl( fileRes.property( Nepomuk::Vocabulary::NIE::url() ) );
++ if ( url.isEmpty() ) {
++ url = extractUrl( fileRes.property( Soprano::Vocabulary::Xesam::url() ) );
++ if ( url.isEmpty() )
++ url = result.resourceUri();
++ }
++ uds = statFile( url, isPimoThingLinkedFile );
++ }
++ }
+
++ QString name = res.label();
++ if ( name.isEmpty() && !isPimoThingLinkedFile )
++ name = res.genericLabel();
++
+ // make sure name is not the URI (which is the fallback of genericLabel() and will lead to crashes in KDirModel)
+ if ( name.contains( '/' ) ) {
+ name = name.section( '/', -1 );
+@@ -403,28 +398,45 @@
+ name = res.resourceUri().toString().replace( '/', '_' );
+ }
+
+- uds.insert( KIO::UDSEntry::UDS_NAME, name );
+- uds.insert( KIO::UDSEntry::UDS_DISPLAY_NAME, name );
++ //
++ // We always use the pimo things label, even if it points to a file
++ //
++ if ( !name.isEmpty() ) {
++ uds.insert( KIO::UDSEntry::UDS_NAME, name );
++ uds.insert( KIO::UDSEntry::UDS_DISPLAY_NAME, name );
++ }
+
++ //
++ // An icon set on the pimo thing overrides the file's icon
++ //
+ QString icon = res.genericIcon();
+ if ( !icon.isEmpty() ) {
+ uds.insert( KIO::UDSEntry::UDS_ICON_NAME, icon );
+ }
+- else {
++ else if ( !isPimoThingLinkedFile ) {
+ uds.insert( KIO::UDSEntry::UDS_ICON_NAME, "nepomuk" );
+ }
+
+- uds.insert( KIO::UDSEntry::UDS_CREATION_TIME, res.property( Soprano::Vocabulary::NAO::created() ).toDateTime().toTime_t() );
++ //
++ // Generate some dummy values
++ //
++ if ( !isPimoThingLinkedFile ) {
++ uds.insert( KIO::UDSEntry::UDS_CREATION_TIME, res.property( Soprano::Vocabulary::NAO::created() ).toDateTime().toTime_t() );
++ uds.insert( KIO::UDSEntry::UDS_ACCESS, 0700 );
++ uds.insert( KIO::UDSEntry::UDS_USER, KUser().loginName() );
++// uds.insert( KIO::UDSEntry::UDS_MIME_TYPE, "application/x-nepomuk-resource" );
++ }
+
+- uds.insert( KIO::UDSEntry::UDS_ACCESS, 0700 );
+- uds.insert( KIO::UDSEntry::UDS_USER, KUser().loginName() );
+-
+-// uds.insert( KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR );
+- uds.insert( KIO::UDSEntry::UDS_MIME_TYPE, "application/x-nepomuk-resource" );
++ //
++ // Although in KDE 4.3 the target url is sort of deprecated, we still set it.
++ // Cannot hurt.
++ //
++ if ( isPimoThingLinkedFile )
++ uds.insert( KIO::UDSEntry::UDS_TARGET_URL, url.url() );
++ else
++ uds.insert( KIO::UDSEntry::UDS_TARGET_URL, result.resourceUri().toString() );
+ }
+
+- uds.insert( KIO::UDSEntry::UDS_TARGET_URL, result.resourceUri().toString() );
+-
+ //
+ // make sure we have no duplicate names
+ //
+--- runtime/nepomuk/kioslaves/search/kio_nepomuksearch.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/nepomuk/kioslaves/search/kio_nepomuksearch.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -347,7 +347,7 @@
+ KDE_EXPORT int kdemain( int argc, char **argv )
+ {
+ // necessary to use other kio slaves
+- KComponentData( "kio_nepomuksearch" );
++ KComponentData comp( "kio_nepomuksearch" );
+ QCoreApplication app( argc, argv );
+
+ if ( Nepomuk::ResourceManager::instance()->init() ) {
+--- runtime/nepomuk/kioslaves/search/searchfolder.h (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/nepomuk/kioslaves/search/searchfolder.h (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -25,6 +25,7 @@
+ #include <QtCore/QEventLoop>
+ #include <QtCore/QQueue>
+ #include <QtCore/QMutex>
++#include <QtCore/QWaitCondition>
+
+ #include "term.h"
+ #include "result.h"
+@@ -73,17 +74,21 @@
+ QString name() const { return m_name; }
+ QList<SearchEntry*> entries() const { return m_entries.values(); }
+
+- SearchEntry* findEntry( const QString& name ) const;
+- SearchEntry* findEntry( const KUrl& url ) const;
++ SearchEntry* findEntry( const QString& name );
++ SearchEntry* findEntry( const KUrl& url );
+
+ void list();
+ void stat( const QString& name );
+
+ private Q_SLOTS:
++ /// connected to the QueryServiceClient in the search thread
+ void slotNewEntries( const QList<Nepomuk::Search::Result>& );
++
++ /// connected to the QueryServiceClient in the search thread
+ void slotEntriesRemoved( const QList<QUrl>& );
++
++ /// connected to the QueryServiceClient in the search thread
+ void slotFinishedListing();
+- void slotStatNextResult();
+
+ private:
+ // reimplemented from QThread -> does handle the query
+@@ -93,17 +98,24 @@
+ void run();
+
+ /**
++ * This method will stat all entries in m_resultsQueue until
++ * the search thread is finished. It is run in the main thread.
++ */
++ void statResults();
++
++ /**
+ * Stats the result and returns the entry.
+ */
+ SearchEntry* statResult( const Search::Result& result );
+- void wrap();
+
+ // folder properties
+ QString m_name;
+ Search::Query m_query;
+
+- // result cache
+- QQueue<Search::Result> m_results;
++ // result cache, filled by the search thread
++ QQueue<Search::Result> m_resultsQueue;
++
++ // final results, filled by the main thread in statResults
+ QHash<QString, SearchEntry*> m_entries;
+ QHash<QUrl, QString> m_resourceNameMap;
+
+@@ -119,27 +131,16 @@
+ // the parent slave used for listing and stating
+ KIO::SlaveBase* m_slave;
+
+- // if set, this is the name that was requested through
+- // stat(). Used during initial listing when not all results
+- // are available yet
+- QString m_nameToStat;
+-
+- // true if stating of an entry has been requested (name of entry in m_nameToStat)
+- bool m_statEntry;
+-
+ // true if listing of entries has been requested
+ bool m_listEntries;
+
+- // true if the stat loop is running
+- bool m_statingStarted;
+-
+- // used to make all calls sync
+- QEventLoop m_loop;
+-
+ Search::QueryServiceClient* m_client;
+
+ // mutex to protect the results
+ QMutex m_resultMutex;
++
++ // used to wait in the main thread for the serch thread to deliver results
++ QWaitCondition m_resultWaiter;
+ };
+ }
+
+--- runtime/nepomuk/services/ontologyloader/nepomukontologyloader.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/nepomuk/services/ontologyloader/nepomukontologyloader.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -26,6 +26,7 @@
+ Name[gu]=નેપોમુક ઓન્ટોલોજી લાવનાર
+ Name[hi]=नेपोमक ऑन्टोलॉज़ी लोडर
+ Name[hne]=नेपोमक ओन्टोलोजी लोडर
++Name[hr]=Nepomuk Učitavač Ontologije
+ Name[hsb]=Nepomuk začitanje ontologije
+ Name[hu]=Nepomuk ontológiabetöltő
+ Name[is]=Nepomuk verufræðihöndlari (Ontology Loader)
+@@ -85,6 +86,7 @@
+ Comment[gl]=O servizo de Nepomuk que mantén as ontoloxías que teña instaladas no sistema
+ Comment[gu]=નેપોમુક સેવા જે સિસ્ટમમાં સ્થાપિત થયેલ ઓન્ટોલોજીની જાળવણી કરે છે
+ Comment[hne]=नेपोमक सेवा जउन सिस्टम मं इस्टाल ओन्टोलोजी मन ल मेंटेन करथे
++Comment[hr]=Nepomukova usluga koja održava ontologije instalirane na sustav
+ Comment[hsb]=Nepomukowa słužba, kiž so stara wo instalowane ontologije
+ Comment[hu]=Nepomuk-szolgáltatás a rendszer ontológiáinak karbantartásához
+ Comment[is]=Nepomuk þjónusta sem viðheldur þeim verufræðitengingum (ontologies) sem uppsettar eru á kerfinu
+--- runtime/nepomuk/services/strigi/nepomukstrigiservice.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/nepomuk/services/strigi/nepomukstrigiservice.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -94,6 +94,7 @@
+ Comment[ga]=An tSeirbhís Nepomuk a rialaíonn an strigidaemon, .i. a dhéanann innéacsú de chomhaid ar an deasc
+ Comment[gl]=Un servido de Nepomuk que controla o daemon de strigi, i.e. indexa os ficheiros do escritorio
+ Comment[gu]=નેપોમુક સેવા જે સ્ટ્રિગિડેમનને નિયંત્રિત કરે છે, દા.ત. ડેસ્કટોપ પર ફાઇલોને અનુક્રમિત કરવી
++Comment[hr]=Nepomukova usluga koja upravlja strigidaemonom, tj. indeksira datoteke na računalu
+ Comment[hsb]=Nepomukowa słužba za strigidemon, to su indeksowe dataje na dźěłowym powjerchu
+ Comment[hu]=A Strigi szolgáltatást kezeli, amely fájlok indexelését végzi
+ Comment[is]=Nepomuk þjónusta sem stýrir strigidaemon, þ.e. býr til yfirlit um skrár á skjáborði
+--- runtime/nepomuk/services/strigi/nepomukstrigiservice.notifyrc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/nepomuk/services/strigi/nepomukstrigiservice.notifyrc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -22,6 +22,7 @@
+ Comment[gu]=નેપોમુક સ્ટ્રિગિ ફાઇલ ઇન્ડેક્સર
+ Comment[hi]=नेपोमक स्ट्रिगी फ़ाइल सूची बनाने वाला
+ Comment[hne]=नेपोमक स्ट्रिगि फाइल सूची बनइया
++Comment[hr]=Nepomuk Strigi indekser datoteka
+ Comment[hsb]=Nepomukowy strigi-indekser za dataje
+ Comment[hu]=Nepomuk Strigi fájlindexelő
+ Comment[is]=Nepomuk Strigi skráayfirlitsgerð
+@@ -87,6 +88,7 @@
+ Name[he]=החל תהליך האינדוקס הראשוני
+ Name[hi]=आरंभिक सूची बनाना प्रारंभ हो गया
+ Name[hne]=सूची बनाना सुरू हो गे
++Name[hr]=Prvotno indeksiranje je započelo
+ Name[hsb]=Prěnje tworjenje indeksa startowane
+ Name[hu]=A kezdeti index elkészítése folyik
+ Name[is]=Gerð upphafsyfirlits er hafin
+@@ -147,6 +149,7 @@
+ Comment[gl]=Strigi comezou a indexación inicial dos ficheiros locais para facer procuras rápidas no escritorio
+ Comment[gu]=સ્ટ્રીગીએ ઝડપી ડેસ્કટોપ શોધ માટે સ્થાનિક ફાઇલોનું શરૂઆતી ઇન્ડેક્સીંગ ચાલુ કર્યું છે
+ Comment[hne]=डेस्कटाप मं तेजी से खोजे बर स्ट्रिगि हर लोकल फाइल के सूची बनाय बर चालू कर दिस
++Comment[hr]=Strigi je započeo prvotno indeksiranje lokalnih datoteka za brzo pretraživanje računala
+ Comment[hsb]=Strigi je prěnje tworjenje indeksa za lokalne dataje startował, za spěšne pytanje na dźěłowym powjerchu
+ Comment[hu]=A Strigi fájlindexelő elkészítette a kezdeti helyi indexet
+ Comment[is]=Strigi hóf gerð upphafsyfirlits um skrár á tölvunni til að styðja við hraðar skjáborðsleitir
+@@ -210,6 +213,7 @@
+ Name[he]=תהליך האינדוקס הראשוני הסתיים
+ Name[hi]=आरंभिक सूची बना लिया गया
+ Name[hne]=सुरू के सूची बनाए के काम पूरा हो गे
++Name[hr]=Prvotno indeksiranje je završilo
+ Name[hsb]=Prěni indeks dotwarjeny
+ Name[hu]=A kiindulási index elkészült
+ Name[is]=Gerð upphafsyfirlits er lokið
+@@ -270,6 +274,7 @@
+ Comment[gl]=Strigi rematou a indexación inicial dos ficheiros locais para facer procuras rápidas no escritorio
+ Comment[gu]=સ્ટ્રીગીએ ઝડપી ડેસ્કટોપ શોધ માટે સ્થાનિક ફાઇલોનું શરૂઆતી ઇન્ડેક્સીંગ પૂર્ણ કર્યું છે
+ Comment[hne]=तेज डेस्कटाप खोज बर स्ट्रिगि सुरु के इंडेक्सिंग लोकल फाइल बर पूरा कर लिस
++Comment[hr]=Strigi je završio prvotno indeksiranje lokalnih datoteka za brzo pretraživanje računala
+ Comment[hsb]=Strigi je prěnje tworjenje indeksa za lokalne dataje zakónčił, za spěšne pytanje na dźěłowym powjerchu
+ Comment[hu]=A Strigi fájlindexelő elkészítette a kezdeti helyi indexet
+ Comment[is]=Strigi hefur lokið gerð upphafsyfirlits um skrár á tölvunni til að styðja við hraðar skjáborðsleitir
+@@ -333,6 +338,7 @@
+ Name[he]=האינדוקס הופסק
+ Name[hi]=सूची बनाना निलंबित
+ Name[hne]=इंडेक्सिंग सस्पेंड हे
++Name[hr]=Indeksiranje je pauzirano
+ Name[hsb]=Tworjenje indeksa zastajene
+ Name[hu]=Az indexelés felfüggesztve
+ Name[is]=Hætt við yfirlitsgerð
+@@ -393,6 +399,7 @@
+ Comment[gu]=સ્ટ્રીગીએ ફાઇલ ઇન્ડેક્સીંગ બંધ કરવામાં આવ્યું છે
+ Comment[hi]=स्ट्रिगी फ़ाइल सूची बनाना निलंबित किया गया है
+ Comment[hne]=स्ट्रिगि फाइल इन्डेक्सिंग सस्पेंड हे
++Comment[hr]=Strigi indeksiranje datoteka je pauzirano
+ Comment[hsb]=Indeksowanje Strigija bu zastajene
+ Comment[hu]=A Strigi fájlindexelő felfüggesztve
+ Comment[is]=Gerð skráayfirlits með Strigi hefur verið frestað
+@@ -458,6 +465,7 @@
+ Name[he]=האינדוקס הומשך
+ Name[hi]=सूची बनाना पुनरारंभ
+ Name[hne]=इन्डेक्सिंग वापस चालू
++Name[hr]=Indeksiranje nastavljeno
+ Name[hsb]=Indeks so dale twari
+ Name[hu]=Az indexelés folytatódik
+ Name[is]=Yfirlitsgerð er hafin aftur
+@@ -518,6 +526,7 @@
+ Comment[gu]=સ્ટ્રીગીએ ફાઇલ ઇન્ડેક્સીંગ પુન: શરૂ કરવામાં આવ્યું છે
+ Comment[hi]=स्ट्रिगी फ़ाइल सूची बनाना पुनरारंभ
+ Comment[hne]=स्ट्रिगि फाइल इन्डेक्सिंग वापस चालू होगे
++Comment[hr]=Strigi indeksiranje datoteka je nastavljeno
+ Comment[hsb]=Twarjenje indeksa za Strigi so pokročuje
+ Comment[hu]=A Strigi fájlindexelő futása folytatódik
+ Comment[is]=Gerð skráayfirlits með Strigi er hafin aftur
+--- runtime/nepomuk/services/storage/nepomukstorage.notifyrc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/nepomuk/services/storage/nepomukstorage.notifyrc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -25,6 +25,7 @@
+ Name[he]=שירותי אחסון של Nepomuk
+ Name[hi]=नेपोमक डाटा भंडार
+ Name[hne]=नेपोमक डाटा भंडार
++Name[hr]=Nepomuk Pohrana Podataka
+ Name[hsb]=Nepomuk składowanje datow
+ Name[hu]=Nepomuk adattároló
+ Name[is]=Nepomuk gagnageymsla
+@@ -87,6 +88,7 @@
+ Comment[he]=שירותי האחסון המידע של Nepomuk
+ Comment[hi]=नेपोमक भंडार सेवा
+ Comment[hne]=नेपोमक भंडार सेवा
++Comment[hr]=Nepomuk Usluga Pohrane
+ Comment[hsb]=Nepomuk Storage Service
+ Comment[hu]=Nepomuk-tároló
+ Comment[is]=Nepomuk gagnageymslumiðlari
+@@ -151,6 +153,7 @@
+ Name[he]=בונה מחדש את האינדקס של Neapomuk
+ Name[hi]=नेपोमक निर्देशिका फिर से बनाया जा रहा है
+ Name[hne]=नेपोमक सूची फिर से बनावत हे
++Name[hr]=Ponovno izgrađujem Nepomukov index
+ Name[hsb]=Indeks za Nepomuk znowa natwarjam
+ Name[hu]=Az index újraépítése
+ Name[is]=Endurbyggi Nepomuk yfirlit
+@@ -208,6 +211,7 @@
+ Comment[gl]=O índice de procuras de texto completo de Nepomuk está a ser reconstruído para dispor de novas funcionalidades
+ Comment[gu]=નવી લાક્ષણિકતાઓ માટે નેપોમુક પૂર્ણ લખાણ શોધ અનુક્રમણિકા ફરી બની રહી છે
+ Comment[hne]=नवा फीचर बर नेपोमक पूरा पाठ खोज सूची फिर से बनावत हे
++Comment[hr]=Nepomukov index pretrage punog teksta je ponovno izgrađen s novim mogućnostima
+ Comment[hsb]=Nepomukowy indeks za połnotekstowe pytanje so znowa natwarja za instalowanje nowych móžnosćow
+ Comment[hu]=A Nepomuk kereső újraépíti az indexet strukturális változások miatt
+ Comment[is]=Yfirlit Nepomuk um leit í öllum texta er endurbyggt vegna nýrra möguleika
+@@ -270,6 +274,7 @@
+ Name[gu]=નેપોમુક અનુક્રમ ફરી બનાવવાનું પૂર્ણ
+ Name[hi]=नेपोमक निर्देशिका फिर से बना लिया गया
+ Name[hne]=नेपोमक सूची फिर से बन गिस
++Name[hr]=Ponovna izgradnja Nepomukovog indeksa je završila.
+ Name[hsb]=Indeks za Nepomuk znowa natwarjeny
+ Name[hu]=Az index frissítése befejeződött
+ Name[is]=Endurbygging Nepomuk yfirlits er lokið
+@@ -329,6 +334,7 @@
+ Comment[gu]=નેપોમુક પૂર્ણ લખાણ શોધ અનુક્રમણિકા બનાવવાનું પૂર્ણ થયેલ છે.
+ Comment[hi]=नेपोमक पूरा पाठ खोज निर्देशिका फिर से बना लिया गया
+ Comment[hne]=नेपोमक पूरा पाठ खोज सूची फिर से बन गिस
++Comment[hr]=Ponovna izgradnja Nepomukovog indeksa pretrage punog teksta je završila.
+ Comment[hsb]=Nepomukowy indeks za połnotekstowe pytanje je donatwarjeny
+ Comment[hu]=Az index frissítése befejeződött.
+ Comment[is]=Endurbygging yfirlits Nepomuk um leit í öllum texta er lokið.
+@@ -391,6 +397,7 @@
+ Name[gu]=નેપોમુક માહિતી ફેરવે છે
+ Name[hi]=नेपोमक डाटा बदला जा रहा है
+ Name[hne]=नेपोमक डाटा ल बदलत हे
++Name[hr]=Pretvaram Nepomukove podatke
+ Name[hsb]=Konwertěruju Nepomukowe daty
+ Name[hu]=Indexadatok konvertálása folyik
+ Name[is]=Umbreyti Nepomuk gögnum
+@@ -449,6 +456,7 @@
+ Comment[gu]=બધી નેપોમુક માહિતી નવાં સંગ્રહ બેકએન્ડમાં ફેરવાઇ ગઇ છે
+ Comment[hi]=सभी नेपोमक डाटा को नया भंडार बैकएण्ड में परिवर्तित कर लिया गया
+ Comment[hne]=नवा भंडार बेकएन्ड मं सब्बो नेपोमक डाटा बदल गे हे
++Comment[hr]=Svi Nepomukovi podaci su pretvoreni u format novog načina pohrane
+ Comment[hsb]=Wšě Nepomukowe daty buchu za nowy składowanski backend konwertěrowane
+ Comment[hu]=Sikerült átkonvertálni minden adatot az új tárolómodul számára
+ Comment[is]=Öllum Nepomuk er umbreytt fyrir nýja geymslubakendann
+@@ -511,6 +519,7 @@
+ Name[gu]=નેપોમુક માહિતી ફેરવવાનું નિષ્ફળ
+ Name[hi]=नेपोमक डाटा परिवर्तित करने में असफल
+ Name[hne]=नेपोमक डाटा ल बदले मं फेल होगे
++Name[hr]=Pretvaranje Nepomukovih podataka nije uspjelo.
+ Name[hsb]=Konwertěrowanje Nepomukowych datow zwrěšćene
+ Name[hu]=Adatkonvertálási hiba történt a Nepomukban
+ Name[is]=Umbreyting Nepomuk gagna mistókst
+@@ -570,6 +579,7 @@
+ Comment[gu]=નેપોમુક માહિતીને નવાં બેકએન્ડમાં ફેરવવાનું નિષ્ફળ ગયું
+ Comment[hi]=नेपोमक डाटा को नए बैकएण्ड में परिवर्तित करने में असफल
+ Comment[hne]=नेपोमक डाटा ल नवा बेकएंड मं बदले मं फेल होगे
++Comment[hr]=Pretvaranje Nepomukovih podataka u novi format nije uspjelo.
+ Comment[hsb]=Konwertěrowanje Nepomukowych datow za nowy backend je zwrěšćiło.
+ Comment[hu]=Ne sikerült átkonvertálni Nepomuk-adatokat egy új kezelőmodul számára
+ Comment[is]=Umbreyting Nepomuk gagna fyrir nýjan bakenda mistókst
+@@ -632,6 +642,7 @@
+ Name[gu]=નેપોમુક માહિતી ફેરવવાનું પૂર્ણ
+ Name[hi]=नेपोमक डाटा परिवर्तित हो गया
+ Name[hne]=नेपोमक डाटा बदल दे गिस
++Name[hr]=Pretvarane Nepomukovih podataka je završilo.
+ Name[hsb]=Konwertěrowanje Nepomukowych datow zakónčene
+ Name[hu]=Nepomuk adatkonverzió befejeződött
+ Name[is]=Umbreyting Nepomuk gagna er lokið
+@@ -691,6 +702,7 @@
+ Comment[gu]=નેપોમુક માહિતીને નવા બેકએન્ડમાં સફળતાપૂર્વક ફેરવી દેવામાં આવી
+ Comment[hi]=नेपोमक डाटा को नए बैकएण्ड में सफलतापूर्वक परिवर्तित किया गया
+ Comment[hne]=नवा बेकएंड मं नेपोमक डाटा ल सफलता से बदल दे गिस
++Comment[hr]=Nepomukovi podaci su uspješno pretvoreni u novi format.
+ Comment[hsb]=Konwertěrowanje Nepomukowych datow za nowy backend wuspěšne.
+ Comment[hu]=Sikerült átkonvertálni minden Nepomuk-adatot az új tárolómodulhoz
+ Comment[is]=Umbreyting Nepomuk gagna fyrir nýjan bakenda tókst
+--- runtime/nepomuk/services/storage/repository.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/nepomuk/services/storage/repository.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -279,6 +279,7 @@
+
+ void Nepomuk::Repository::rebuildingIndexFinished()
+ {
++#if defined(HAVE_SOPRANO_INDEX) && defined(HAVE_CLUCENE) && SOPRANO_IS_VERSION(2,1,64)
+ KNotification::event( "rebuldingNepomukIndexDone",
+ i18nc("@info - notification message",
+ "Rebuilding Nepomuk full text search index for new features done."),
+@@ -291,6 +292,7 @@
+ // inform that we are open and done
+ m_state = OPEN;
+ emit opened( this, true );
++#endif
+ }
+
+
+--- runtime/nepomuk/services/storage/nepomukstorage.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/nepomuk/services/storage/nepomukstorage.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -29,6 +29,7 @@
+ Name[he]=שירותי אחסון של Nepomuk
+ Name[hi]=नेपोमक डाटा भंडार
+ Name[hne]=नेपोमक डाटा भंडार
++Name[hr]=Nepomuk Pohrana Podataka
+ Name[hsb]=Nepomuk składowanje datow
+ Name[hu]=Nepomuk adattároló
+ Name[is]=Nepomuk gagnageymsla
+@@ -92,6 +93,7 @@
+ Comment[he]=הליבה של שירותי אחסון המידע של Nepomuk
+ Comment[hi]=कोर नेपोमक डाटा भंडार सेवा
+ Comment[hne]=कोर नेपोमक डाटा भंडार सेवा
++Comment[hr]=Nepomukova sržna usluga pohrane podataka
+ Comment[hsb]=Centralna Nepomukowa słužba za składowanje datow
+ Comment[hu]=Nepomuk adattároló alapszolgáltatás
+ Comment[is]=Kjarni Nepomuk gagnageymslumiðlunar
+--- runtime/nepomuk/services/filewatch/nepomukfilewatch.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/nepomuk/services/filewatch/nepomukfilewatch.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -13,6 +13,7 @@
+ Name[gu]=નેપોમુકફાઇલવોચ
+ Name[hi]=नेपोमक-फ़ाइल-वाच
+ Name[hne]=नेपोमकफाइलवाच
++Name[hr]=Nepomuk nadgledanje datoteka
+ Name[is]=Nepomuk skráavörður
+ Name[kn]=ನೆಪೋಮುಕ್ ಕಡತ ಕಾವಲು
+ Name[ku]=NepomukNihêrînaPelê
+@@ -53,6 +54,7 @@
+ Comment[gu]=નેપોમુક ફાઇલ વોચ સર્વિસ ફાઇલ ફેરફારો પર નજર રાખે છે
+ Comment[hi]=फ़ाइल परिवर्तनों की मॉनिटरिंग के लिए नेपोमक फ़ाइल निगरानी सेवा
+ Comment[hne]=फाइल मं बदलाव बर नेपोमक फाइल देखइया सेवा
++Comment[hr]=Nepomukova usluga nadgledanja datoteka za otkrivanje promjena nad istima
+ Comment[hsb]=Nepomukowe wobkedźbowanje datajow za zwěsćenje změnow
+ Comment[hu]=Nepomuk fájlfigyelő szolgáltatás fájlváltozások követéséhez
+ Comment[is]=Nepomuk skráavarslan fylgist með breytingum á skrám
+--- runtime/nepomuk/services/queryservice/searchcore.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/nepomuk/services/queryservice/searchcore.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -31,7 +31,7 @@
+ {
+ public:
+ Private()
+- : cutOffScore( 0.25 ),
++ : cutOffScore( 0.0 ),
+ active( false ),
+ canceled( false ) {
+ }
+--- runtime/nepomuk/services/queryservice/searchcore.h (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/nepomuk/services/queryservice/searchcore.h (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -58,7 +58,7 @@
+ void cancel();
+
+ /**
+- * Default: 0.25
++ * Default: 0.0
+ */
+ void setCutOffScore( double score );
+
+--- runtime/nepomuk/services/queryservice/nepomukqueryservice.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/nepomuk/services/queryservice/nepomukqueryservice.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -16,6 +16,7 @@
+ Name[gu]=નેપોમુકપ્રશ્નસેવા
+ Name[hi]=नेपोमक-क्वैरी-सेवाएँ
+ Name[hne]=नेपोमक-क्वेरी-सर्विस
++Name[hr]=Nepomuk Upitna Usluga
+ Name[hu]=Nepomuk-lekérdezés
+ Name[is]=Nepomuk fyrirspurnamiðlari
+ Name[ja]=Nepomuk クエリサービス
+@@ -57,6 +58,7 @@
+ Comment[ga]=Soláthraíonn Seirbhís Iarratais Nepomuk comhéadan le fillteáin sheasmhacha iarratais
+ Comment[gl]=O servizo de procura de Nepomuk fornece unha interface para cartafoles persistente de procuras
+ Comment[hi]=नेपोमक क्वैरी सेवा जो परसिस्टैंस क्वैरी फ़ोल्डरों को इंटरफेस प्रदान करता है
++Comment[hr]=Nepomuk Upitna Usluga pruža sučelje za trajne upitne direktorije
+ Comment[hsb]=Nepomukowa naprašowanska słužba staji intefejs za persistentne naprašowanske zapiski k dispoziciji.
+ Comment[hu]=A Nepomuk lekérdező szolgáltatás keresőmappákhoz nyújt felületet
+ Comment[is]=Nepomuk fyrirspurnamiðlarinn er viðmót fyrir viðvarandi fyrirspurnamöppur (persistent query folders)
+--- runtime/nepomuk/services/migration1/nepomukmigration1.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/nepomuk/services/migration1/nepomukmigration1.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -26,6 +26,7 @@
+ Comment[gu]=નેપોમુક માહિતી વહન સ્તર ૧
+ Comment[hi]=नेपोमक डाटा माइग्रेशन स्तर 1
+ Comment[hne]=नेपोमक डाटा माइग्रेसन लेवल १
++Comment[hr]=Nepomuk Seoba Podataka Razina 1
+ Comment[hsb]=Nepomuk migracija datow runina 1
+ Comment[hu]=Nepomuk adatmigráció 1. szint
+ Comment[is]=Nepomuk gagnaflutningur, stig 1
+--- runtime/nepomuk/server/nepomukserver.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/nepomuk/server/nepomukserver.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -97,6 +97,7 @@
+ Comment[gu]=નેપોમુક સર્વર સંગ્રહ સેવાઓ અને સ્ટ્રીગી નિયંત્રણો પૂરાં પાડે છે
+ Comment[hi]=नेपोमक सर्वर - भंडारण सेवाएँ तथा स्ट्रिगि नियंत्रण प्रदान करता है
+ Comment[hne]=नेपोमक सर्वर जउन भंडार सेवा अउ स्ट्रिगि कंट्रोल देथे
++Comment[hr]=Nepomuk poslužitelj koji pruža usluge pohrane i upravljanja Strigijem
+ Comment[hsb]=Nepomuk-serwer staji składowanske słužby a strigi-kontrolu k dispoziciji.
+ Comment[hu]=A Nepomuk szolgáltatás tárolási lehetőséget biztosít és a Strigi vezérlését végzi
+ Comment[is]=Nepomuk miðlarinn heldur utanum geymsluþjónustur og Strigi stýringu
+--- runtime/nepomuk/kcm/nepomukserverkcm.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/nepomuk/kcm/nepomukserverkcm.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -24,7 +24,6 @@
+ #include <KPluginLoader>
+ #include <KAboutData>
+ #include <KSharedConfig>
+-#include <KLed>
+ #include <KMessageBox>
+
+ #include <QtGui/QTreeView>
+@@ -51,6 +50,30 @@
+ expandRecursively( index.parent(), view );
+ }
+ }
++
++ bool isDirHidden( const QString& dir ) {
++ QDir d( dir );
++ while ( !d.isRoot() ) {
++ if ( QFileInfo( d.path() ).isHidden() )
++ return true;
++ if ( !d.cdUp() )
++ return false; // dir does not exist or is not readable
++ }
++ return false;
++ }
++
++ QStringList removeHiddenFolders( const QStringList& folders ) {
++ QStringList newFolders( folders );
++ for ( QStringList::iterator it = newFolders.begin(); it != newFolders.end(); /* do nothing here */ ) {
++ if ( isDirHidden( *it ) ) {
++ it = newFolders.erase( it );
++ }
++ else {
++ ++it;
++ }
++ }
++ return newFolders;
++ }
+ }
+
+
+@@ -137,6 +160,17 @@
+ strigiConfig.group( "General" ).readPathEntry( "exclude folders", QStringList() ) );
+ m_editStrigiExcludeFilters->setItems( strigiConfig.group( "General" ).readEntry( "exclude filters", defaultExcludeFilters() ) );
+
++ // make sure we do not have a hidden folder to expand which would make QFileSystemModel crash
++ // + it would be weird to have a hidden folder indexed but not shown
++ if ( !m_checkShowHiddenFolders->isChecked() ) {
++ foreach( const QString& dir, m_folderModel->includeFolders() + m_folderModel->excludeFolders() ) {
++ if ( isDirHidden( dir ) ) {
++ m_checkShowHiddenFolders->setChecked( true );
++ break;
++ }
++ }
++ }
++
+ // make sure that the tree is expanded to show all selected items
+ foreach( const QString& dir, m_folderModel->includeFolders() + m_folderModel->excludeFolders() ) {
+ expandRecursively( m_folderModel->index( dir ), m_viewIndexFolders );
+@@ -150,6 +184,15 @@
+
+ void Nepomuk::ServerConfigModule::save()
+ {
++ QStringList includeFolders = m_folderModel->includeFolders();
++ QStringList excludeFolders = m_folderModel->excludeFolders();
++
++ // 0. remove all hidden dirs from the folder lists if hidden folders are not to be indexed
++ if ( !m_checkShowHiddenFolders->isChecked() ) {
++ includeFolders = removeHiddenFolders( includeFolders );
++ excludeFolders = removeHiddenFolders( excludeFolders );
++ }
++
+ // 1. change the settings (in case the server is not running)
+ KConfig config( "nepomukserverrc" );
+ config.group( "Basic Settings" ).writeEntry( "Start Nepomuk", m_checkEnableNepomuk->isChecked() );
+@@ -158,8 +201,8 @@
+
+ // 2. update Strigi config
+ KConfig strigiConfig( "nepomukstrigirc" );
+- strigiConfig.group( "General" ).writePathEntry( "folders", m_folderModel->includeFolders() );
+- strigiConfig.group( "General" ).writePathEntry( "exclude folders", m_folderModel->excludeFolders() );
++ strigiConfig.group( "General" ).writePathEntry( "folders", includeFolders );
++ strigiConfig.group( "General" ).writePathEntry( "exclude folders", excludeFolders );
+ strigiConfig.group( "General" ).writeEntry( "exclude filters", m_editStrigiExcludeFilters->items() );
+ strigiConfig.group( "General" ).writeEntry( "index hidden folders", m_checkShowHiddenFolders->isChecked() );
+
+--- runtime/kstyles/themes/mega.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kstyles/themes/mega.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -27,6 +27,7 @@
+ Name[he]=סגנון MegaGradient בעל צבעים גבוהים
+ Name[hi]=मेगाग्रंडिएंट उच्चरंग शैली
+ Name[hne]=मेगाग्रेडिएंट हाईकलर सैली
++Name[hr]=MegaGradient obojeni stil
+ Name[hsb]=MegaGradient wjelebarbny stil
+ Name[hu]=MegaGradiens sokszínű stílus
+ Name[is]=MegaLitstigull hálitastíll
+--- runtime/kstyles/themes/light-v2.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kstyles/themes/light-v2.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -25,6 +25,7 @@
+ Name[he]=סגנון קליל, גרסה שנייה
+ Name[hi]=लाइट शैली, 2रा संशोधन
+ Name[hne]=लाइट स्टाइल, २ रा संस्करन
++Name[hr]=Svjetli stil, 2. verzija
+ Name[hsb]=Light Style, druha wersija
+ Name[hu]=Light stílus (2. verzió)
+ Name[is]=Léttur stíll, 2 útgáfa
+@@ -91,6 +92,7 @@
+ Comment[he]=הגרסה השנייה של הסגנון הפשוט והאלגנטי, ערכת הפקדים ה"קלילה".
+ Comment[hi]=सादा और सुरूचिकर 'लाइट' विजेट शैली का दूसरा संशोधन.
+ Comment[hne]=लाइट विजेट स्टाइल के सादा अउ एलिगेंट विजेट सैली के दूसरा संस्करन
++Comment[hr]=Druga verzija jednostavnog i elegantnog svjetlog stila grafičkih elemenata.
+ Comment[hsb]=Druha wersija jednoreho a elegantneho 'Light' stila.
+ Comment[hu]=Az egyszerű, de elegáns Light elemstílus 2. verziója.
+ Comment[is]=Önnur útgáfa af fáguðum og einföldum 'Létta' stílnum
+--- runtime/kstyles/themes/light-v3.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kstyles/themes/light-v3.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -25,6 +25,7 @@
+ Name[he]=סגנון קליל, גרסה שלישית
+ Name[hi]=लाइट शैली, 3रा संशोधन
+ Name[hne]=लाइट स्टाइल, ३ रा संस्करन
++Name[hr]=Svjetli stil, 3. verzija
+ Name[hsb]=Light Style, třeća wersija
+ Name[hu]=Light stílus (3. verzió)
+ Name[is]=Léttur stíll, 3 útgáfa
+@@ -91,6 +92,7 @@
+ Comment[he]=הגרסה השלישית של הסגנון הפשוט והאלגנטי, ערכת הפקדים ה"קלילה".
+ Comment[hi]=सादा और सुरूचिकर 'लाइट' विजेट शैली का तीसरा संशोधन.
+ Comment[hne]=लाइट विजेट स्टाइल के सादा अउ एलिगेंट विजेट सैली के तीसरा संस्करन
++Comment[hr]=Treća verzija jednostavnog i elegantnog svjetlog stila grafičkih elemenata.
+ Comment[hsb]=Třeća wersija jednoreho a elegantneho 'Light' stila.
+ Comment[hu]=Az egyszerű, de elegáns Light elemstílus 3. verziója.
+ Comment[is]=Þriðja útgáfa af fáguðum og einföldum 'Léttum' stíl.
+--- runtime/kstyles/themes/highcolor.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kstyles/themes/highcolor.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -25,6 +25,7 @@
+ Name[he]=צבע גבוהה קלאסי
+ Name[hi]=उच्च-रंग क्लासिक
+ Name[hne]=जादा-रंग क्लासिक
++Name[hr]=Klasična obojanost
+ Name[hu]=Sokszínű Classic
+ Name[is]=Sterklita klassík
+ Name[it]=Classico HighColor
+@@ -89,6 +90,7 @@
+ Comment[he]=גרסה בעלת צבע גבוהה של הערכה הקלאסית
+ Comment[hi]=क्लाशिक शैली का उच्च-रंग संस्करण
+ Comment[hne]=क्लासिक सैली के जादा-रंग संस्करन
++Comment[hr]=Obojana verzija klasičnog stila
+ Comment[hsb]=Wjelebarbna wersija klasiskeho stila
+ Comment[hu]=A Classic stílus sok színt használó változata
+ Comment[is]=Klassískur stíll í sterkum litum
+--- runtime/kstyles/themes/qtplatinum.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kstyles/themes/qtplatinum.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -54,6 +54,7 @@
+ Comment[he]=ערכה מובנית בסגנון Platinum
+ Comment[hi]=अंतर्निर्मित बगैर-प्रसंग प्लेटिनम शैली
+ Comment[hne]=बिना थीम के भीतरे मं बने प्लेटिनम सैली
++Comment[hr]=Ugrađeni netematski Platinum stil
+ Comment[hsb]=Integrowany Platinum-stil bjez temow
+ Comment[hu]=Beépített Platinum stílus
+ Comment[is]=Innbyggður óþemaður Platínu stíll
+--- runtime/kstyles/themes/qtwindows.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kstyles/themes/qtwindows.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -39,6 +39,7 @@
+ Comment[he]=מובנה חסר ערכת־נושא בסגנון חלונות 9x
+ Comment[hi]=अंतर्निर्मित विंडोज़ 9x शैली
+ Comment[hne]=बिना थीम के भीतरे मं बने विंडोज९xीई सैली
++Comment[hr]=Ugrađeni netematski Windows 9x stil
+ Comment[hsb]=Integrowany WIndows 9x stil bjez temow
+ Comment[hu]=Beépített Windows 9x stílus
+ Comment[is]=Innbyggður óþemaður Windows 9x stíll
+--- runtime/kstyles/themes/qtcde.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kstyles/themes/qtcde.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -34,6 +34,7 @@
+ Comment[he]=מובנה בסגנון CDE
+ Comment[hi]=अंतर्निर्मित बगैर-प्रसंग सीडीई शैली
+ Comment[hne]=बिना थीम के भीतरे मं बने सीडीई सैली
++Comment[hr]=Ugrađeni netematski CDE stil
+ Comment[hsb]=Integrowany CDE-stil bjez temow
+ Comment[hu]=Beépített CDE stílus
+ Comment[is]=Innbyggður óþemaður CDE stíll
+--- runtime/kstyles/themes/keramik.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kstyles/themes/keramik.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -58,6 +58,7 @@
+ Comment[he]=סגנון המשתמש מיזוג צבעים
+ Comment[hi]=अल्फाबेंडिंग के उपयोग से डिफ़ॉल्ट शैली
+ Comment[hne]=एक स्टाइल जे हर अल्फाब्लेंडिंग उपयोग करथे
++Comment[hr]=Stil koji koristi blendiranje
+ Comment[hsb]=Stil z alphablendingom
+ Comment[hu]=Áttetszőséget használó stílus
+ Comment[is]=Stíll sem notar blöndun með gegnsæi
+--- runtime/kstyles/themes/qtmotif.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kstyles/themes/qtmotif.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -39,6 +39,7 @@
+ Comment[he]=מובנה בסגנון Motif ללא ערכת נושא
+ Comment[hi]=अंतर्निर्मित बगैर-प्रसंग मोटिफ शैली
+ Comment[hne]=बिना थीम के भीतरे मं बने मोटिफ सैली
++Comment[hr]=Ugrađeni netematski Motif stil
+ Comment[hsb]=Integrowany Motif-stil bjez temy
+ Comment[hu]=Beépített Motif stílus
+ Comment[is]=Innbyggður óþemaður Mótíf stíll
+--- runtime/kstyles/themes/b3.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kstyles/themes/b3.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -36,6 +36,7 @@
+ Comment[he]=B3/שינוי של B2
+ Comment[hi]=B3/ B2 का संशोधन
+ Comment[hne]=बी३/बी२ मं सुधार
++Comment[hr]=B3/Promjena B2
+ Comment[hsb]=B3/modifikacija wot B2
+ Comment[hu]=B3: Feljavított B2 stílus
+ Comment[is]=B3/Breyting á B2
+--- runtime/kstyles/themes/qtmotifplus.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kstyles/themes/qtmotifplus.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -46,6 +46,7 @@
+ Comment[he]=ערכה מובנית בסגנון Motig משופר
+ Comment[hi]=अंतर्निर्मित एनहेंस्ड मोटिफ शैली
+ Comment[hne]=भीतरे मं बने एनहेंस्ड मोटिफ सैली
++Comment[hr]=Ugrađeni poboljšani Motif stil
+ Comment[hsb]=Integrowany, polěpšeny Motif-stil
+ Comment[hu]=Beépített Motif stílus
+ Comment[is]=Innbyggður endurbættur Mótíf stíll
+--- runtime/kstyles/themes/qtsgi.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kstyles/themes/qtsgi.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -34,6 +34,7 @@
+ Comment[he]=מובנה בסגנון SGI
+ Comment[hi]=अंतर्निर्मित एसजीआई शैली
+ Comment[hne]=भीतरे मं बने एसजीआई सैली
++Comment[hr]=Ugrađeni SGI stil
+ Comment[hsb]=Integrowany SGI-stil
+ Comment[hu]=Beépített SGI stílus
+ Comment[is]=Innbyggður SGI stíll
+--- runtime/kstyles/oxygen/oxygen.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kstyles/oxygen/oxygen.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -53,6 +53,7 @@
+ Comment[he]=הסגנון של הדור הבא של שולחן העבודה
+ Comment[hi]=अगली पीढ़ी के डेस्कटॉप की शैलियाँ
+ Comment[hne]=अगला जनरेसन डेस्कटाप के स्टाइलिंग
++Comment[hr]=Stil sljedeće generacije radnih okruženja
+ Comment[hsb]=Stil za dźěłowy powjerch přichodneje generacije
+ Comment[hu]=Új generációs stílus
+ Comment[is]=Stílar fyrir næstu kynslóðar skjáborð
+--- runtime/kstyles/oxygen/oxygen.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kstyles/oxygen/oxygen.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -322,6 +322,7 @@
+ p->setClipRegion(rbOpt->rect);
+ p->drawRect(rbOpt->rect.adjusted(0,0,-1,-1));
+ p->restore();
++ return;
+ }
+ break;
+ }
+@@ -354,6 +355,7 @@
+ cb->palette, cb->state & State_Enabled, cb->currentText);
+ }
+ p->restore();
++ return;
+ }
+ break;
+ }
+--- runtime/kstyles/web/web.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kstyles/web/web.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -99,6 +99,7 @@
+ Comment[he]=סגנון Widget אינטרנטי
+ Comment[hi]=वेब विज़ेट शैली
+ Comment[hne]=वेब विजेट सैली
++Comment[hr]=Stil web grafičkih elemenata
+ Comment[hsb]=Web - widgetowy stil
+ Comment[hu]=Webes elemstílus
+ Comment[is]=Vefgræju stíll
+--- runtime/kurifilter-plugins/ikws/searchproviders/bugft.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/bugft.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -80,6 +80,7 @@
Name[zh_CN]=KDE Bug 数据库全文检索
Name[zh_TW]=KDE 臭蟲資料庫全文檢索
- Query=http://bugs.kde.org/buglist.cgi?quicksearch=\\{1}+\\{2}+\\{3}+\\{4}+\\{5}+\\{6}+\\{7}+\\{8}+\\{9}
---- runtime/kurifilter-plugins/ikws/searchproviders/rfc.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/rfc.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -52,8 +52,8 @@
- Name[uk]=Запит коментарів (RFC) IETF
- Name[vi]=Yêu cầu Bình luận IETF
- Name[wa]=Dimande di rawetes IETF
-+Name[xh]=Izicelo Zogqabazo ze IETF
- Name[x-test]=xxIETF Requests for Commentsxx
--Name[xh]=Izicelo Zogqabazo ze IETF
- Name[zh_CN]=IETF 评论请求
- Name[zh_TW]=IETF RFC 文件
- Query=http://www.ietf.org/rfc/rfc\\{@}.txt
---- runtime/kurifilter-plugins/ikws/searchproviders/bugno.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/bugno.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -74,8 +74,8 @@
- Name[uz@cyrillic]=KDE хато маълумот базаси (хатонинг рақамини қидириш)
- Name[vi]=Tìm kiếm số hiệu lỗi trong cơ sở dữ liệu lỗi của KDE
- Name[wa]=Båze di dnêyes pol cweraedje di bugs di KDE pa les limeros
-+Name[xh]=KDE Uphendlo Lwenani Legciwane Isiseko se data Segciwane
- Name[x-test]=xxKDE Bug Database Bug Number Searchxx
--Name[xh]=KDE Uphendlo Lwenani Legciwane Isiseko se data Segciwane
+ Query=http://bugs.kde.org/buglist.cgi?quicksearch=\\{@}
++Query[hr]=http://bugs.kde.org/show_bug.cgi?id=\\{@}
+ Query[x-test]=xxhttp://bugs.kde.org/buglist.cgi?quicksearch=\\{@}xx
+ X-KDE-ServiceTypes=SearchProvider
+ Type=Service
+--- runtime/kurifilter-plugins/ikws/searchproviders/bugno.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/bugno.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -82,6 +82,7 @@
Name[zh_CN]=KDE Bug 数据库按 Bug 编号搜索
Name[zh_TW]=KDE 臭蟲資料庫按錯誤編號搜索
- Query=http://bugs.kde.org/show_bug.cgi?id=\\{@}
---- runtime/kurifilter-plugins/ikws/searchproviders/python.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/python.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -71,8 +71,8 @@
- Name[uz@cyrillic]=Python учун кўлланма
- Name[vi]=Sổ tay Tham khảo Python
- Name[wa]=Manuel di referince di Python
-+Name[xh]=Ubhekiso lwe Python yesandla
- Name[x-test]=xxPython Reference Manualxx
--Name[xh]=Ubhekiso lwe Python yesandla
- Name[zh_CN]=Python 参考手册
- Name[zh_TW]=Python 參考手冊
- Query=http://www.google.com/search?sourceid=python-search&q=\\{@}&submit=Search&q=site%3Apython.org
---- runtime/kurifilter-plugins/ikws/searchproviders/appsy.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/appsy.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -73,8 +73,8 @@
- Name[uz@cyrillic]=KDE дастурларида қидириш
- Name[vi]=Tìm Ứng dụng KDE
- Name[wa]=Programe di cweraedje di KDE
-+Name[xh]=Uphendlo lwe KDE App
- Name[x-test]=xxKDE App Searchxx
--Name[xh]=Uphendlo lwe KDE App
- Name[zh_CN]=KDE 应用程序搜索
- Name[zh_TW]=KDE 程式搜尋
- X-KDE-ServiceTypes=SearchProvider
---- runtime/kurifilter-plugins/ikws/searchproviders/google_images.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/google_images.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,8 +78,8 @@
- Name[uz@cyrillic]=Google - Расм қидириш
- Name[vi]=Tìm kiếm Hình ảnh Google
- Name[wa]=Cweraedje d' imådjes avou Google
-+Name[xh]=Uphendlo Lomfanekiso we Google
- Name[x-test]=xxGoogle Image Searchxx
--Name[xh]=Uphendlo Lomfanekiso we Google
- Name[zh_CN]=Google 图像搜索
- Name[zh_TW]=Google 圖片搜尋
- X-KDE-ServiceTypes=SearchProvider
---- runtime/kurifilter-plugins/ikws/searchproviders/google_groups.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/google_groups.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -70,8 +70,8 @@
- Name[uz]=Google - Guruhlar
- Name[uz@cyrillic]=Google - Гуруҳлар
- Name[vi]=Nhóm Google
-+Name[xh]=Amaqela e Google
- Name[x-test]=xxGoogle Groupsxx
--Name[xh]=Amaqela e Google
- Name[zh_CN]=Google 兴趣小组
- Name[zh_TW]=Google 群組
- X-KDE-ServiceTypes=SearchProvider
---- runtime/kurifilter-plugins/ikws/searchproviders/webster.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/webster.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -67,8 +67,8 @@
- Name[uz@cyrillic]=Merriam-Webster луғати
- Name[vi]=Từ điển Merriam-Webster
- Name[wa]=Diccionaire inglès Merriam-Webster
-+Name[xh]= Dikshinari ye Merriam-Webster
- Name[x-test]=xxMerriam-Webster Dictionaryxx
--Name[xh]= Dikshinari ye Merriam-Webster
- Name[zh_CN]=韦氏词典
- Name[zh_TW]=韋氏詞典
- X-KDE-ServiceTypes=SearchProvider
---- runtime/kurifilter-plugins/ikws/searchproviders/docbook.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/docbook.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -66,8 +66,8 @@
- Name[uz@cyrillic]=DocBook - тўлиқ қўлланма
- Name[vi]=DocBook - Hướng dẫn Đầy đủ
- Name[wa]=DocBook - Li seu guide
-+Name[xh]=DocBook - Incwadi Echazayo
- Name[x-test]=xxDocBook - The Definitive Guidexx
--Name[xh]=DocBook - Incwadi Echazayo
- Name[zh_CN]=DocBook - 权威的指南
- Name[zh_TW]=DocBook - 終極指南
- Query=http://www.docbook.org/tdg/en/html/\\{1}.html
---- runtime/kurifilter-plugins/ikws/searchproviders/rpmfind.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/rpmfind.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -41,8 +41,8 @@
- Name[uz]=RPM qidirish
- Name[uz@cyrillic]=RPM қидириш
- Name[vi]=Tìm RPM
-+Name[xh]=RPM-Fumana
- Name[x-test]=xxRPM-Findxx
--Name[xh]=RPM-Fumana
- X-KDE-ServiceTypes=SearchProvider
- Keys=rf,rpmfind
- Query=http://www.rpmfind.net/linux/rpm2html/search.php?query=\\{@}
---- runtime/kurifilter-plugins/ikws/searchproviders/google_advanced.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/google_advanced.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,8 +77,8 @@
- Name[uz@cyrillic]=Google - Илғор қидириш
- Name[vi]=Tra cứu Nâng cao Google
- Name[wa]=Ricweraedje avancî di Google
-+Name[xh]=Uphendlo Olubhekisa phambili lwe Google
- Name[x-test]=xxGoogle Advanced Searchxx
--Name[xh]=Uphendlo Olubhekisa phambili lwe Google
- Name[zh_CN]=Google 高级搜索
- Name[zh_TW]=Google 進階搜尋
- Query=http://www.google.com/search?as_q=\\{all,@}&num=\\{num,"10"}&btnG=Google+Search&as_epq=\\{exact,""}&as_oq=\\{any,""}&as_eq=\\{without,""}&lr=\\{lang,""}&as_ft=\\{ft,"i"}&as_filetype=\\{filetype,""}&as_qdr=\\{date,"all"}&as_occt=\\{occ,"any"}&as_dt=\\{siteop,"i"}&as_sitesearch=\\{site}&safe=\\{safe,"active"}&ie=UTF-8&oe=UTF-8
---- runtime/kurifilter-plugins/ikws/searchproviders/php.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/php.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -75,8 +75,8 @@
- Name[uz@cyrillic]=PHP қидириш
- Name[vi]=Tìm kiếm PHP
- Name[wa]=Cweraedje PHP
-+Name[xh]=Uphendlo lwe PHP
- Name[x-test]=xxPHP Searchxx
--Name[xh]=Uphendlo lwe PHP
- Name[zh_CN]=PHP 搜索
- Name[zh_TW]=PHP 搜尋
- Query=http://www.php.net/search.php?show=\\{mode,"manual"}&pattern=\\{@}
---- runtime/kurifilter-plugins/ikws/searchproviders/mamma.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/mamma.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -70,8 +70,8 @@
- Name[uz@cyrillic]=Mamma - Ҳамма қидириш воситаларининг онаси
- Name[vi]=Mamma - Người mẹ của tất cả các máy truy tìm dữ liệu
- Name[wa]=Mamma - Li mame di tos les éndjins d' cweraedje
-+Name[xh]=Mamma - Umama weenjini zonke zophendlo
- Name[x-test]=xxMamma - Mother of all Search Enginesxx
--Name[xh]=Mamma - Umama weenjini zonke zophendlo
- Name[zh_CN]=Mamma - 所有搜索引擎之母
- Name[zh_TW]=Mamma - 搜尋引擎之母
- X-KDE-ServiceTypes=SearchProvider
---- runtime/kurifilter-plugins/ikws/searchproviders/msdn.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/msdn.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -69,8 +69,8 @@
- Name[uz@cyrillic]=Microsoft Developer Network'да қидириш
- Name[vi]=Tìm kiếm qua Mạng Nhà phát triển Microsoft
- Name[wa]=Cweraedje del rantoele des programeus Microsoft
-+Name[xh]=Uphendlo Womsebenzi womnatha Wombhekisi phambili we Microsoft
- Name[x-test]=xxMicrosoft Developer Network Searchxx
--Name[xh]=Uphendlo Womsebenzi womnatha Wombhekisi phambili we Microsoft
- Name[zh_CN]=MSDN 微软开发者网络搜索
- Name[zh_TW]=微軟開發者網路搜尋
+ Query=https://bugs.kde.org/show_bug.cgi?id=\\{@}
++Query[hr]=http://bugs.kde.org/show_bug.cgi?id=\\{@}
+ Query[it]=http://bugs.kde.org/show_bug.cgi?id=\\{@}
+ Query[tg]=http://bugs.kde.org/show_bug.cgi?id=\\{@}
+ Query[x-test]=xxhttps://bugs.kde.org/show_bug.cgi?id=\\{@}xx
+--- runtime/kurifilter-plugins/ikws/searchproviders/fr2de.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/fr2de.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -29,7 +29,7 @@
+ Name[he]=LEO - תרגום בין צרפתית וגרמנית
+ Name[hi]=लिओ - फ्रांसीसी तथा जर्मनी के बीच अनुवाद
+ Name[hne]=लिओ - फ्रांसीसी अउ जर्मनी के बीच अनुवाद
+-Name[hr]=LEO - Prevođenje između francuskog i njemačkog
++Name[hr]=LEO – Prevođenje između francuskog i njemačkog
+ Name[hsb]=LEO - přełožowanje z francošćiny a němčiny
+ Name[hu]=LEO - Fordítás franciáról németre (mindkét irányban)
+ Name[is]=LEO - Þýða á milli frönsku og þýsku
+--- runtime/kurifilter-plugins/ikws/searchproviders/docbook.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/docbook.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -26,7 +26,7 @@
+ Name[he]=DocBook - המדריך האולטימטיבי
+ Name[hi]=डॉकबुक - निर्णायक मार्गदर्शक
+ Name[hne]=डाकबुक - निर्नायक मार्गदर्सक
+-Name[hr]=DocBook - Definitivni vodič
++Name[hr]=DocBook – Definitivni vodič
+ Name[is]=DocBook - Opinbera handbókin
+ Name[it]=DocBook - La guida definitiva
+ Name[ja]=DocBook - 完全ガイド
+--- runtime/kurifilter-plugins/ikws/searchproviders/multitran-esru.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/multitran-esru.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -29,7 +29,7 @@
+ Name[he]=Multitran - תרגום בין ספרדית לרוסית
+ Name[hi]=मल्टीट्रान - रूसी तथा स्पेनी के बीच अनुवाद
+ Name[hne]=मल्टीट्रान - स्पेनी अउ रूसी के बीच अनुवाद
+-Name[hr]=Multitran - Prevođenje između španjolskog i ruskog
++Name[hr]=Multitran – Prevođenje između španjolskog i ruskog
+ Name[hsb]=Multitran - přełožowanje ze španšćiny a rušćiny
+ Name[hu]=Multitran - Fordítás spanyolról oroszra (mindkét irányban)
+ Name[is]=Multitran - Þýða á milli spænsku og rússnesku
+--- runtime/kurifilter-plugins/ikws/searchproviders/wiktionary.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/wiktionary.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -30,7 +30,7 @@
+ Name[he]=ויקימילון - המילון החופשי
+ Name[hi]=विकिपेडिया- मुफ्त विश्वकोश
+ Name[hne]=विकिपेडिया- फोकट विस्वकोस
+-Name[hr]=Wiktionary - besplatna enciklopedija
++Name[hr]=Wiktionary – besplatna enciklopedija
+ Name[hsb]=Wikisłownik - Swobodny słownik
+ Name[hu]=Wiktionary
+ Name[is]=Wiktionary - Frjálsa orðabókin
+--- runtime/kurifilter-plugins/ikws/searchproviders/multitran-deru.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/multitran-deru.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -29,7 +29,7 @@
+ Name[he]=Multitran - תרגם מין גרמנית לרוסית
+ Name[hi]=मल्टीट्रान - जर्मनी तथा रूसी के बीच अनुवाद
+ Name[hne]=मल्टीट्रान - जर्मनी अउ रूसी के बीच अनुवाद
+-Name[hr]=Multitran - Prevođenje između njemačkog i ruskog
++Name[hr]=Multitran – Prevođenje između njemačkog i ruskog
+ Name[hsb]=Multitran - přełožowanje z němčiny a rušćiny
+ Name[hu]=Multitran - Fordítás németről oroszra (mindkét irányban)
+ Name[is]=Multitran - Þýða á milli þýsku og rússnesku
+--- runtime/kurifilter-plugins/ikws/searchproviders/ethicle.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/ethicle.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -14,4 +14,5 @@
X-KDE-ServiceTypes=SearchProvider
---- runtime/kurifilter-plugins/ikws/searchproviders/acronym.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/acronym.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -72,8 +72,8 @@
- Name[uz@cyrillic]=Қисқартма маълумот базаси
- Name[vi]=Cơ sở dữ liệu Viết tắt
- Name[wa]=Båzes di dnêyes d' acourtixheures
-+Name[xh]=Isiseko sedata Segama elenziwe ngonoobumba bamanye amagama
- Name[x-test]=xxAcronym Databasexx
--Name[xh]=Isiseko sedata Segama elenziwe ngonoobumba bamanye amagama
- Name[zh_CN]=首字母缩写数据库
- Name[zh_TW]=Acronym 資料庫
- X-KDE-ServiceTypes=SearchProvider
---- runtime/kurifilter-plugins/ikws/searchproviders/dmoz.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/dmoz.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -44,8 +44,8 @@
- Name[tg]=Кушодани феҳрист
- Name[uk]=Відкритий каталог
- Name[vi]=Thư mục mở
-+Name[xh]=Vula Ulawulo
- Name[x-test]=xxOpen Directoryxx
--Name[xh]=Vula Ulawulo
- Name[zh_TW]=開啟目錄
- X-KDE-ServiceTypes=SearchProvider
- Keys=dmoz,odp
---- runtime/kurifilter-plugins/ikws/searchproviders/leo.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/leo.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -49,8 +49,8 @@
- Name[uz]=LEO tarjima
- Name[uz@cyrillic]=LEO таржима
- Name[vi]=Dịch bằng LEO
-+Name[xh]=LEO-Guqulela
- Name[x-test]=xxLEO-Translatexx
--Name[xh]=LEO-Guqulela
- X-KDE-ServiceTypes=SearchProvider
- Keys=leo
- Query=http://dict.leo.org/?search=\\{@}
---- runtime/kurifilter-plugins/ikws/searchproviders/cpan.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/cpan.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -51,8 +51,8 @@
- Name[uz@cyrillic]=CPAN - Perl бўйича мукаммал архив тармоғи
- Name[vi]=CPAN - Mạng kho lưu Perl đầy đủ
- Name[wa]=CPAN - Rantoele d' Årtchives Perl avou ttafwait
-+Name[xh]=CPAN - Enomxholo Perl Indawo yokugcina Yomsebenzi womnatha
- Name[x-test]=xxCPAN - Comprehensive Perl Archive Networkxx
--Name[xh]=CPAN - Enomxholo Perl Indawo yokugcina Yomsebenzi womnatha
- Name[zh_CN]=CPAN - 综合性 Perl 档案网络
- Name[zh_TW]=CPAN - 全面的 Perl 收集網路
- Query=http://search.cpan.org/search?mode=\\{mode,2,"dist"}&query=\\{query,q,1}
---- runtime/kurifilter-plugins/ikws/searchproviders/pgpkeys.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/pgpkeys.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,8 +77,8 @@
- Name[uz@cyrillic]=OpenPGP калитларни қидириш
- Name[vi]=Tìm kiếm khoá OpenPGP
- Name[wa]=Cweraedje d' ene clé OpenPGP
-+Name[xh]=Uphendlo Lwesitshixo se OpenPGP
- Name[x-test]=xxOpenPGP Key Searchxx
--Name[xh]=Uphendlo Lwesitshixo se OpenPGP
- Name[zh_CN]=OpenPGP 关键字搜索
- Name[zh_TW]=OpenPGP 金鑰搜尋
- Query=http://pgp.dtype.org:11371/pks/lookup?search=\\{@}&op=vindex
---- runtime/kurifilter-plugins/ikws/searchproviders/ctan.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/ctan.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -52,8 +52,8 @@
- Name[uz@cyrillic]=CTAN - TeX бўйича мукаммал архив тармоғи
- Name[vi]=CTAN - Mạng kho lưu TeX đầy đủ
- Name[wa]=CPAN - Rantoele d' Årtchives TeX avou ttafwait
-+Name[xh]=CTAN - Enomxholo TeX Indawo yokugcina Yomsebenzi womnatha
- Name[x-test]=xxCTAN - Comprehensive TeX Archive Networkxx
--Name[xh]=CTAN - Enomxholo TeX Indawo yokugcina Yomsebenzi womnatha
- Name[zh_CN]=CTAN - 综合性 TeX 档案网络
- Name[zh_TW]=CTAN - 全面的 Tex 收集網路
- Query=http://ctan.org/cgi-bin/filenameSearch.py?filename=\\{@}&Search=Search
---- runtime/kurifilter-plugins/ikws/searchproviders/ruby_application_archive.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/ruby_application_archive.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -71,8 +71,8 @@
- Name[uz@cyrillic]=Ruby дастур архиви
- Name[vi]=Kho lưu Ứng dụng Ruby
- Name[wa]=Årtchives di programes Ruby
-+Name[xh]=Indawo ye Ruby yokugcina Isicelo
- Name[x-test]=xxRuby Application Archivexx
--Name[xh]=Indawo ye Ruby yokugcina Isicelo
- Name[zh_CN]=Ruby 应用程序档案
- Name[zh_TW]=Ruby 應用程式檔案庫
- X-KDE-ServiceTypes=SearchProvider
---- runtime/kurifilter-plugins/ikws/kurisearchfilter.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/kurifilter-plugins/ikws/kurisearchfilter.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -52,8 +52,8 @@
- Name[uz@cyrillic]=Қидириш калит сўзлар филтери
- Name[vi]=Bộ lọc tìm từ khoá
- Name[wa]=PasseteTapreceCweraedje
-+Name[xh]=Phendla Amagama Angundoqo Ecebo Lokucoca Ulwelo
- Name[x-test]=xxSearchKeywordsFilterxx
--Name[xh]=Phendla Amagama Angundoqo Ecebo Lokucoca Ulwelo
- Name[zh_CN]=搜索关键字过滤
- Name[zh_TW]=搜索關鍵字過濾
- X-KDE-Library=kurisearchfilter
---- runtime/drkonqi/presets/developerrc (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/drkonqi/presets/developerrc (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -72,8 +72,8 @@
- Name[uz]=Tuzuvchi
- Name[uz@cyrillic]=Тузувчи
- Name[wa]=Programeu
-+Name[xh]=Umbhekisi phambili
- Name[x-test]=xxDeveloperxx
--Name[xh]=Umbhekisi phambili
- Name[zh_CN]=开发者
- Name[zh_TW]=開發者
- Comment=Settings preferred for developers
-@@ -146,8 +146,8 @@
- Comment[uz]=Tuzuvchilar uchun afzal moslamalar
- Comment[uz@cyrillic]=Тузувчилар учун афзал мосламалар
- Comment[wa]=Favoris apontiaedjes po programeus
-+Comment[xh]=Izicwangciso ezikhetiweyo zababhekisi phambili
- Comment[x-test]=xxSettings preferred for developersxx
--Comment[xh]=Izicwangciso ezikhetiweyo zababhekisi phambili
- Comment[zh_CN]=开发者的首选设置
- Comment[zh_TW]=開發者預設設定
-
-@@ -228,8 +228,8 @@
- Name[uz]=Dasturning %progname (%appname), pid %pid, ishida xato roʻy berdi va %signum (%signame) signaliga sababchi boʻldi.
- Name[uz@cyrillic]=Дастурнинг %progname (%appname), pid %pid, ишида хато рўй берди ва %signum (%signame) сигналига сабабчи бўлди.
- Name[wa]=Li programe %progname (%appname), pid %pid, s' a spotchî eyet a fwait l' signå %signum (%signame).
-+Name[xh]=Isicelo %progname (%appname), pid %pid, ilalhekile kwaye ibangele uphawu %signum (%signame).
- Name[x-test]=xxThe application %progname (%appname), pid %pid, crashed and caused the signal %signum (%signame).xx
--Name[xh]=Isicelo %progname (%appname), pid %pid, ilalhekile kwaye ibangele uphawu %signum (%signame).
- Name[zh_CN]=应用程序 %progname (%appname)，pid %pid，已经崩溃并导致了信号 %signum (%signame)。
- Name[zh_TW]=應用程式 %progname（%appname），行程代碼 %pid，崩潰並引發信號 %signum（%signame）。
-
-@@ -303,8 +303,8 @@
- Name[tr]=Programınızdaki sorunu çözmek isterseniz hata ayıklayıcı sekmesine bakın.
- Name[uk]=Полагодьте вашу програму. Загляньте у вкладку зворотного трасування.
- Name[wa]=Vos vôroz motoit remantchî vosse programe. Riwaitîz al linwete backtrace.
-+Name[xh]=Ungafuna ukulungisa udweliso lwakho lwenkqubo. Thatha ujongo kukhangelo lwasemva lwesithuba.
- Name[x-test]=xxYou might want to fix your program. Take a look at the backtrace tab.xx
--Name[xh]=Ungafuna ukulungisa udweliso lwakho lwenkqubo. Thatha ujongo kukhangelo lwasemva lwesithuba.
- Name[zh_CN]=您可能想要修正您的程序。请查阅回溯标签。
- Name[zh_TW]=您可能要修正您的程式。請參考一下「回溯」分頁。
-
-@@ -385,8 +385,8 @@
- Comment[uz]=Koʻrsatma haqiqiy emas.
- Comment[uz@cyrillic]=Кўрсатма ҳақиқий эмас.
- Comment[wa]=Instruccion nén permetowe pal lwè.
-+Comment[xh]=Engavumelekanga imiyalelo.
- Comment[x-test]=xxIllegal instruction.xx
--Comment[xh]=Engavumelekanga imiyalelo.
- Comment[zh_CN]=非法指令。
- Comment[zh_TW]=不合法的指令。
-
-@@ -466,8 +466,8 @@
- Comment[tr]=İptal edildi.
- Comment[uk]=Перервано.
- Comment[wa]=Abandné.
-+Comment[xh]=Ayamkelekanga.
- Comment[x-test]=xxAborted.xx
--Comment[xh]=Ayamkelekanga.
- Comment[zh_CN]=已中止。
- Comment[zh_TW]=被中止。
-
-@@ -540,8 +540,8 @@
- Comment[tr]=Kayar nokta hatası.
- Comment[uk]=Виключення під час роботи з числами з плаваючою точкою.
- Comment[wa]=Flotant pont foû rîle.
-+Comment[xh]=Amaxabiso okudada akhethekileyo.
- Comment[x-test]=xxFloating point exception.xx
--Comment[xh]=Amaxabiso okudada akhethekileyo.
- Comment[zh_CN]=浮点异常。
- Comment[zh_TW]=浮點運算出現錯誤。
-
-@@ -616,8 +616,8 @@
- Comment[tr]=Geçersiz bellek referansı.
- Comment[uk]=Нечинне посилання на область пам’яті.
- Comment[wa]=Referince del memwere nén valide.
-+Comment[xh]=Uthelekiso lwenkumbulo engasebenziyo.
- Comment[x-test]=xxInvalid memory reference.xx
--Comment[xh]=Uthelekiso lwenkumbulo engasebenziyo.
- Comment[zh_CN]=无效的内存引用。
- Comment[zh_TW]=記憶體區段錯誤。
-
-@@ -696,8 +696,8 @@
- Name[uz]=Nomaʼlum
- Name[uz@cyrillic]=Номаълум
- Name[wa]=Nén cnoxhou
-+Name[xh]=Engaziwayo
- Name[x-test]=xxUnknownxx
--Name[xh]=Engaziwayo
- Name[zh_CN]=未知
- Name[zh_TW]=未知
- Comment=This signal is unknown.
-@@ -769,7 +769,7 @@
- Comment[uz]=Bu signal nomaʼlum.
- Comment[uz@cyrillic]=Бу сигнал номаълум.
- Comment[wa]=Ci signå n' est nén cnoxhou.
-+Comment[xh]=Oluphawu olungaziwayo.
- Comment[x-test]=xxThis signal is unknown.xx
--Comment[xh]=Oluphawu olungaziwayo.
- Comment[zh_CN]=此信号未知。
- Comment[zh_TW]=未知的信號。
---- runtime/drkonqi/presets/enduserrc (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/drkonqi/presets/enduserrc (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -68,8 +68,8 @@
- Name[uz]=Oddiy foydalanuvchi
- Name[uz@cyrillic]=Оддий фойдаланувчи
- Name[wa]=Finå uzeu
-+Name[xh]=Umsebenzisi wokugqibela
- Name[x-test]=xxEnd userxx
--Name[xh]=Umsebenzisi wokugqibela
- Name[zh_CN]=最终用户
- Name[zh_TW]=終端使用者
- Comment=Settings preferred for end users
-@@ -141,8 +141,8 @@
- Comment[uz]=Oddiy foydalanuvchilar uchun afzal moslamalar
- Comment[uz@cyrillic]=Оддий фойдаланувчилар учун афзал мосламалар
- Comment[wa]=Favoris apontiaedjes po les finås uzeus
-+Comment[xh]=Izicwangciso ezikhethwayo zomsebenzisi osekugqhibeleni
- Comment[x-test]=xxSettings preferred for end usersxx
--Comment[xh]=Izicwangciso ezikhethwayo zomsebenzisi osekugqhibeleni
- Comment[zh_CN]=最终用户的首选设置
- Comment[zh_TW]=終端使用者設定
-
-@@ -223,8 +223,8 @@
- Name[uz]=Dasturning %progname (%appname) ishida xato roʻy berdi va %signum (%signame) signaliga sababchi boʻldi.
- Name[uz@cyrillic]=Дастурнинг %progname (%appname) ишида хато рўй берди ва %signum (%signame) сигналига сабабчи бўлди.
- Name[wa]=Li programe %progname (%appname) s' a spotchî eyet a fwait l' signå %signum (%signame).
-+Name[xh]=Isicelo se %progname (%appname) ingqubekile yaze yabangela uphawu lwe %signum (%signame).
- Name[x-test]=xxThe application %progname (%appname) crashed and caused the signal %signum (%signame).xx
--Name[xh]=Isicelo se %progname (%appname) ingqubekile yaze yabangela uphawu lwe %signum (%signame).
- Name[zh_CN]=应用程序 %progname (%appname) 已经崩溃并导致了信号 %signum (%signame)。
- Name[zh_TW]=應用程式 %progname（%appname），行程代碼 %pid，崩潰並引發信號 %signum（%signame）。
-
-@@ -368,8 +368,8 @@
- Comment[uz]=Odatda, SIGILL signaliga dasturdagi xato sababchi boʻladi. Dasturdan maʼlumotlarni saqlash talab qilindi.
- Comment[uz@cyrillic]=Одатда, SIGILL сигналига дастурдаги хато сабабчи бўлади. Дастурдан маълумотларни сақлаш талаб қилинди.
- Comment[wa]=On programe riçût sortot l' signå SIGILL a cåze d' on bug dins l' programe. Dj' a dmandé å programe di schaper ses documints.
-+Comment[xh]=Isicelo esifumana i SIGILL uphawu enxa yegciwane kwi sicelo. Isicelo sicelwe ukuba sigcine amaxwebhu aso.
- Comment[x-test]=xxAn application mostly receives the SIGILL signal due to a bug in the application. The application was asked to save its documents.xx
--Comment[xh]=Isicelo esifumana i SIGILL uphawu enxa yegciwane kwi sicelo. Isicelo sicelwe ukuba sigcine amaxwebhu aso.
- Comment[zh_CN]=应用程序之所以收到 SIGILL 信号，大多是因为应用程序有错误。应用程序会请求保存其文档。
- Comment[zh_TW]=應用程式收到 SIGILL 信號，通常是因為應用程式的錯誤。此應用程式已被要求儲存其文件。
-
-@@ -445,8 +445,8 @@
- Comment[uz]=Dasturning ishi SIGABRT signali bilan tugashiga uning ichki ketma-ketligini ishdan chiqargan xato sababchi boʻladi.
- Comment[uz@cyrillic]=Дастурнинг иши SIGABRT сигнали билан тугашига унинг ички кетма-кетлигини ишдан чиқарган хато сабабчи бўлади.
- Comment[wa]=On programe a fini avou on signå SIGABRT cwand il a trové ene divintrinne inconsistance a cåze d' on bug dins l' programe.
-+Comment[xh]=Isicelo sicinywa ngophawu lwe SIGABRT xa sibona ukungahambisalani kwangaphakathi okwenziwa ligciwane kwinkqubo.
- Comment[x-test]=xxAn application terminates with a SIGABRT signal when it detects an internal inconsistency caused by a bug in the program.xx
--Comment[xh]=Isicelo sicinywa ngophawu lwe SIGABRT xa sibona ukungahambisalani kwangaphakathi okwenziwa ligciwane kwinkqubo.
- Comment[zh_CN]=应用程序以 SIGABRT 信号终止，可能是因为程序自身的错误导致了内部不一致。
- Comment[zh_TW]=應用程式收到 SIGABRT 而結束，通常是因為應用程式的問題，讓它偵測到內部資料有不相符的地方。
-
-@@ -523,8 +523,8 @@
- Comment[uz]=Odatda, SIGFPE signaliga dasturdagi xato sababchi boʻladi. Dasturdan maʼlumotlarni saqlash talab qilindi.
- Comment[uz@cyrillic]=Одатда, SIGFPE сигналига дастурдаги хато сабабчи бўлади. Дастурдан маълумотларни сақлаш талаб қилинди.
- Comment[wa]=On programe riçût sortot l' signå SIGFPE a cåze d' on bug dins l' programe. Dj' a dmandé å programe di schaper ses documints.
-+Comment[xh]=Isicelo sifumana i SIGFPE uphawu ngenxa ye gciwane kwisicelo. Isicelo sicelwe ukuba sigcine amaxwebhu ayo.
- Comment[x-test]=xxAn application mostly receives the SIGFPE signal due to a bug in the application. The application was asked to save its documents.xx
--Comment[xh]=Isicelo sifumana i SIGFPE uphawu ngenxa ye gciwane kwisicelo. Isicelo sicelwe ukuba sigcine amaxwebhu ayo.
- Comment[zh_CN]=应用程序之所以收到 SIGFPE 信号，大多是因为应用程序有错误。应用程序会请求保存其文档。
- Comment[zh_TW]=應用程式收到 SIGFPE 信號，通常是因為應用程式的錯誤。此應用程式已被要求儲存其文件。
-
-@@ -600,8 +600,8 @@
- Comment[uz]=Odatda, SIGSEGV signaliga dasturdagi xato sababchi boʻladi. Dasturdan maʼlumotlarni saqlash talab qilindi.
- Comment[uz@cyrillic]=Одатда, SIGSEGV сигналига дастурдаги хато сабабчи бўлади. Дастурдан маълумотларни сақлаш талаб қилинди.
- Comment[wa]=On programe riçût sortot l' signå SIGSEGV a cåze d' on bug dins l' programe. Dj' a dmandé å programe di schaper ses documints.
-+Comment[xh]=Isicelo esifumana i SIGSEGV uphawu ngenxa yegciwane. Isicelo siceliwe ukuba sigcine amaxwebhu aso.
- Comment[x-test]=xxAn application mostly receives the SIGSEGV signal due to a bug in the application. The application was asked to save its documents.xx
--Comment[xh]=Isicelo esifumana i SIGSEGV uphawu ngenxa yegciwane. Isicelo siceliwe ukuba sigcine amaxwebhu aso.
- Comment[zh_CN]=应用程序之所以收到 SIGSEGV 信号，大多是因为应用程序有错误。应用程序会请求保存其文档。
- Comment[zh_TW]=應用程式收到 SIGSEGV 信號，通常是因為應用程式的錯誤。此應用程式已被要求儲存其文件。
-
-@@ -680,8 +680,8 @@
- Name[uz]=Nomaʼlum
- Name[uz@cyrillic]=Номаълум
- Name[wa]=Nén cnoxhou
-+Name[xh]=Engaziwayo
- Name[x-test]=xxUnknownxx
--Name[xh]=Engaziwayo
- Name[zh_CN]=未知
- Name[zh_TW]=未知
- Comment=Sorry, I do not know this signal.
---- runtime/drkonqi/debuggers/gdbrc (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/drkonqi/debuggers/gdbrc (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -135,8 +135,8 @@
- Comment[uz]=Terminalda GNU uchun matn asosida debagger
- Comment[uz@cyrillic]=Терминалда GNU учун матн асосида дебаггер
- Comment[wa]=Disbugueu e tecse di GNU dins ene konzôle
-+Comment[xh]=Text based debugger evela kwi GNU kwi konsole
- Comment[x-test]=xxText based debugger from GNU in a konsolexx
--Comment[xh]=Text based debugger evela kwi GNU kwi konsole
- Comment[zh_CN]=在 Konsole 中调用文字界面的 GNU 调试器
- Comment[zh_TW]=在 Konsole 的文字型除錯器
- Exec=konsole -e gdb -nw %execname %pid
---- runtime/l10n/northamerica.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/northamerica.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -76,7 +76,7 @@
- Name[uz@cyrillic]=Америка, Шимолий
- Name[vi]=Bắc Mĩ
- Name[wa]=Amerike bijhrece
-+Name[xh]=Melika, Mntla
- Name[x-test]=xxAmerica, Northxx
--Name[xh]=Melika, Mntla
- Name[zh_CN]=北美
- Name[zh_TW]=美洲，北部
---- runtime/l10n/za/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/za/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -80,8 +80,8 @@
- Name[uz@cyrillic]=Жанубий Африка
- Name[vi]=Nam Phi
- Name[wa]=Nonne Afrike
-+Name[xh]=Mzantsi Afrika
- Name[x-test]=xxSouth Africaxx
--Name[xh]=Mzantsi Afrika
- Name[zh_CN]=南非
- Name[zh_TW]=南非
- Region=southafrica
---- runtime/l10n/kn/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/kn/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -74,8 +74,8 @@
- Name[uz@cyrillic]=Сент-Кристофер ва Невис
- Name[vi]=San Khíth và Ne-vi-xợ
- Name[wa]=Sint Kitts eyet Nevis
-+Name[xh]=St. Kitts neNevis
- Name[x-test]=xxSt. Kitts and Nevisxx
--Name[xh]=St. Kitts neNevis
- Name[zh_CN]=圣基茨和尼维斯
- Name[zh_TW]=聖克理斯多福及尼維斯
- Region=caribbean
---- runtime/l10n/kp/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/kp/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -76,8 +76,8 @@
- Name[uz@cyrillic]=Шимолий Корея
- Name[vi]=Bắc Triều Tiên
- Name[wa]=Bijhe Corêye
-+Name[xh]=Umntla Korea
- Name[x-test]=xxNorth Koreaxx
--Name[xh]=Umntla Korea
- Name[zh_CN]=朝鲜
- Name[zh_TW]=北韓
- Region=eastasia
---- runtime/l10n/kr/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/kr/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -76,8 +76,8 @@
- Name[uz@cyrillic]=Жанубий Корея
- Name[vi]=Hàn Quốc
- Name[wa]=Nonne Corêye
-+Name[xh]=Umzantsi Korea
- Name[x-test]=xxSouth Koreaxx
--Name[xh]=Umzantsi Korea
- Name[zh_CN]=韩国
- Name[zh_TW]=南韓
- Region=eastasia
---- runtime/l10n/C/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/C/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,8 +78,8 @@
- Name[uz@cyrillic]=Андоза
- Name[vi]=Mặc định
- Name[wa]=Prémetou
-+Name[xh]=Okwendalo
- Name[x-test]=xxDefaultxx
--Name[xh]=Okwendalo
- Name[zh_CN]=默认
- Name[zh_TW]=預設
- Languages=en_US
---- runtime/l10n/southamerica.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/southamerica.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,7 +77,7 @@
- Name[uz@cyrillic]=Америка, Жанубий
- Name[vi]=Nam Mĩ
- Name[wa]=Amerike nonnrece
-+Name[xh]=Emelika, Ezantsi
- Name[x-test]=xxAmerica, Southxx
--Name[xh]=Emelika, Ezantsi
- Name[zh_CN]=南美
- Name[zh_TW]=美洲，南部
---- runtime/l10n/om/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/om/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -51,8 +51,8 @@
- Name[uz]=Ummon
- Name[uz@cyrillic]=Уммон
- Name[vi]=Ô-man
-+Name[xh]= Oman
- Name[x-test]=xxOmanxx
--Name[xh]= Oman
- Name[zh_CN]=阿曼
- Name[zh_TW]=阿曼
- Region=middleeast
---- runtime/l10n/ps/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/ps/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -75,8 +75,8 @@
- Name[uz@cyrillic]=Фаластин Ерлари
- Name[vi]=Lãnh thổ Palestine
- Name[wa]=Palestene
-+Name[xh]=Umhlaba wePalestina
- Name[x-test]=xxPalestinian Territoryxx
--Name[xh]=Umhlaba wePalestina
- Name[zh_CN]=巴勒斯坦地区
- Name[zh_TW]=巴勒斯坦領地
- Region=middleeast
---- runtime/l10n/ag/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/ag/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,8 +77,8 @@
- Name[uz@cyrillic]=Антигуа ва Барбуда
- Name[vi]=An-ti-gua và Bă-bu-đa
- Name[wa]=Antigua eyet Barbuda
-+Name[xh]=Antigua ne Barbuda
- Name[x-test]=xxAntigua and Barbudaxx
--Name[xh]=Antigua ne Barbuda
- Name[zh_CN]=安提瓜和巴布达
- Name[zh_TW]=安地瓜島和巴布達島
- Region=caribbean
---- runtime/l10n/az/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/az/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -70,7 +70,7 @@
- Name[tg]=Озарбойҷон
- Name[th]=อาร์เซอร์ไบจัน
- Name[tr]=Azerice
--Name[uk]=Азербайджан
-+Name[uk]=Азербайджанська
- Name[uz]=Ozarbayjon
- Name[uz@cyrillic]=Озарбайжон
- Name[vi]=A-xợ-bai-gianh
---- runtime/l10n/ba/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/ba/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,8 +78,8 @@
- Name[uz@cyrillic]=Босния ва Герцоговина
- Name[vi]=Bô-xni-a và Héc-xê-gô-vi-na
- Name[wa]=Bosneye
-+Name[xh]=Bosnia ne Herzegovina
- Name[x-test]=xxBosnia and Herzegovinaxx
--Name[xh]=Bosnia ne Herzegovina
- Name[zh_CN]=波斯尼亚和黑塞哥维那
- Name[zh_TW]=波士尼亞與赫塞哥維納
- Region=southeurope
---- runtime/l10n/southeurope.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/southeurope.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,7 +77,7 @@
- Name[uz@cyrillic]=Ойропа, Жанубий
- Name[vi]=Nam Âu
- Name[wa]=Urope nonnrece
-+Name[xh]=Yurophu, Emazantsi
- Name[x-test]=xxEurope, Southernxx
--Name[xh]=Yurophu, Emazantsi
- Name[zh_CN]=南欧
- Name[zh_TW]=歐洲，南部
---- runtime/l10n/ru/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/ru/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -76,8 +76,8 @@
- Name[uz@cyrillic]=Россия
- Name[vi]=Nga
- Name[wa]=Rûsseye
-+Name[xh]=Rashiya
- Name[x-test]=xxRussiaxx
--Name[xh]=Rashiya
- Name[zh_CN]=俄罗斯
- Name[zh_TW]=俄羅斯
- Region=easteurope
---- runtime/l10n/co/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/co/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -69,8 +69,8 @@
- Name[uz@cyrillic]=Колумбия
- Name[vi]=Cô-lom-bi-a
- Name[wa]=Colombeye
-+Name[xh]=Columbia
- Name[x-test]=xxColombiaxx
--Name[xh]=Columbia
- Name[zh_CN]=哥伦比亚
- Name[zh_TW]=哥倫比亞
- Region=southamerica
---- runtime/l10n/do/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/do/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,8 +78,8 @@
- Name[uz@cyrillic]=Доминикана Республикаси
- Name[vi]=Cộng hoà Đô-mi-ni-ca
- Name[wa]=Republike Dominikinne
-+Name[xh]=IRepublic yeDominican
- Name[x-test]=xxDominican Republicxx
--Name[xh]=IRepublic yeDominican
- Name[zh_CN]=多米尼加共和国
- Name[zh_TW]=多明尼加共和國
- Region=caribbean
---- runtime/l10n/tt/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/tt/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,8 +78,8 @@
- Name[uz@cyrillic]=Тринидад ва Тобаго
- Name[vi]=Tợ-ri-ni-đađ và Tô-ba-gô
- Name[wa]=Trinité et Tobago
-+Name[xh]=Trinidad ne Tobago
- Name[x-test]=xxTrinidad and Tobagoxx
--Name[xh]=Trinidad ne Tobago
- Name[zh_CN]=特立尼达和多巴哥
- Name[zh_TW]=千里達及托貝哥
- Region=caribbean
---- runtime/l10n/us/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/us/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,8 +78,8 @@
- Name[uz@cyrillic]=АҚШ
- Name[vi]=Hoa Kỳ
- Name[wa]=Estats Unis
-+Name[xh]=United States ye Melika
- Name[x-test]=xxUnited States of Americaxx
--Name[xh]=United States ye Melika
- Name[zh_CN]=美国
- Name[zh_TW]=美利堅合眾國
- Region=northamerica
---- runtime/l10n/fr/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/fr/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,8 +78,8 @@
- Name[uz]=Fransiya
- Name[uz@cyrillic]=Франция
- Name[vi]=Pháp
-+Name[xh]=Fransi
- Name[x-test]=xxFrancexx
--Name[xh]=Fransi
- Name[zh_CN]=法国
- Name[zh_TW]=法國
- Region=westeurope
---- runtime/l10n/vc/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/vc/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,8 +78,8 @@
- Name[uz@cyrillic]=Сент-Винсент ва Гренадина
- Name[vi]=Xan Vin-xen và các Gợ-re-na-đinh
- Name[wa]=St. Vincint et les Grenadines
-+Name[xh]=St. Vincent ne Grenadines
- Name[x-test]=xxSt. Vincent and the Grenadinesxx
--Name[xh]=St. Vincent ne Grenadines
- Name[zh_CN]=圣文森特和格林纳丁斯
- Name[zh_TW]=聖文森及格納那丁
- Region=caribbean
---- runtime/l10n/easteurope.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/easteurope.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,7 +77,7 @@
- Name[uz@cyrillic]=Ойропа, Шарқий
- Name[vi]=Tây Âu
- Name[wa]=Urope levantrece
-+Name[xh]=Yurophu,Impuma
- Name[x-test]=xxEurope, Easternxx
--Name[xh]=Yurophu,Impuma
- Name[zh_CN]=东欧
- Name[zh_TW]=歐洲，東部
---- runtime/l10n/gb/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/gb/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,8 +78,8 @@
- Name[uz@cyrillic]=ББ
- Name[vi]=Vương quốc Anh
- Name[wa]=Rweyåme Uni
-+Name[xh]=United Kingdom
- Name[x-test]=xxUnited Kingdomxx
--Name[xh]=United Kingdom
- Name[zh_CN]=英国
- Name[zh_TW]=聯合王國
- Region=westeurope
---- runtime/l10n/northeurope.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/northeurope.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -76,7 +76,7 @@
- Name[uz@cyrillic]=Ойропа, Шимолий
- Name[vi]=Bắc Âu
- Name[wa]=Urope bijhrece
-+Name[xh]=Yurophu, Esemantla
- Name[x-test]=xxEurope, Northernxx
--Name[xh]=Yurophu, Esemantla
- Name[zh_CN]=北欧
- Name[zh_TW]=歐洲，北部
---- runtime/l10n/centraleurope.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/centraleurope.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -77,7 +77,7 @@
- Name[uz@cyrillic]=Ойропа, Марказий
- Name[vi]=Trung Âu
- Name[wa]=Urope cintråle
-+Name[xh]=Yurophu, Kumbindi
- Name[x-test]=xxEurope, Centralxx
--Name[xh]=Yurophu, Kumbindi
- Name[zh_CN]=中欧
- Name[zh_TW]=歐洲，中部
---- runtime/l10n/il/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/il/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -56,8 +56,8 @@
- Name[uz@cyrillic]=Исроил
- Name[vi]=Do Thái
- Name[wa]=Israyel
-+Name[xh]=USirayeli
- Name[x-test]=xxIsraelxx
--Name[xh]=USirayeli
- Name[zh_CN]=以色列
- Name[zh_TW]=以色列
- Region=middleeast
---- runtime/l10n/westeurope.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/westeurope.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,7 +78,7 @@
- Name[uz@cyrillic]=Ойропа, Ғарбий
- Name[vi]=Tây Âu
- Name[wa]=Urope coûtchantrece
-+Name[xh]=Yurophu, Entshona
- Name[x-test]=xxEurope, Westernxx
--Name[xh]=Yurophu, Entshona
- Name[zh_CN]=西欧
- Name[zh_TW]=歐洲，西部
---- runtime/l10n/it/entry.desktop (.../tags/KDE/4.2.3/kdebase) (wersja 974232)
-+++ runtime/l10n/it/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 974232)
-@@ -78,8 +78,8 @@
- Name[uz@cyrillic]=Италия
- Name[vi]=Ý
- Name[wa]=Itåleye
-+Name[xh]=Ithali
- Name[x-test]=xxItalyxx
--Name[xh]=Ithali
- Name[zh_CN]=意大利
- Name[zh_TW]=義大利
- Region=southeurope
+ Keys=et,ethicle
+ Query=http://www.ethicle.com/search.php?q=\\{@}
++Query[hr]=http://info.alexa.com/search?q=\\{@}
+ Query[x-test]=xxhttp://www.ethicle.com/search.php?q=\\{@}xx
+--- runtime/kurifilter-plugins/ikws/searchproviders/mamma.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/mamma.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -27,7 +27,7 @@
+ Name[he]=Mamma - אם כל מנועי החיפוש
+ Name[hi]=मम्मा- सभी खोज इंजिन की अम्मा
+ Name[hne]=मम्मा- सब्बो खोज इंजिन के अम्मा
+-Name[hr]=Mamma - Majka svih tražilica
++Name[hr]=Mamma – Majka svih tražilica
+ Name[hu]=Mamma
+ Name[is]=Mamma - Mamma allra leitarvéla
+ Name[it]=Mamma - Madre di tutti i motori di ricerca
+--- runtime/kurifilter-plugins/ikws/searchproviders/multitran-frru.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/multitran-frru.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -29,7 +29,7 @@
+ Name[he]=Multitran - תרגום בין צרפתית ורוסית
+ Name[hi]=मल्टीट्रान - फ्रांसीसी तथा रूसी के बीच अनुवाद
+ Name[hne]=मल्टीट्रान - फ्रांसीसी अउ रूसी के बीच अनुवाद
+-Name[hr]=Multitran - Prevođenje između francuskog i ruskog
++Name[hr]=Multitran – Prevođenje između francuskog i ruskog
+ Name[hsb]=Multitran - přełožowanje z francošćiny a rušćiny
+ Name[hu]=Multitran - Fordítás franciáról oroszra (mindkét irányban)
+ Name[is]=Multitran - Þýða á milli frönsku og rússnesku
+--- runtime/kurifilter-plugins/ikws/searchproviders/multitran-nlru.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/multitran-nlru.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -29,7 +29,7 @@
+ Name[he]=Multitran - תרגום בין הולנדית ורוסית
+ Name[hi]=मल्टीट्रान - डच तथा रूसी के बीच अनुवाद
+ Name[hne]=मल्टीट्रान - डच अउ रूसी के बीच अनुवाद
+-Name[hr]=Multitran - Prevođenje između nizozemskog i ruskog
++Name[hr]=Multitran – Prevođenje između nizozemskog i ruskog
+ Name[hsb]=Multitran - přełožowanje z nižozemčiny a rušćiny
+ Name[hu]=Multitran - Fordítás hollandról oroszra (mindkét irányban)
+ Name[is]=Multitran - Þýða á milli hollensku og rússnesku
+--- runtime/kurifilter-plugins/ikws/searchproviders/cpan.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/cpan.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -21,7 +21,7 @@
+ Name[gu]=CPAN - કોમ્પ્રેસિવ પર્લ અર્કાઇવ નેટવર્ક
+ Name[hi]=CPAN - कॉम्प्रेहेंसिव पर्ल आर्काइव नेटवर्क
+ Name[hne]=CPAN - काम्प्रेहेंसिव पर्ल आर्काइव नेटवर्क
+-Name[hr]=CPAN - Perl mreža sveobuhvatne arhive
++Name[hr]=CPAN – Perl mreža sveobuhvatne arhive
+ Name[kk]=CPAN - Perl скрипттер архив желісі
+ Name[kn]=CPAN -ವ್ಯಾಪಕ ಪರ್ಲ್ ಕಡತಾಗಾರ (ಆರ್ಕೈವ್) ಜಾಲ
+ Name[ku]=CPAN - Tora Arşîva Perl yê Bikitekit
+--- runtime/kurifilter-plugins/ikws/searchproviders/ctan.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/ctan.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -21,7 +21,7 @@
+ Name[gu]=CTAN - કોમ્પ્રેસિવ ટેક અર્કાઇવ નેટવર્ક
+ Name[hi]=CTAN - कॉम्प्रेहेंसिव टीईएक्स आर्काइव नेटवर्क
+ Name[hne]=सीटीएएन - काम्प्रेहेंसिव टीईएक्स आर्काइव नेटवर्क
+-Name[hr]=CTAN - TeX mreža sveobuhvatne arhive
++Name[hr]=CTAN – TeX mreža sveobuhvatne arhive
+ Name[kk]=CTAN - TeX архив желісі
+ Name[kn]=CTAN -ವ್ಯಾಪಕ ಟೆಕ್ ( TeX) ಕಡತಾಗಾರ (ಆರ್ಕೈವ್) ಜಾಲ
+ Name[ku]=CTAN - Tora Arşîva TeX yê Bikitekit
+--- runtime/kurifilter-plugins/ikws/searchproviders/multitran-enru.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/multitran-enru.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -29,7 +29,7 @@
+ Name[he]=Multitran - תרגום בין אנגלית ורוסית
+ Name[hi]=मल्टीट्रान - रूसी तथा अंग्रेज़ी के बीच अनुवाद
+ Name[hne]=मल्टीट्रान - अंग्रेजी अउ रूसी के बीच अनुवाद
+-Name[hr]=Multitran - Prevođenje između engleskog i ruskog
++Name[hr]=Multitran – Prevođenje između engleskog i ruskog
+ Name[hsb]=Multitran - přełožowanje z jendźelšćiny a rušćiny
+ Name[hu]=Multitran - Fordítás angolról oroszra (mindkét irányban)
+ Name[is]=Multitran - Þýða á milli ensku og rússnesku
+--- runtime/kurifilter-plugins/ikws/searchproviders/multitran-itru.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/multitran-itru.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -29,7 +29,7 @@
+ Name[he]=Multitran - תרגום בין איטלקית ורוסית
+ Name[hi]=मल्टीट्रान - रूसी तथा इतालवी के बीच अनुवाद
+ Name[hne]=मल्टीट्रान - इतालवी अउ रूसी के बीच अनुवाद
+-Name[hr]=Multitran - Prevođenje između talijanskog i ruskog
++Name[hr]=Multitran – Prevođenje između talijanskog i ruskog
+ Name[hsb]=Multitran - přełožowanje z italšćiny a rušćiny
+ Name[hu]=Multitran - Fordítás olaszról oroszra (mindkét irányban)
+ Name[is]=Multitran - Þýða á milli ítölsku og rússnesku
+--- runtime/kurifilter-plugins/ikws/searchproviders/de2fr.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/de2fr.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -29,7 +29,7 @@
+ Name[he]=LEO - תרגום בין גרמנית לצרפתית
+ Name[hi]=लिओ - जर्मनी तथा फ्रेंच के बीच अनुवाद
+ Name[hne]=लिओ - जर्मनी अउ फ्रेंच के बीच अनुवाद
+-Name[hr]=LEO - Prevođenje između njemačkog i francuskog
++Name[hr]=LEO – Prevođenje između njemačkog i francuskog
+ Name[hsb]=LEO - přełožowanje z němčiny a francošćiny
+ Name[hu]=LEO - Fordítás németről franciára (mindkét irányban)
+ Name[is]=LEO - Þýða á milli þýsku og frönsku
+--- runtime/kurifilter-plugins/ikws/searchproviders/wikipedia.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kurifilter-plugins/ikws/searchproviders/wikipedia.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -31,7 +31,7 @@
+ Name[he]=ויקיפדיה - האנציקלופדיה החופשית
+ Name[hi]=विकिपेडिया- मुफ्त विश्वकोश
+ Name[hne]=विकिपीडिया- फोकट विस्वकोस
+-Name[hr]=Wikipedia - besplatna enciklopedija
++Name[hr]=Wikipedia – besplatna enciklopedija
+ Name[hsb]=Wikipedia - Swobodna encyklopedija
+ Name[hu]=Wikipedia
+ Name[is]=Wikipedia - Frjálst alfræðiorðasafn
+--- runtime/soliduiserver/soliduiserver.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/soliduiserver/soliduiserver.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -30,6 +30,7 @@
+ Name[he]=שרת ממשק משתמש של Solid
+ Name[hi]=ठोस उपयोक्ता अंतरफलक सर्वर
+ Name[hne]=सालिड यूजर इंटरफेस सर्वर
++Name[hr]=Solid Poslužitelj Korsničkog Sučelja
+ Name[hsb]=Solid User Interface Serwer
+ Name[hu]=Solid felületkezelő szolgáltatás
+ Name[is]=Solid miðlari fyrir notendaviðmót
+@@ -95,6 +96,7 @@
+ Comment[gu]=સોલિડ માટે યુઝર ઇન્ટરફેસ સર્વર, હાર્ડેવર શોધવાની સિસ્ટમ
+ Comment[he]=שרת ממשק משתמש ל־Solid, מערכת זיהוי החומרה
+ Comment[hne]=सालिड - हार्डवेयर पता लगइया तंत्र बर यूजर इंटरफेस
++Comment[hr]=Poslužitelj korisničkog sučelja za Solid, sustav detekcije hardvera
+ Comment[hsb]=Wužiwarski intefejs za Solid, system za namakanje hardware
+ Comment[hu]=Felhasználói felület a Solid hardverdetektáló rendszerhez
+ Comment[is]=Miðlari fyrir notendaviðmót í Solid vélbúnaðarkönnuðinn
+--- runtime/keditfiletype/tests/filetypestest.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/keditfiletype/tests/filetypestest.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -137,8 +137,8 @@
+ QVERIFY(patterns.contains("*.txt"));
+ QVERIFY(!patterns.contains("*.toto"));
+ const QStringList origPatterns = patterns;
+- if (KMimeType::sharedMimeInfoVersion() >= KDE_MAKE_VERSION(0, 60, 0)) {
+- // <glob-deleteall> is only supported by shared-mime-info >= 0.60
++ if (KMimeType::sharedMimeInfoVersion() >= KDE_MAKE_VERSION(0, 61, 0)) {
++ // <glob-deleteall> is only supported by shared-mime-info > 0.60
+ patterns.removeAll("*.txt");
+ }
+ patterns.append("*.toto"); // yes, a french guy wrote this, as you can see
+--- runtime/kglobalaccel/kglobalaccel.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/kglobalaccel/kglobalaccel.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -30,6 +30,7 @@
+ Name[he]=שרת הקיצורי מקשים גלובליים KDED
+ Name[hi]=केडीईडी ग्लोबल शॉर्टकट सर्वर
+ Name[hne]=केडीईडी वैस्विक सार्टकट सर्वर
++Name[hr]=KDED Globalni poslužitelj prečaca tipkovnice
+ Name[hsb]=Serwer za globalne KDE-skrótšenki
+ Name[hu]=KDE-szolgáltatás a globális billentyűparancsok lekérdezéséhez
+ Name[is]=KDED víðtækur tenglaþjónn
+--- runtime/drkonqi/drkonqiassistantpages_bugzilla.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/drkonqi/drkonqiassistantpages_bugzilla.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -495,6 +495,13 @@
+
+ ui.m_statusWidget->setBusy(i18nc("@info:status","Searching for duplicates (from %1 to %2)...",
+ startDateStr, endDateStr));
++
++ //Bugzilla will not search on Today bugs if we send the date.
++ //we need to send "Now"
++ if (m_searchingEndDate == QDate::currentDate()) {
++ endDateStr = QLatin1String("Now");
++ }
++
+ BugReport report = reportInfo()->newBugReportTemplate();
+ bugzillaManager()->searchBugs(m_currentKeywords, report.product(), report.bugSeverity(),
+ startDateStr, endDateStr, reportInfo()->firstBacktraceFunctions().join(" "));
+@@ -808,7 +815,6 @@
+ KIcon("document-preview"),
+ i18nc("@info:tooltip", "Use this button to show the generated "
+ "report information about this crash.")));
+- ui.m_showReportContentsButton->setVisible(false);
+ connect(ui.m_showReportContentsButton, SIGNAL(clicked()), this, SLOT(openReportContents()));
+
+ ui.m_retryButton->setVisible(false);
+@@ -822,7 +828,6 @@
+
+ void BugzillaSendPage::retryClicked()
+ {
+- ui.m_showReportContentsButton->setVisible(false);
+ ui.m_retryButton->setEnabled(false);
+ aboutToShow();
+ }
+@@ -861,8 +866,6 @@
+ ui.m_statusWidget->setIdle(i18nc("@info:status","Error sending the crash report: "
+ "<message>%1.</message>", errorString));
+
+- ui.m_showReportContentsButton->setVisible(true);
+-
+ ui.m_retryButton->setEnabled(true);
+ ui.m_retryButton->setVisible(true);
+ }
+--- runtime/l10n/eastafrica.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/l10n/eastafrica.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -25,6 +25,7 @@
+ Name[he]=אפריקה, מזרח
+ Name[hi]=पूर्वी अफ्रीका
+ Name[hne]=अफ्रीका, पस्चिमी
++Name[hr]=Afrika, istočna
+ Name[hsb]=Afrika, Wuchodna
+ Name[hu]=Kelet-Afrika
+ Name[is]=Afríka, Austur-Afríka
+--- runtime/l10n/sg/entry.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/l10n/sg/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -86,7 +86,7 @@
+ NegativeMonetarySignPosition=3
+ DateFormat=%d %B %Y
+ DateFormatShort=%d/%m/%Y
+-TimeFormat=%p %H:%M:%S
++TimeFormat=%p %l:%M:%S
+ WeekStartDay=7
+ PageSize=0
+ MeasureSystem=0
+--- runtime/l10n/sk/entry.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/l10n/sk/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -48,7 +48,7 @@
+ Name[mk]=Словачка
+ Name[ml]=സ്ലോവാക്ക്യ
+ Name[mr]=स्लोवाकिया
+-Name[nds]=Slowakei
++Name[nds]=Slowakien
+ Name[ne]=स्लोभाकिया
+ Name[nl]=Slowakije
+ Name[oc]=Eslòvac
+--- runtime/l10n/ec/entry.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/l10n/ec/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -19,6 +19,7 @@
+ Name[he]=אקוודור
+ Name[hi]=इक्वाडॉर
+ Name[hne]=इक्वेडार
++Name[hr]=Ekvador
+ Name[is]=Ekvador
+ Name[ja]=エクアドル
+ Name[kk]=Эквадор
+--- runtime/l10n/ee/entry.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/l10n/ee/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -44,7 +44,7 @@
+ Name[ml]=എസ്റ്റോണിയ
+ Name[mr]=इस्टोनिया
+ Name[nb]=Estland
+-Name[nds]=Estland
++Name[nds]=Eestland
+ Name[ne]=इस्टोनिया
+ Name[nl]=Estland
+ Name[nn]=Estland
+--- runtime/plasma/scriptengines/javascript/plasma-scriptengine-runner-javascript.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/plasma/scriptengines/javascript/plasma-scriptengine-runner-javascript.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -21,6 +21,7 @@
+ Name[gu]=જાવાસ્ક્રિપ્ટ ચલાવનાર
+ Name[hi]=जावास्क्रिप्ट चलाने वाला
+ Name[hne]=जावास्क्रिप्ट चलइया
++Name[hr]=JavaScript Pokretač
+ Name[hu]=JavaScript-indító
+ Name[is]=JavaScript keyrari
+ Name[it]=Esecutore JavaScript
+@@ -81,6 +82,7 @@
+ Comment[gu]=જાવાસ્ક્રિપ્ટ ચલાવનાર
+ Comment[hi]=जावास्क्रिप्ट चलाने वाला
+ Comment[hne]=जावास्क्रिप्ट चलइया
++Comment[hr]=JavaScript pokretač
+ Comment[hu]=JavaScript-indító
+ Comment[is]=JavaScript keyrari
+ Comment[it]=Esecutore JavaScript
+--- runtime/plasma/scriptengines/javascript/plasma-scriptengine-applet-simple-javascript.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/plasma/scriptengines/javascript/plasma-scriptengine-applet-simple-javascript.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -21,6 +21,7 @@
+ Name[gu]=જાવાસ્ક્રિપ્ટ વિજેટ
+ Name[hi]=जावास्क्रिप्ट विज़ेट
+ Name[hne]=जावास्क्रिप्ट विजेट
++Name[hr]=JavaScript Spravica
+ Name[hu]=JavaScript-objektum
+ Name[is]=JavaScript græja
+ Name[it]=Oggetto JavaScript
+@@ -81,6 +82,7 @@
+ Comment[gu]=જાવાસ્ક્રિપ્ટમાં લખાયેલ મૂળભૂત પ્લાઝમા વિજેટ
+ Comment[hi]=जावास्क्रिप्ट में लिखा गया नेटिव प्लाज्मा विजेट
+ Comment[hne]=जावास्क्रिप्ट मं लिखे नेटिव प्लाज्मा विजेट
++Comment[hr]=Izvorna Plasma spravica napisana u JavaScriptu
+ Comment[hu]=Plasma-elem Javasciptben elkészítve
+ Comment[is]=Upprunabundin Plasma græja skrifuð í JavaScript
+ Comment[it]=Oggetto nativo di Plasma scritto in JavaScript
+--- runtime/plasma/scriptengines/javascript/tests/javascript-config-test/metadata.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/plasma/scriptengines/javascript/tests/javascript-config-test/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -4,6 +4,7 @@
+ Name[es]=test-de-config-javascript
+ Name[fy]=javaskript-konfig-test
+ Name[gu]=જાવાસ્ક્રિપ્ટ-રૂપરેખાંકન-ચકાસણી
++Name[hr]=javascript-test-konfiguracije
+ Name[is]=JavaScript stillingaprófun
+ Name[lt]=javascript-config-testas
+ Name[nds]=JavaScript-Instellen-Test
+@@ -28,6 +29,7 @@
+ Comment[gl]=Widget de proba da configuración do obxecto en Javascript
+ Comment[gu]=જાવાસ્ક્રિપ્ટ રૂપરેખાંકન ઓબ્જેક્ટ ચકાસણી વિજેટ
+ Comment[hi]=जावास्क्रिप्ट कान्फिग वस्तु जाँच विज़ेट
++Comment[hr]=Spravica za testiranje Javascript konfiguracijskog objekta
+ Comment[hu]=JavaScript-tesztobjektum
+ Comment[is]=Javascript græja til stillingaprófana
+ Comment[it]=Oggetto di prova per la gestione della configurazione in JavaScript
+--- runtime/plasma/scriptengines/javascript/tests/script-digital-clock/metadata.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/plasma/scriptengines/javascript/tests/script-digital-clock/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -6,6 +6,7 @@
+ Name[fy]=skript-digitale-klok
+ Name[gu]=સ્ક્રિપ્ટ-ડિજીટલ-ઘડિયાળ
+ Name[hi]=स्क्रिप्ट-डिजिटल-घड़ी
++Name[hr]=script-digitalni-sat
+ Name[is]=Stafræn klukkuskrifta
+ Name[km]=នាឡិកាឌីជីថលស្គ្រីប
+ Name[kn]=ಸ್ಕ್ರಿಪ್ಟ್-ಅಂಕೀಯ (ಡಿಜಿಟಲ್)-ಗಡಿಯಾರ
+@@ -39,6 +40,7 @@
+ Comment[gl]=Reloxo dixital escrito en JavaScript
+ Comment[gu]=જાવાસ્ક્રિપ્ટ ડિજીટલ ઘડિયાળ
+ Comment[hi]=जावास्क्रिप्ट डिजिटल घड़ी
++Comment[hr]=Jednostavan digitalni sat
+ Comment[hu]=JavaScript-alapú digitális óra
+ Comment[is]=JavaScript stafræn klukka
+ Comment[it]=Orologio digitale JavaScript
+--- runtime/plasma/scriptengines/javascript/tests/script-nowplaying/metadata.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/plasma/scriptengines/javascript/tests/script-nowplaying/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -5,6 +5,7 @@
+ Name[es]=script-ejecutando
+ Name[fy]=skript-no ôfspyljend
+ Name[hi]=स्क्रिप्ट-अब बजा रहा है
++Name[hr]=script-sadasvira
+ Name[is]=spilanúna-skrifta
+ Name[kn]=ಸ್ಕ್ರಿಪ್ಟ್-ಈಗ ಚಾಲನೆಯಲ್ಲಿರುವ
+ Name[lt]=scenarijus-dabar groja
+@@ -37,6 +38,7 @@
+ Comment[ga]=Amhrán á sheinm anois in JavaScript
+ Comment[gl]=Versión en Javascript da pista a reproducir
+ Comment[hi]=जावास्क्रिप्ट संस्करण मौजूदा ट्रैक प्लेइंग
++Comment[hr]=Javascript verzija spravice za prikaz trenutne pjesme koja svira
+ Comment[hu]=JavaScript-függvény az éppen lejátszott szám jellemzőihez
+ Comment[is]=Javascript útgáfa núverandi spilunar
+ Comment[it]=La traccia attualmente in riproduzione (versione JavaScript)
+--- runtime/plasma/scriptengines/javascript/tests/tiger/metadata.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/plasma/scriptengines/javascript/tests/tiger/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -13,6 +13,7 @@
+ Name[he]=נמר
+ Name[hi]=शेर
+ Name[hne]=टाइगर
++Name[hr]=Tigar
+ Name[it]=Tigre
+ Name[ja]=タイガー
+ Name[kk]=Жолбарыс
+@@ -59,6 +60,7 @@
+ Comment[gl]=Un adaptador de script
+ Comment[gu]=સ્ક્રિપ્ટ એડપ્ટર
+ Comment[hi]=स्क्रिप्ट एडाप्टर
++Comment[hr]=Prilagodnik skripte
+ Comment[hu]=Szkriptkezelő modul
+ Comment[is]=Skriftumótari
+ Comment[it]=Script adattatore
+--- runtime/plasma/scriptengines/javascript/tests/script-mediaplayer/metadata.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412)
++++ runtime/plasma/scriptengines/javascript/tests/script-mediaplayer/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412)
+@@ -5,6 +5,7 @@
+ Name[fy]=script-mediaspiler
+ Name[gu]=સ્ક્રિપ્ટ-મીડિઆપ્લેયર
+ Name[hi]=स्क्रिप्ट-मीडिया प्लेयर
++Name[hr]=script-multimedijski_program
+ Name[is]=margmiðlunarspilara-skrifta
+ Name[kn]=ಸ್ಕ್ರಿಪ್ಟ್-ಮಾಧ್ಯಮನಿರೂಪಕ
+ Name[mai]=स्क्रिप्ट मीडिया प्लेयर
+@@ -37,6 +38,7 @@
+ Comment[gl]=Reprodutor multimedia escrito en Javascript
+ Comment[gu]=જાવાસ્ક્રિપ્ટ મિડીઆ પ્લેયર
+ Comment[hi]=जावास्क्रिप्ट मीडिया प्लेयर
++Comment[hr]=Multimedijski program
+ Comment[hu]=JavaScript-alapú médialejátszó
+ Comment[is]=JavaScript margmiðlunarspilari
+ Comment[it]=Riproduttore multimediale JavaScript
projects / packages / kde4-kdebase-runtime.git / commitdiff