---- 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 @@
+--- runtime/knotify/knotify4.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/knotify/knotify4.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -139,7 +139,7 @@
+ Comment[ru]=Служба уведомлений KDE
+ Comment[se]=KDE-dieđihanduogášprográmma
+ Comment[si]=KDE Notification Daemon
+-Comment[sk]=KDE Notifikačný démon
++Comment[sk]=KDE démon upozornení
+ Comment[sl]=KDE-jev demon za obveščanje
+ Comment[sr]=КДЕ‑ов демон за обавештења
+ Comment[sr@latin]=KDE‑ov demon za obaveštenja
+--- runtime/knotify/kde.notifyrc (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/knotify/kde.notifyrc (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -209,7 +209,7 @@
+ Comment[ru]=Корзина очищена
+ Comment[se]=Ruskalihtti gurrejuvvui
+ Comment[si]=The trash has been emptied
+-Comment[sk]=Kôš bol vyprázdnený.
++Comment[sk]=Kôš bol vyprázdnený
+ Comment[sl]=Smeti so bile izpraznjene
+ Comment[sr]=Смеће је испражњено
+ Comment[sr@latin]=Smeće je ispražnjeno
+@@ -283,7 +283,7 @@
+ Name[ro]=Completare text: Rotație
+ Name[ru]=Автозавершение: переход по кругу
+ Name[si]=Textcompletion: Rotation
+-Name[sk]=Textcompletion: rotácia
++Name[sk]=Doplnenie textu: rotácia
+ Name[sl]=Dokončevanje besedila: rotacija
+ Name[sr]=Допуна текста: ротација
+ Name[sr@latin]=Dopuna teksta: rotacija
+@@ -356,7 +356,7 @@
+ Comment[ru]=Достигнут конец списка совпадений
+ Comment[se]=Joavddai deaivanlisttu lohppii
+ Comment[si]=The end of the list of matches has been reached
+-Comment[sk]=Bol dosiahnutý koniec zoznamu výsledkov hľadania
++Comment[sk]=Bol dosiahnutý koniec zoznamu nájdených položiek
+ Comment[sl]=Dosežen je bil konec seznama ujemanj
+ Comment[sr]=Достигнут је крај списка поклапања
+ Comment[sr@latin]=Dostignut je kraj spiska poklapanja
+@@ -432,7 +432,7 @@
+ Name[ro]=Completare text: nici o potrivire
+ Name[ru]=Автозавершение: нет совпадений
+ Name[si]=Textcompletion: No Match
+-Name[sk]=Textcompletion: Nič nenájdené
++Name[sk]=Doplnenie textu: žiadna zhoda
+ Name[sl]=Dokončevanje besedila: ni ujemanja
+ Name[sr]=Допуна текста: нема поклапања
+ Name[sr@latin]=Dopuna teksta: nema poklapanja
+@@ -505,7 +505,7 @@
+ Comment[ru]=Подходящее завершение не найдено
+ Comment[se]=Ii gávdnan teakstaollášuhttima
+ Comment[si]=No matching completion was found
+-Comment[sk]=Žiadne zodpovedajúce doplnenie nebolo nájdené
++Comment[sk]=Nebola nájdená žiadna zhoda
+ Comment[sl]=Ni bilo moč najti ujemanja za dokončevanje
+ Comment[sr]=Није нађено ниједно поклапање за допуну
+ Comment[sr@latin]=Nije nađeno nijedno poklapanje za dopunu
+@@ -581,7 +581,7 @@
+ Name[ro]=Completare text: potrivire parțială
+ Name[ru]=Автозавершение: частичное совпадение
+ Name[si]=Textcompletion: Partial Match
+-Name[sk]=Textcompletion: Čiastočná zhoda
++Name[sk]=Doplnenie textu: čiastočná zhoda
+ Name[sl]=Dokončevanje besedila: delno ujemanje
+ Name[sr]=Допуна текста: делимично поклапање
+ Name[sr@latin]=Dopuna teksta: delimično poklapanje
+@@ -655,7 +655,7 @@
+ Comment[ru]=Доступно более чем одно совпадение
+ Comment[se]=Lea eanetgo ovtta vejolaš deaivan
+ Comment[si]=There is more than one possible match
+-Comment[sk]=Je tu viac ako jeden výsledok hľadania
++Comment[sk]=Existuje viac ako jedna zhoda
+ Comment[sl]=Na voljo je več možnih ujemanj
+ Comment[sr]=Постоји више од једног могућег поклапања
+ Comment[sr@latin]=Postoji više od jednog mogućeg poklapanja
+@@ -808,7 +808,7 @@
+ Comment[ru]=Произошла серьёзная ошибка, приведшая к завершению работы программы
+ Comment[se]=Duođalaš meattáhus bissehii prográmma
+ Comment[si]=There was a serious error causing the program to exit
+-Comment[sk]=Stala sa vážna chyba, ktorá zapríčinila ukončenie programu
++Comment[sk]=Vyskytla sa vážna chyba, ktorá spôsobila ukončenie programu
+ Comment[sl]=Prišlo je do resne napake, zaradi katere se je program končal
+ Comment[sr]=Дошло је до озбиљне грешке због које је програм обустављен
+ Comment[sr@latin]=Došlo je do ozbiljne greške zbog koje je program obustavljen
+@@ -1120,7 +1120,7 @@
+ Comment[ru]=В программе произошла ошибка, которая может вызвать проблемы
+ Comment[se]=Lei meattáhus prográmmas mii dáidá ráhkadit váttisvuođaid
+ Comment[si]=There was an error in the program which may cause problems
+-Comment[sk]=Vyskytla sa chyba v programe, ktorá môže spôsobiť problémy
++Comment[sk]=V programe sa vyskytla chyba, ktorá môže spôsobiť problémy
+ Comment[sl]=V programu je prišlo do napake, ki lahko povzroči težave
+ Comment[sr]=Дошло је до грешке у програму која може изазвати проблеме
+ Comment[sr@latin]=Došlo je do greške u programu koja može izazvati probleme
+@@ -1268,7 +1268,7 @@
+ Comment[ro]=A intervenit o eroare foarte gravă, cauzînd cel puțin ieșirea programului
+ Comment[ru]=Произошла очень серьёзная ошибка, как минимум, вызвавшая завершение работы программы
+ Comment[si]=A very serious error occurred, at least causing the program to exit
+-Comment[sk]=Stala sa veľmi vážna chyba, ktorá zapríčinila minimálne ukončenie programu
++Comment[sk]=Nastala veľmi vážna chyba, ktorá zapríčinila minimálne ukončenie programu
+ Comment[sl]=Prišlo je do zelo resne napake, zaradi katere se je program končal
+ Comment[sr]=Дошло је до врло озбиљне грешке, због које је бар програм обустављен
+ Comment[sr@latin]=Došlo je do vrlo ozbiljne greške, zbog koje je bar program obustavljen
+@@ -1895,7 +1895,7 @@
+ Comment[ru]=Произошла ошибка печати
+ Comment[se]=Čálihanmeattáhus čuožžilii
+ Comment[si]=A print error has occurred
+-Comment[sk]=Vyskytla sa chyba tlače
++Comment[sk]=Nastala chyba tlače
+ Comment[sl]=Prišlo je do napake pri tiskanju
+ Comment[sr]=Дошло је до грешке при штампању
+ Comment[sr@latin]=Došlo je do greške pri štampanju
+@@ -2127,7 +2127,7 @@
+ Name[ro]=Mesaj de avertizare
+ Name[ru]=Предупредительное сообщение
+ Name[se]=Várrehusdiehtu
+-Name[sk]=Správa varovania
++Name[sk]=Varovanie
+ Name[sl]=Opozorilo
+ Name[sr]=Упозоравајућа порука
+ Name[sr@latin]=Upozoravajuća poruka
+--- runtime/kcontrol/locale/language.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kcontrol/locale/language.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -76,7 +76,7 @@
+ Name[ru]=Язык и стандарты
+ Name[se]=Riika/guovla ja giella
+ Name[si]=රට/ප්රදේශය සහ භාෂාව
+-Name[sk]=Krajina/Región a Jazyk
++Name[sk]=Krajina/Región a jazyk
+ Name[sl]=Država/regija in jezik
+ Name[sr]=Држава (регија) и језик
+ Name[sr@latin]=Država (regija) i jezik
+@@ -160,7 +160,7 @@
+ Comment[ru]=Настройка языка, даты и времени для вашего региона
+ Comment[se]=Báikkalaš giella-,lohko- ja áigeheivehusat
+ Comment[si]=Language, numeric, and time settings for your particular region
+-Comment[sk]=Jazyk, čísla, a nastavenia času pre váš región
++Comment[sk]=Nastavenie jazyka, formátu čísel, a času pre váš región
+ Comment[sl]=Jezikovne, številske in časovne nastavitve za vaše območje
+ Comment[sr]=Поставке језика, бројева и времена према вашем окружењу
+ Comment[sr@latin]=Postavke jezika, brojeva i vremena prema vašem okruženju
+--- runtime/kcontrol/knotify/kcmnotify.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kcontrol/knotify/kcmnotify.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -76,7 +76,7 @@
+ Name[ru]=Системные уведомления
+ Name[se]=Vuogádatmuittuhusat
+ Name[si]=පද්ධති දැනුම් දීම්
+-Name[sk]=Systémové správy
++Name[sk]=Systémové upozornenia
+ Name[sl]=Sistemska obvestila
+ Name[sr]=Системска обавештења
+ Name[sr@latin]=Sistemska obaveštenja
+@@ -161,7 +161,7 @@
+ Comment[ru]=Настройка системных уведомлений
+ Comment[se]=Heivet vuogádatmuittuhusat
+ Comment[si]=පද්ධති දැනුම් දීම් සැකසීම
+-Comment[sk]=Nastavenie správ systému
++Comment[sk]=Nastavenie systémových upozornení
+ Comment[sl]=Nastavitev sistemskih obvestil
+ Comment[sr]=Постава системских обавештења
+ Comment[sr@latin]=Postava sistemskih obaveštenja
+--- runtime/kcontrol/componentchooser/componentservices/kcm_kemail.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_kemail.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -12,6 +12,7 @@
+ Name[en_GB]=Email Client
+ Name[es]=Cliente de correo electrónico
+ Name[et]=E-posti klient
++Name[eu]=Post@ bezeroa
+ Name[fr]=Client de courrier électronique
+ Name[fy]=Email Client
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 @@
+@@ -40,6 +41,7 @@
+ Name[pt_BR]=Cliente de e-mail
+ Name[ro]=Client de poștă
+ Name[ru]=Почтовый клиент
++Name[sk]=E-mailový klient
+ Name[sl]=Odjemalec e-pošte
+ Name[sr]=клијент е‑поште
+ Name[sr@latin]=klijent e‑pošte
+--- runtime/kcontrol/componentchooser/componentservices/kcm_browser.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_browser.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -12,6 +12,7 @@
+ Name[en_GB]=Web Browser
+ Name[es]=Navegador web
+ Name[et]=Veebibrauser
++Name[eu]=Web arakatzailea
+ Name[fr]=Navigateur Web
+ Name[fy]=Web Browser
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 @@
+@@ -40,13 +41,14 @@
+ Name[pt_BR]=Navegador da Internet
+ Name[ro]=Navigator de Internet
+ Name[ru]=Веб-браузер
++Name[sk]=Webový prehliadač
+ Name[sl]=Spletni brskalnik
+ Name[sr]=веб прегледач
+ Name[sr@latin]=veb pregledač
+ Name[sv]=Webbläsare
+ Name[tg]=Намоишгари Интернет
+ Name[tr]=Web Tarayıcı
+-Name[uk]=Навігатор Тенет
++Name[uk]=Переглядач інтернету
+ Name[wa]=Betchteu waibe
+ Name[x-test]=xxWeb Browserxx
+ Name[zh_CN]=网页浏览器
+--- runtime/kcontrol/componentchooser/componentservices/kcm_wm.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_wm.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -12,6 +12,7 @@
+ Name[en_GB]=Window Manager
+ Name[es]=Gestor de ventanas
+ Name[et]=Aknahaldur
++Name[eu]=Leiho kudeatzailea
+ Name[fr]=Gestionnaire de fenêtre
+ Name[fy]=Finsterbehearder
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 @@
+@@ -40,6 +41,7 @@
+ Name[pt_BR]=Gerenciador de janelas
+ Name[ro]=Gestionar de ferestre
+ Name[ru]=Диспетчер окон
++Name[sk]=Správca okien
+ Name[sl]=Upravljalnik oken
+ Name[sr]=менаџер прозора
+ Name[sr@latin]=menadžer prozora
+--- runtime/kcontrol/componentchooser/componentservices/kcm_filemanager.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_filemanager.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -12,6 +12,7 @@
+ Name[en_GB]=File Manager
+ Name[es]=Gestor de archivos
+ Name[et]=Failihaldur
++Name[eu]=Fitxategi kudeatzailea
+ Name[fr]=Gestionnaire de fichiers
+ Name[fy]=File Manager
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 @@
+@@ -40,6 +41,7 @@
+ Name[pt_BR]=Gerenciador de arquivos
+ Name[ro]=Gestionar de fișiere
+ Name[ru]=Диспетчер файлов
++Name[sk]=Správca súborov
+ Name[sl]=Upravitelj datotek
+ Name[sr]=менаџер фајлова
+ Name[sr@latin]=menadžer fajlova
+--- runtime/kcontrol/componentchooser/componentservices/kcm_terminal.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_terminal.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -12,6 +12,7 @@
+ Name[en_GB]=Terminal Emulator
+ Name[es]=Emulador de terminal
+ Name[et]=Terminaliemulaator
++Name[eu]=Terminal emulatzailea
+ Name[fr]=Émulateur de terminal
+ Name[fy]=Terminal emulator
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 @@
+@@ -40,6 +41,7 @@
+ Name[pt_BR]=Emulador de terminal
+ Name[ro]=Emulator de terminal
+ Name[ru]=Эмулятор терминала
++Name[sk]=Emulátor terminálu
+ Name[sl]=Posnemovalnik terminala
+ Name[sr]=емулатор терминала
+ Name[sr@latin]=emulator terminala
+--- runtime/kcontrol/kded/kcmkded.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kcontrol/kded/kcmkded.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -154,7 +154,7 @@
+ Comment[ru]=Настройка служб KDE
+ Comment[se]=KDE-bálvalusaid heiveheapmi
+ Comment[si]=KDE සේවා සැකසීම
+-Comment[sk]=Nastavenie systémových služieb
++Comment[sk]=Nastavenie KDE služieb
+ Comment[sl]=Nastavitve storitev KDE
+ Comment[sr]=Постава КДЕ‑ових сервиса
+ Comment[sr@latin]=Postava KDE‑ovih servisa
+--- runtime/desktoptheme/air/metadata.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/desktoptheme/air/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -73,6 +73,8 @@
+ Comment[en_GB]=A breath of fresh air
+ Comment[es]=Un soplo de aire fresco
+ Comment[et]=Värskendav tuulepuhang
++Comment[eu]=Haize berria
++Comment[fi]=Raikkaan ilman leyhähdys
+ Comment[fr]=Un souffle d'air frais
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 @@
+@@ -95,6 +97,7 @@
+ Comment[pt_BR]=Uma brisa de ar fresco
+ Comment[ro]=O gură de aer proaspăt
+ Comment[ru]=Волшебные пузырьки
++Comment[sk]=Závan čerstvého vzduchu
+ Comment[sl]=Svež vetrič
+ Comment[sr]=Дашак свежег ваздуха
+ Comment[sr@latin]=Dašak svežeg vazduha
+--- runtime/phonon/platform_kde/phonon.notifyrc (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/phonon/platform_kde/phonon.notifyrc (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -261,7 +261,7 @@
+ Comment[ro]=Notificare la comutarea pe rezervă dacă dispozitivul preferat nu este disponibil
+ Comment[ru]=Уведомление о недоступности звукового устройства по умолчанию
+ Comment[si]=Notification on automatic fallback if the preferred device is unavailable
+-Comment[sk]=Notifikácia automatického použitia záložného zariadenia, ak je preferované zariadenie nedostupné
++Comment[sk]=Upozornenie na automatické použitie záložného zariadenia, ak je preferované zariadenie nedostupné
+ Comment[sl]=Obvestilo o samodejni uporabi zasilnerezervi, če željena naprava ni dosegljiva
+ Comment[sr]=Обавештење о аутоматском спадању ако пожељни уређај није доступан
+ Comment[sr@latin]=Obaveštenje o automatskom spadanju ako poželjni uređaj nije dostupan
+--- runtime/phonon/kcm/kcm_phonon.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/phonon/kcm/kcm_phonon.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -150,7 +150,7 @@
+ Comment[ro]=Configurare sunet și video
+ Comment[ru]=Настройка звука и видео
+ Comment[si]=Sound and Video Configuration
+-Comment[sk]=Nastavenie zvuku a obrazu
++Comment[sk]=Nastavenie zvuku a videa
+ Comment[sl]=Nastavitev zvoka in videa
+ Comment[sr]=Постава звука и видеа
+ Comment[sr@latin]=Postava zvuka i videa
+--- runtime/kpasswdserver/kpasswdserver.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kpasswdserver/kpasswdserver.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -20,7 +20,7 @@
+ Name[es]=Módulo de contraseñas de KDED
+ Name[et]=KDED paroolimoodul
+ Name[eu]=KDED pasahitzen modulua
+-Name[fi]=KDED-salasanamoduli
++Name[fi]=KDED-salasanamoduuli
+ Name[fr]=Module de mot de passe KDED
+ Name[fy]=KDED-wachtwurdmodule
+ Name[ga]=Modúl Focail Faire KDED
+@@ -59,7 +59,7 @@
+ Name[ru]=Хранение паролей
+ Name[se]=KDED-beassansátnemodula
+ Name[si]=KDED Password Module
+-Name[sk]=KDED Password Module
++Name[sk]=KDED modul pre heslá
+ Name[sl]=KDE-jev modul za gesla
+ Name[sr]=КДЕД модул за лозинке
+ Name[sr@latin]=KDED modul za lozinke
+--- runtime/khelpcenter/khelpcenter.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/khelpcenter/khelpcenter.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -148,7 +148,7 @@
+ Comment[ru]=Центр справки KDE
+ Comment[se]=KDE veahkkeguovddáš
+ Comment[si]=KDE උදව් මධ්යස්ථානය
+-Comment[sk]=KDE Centrum pomocník
++Comment[sk]=KDE Centrum pomoci
+ Comment[sl]=Središče pomoči za KDE
+ Comment[sr]=КДЕ‑ов центар за помоћ
+ Comment[sr@latin]=KDE‑ov centar za pomoć
+--- runtime/khelpcenter/plugins/Manpages/.directory (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/khelpcenter/plugins/Manpages/.directory (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -59,7 +59,7 @@
+ Name[ru]=Страницы руководств UNIX
+ Name[se]=Unix-giehtagirjesiiddut
+ Name[si]=UNIX අත්පොත් පිටු
+-Name[sk]=UNIX-ové manuálové stránky
++Name[sk]=Unixové manuálové stránky
+ Name[sl]=Strani priročnika za UNIX
+ Name[sr]=Упутне странице наредби
+ Name[sr@latin]=Uputne stranice naredbi
+--- runtime/khelpcenter/plugins/Manpages/man1.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/khelpcenter/plugins/Manpages/man1.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -65,7 +65,7 @@
+ Name[ru]=(1) Пользовательские команды
+ Name[se]=(1) Geavaheaddjigohččumat
+ Name[si]=(1) පරිශීලක විධානය
+-Name[sk]=(1) Používateľské príkazy
++Name[sk]=(1) Užívateľské príkazy
+ Name[sl]=(1) Uporabniški ukazi
+ Name[sr]=(1) Корисничке наредбе
+ Name[sr@latin]=(1) Korisničke naredbe
+--- runtime/khelpcenter/plugins/userguide.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/khelpcenter/plugins/userguide.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -65,7 +65,7 @@
+ Name[ru]=Руководство пользователя KDE
+ Name[se]=KDE giehtagirji
+ Name[si]=KDE Users' Manual
+-Name[sk]=Používateľský manuál KDE
++Name[sk]=Užívateľský manuál KDE
+ Name[sl]=Uporabniški priročnik KDE
+ Name[sr]=Кориснички приручник КДЕ‑а
+ Name[sr@latin]=Korisnički priručnik KDE‑a
+--- runtime/menu/desktop/kde-utilities-xutils.directory (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/menu/desktop/kde-utilities-xutils.directory (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -68,7 +68,7 @@
+ Name[ru]=Утилиты X
+ Name[se]=X-reaiddut
+ Name[si]=X-උපයෝග
+-Name[sk]=Nastroje pre X
++Name[sk]=Nástroje pre X
+ Name[sl]=Potrebščine za X
+ Name[sr]=Икс‑алатке
+ Name[sr@latin]=X-alatke
+--- runtime/menu/desktop/kde-science.directory (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/menu/desktop/kde-science.directory (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -68,7 +68,7 @@
+ Name[ru]=Наука
+ Name[se]=Dieđa ja matematihkka
+ Name[si]=ගණිතය සහ විද්යාව
+-Name[sk]=Veda a Matematika
++Name[sk]=Veda a matematika
+ Name[sl]=Znanost in matematika
+ Name[sr]=Наука и математика
+ Name[sr@latin]=Nauka i matematika
+--- runtime/platforms/win/config/platform.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/platforms/win/config/platform.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -54,6 +54,7 @@
+ Name[ro]=Platformă
+ Name[ru]=Платформа
+ Name[si]=වේදිකාව
++Name[sk]=Platforma
+ Name[sl]=Okolje
+ Name[sr]=Платформа
+ Name[sr@latin]=Platforma
+@@ -106,6 +107,7 @@
+ Comment[pt]=Gestor da Plataforma Windows
+ Comment[pt_BR]=Gerenciador da plataforma Windows
+ Comment[ro]=Gestionar de platformă Windows
++Comment[sk]=Správca platformy Windows
+ Comment[sl]=Upravljalnik okolja Windows
+ Comment[sr]=Менаџер виндоуз платформе
+ Comment[sr@latin]=Menadžer windows platforme
+--- runtime/platforms/win/kwinstartmenu/winstartmenu.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/platforms/win/kwinstartmenu/winstartmenu.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -54,7 +54,7 @@
+ Name[ro]=Modul KDED Meniu Start Windows
+ Name[ru]=Меню входа в Windows
+ Name[si]=KDED Windows Start Menu Module
+-Name[sk]=KDED Windows Start Menu Modul
++Name[sk]=KDED modul pre Štart menu Windows
+ Name[sl]=Modul KDED za zagonski meni v Windows
+ Name[sr]=КДЕД модул покретачког менија Виндоуза
+ Name[sr@latin]=KDED modul pokretačkog menija Windowsa
+--- runtime/kwalletd/kwalletd.notifyrc (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kwalletd/kwalletd.notifyrc (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -13,6 +13,7 @@
+ Comment[en_GB]=The KDE Wallet Dæmon
+ Comment[es]=El demonio del monedero de KDE
+ Comment[et]=KDE turvalaeka deemon
++Comment[eu]=KDEren zorroaren deabrua
+ Comment[fi]=KDE-lompakkopalvelin
+ Comment[fr]=Démon du porte-feuille de KDE
+ Comment[fy]=The KDE slûf daemon
+@@ -44,6 +45,7 @@
+ Comment[ro]=Demonul de portofel KDE
+ Comment[ru]=Бумажник KDE
+ Comment[si]=The KDE Wallet Daemon
++Comment[sk]=Démon KDE Wallet
+ Comment[sl]=Pritajeni program KDE-jeve Listnice
+ Comment[sr]=КДЕ‑ов демон новчаника
+ Comment[sr@latin]=KDE‑ov demon novčanika
+@@ -68,6 +70,7 @@
+ Name[en_GB]=kwalletd
+ Name[es]=kwalletd
+ Name[et]=kwalletd
++Name[eu]=kwalletd
+ Name[fi]=kwalletd
+ Name[fr]=kwalletd
+ Name[fy]=kwalletd
+@@ -99,6 +102,7 @@
+ Name[ro]=kwalletd
+ Name[ru]=kwalletd
+ Name[si]=kwalletd
++Name[sk]=kwalletd
+ Name[sl]=kwalletd
+ Name[sr]=kwalletd
+ Name[sr@latin]=kwalletd
+@@ -125,6 +129,7 @@
+ Name[en_GB]=Needs password
+ Name[es]=Necesita contraseña
+ Name[et]=Vajalik on parool
++Name[eu]=Pasahitza behar du
+ Name[fi]=Kysyy salasanaa
+ Name[fr]=Nécessite un mot de passe
+ Name[fy]=Hat wachwurd nedich
+@@ -157,6 +162,7 @@
+ Name[ro]=Necesită parolă
+ Name[ru]=Требуется пароль
+ Name[si]=රහස්පදය අවශ්ය වේ
++Name[sk]=Je potrebné heslo
+ Name[sl]=Potrebuje geslo
+ Name[sr]=Захтева лозинку
+ Name[sr@latin]=Zahteva lozinku
+@@ -180,6 +186,8 @@
+ Comment[en_GB]=The KDE Wallet Dæmon requests a password
+ Comment[es]=El demonio del monedero de KDE requiere una contraseña
+ Comment[et]=KDE turvalaeka deemon nõuab parooli
++Comment[eu]=KDE-ren zorroaren deabruak pasahitza eskatzen du
++Comment[fi]=KDE:n Lompakko-palvelu pyytää salasanaa
+ Comment[fr]=Le démon du porte-feuille de KDE requiers un mot de passe
+ Comment[fy]=The KDE slûf daemon fereasket in wachtwurd
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 @@
+@@ -207,6 +215,7 @@
+ Comment[pt_BR]=O servidor da carteira do KDE está solicitando uma senha
+ Comment[ro]=Demonul de portofel KDE cere o parolă
+ Comment[si]=The KDE Wallet Daemon requests a password
++Comment[sk]=Démon KDE Wallet vyžaduje heslo
+ Comment[sl]=Pritajeni program KDE-jeve Listnice zahteva geslo
+ Comment[sr]=КДЕ‑ов демон новчаника захтева лозинку
+ Comment[sr@latin]=KDE‑ov demon novčanika zahteva lozinku
+--- runtime/ktimezoned/ktimezoned.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/ktimezoned/ktimezoned.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -68,7 +68,7 @@
+ Name[ru]=Служба часовых поясов KDE
+ Name[se]=KDE-áigeavádatduogášprográmma
+ Name[si]=KDE වේලා කලාප විභුද්ධකයා
+-Name[sk]=KDE Time Zone Daemon
++Name[sk]=KDE démon pre časové pásma
+ Name[sl]=KDE-jev demon za časovne pasove
+ Name[sr]=КДЕ‑ов демон за временске зоне
+ Name[sr@latin]=KDE‑ov demon za vremenske zone
+@@ -144,7 +144,7 @@
+ Comment[ru]=Служба часовых поясов для KDE
+ Comment[se]=KDE-áigeavádatduogášprográmma
+ Comment[si]=KDE සඳහා වේලා කලාප විභුද්ධකයා
+-Comment[sk]=Démon časových zón pre KDE
++Comment[sk]=Démon časových pásiem pre KDE
+ Comment[sl]=KDE-jev demon za časovne pasove
+ Comment[sr]=Демон за праћење временских зона у КДЕ‑у
+ Comment[sr@latin]=Demon za praćenje vremenskih zona u KDE‑u
+--- runtime/ktimezoned/ktimezoned.cpp (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/ktimezoned/ktimezoned.cpp (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -1,6 +1,6 @@
+ /*
+ This file is part of the KDE libraries
+- Copyright (c) 2005-2007 David Jarvie <djarvie@kde.org>
++ Copyright (c) 2005-2009 David Jarvie <djarvie@kde.org>
+ Copyright (c) 2005 S.R.Haque <srhaque@iee.org>.
+
+ This library is free software; you can redistribute it and/or
+@@ -99,6 +99,8 @@
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})
++ if (mZoneinfoDir.length() > 1 && mZoneinfoDir.endsWith('/'))
++ mZoneinfoDir.truncate(mZoneinfoDir.length() - 1); // strip trailing '/'
- #qt4_add_dbus_adaptor(kded_ktimezoned_SRCS org.kde.KTimeZoned ktimezonedbus.h DBusHandler)
-@@ -13,3 +16,5 @@
+ // For Unix, read zone.tab.
- 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(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;
- };
-
- #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 @@
- }
-
- 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 @@
- }
+@@ -378,6 +380,8 @@
+ if (!mLocalZoneDataFile.isEmpty())
+ mDirWatch->addFile(mLocalZoneDataFile);
+ connect(mDirWatch, SIGNAL(dirty(const QString&)), SLOT(localChanged(const QString&)));
++ connect(mDirWatch, SIGNAL(deleted(const QString&)), SLOT(localChanged(const QString&)));
++ connect(mDirWatch, SIGNAL(created(const QString&)), SLOT(localChanged(const QString&)));
}
-
-- 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);
+ else if (!mZoneinfoDir.isEmpty())
+ {
+@@ -574,20 +578,31 @@
+ if (!ts.atEnd())
+ zoneName = ts.readLine();
+ f.close();
+- if (!zoneName.isEmpty())
++ if (zoneName.isEmpty())
++ return false;
++ KTimeZone local = mZones.zone(zoneName);
++ if (!local.isValid())
+ {
+- KTimeZone local = mZones.zone(zoneName);
++ // It isn't a recognised zone in zone.tab.
++ // Note that some systems (e.g. Gentoo) have zones under zoneinfo which
++ // are not in zone.tab, so check if it points to another zone file.
++ if (mZoneinfoDir.isEmpty())
++ return false;
++ QString path = mZoneinfoDir + '/' + zoneName;
++ QFile qf;
++ qf.setFileName(path);
++ QFileInfo fi(qf);
++ if (fi.isSymLink())
++ fi.setFile(fi.canonicalFilePath());
++ if (!fi.exists() || !fi.isReadable())
++ return false;
++ }
+ kDebug(1221)<<"checkTimezone(): local="<<local.isValid()<<", name="<<zoneName;
+- if (local.isValid())
+- {
+- mLocalZone = zoneName;
+- mLocalMethod = Timezone;
+- mLocalIdFile = f.fileName();
+- mLocalZoneDataFile = mZoneinfoDir.isEmpty() ? QString() : mZoneinfoDir + '/' + zoneName;
+- return true;
- }
- }
-+ scaleDownImage(img, m_width, m_height);
+- return false;
++ mLocalZone = zoneName;
++ mLocalMethod = Timezone;
++ mLocalIdFile = f.fileName();
++ mLocalZoneDataFile = mZoneinfoDir.isEmpty() ? QString() : mZoneinfoDir + '/' + zoneName;
++ return true;
+ }
- // ### 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
+ bool KTimeZoned::matchZoneFile(const QString &path)
+@@ -609,12 +624,10 @@
+ {
+ // We've got the zoneinfo file path.
+ // The time zone name is the part of the path after the zoneinfo directory.
+- QString name = zoneInfoFileName.mid(mZoneinfoDir.length() + 1);
+- // kDebug(1221) << "local=" << name;
+- KTimeZone local = mZones.zone(name);
+- if (!local.isValid())
+- return false;
+- mLocalZone = name;
++ // Note that some systems (e.g. Gentoo) have zones under zoneinfo which
++ // are not in zone.tab, so don't validate against mZones.
++ mLocalZone = zoneInfoFileName.mid(mZoneinfoDir.length() + 1);
++ // kDebug(1221) << "local=" << mLocalZone;
}
+ else
+ {
+--- runtime/kioslave/thumbnail/directorythumbnail.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kioslave/thumbnail/directorythumbnail.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -13,6 +13,7 @@
+ Name[en_GB]=Directories
+ Name[es]=Directorios
+ Name[et]=Kataloogid
++Name[eu]=Direktorioak
+ Name[fi]=Kansiot
+ Name[fr]=Dossiers
+ Name[fy]=Triemtafels
+@@ -45,6 +46,7 @@
+ Name[ro]=Directoare
+ Name[ru]=Папки
+ Name[si]=බහලුම්
++Name[sk]=Adresáre
+ Name[sl]=Mape
+ Name[sr]=Фасцикле
+ Name[sr@latin]=Fascikle
+--- runtime/kioslave/thumbnail/desktopthumbnail.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kioslave/thumbnail/desktopthumbnail.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -13,6 +13,7 @@
+ Name[en_GB]=Desktop Files
+ Name[es]=Archivos de escritorio
+ Name[et]=Töölauafailid
++Name[eu]=Mahaigain fitxategiak
+ Name[fr]=Fichier du bureau
+ Name[fy]=Buroblêd triemmen
+ Name[gl]=Ficheiros do escritorio
+@@ -41,6 +42,7 @@
+ Name[pt_BR]=Arquivos desktop
+ Name[ro]=Fișiere de birou
+ Name[ru]=Файлы описаний (.desktop)
++Name[sk]=Súbory plochy
+ Name[sl]=Datoteke za namizje
+ Name[sr]=Фајлови површи
+ Name[sr@latin]=Fajlovi površi
+--- runtime/kioslave/thumbnail/thumbnail.cpp (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kioslave/thumbnail/thumbnail.cpp (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -175,11 +175,11 @@
+ if (info.isDir()) {
+ m_mimeType = "inode/directory";
+ } else {
+- KMimeType::findByUrl(KUrl(info.filePath()))->name();
++ m_mimeType = KMimeType::findByUrl(KUrl(info.filePath()))->name();
+ }
-+ 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);
-+ }
-+ }
-+}
+ kDebug(7115) << "Guessing MIME Type:" << m_mimeType;
+- direct=true; // thumbnail: was probably called from Konqueror
++ direct=true; // thumbnail: URL was probably typed in Konqueror
+ }
+ #endif
-+
---- 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 @@
+@@ -350,6 +350,7 @@
+ }
+ img.save(&buf,"PNG");
+ buf.close();
++ mimeType("image/png");
+ data(buf.buffer());
+ }
+ else
+@@ -359,6 +360,7 @@
+ QDataStream stream( &imgData, QIODevice::WriteOnly );
+ //kDebug(7115) << "IMAGE TO STREAM";
+ stream << img;
++ mimeType("application/octet-stream");
+ data(imgData);
+ }
+ } else {
+@@ -383,6 +385,7 @@
+ stream << img.width() << img.height() << quint8(img.format());
+ memcpy(shmaddr, img.bits(), img.numBytes());
+ shmdt((char*)shmaddr);
++ mimeType("application/octet-stream");
+ data(imgData);
+ #endif
+ }
+--- runtime/kioslave/network/ioslave/network.protocol (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kioslave/network/ioslave/network.protocol (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -18,6 +18,7 @@
+ Description[en_GB]=A kioslave to browse the network
+ Description[es]=Un kioslave para explorar la red
+ Description[et]=KIO moodul võrgu sirvimiseks
++Description[eu]=Sarea arakatzeko kioslave bat
+ Description[fi]=Yhteyskäytäntö verkkopalveluiden selaamiseen
+ Description[fr]=Un module d'entrées / sorties pour naviguer dans le réseau
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 @@
+@@ -45,6 +46,7 @@
+ Description[pt_BR]=Um kioslave para navegar a rede
+ Description[ro]=Un kioslave pentru răsfoirea rețelei
+ Description[ru]=Обзор локальной сети
++Description[sk]=Kioslave pre prechádzanie siete
+ Description[sl]=Podpora za brskanje po omrežju
+ Description[sr]=У/И захват за прегледање мреже
+ Description[sr@latin]=U/I zahvat za pregledanje mreže
+--- runtime/kioslave/network/kded/networkwatcher.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kioslave/network/kded/networkwatcher.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -18,6 +18,7 @@
+ Name[en_GB]=Network Watcher
+ Name[es]=Visor de redes
+ Name[et]=Võrgujälgija
++Name[eu]=Sare behatzailea
+ Name[fi]=Verkkotilan valvoja
+ Name[fr]=Surveillance du réseau
+ Name[fy]=Netwurk sjogger
+@@ -46,6 +47,7 @@
+ Name[pt_BR]=Monitor de rede
+ Name[ro]=Supraveghetor rețea
+ Name[ru]=Обзор сети
++Name[sk]=Sledovanie siete
+ Name[sl]=Opazovalnik omrežja
+ Name[sr]=Надзорник мреже
+ Name[sr@latin]=Nadzornik mreže
+@@ -67,6 +69,8 @@
+ Comment[en_GB]=Keeps track of the network and updates directory listings of the network:/ protocol
+ Comment[es]=Registra la red y las actualizaciones de listados de directorios del protocolo network:/
+ Comment[et]=Hoiab võrgul silma peal ja uuendab protokolli network:/ kataloogide nimekirja
++Comment[eu]=Sarearen aztarnak jarraitzen ditu eta network:/ protokoloaren direktorio zerrendak eguneratzen ditu
++Comment[fi]=Pitää kirjaa verkosta ja päivittää network:/-protokollan kansioluettelot
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)
+@@ -87,6 +91,7 @@
+ Comment[pt_BR]=Monitora a rede e atualiza a listagem de diretórios do protocolo network:/
+ Comment[ro]=Duce evidența rețelei și actualizează conținutul dosarelor protocolului network:/
+ Comment[ru]=Поиск служб и обновление списка каталогов по протоколу network:/
++Comment[sk]=Udržuje prehľad o sieti a aktualizuje výpisy adresárov protokolu network:/
+ Comment[sl]=Sledi omrežju in posodablja seznam map za protokol network:/
+ Comment[sr]=Прати мрежу и ажурира исписе фасцикли протокола network:/
+ Comment[sr@latin]=Prati mrežu i ažurira ispise fascikli protokola network:/
+--- runtime/kioslave/remote/kdedmodule/remotedirnotify.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kioslave/remote/kdedmodule/remotedirnotify.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -18,7 +18,7 @@
+ Name[et]=KDED mujalasuva URL-i teadustaja
+ Name[eu]=KDED urruneko URL oinarriaren iragarlea
+ Name[fa]=اخطاردهندۀ نشانی وب پایه دور KDED
+-Name[fi]=KDED:in etäverkko-osoitteen ilmaisin
++Name[fi]=KDEDin etäverkko-osoitteen ilmaisin
+ Name[fr]=Notifieur d'URL distante KDED
+ Name[fy]=KDED ekstern basis-URL-adres melding
+ Name[ga]=Fógróir Bun-URL Cianda KDED
+--- runtime/kioslave/desktop/desktopnotifier.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kioslave/desktop/desktopnotifier.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
@@ -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]=Επιτρέπει την αυτόματη εξαγωγή μέσων σε οδηγούς όπου πιέστηκε το πλήκτρο εξαγωγής
+ Name[es]=Notificador de carpeta de escritorio de KDED
+ Name[et]=KDED töölaua kausta teadustaja
+ Name[eu]=KDED mahaigaineko karpeta iragarlea
++Name[fi]=KDEDin työpöytäkansion ilmaisin
+ Name[fr]=Notifieur de dossier bureau KDED
+ Name[fy]=KDED buroblêd map melder
+ Name[ga]=Fógróir Fillteáin Deisce KDED
+@@ -54,7 +55,7 @@
+ Name[ro]=Notificare KDED pentru dosare de pe birou
+ Name[ru]=Обновление содержимого папок
+ Name[si]=KDED Desktop Folder Notifier
+-Name[sk]=KDED Desktop Folder Notifier
++Name[sk]=KDED notifikátor na priečinky plochy
+ Name[sl]=Obvestilnik KDED za mape namizja
+ Name[sr]=КДЕД извештавач о фасциклама површи
+ Name[sr@latin]=KDED izveštavač o fasciklama površi
+--- runtime/solidautoeject/solidautoeject.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/solidautoeject/solidautoeject.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -40,6 +40,7 @@
+ Name[pt_BR]=Serviço de ejeção automática do Solid
+ Name[ro]=Serviciu de scoatere automată Solid
+ Name[si]=Solid Auto-eject service
++Name[sk]=Služba automatického vysunutia pre Solid
+ Name[sl]=Storitev za samodejni izmet
+ Name[sr]=Солидов сервис аутоматског избацивања
+ Name[sr@latin]=Solidov servis automatskog izbacivanja
+@@ -61,6 +62,7 @@
+ Comment[en_GB]=Allows to automatically release drives when their eject button is pushed
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[fi]=Mahdollistaa asemien automaattisen vapautuksen, kun niiden poistopainiketta painetaan
+ 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;
+@@ -84,6 +86,7 @@
+ Comment[pt_BR]=Permite liberar automaticamente as unidades quando o botão de ejeção for pressionado
+ Comment[ro]=Permite eliberarea automată a unităților la apăsarea butonului de deschidere al acestora
+ Comment[si]=Allows to automatically release drives when their eject button is pushed
++Comment[sk]=Umožňuje automaticky uvoľniť mechaniku pri stlačení tlačidla vysunúť
+ Comment[sl]=Omogoča, da se ob pritisku gumba na pogonu nosilec samodejno izvrže
+ Comment[sr]=Аутоматско ослобађање уређаја када им се присне дугме за избацивање
+ Comment[sr@latin]=Automatsko oslobađanje uređaja kada im se prisne dugme za izbacivanje
+--- runtime/nepomuk/services/strigi/nepomukstrigiservice.notifyrc (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/nepomuk/services/strigi/nepomukstrigiservice.notifyrc (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -83,6 +83,7 @@
+ Name[es]=Iniciada la indexación inicial
+ Name[et]=Esmaindekseerimine on käivitatud
+ Name[eu]=Hasierako indexaketa abiatuta
++Name[fi]=Indeksointi käynnistetty ensi kertaa
+ Name[fr]=L'indexation initiale a démarré
+ Name[fy]=Earste yndeksering begûn
+ Name[ga]=Tosaíodh an chéad innéacsú
+@@ -149,6 +150,7 @@
+ Comment[es]=Strigi ha comenzado la indexación inicial de archivos locales para búsquedas rápidas en el escritorio
+ Comment[et]=Strigi alustas kohalike failide esimest indekseerimist kiire töölauaotsingu võimaldamiseks
+ Comment[eu]=Strigi-k mahaigaineko bilaketa azkarrak egiteko bertako fitxategien hasierako indexaketa abiatu du
++Comment[fi]=Strigi käynnisti paikallisten tiedostojen indeksoinnin nopeuttaakseen työpöytähakuja
+ Comment[fr]=Strigi a démarré l'indexation initiale des fichiers locaux afin d'améliorer la rapidité de recherche
+ Comment[fy]=Strigi startte de earste yndeksearring fan lokale triemmen foar flugge buroblêd-sykopdrachten
+ Comment[ga]=Thosaigh Strigi an chéad innéacsú de chomhaid logánta leis an deasc a chuardach go tapa
+@@ -343,6 +345,7 @@
+ Name[es]=Indexación suspedida
+ Name[et]=Indekseerimine on peatatud
+ Name[eu]=Indexaketa eseki egin da
++Name[fi]=Indeksointi keskeytetty
+ Name[fr]=Indexation suspendue
+ Name[fy]=Yndesksearring ûnderbrútsen
+ Name[ga]=Innéacsú curtha ar fionraí
+@@ -408,6 +411,7 @@
+ Comment[es]=Se ha suspendido la indexación de archivos Strigi
+ Comment[et]=Strigi failide indekseerimine on peatatud
+ Comment[eu]=Strigiren fitxategi indexaketa eseki egin da
++Comment[fi]=Strigin tiedostoindeksointi on keskeytetty
+ Comment[fr]=L'indexation des fichiers de Strigi a été suspendue
+ Comment[fy]=Strigi triem yndeksearring is ûnderbrútsen
+ Comment[ga]=Cuireadh innéacsú comhad Strigi ar fionraí
+@@ -475,6 +479,7 @@
+ Name[es]=Indexación reanudada
+ Name[et]=Indekseerimine jätkub
+ Name[eu]=Indexazioa berrekin da
++Name[fi]=Indeksointi käynnistetty uudelleen
+ Name[fr]=Reprise de l'indexation
+ Name[fy]=Yndeksearring is ferfette
+ Name[ga]=Innéacsú atosaithe
+@@ -541,6 +546,7 @@
+ Comment[es]=Se ha reanudado la indexación de archivos de Strigi
+ Comment[et]=Strigi failide indekseerimine jätkub
+ Comment[eu]=Strigiren fitxategi indexaketa berrekin da
++Comment[fi]=Strigi tiedostoindeksointi on käynnistetty uudelleen
+ Comment[fr]=L'indexation de fichier de Strigi a repris
+ Comment[fy]=Strigi triem yndeksearring is ferfette
+ Comment[ga]=Atosaíodh innéacsú comhad Strigi
+--- runtime/nepomuk/services/storage/nepomukstorage.notifyrc (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/nepomuk/services/storage/nepomukstorage.notifyrc (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -152,6 +152,7 @@
+ Name[es]=Reconstruyendo el índice de Nepomuk
+ Name[et]=Nepomuki indeksi taasloomine
+ Name[eu]=Berreraiki Nepomuk indizea
++Name[fi]=Rakennetaan Nepomukin indeksiä uudelleen
+ Name[fr]=Reconstruction de l'index de Nepomuk
+ Name[fy]=Nepomuk yndeks op 'e nij oanmeitsje
+ Name[ga]=Innéacs Nepomuk á Atógáil
+@@ -279,6 +280,7 @@
+ Name[es]=Reconstrucción del índice de Nepomuk finalizada
+ Name[et]=Nepomuki indeks on taasloodud
+ Name[eu]=Berreraikitzen Nepomuk indizea burutu da
++Name[fi]=Nepomukin indeksin rakennettu uudestaan
+ Name[fr]=Reconstruction de l'index de Nepomuk effectuée
+ Name[fy]=It op 'e nij bouwen fan de Nepomuk ynsdeks is klear
+ Name[ga]=Atógáil an Innéacs Nepomuk críochnaithe
+@@ -342,6 +344,7 @@
+ Comment[es]=Se ha realizado la reconstrucción del índice de búsqueda de texto de Nepomuk.
+ Comment[et]=Nepomuki täistekstiotsingu indeksi taasloomine on tehtud.
+ Comment[eu]=Berreraikitzen Nepomuk testu bilaketarako indizea burutu da
++Comment[fi]=Nepomukin kokotekstihaun indeksi on rakennettu uudelleen.
+ Comment[fr]=La reconstruction de l'index de recherche de texte de Nepomuk est terminée
+ Comment[fy]=It op 'e nij bouwen fan de Nepomuk-sykyndeks is klear.
+ Comment[ga]=Tá atógáil an innéacs lántéacs chuardaigh le haghaidh Nepomuk críochnaithe.
+@@ -408,6 +411,7 @@
+ Name[es]=Convirtiendo datos de Nepomuk
+ Name[et]=Nepomuki andmete teisendamine
+ Name[eu]=Nepomuk datuak bihurtzen
++Name[fi]=Muunnetaan Nepomukin dataa
+ Name[fr]=Conversion des données de Nepomuk
+ Name[fy]=Nepomuk Gegevens omsette
+ Name[ga]=Sonraí Nepomuk á dtiontú
+@@ -470,6 +474,7 @@
+ Comment[es]=Todos los datos de Nepomuk están convertidos al nuevo motor de almacenamiento
+ Comment[et]=Kõik Nepomuki andmed teisendatakse uuele salvesti taustaprogrammile
+ Comment[eu]=Nepomuk datu denak biltegiratze interfaze berri batetan bihurtu dira
++Comment[fi]=Kaikki Nepomukin data muunnetaan uutta varastotaustaosaa varten
+ Comment[fr]=Toutes les données de Nepomuk sont converties au nouveau système de stockage
+ Comment[fy]=Alle Nepomuk gegevens binne omsetten nei in nije opslach type
+ Comment[ga]=Tiontaíodh na sonraí Nepomuk go léir go hinneall nua stórála
+@@ -536,6 +541,7 @@
+ Name[es]=Conversión de datos Nepomuk fallida
+ Name[et]=Nepomuki andmete teisendamine nurjus
+ Name[eu]=Nepomuk datuak bihurtzeak huts egin du
++Name[fi]=Nepomukin datan muuntaminen epäonnistui
+ Name[fr]=Échec de conversion des données de Nepomuk
+ Name[fy]=Het omsetten fan nemomuk gegevens mislearre
+ Name[ga]=Theip ar thiontú sonraí Nepomuk
+@@ -599,6 +605,7 @@
+ Comment[es]=Ha fallado la conversión de datos Nepomuk al nuevo motor
+ Comment[et]=Nepomuki andmete teisendamine uuele taustaprogrammile nurjus
+ Comment[eu]=Nepomuk datuak interfaze berri batetan bihurtzeak huts egin du
++Comment[fi]=Nepomukin datan muuntaminen uutta taustaosaa varten epäonnistui
+ Comment[fr]=Échec de conversion des données de Nepomuk vers un nouveau système
+ Comment[fy]=It omsetten fan Nepomuk gegevens nei in nij type mislearre
+ Comment[ga]=Theip ar thiontú sonraí Nepomuk go hinneall nua
+@@ -664,6 +671,7 @@
+ Name[es]=Conversión de datos Nepomuk realizada
+ Name[et]=Nepomuki andmed on teisendatud
+ Name[eu]=Nepomuk datuak bihurtzea burutu da
++Name[fi]=Nepomukin data muunnettu
+ Name[fr]=Conversion des données de Nepomuk effectuée
+ Name[fy]=It omsetten fan nepomuk gegevens is klear
+ Name[ga]=Tiontú sonraí Nepomuk críochnaithe
+@@ -727,6 +735,7 @@
+ Comment[es]=Se ha convertido correctamente los datos Nepomuk al nuevo motor
+ Comment[et]=Nepomuki andmed on teisendatud uuele taustaprogrammile
+ Comment[eu]=Nepomuk datuak egokiro bihurtu dira backend berrira
++Comment[fi]=Onnistuneesti muunnettu Nepomukin data uutta taustaosaa varten
+ Comment[fr]=Succès de conversion des données de Nepomuk vers un nouveau système
+ Comment[fy]=De Nepomuk gegevens binne mei sukses omsetten nei in nij type
+ Comment[ga]=D'éirigh le tiontú sonraí Nepomuk go hinneall nua
+--- runtime/nepomuk/services/filewatch/nepomukfilewatch.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/nepomuk/services/filewatch/nepomukfilewatch.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -89,6 +89,7 @@
+ Comment[es]=Servicio de monitor de archivos de Nepomuk para monitorizar cambios de los archivos
+ Comment[et]=Nepomuki failijälgimise teenus failide muutuste jälgimiseks
+ Comment[eu]=Nepomuk fitxategi zaiintzailea, fitxategien aldaketak monitorizatzeko
++Comment[fi]=Tiedostojen muutoksia tarkkaileva Nepomuk-tiedostonseurantapalvelu
+ Comment[fr]=Le service de surveillance des fichiers, pour relever les modifications de fichiers
+ Comment[fy]=De Nepomuk triem observaasje tsjinst foar triemferoarings
+ Comment[ga]=Seirbhís fhaire comhad Nepomuk a dhéanann monatóireacht ar athruithe
+--- runtime/nepomuk/services/queryservice/nepomukqueryservice.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/nepomuk/services/queryservice/nepomukqueryservice.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -116,7 +116,7 @@
+ Comment[ro]=Serviciul de interogare Nepomuk oferă o interfață pentru dosarele de interogare persistente
+ Comment[ru]=Служба запросов Nepomuk предоставляет интерфейс к сохранённым папкам поиска
+ Comment[si]=The Nepomuk Query Service provides an interface for persistent query folders
+-Comment[sk]=Služba NepomukQueryService poskytuje rozhranie pre perzistované priečinky dotazov
++Comment[sk]=Služba NepomukQueryService poskytuje rozhranie pre priečinky trvalých dotazov
+ Comment[sl]=Nepomukova poizvedovalna storitev ponuja vmesnik za obstojne poizvedovalne mape
+ Comment[sr]=Сервис Непомукових упита пружа сучеље за трајне упитне фасцикле
+ Comment[sr@latin]=Servis Nepomukovih upita pruža sučelje za trajne upitne fascikle
+--- runtime/nepomuk/server/nepomukserver.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/nepomuk/server/nepomukserver.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -61,7 +61,7 @@
+ Name[ru]=Сервер Nepomuk
+ Name[se]=Nepomuk-bálvá
+ Name[si]=Nepomuk Server
+-Name[sk]=Nepomuk Server
++Name[sk]=Nepomuk server
+ Name[sl]=Strežnik Nepomuk
+ Name[sr]=Сервер Непомука
+ Name[sr@latin]=Server Nepomuka
+@@ -131,7 +131,7 @@
+ Comment[ru]=Сервер Nepomuk предоставляет службы хранения данных и управления Strigi
+ Comment[se]=Nepomuk-bálvá fallá vurkenbálvalusaid ja strigi-stivrran
+ Comment[si]=The Nepomuk Server providing Storage services and strigi controlling
+-Comment[sk]=Server Nepomuk zabezpečuje služby pamäte a ovládanie Strigi
++Comment[sk]=Server Nepomuk poskytuje služby pre ukladanie a ovládanie Strigi
+ Comment[sl]=Strežnik Nepomuk, ki ponuja storitve shranjevanja in nadzorovanja Strigija
+ Comment[sr]=Сервер Непомука пружа сервис за складиштење и контролу Стригија
+ Comment[sr@latin]=Server Nepomuka pruža servis za skladištenje i kontrolu Strigija
+--- runtime/nepomuk/kcm/kcm_nepomuk.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/nepomuk/kcm/kcm_nepomuk.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -36,7 +36,7 @@
+ Name[he]=חיפוש בשולחן עבודה
+ Name[hi]=डेस्कटॉप खोज
+ Name[hne]=डेस्कटाप खोज
+-Name[hr]=Pager na radnoj površini
++Name[hr]=Pretraživanje računala
+ Name[hsb]=Pytanje za dźěłowy powjerch
+ Name[hu]=Asztali keresés
+ Name[is]=Skjáborðsleit
+@@ -65,7 +65,7 @@
+ Name[ro]=Căutare de birou
+ Name[ru]=Поиск в рабочей среде
+ Name[si]=වැඩතල සෙවුම
+-Name[sk]=Desktopové vyhľadávanie
++Name[sk]=Hľadanie na ploche
+ Name[sl]=Namizno iskanje
+ Name[sr]=Претрага површи
+ Name[sr@latin]=Pretraga površi
+--- runtime/kstyles/themes/light-v2.themerc (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kstyles/themes/light-v2.themerc (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -56,7 +56,7 @@
+ Name[ru]=Лёгкий стиль, версия 2
+ Name[se]=Geahppes stiila, nubbi veršuvdna
+ Name[si]=Light Style, 2nd revision
+-Name[sk]=Štýl 'Light', 2. revízia
++Name[sk]=Štýl Light, 2. revízia
+ Name[sl]=Slog »Light«, 2. revizija
+ Name[sr]=Лаки стил, 2. ревизија
+ Name[sr@latin]=Laki stil, 2. revizija
+--- runtime/kstyles/themes/light-v3.themerc (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kstyles/themes/light-v3.themerc (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -56,7 +56,7 @@
+ Name[ru]=Лёгкий стиль, версия 3
+ Name[se]=Geahppes stiila, goalmmát veršuvdna
+ Name[si]=Light Style, 3rd revision
+-Name[sk]=Štýl 'Light', 3. revízia
++Name[sk]=Štýl Light, 3. revízia
+ Name[sl]=Slog »Light«, 3. revizija
+ Name[sr]=Лаки стил, 3. ревизија
+ Name[sr@latin]=Laki stil, 3. revizija
+--- runtime/kstyles/themes/highcolor.themerc (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kstyles/themes/highcolor.themerc (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -57,7 +57,7 @@
+ Name[ru]=Классический многоцветный
+ Name[se]=Máŋgaivnnát klassihkalaš
+ Name[si]=HighColor Classic
+-Name[sk]=Highcolor classic
++Name[sk]=Highcolor klasický
+ Name[sl]=Klasično in barvito
+ Name[sr]=Класични висококолорни
+ Name[sr@latin]=Klasični visokokolorni
+--- runtime/kstyles/themes/qtplatinum.themerc (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kstyles/themes/qtplatinum.themerc (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -130,7 +130,7 @@
+ Comment[ru]=Стиль Platinum (без темы)
+ Comment[se]=Sisahuksejuvvon, fáddákeahtes Platinum-stiila
+ Comment[si]=Built-in unthemed Platinum style
+-Comment[sk]=Zabudovaný netémový Platinum štýl
++Comment[sk]=Zabudovaný Platinum štýl bez témy
+ Comment[sl]=Netematski vgrajeni slog Platinum
+ Comment[sr]=Уграђени бестематски стил Платине
+ Comment[sr@latin]=Ugrađeni bestematski stil Platine
+--- runtime/kstyles/themes/qtwindows.themerc (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kstyles/themes/qtwindows.themerc (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -134,7 +134,7 @@
+ Comment[ru]=Стиль Windows 9x (без темы)
+ Comment[se]=Sisahuksejuvvon, fáddákeahtes Windows 9x-stiila
+ Comment[si]=Built-in unthemed Windows 9x style
+-Comment[sk]=Zabudovaný netémový Windows 9x štýl
++Comment[sk]=Zabudovaný Windows 9x štýl bez témy
+ Comment[sl]=Vgrajeni običajni slog Windows 9x
+ Comment[sr]=Уграђени бестематски стил Виндоуза 9x
+ Comment[sr@latin]=Ugrađeni bestematski stil Windowsa 9x
+--- runtime/kstyles/themes/qtcde.themerc (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kstyles/themes/qtcde.themerc (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -139,7 +139,7 @@
+ Comment[ru]=Стиль CDE (без темы)
+ Comment[se]=Sisahuksejuvvon, fáddákeahtes CDE-stiila
+ Comment[si]=Built-in unthemed CDE style
+-Comment[sk]=Zabudovaný netémový CDE štýl
++Comment[sk]=Zabudovaný CDE štýl bez témy
+ Comment[sl]=Vgrajeni običajni slog CDE
+ Comment[sr]=Уграђени бестематски стил ЦДЕ‑а
+ Comment[sr@latin]=Ugrađeni bestematski stil CDE‑a
+--- runtime/kstyles/themes/qtmotif.themerc (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kstyles/themes/qtmotif.themerc (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -132,7 +132,7 @@
+ Comment[ru]=Стиль Motif (без темы)
+ Comment[se]=Sisahuksejuvvon, fáddákeahtes Motif-stiila
+ Comment[si]=Built-in unthemed Motif style
+-Comment[sk]=Zabudovaný netémový Motif štýl
++Comment[sk]=Zabudovaný Motif štýl bez témy
+ Comment[sl]=Vgrajen običajni slog Motif
+ Comment[sr]=Уграђени бестематски стил Мотифа
+ Comment[sr@latin]=Ugrađeni bestematski stil Motifa
+--- runtime/kstyles/themes/default.themerc (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kstyles/themes/default.themerc (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -59,7 +59,7 @@
+ Name[ru]=Классика KDE
+ Name[se]=KDE klassihkalaš
+ Name[si]=KDE Classic
+-Name[sk]=KDE Classic
++Name[sk]=KDE klasický
+ Name[sl]=Klasičen KDE
+ Name[sr]=Класични КДЕ
+ Name[sr@latin]=Klasični KDE
+@@ -134,7 +134,7 @@
+ Comment[ru]=Классическая тема KDE
+ Comment[se]=Klassihkalaš KDE-stiila
+ Comment[si]=Classic KDE style
+-Comment[sk]=Klasický KDE štýl
++Comment[sk]=Klasický štýl KDE
+ Comment[sl]=Klasičen slog KDE
+ Comment[sr]=Класични стил КДЕ‑а
+ Comment[sr@latin]=Klasični stil KDE‑a
+--- runtime/kstyles/themes/beos.themerc (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kstyles/themes/beos.themerc (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -111,7 +111,7 @@
+ Comment[he]=חסר ערכת־נושא בסגנון BeOS
+ Comment[hi]=प्रसंग-बगैर बीई-ओएस जैसी शैली
+ Comment[hne]=बीईओएस जइसन के अनथीम्ड सैली
+-Comment[hr]=Stil bez teme, nalikuje na BeOS
++Comment[hr]=Netematski stil, sličan BeOS-u
+ Comment[hsb]=Stil, podobny na BeOS
+ Comment[hu]=BeOS-szerű stílus
+ Comment[is]=Óþemað í BeOS-stíl
+@@ -141,7 +141,7 @@
+ Comment[ru]=Стиль, подобный BeOS
+ Comment[se]=BeOS-lágan, fáddákeahtes stiila
+ Comment[si]=Unthemed BeOS-like style
+-Comment[sk]=Netémový BeOS štýl
++Comment[sk]=BeOS štýl bez témy
+ Comment[sl]=Slog brez teme, podoben BeOS
+ Comment[sr]=Бестематски стил налик на БеОС
+ Comment[sr@latin]=Bestematski stil nalik na BeOS
+--- runtime/kstyles/oxygen/oxygen.themerc (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kstyles/oxygen/oxygen.themerc (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -136,7 +136,7 @@
+ Comment[ru]=Стиль рабочего стола следующего поколения
+ Comment[se]=Stiila boahttebuolvvalaš čállinbeavdái
+ Comment[si]=Styling of the next generation desktop
+-Comment[sk]=Štýlovanie plochy ďalšej generácie
++Comment[sk]=Štýl plochy novej generácie
+ Comment[sl]=Slog namizja naslednje generacije
+ Comment[sr]=Стил за наредну генерацију површи
+ Comment[sr@latin]=Stil za narednu generaciju površi
+--- runtime/kstyles/oxygen/oxygen.cpp (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kstyles/oxygen/oxygen.cpp (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -2992,16 +2992,8 @@
+ return false;
+
+ case SH_RubberBand_Mask:
+- {
+- const QStyleOptionRubberBand *opt = qstyleoption_cast<const QStyleOptionRubberBand *>(option);
+- if (!opt)
+- return true;
+- if (QStyleHintReturnMask *mask = qstyleoption_cast<QStyleHintReturnMask*>(returnData)) {
+- mask->region = option->rect;
+- mask->region -= option->rect.adjusted(1,1,-1,-1);
- }
-- delete job;
+- return true;
- }
-+ 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() );
++ return false;
++
+ case SH_WindowFrame_Mask: {
+ const QStyleOptionTitleBar *opt = qstyleoption_cast<const QStyleOptionTitleBar *>(option);
+ if (!opt)
+--- runtime/kstyles/highcontrast/highcontrast.themerc (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kstyles/highcontrast/highcontrast.themerc (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -59,7 +59,7 @@
+ Name[ru]=Высококонтрастный
+ Name[se]=Alla vuostálasvuohta
+ Name[si]=HighContrast
+-Name[sk]=VysokýKontrast
++Name[sk]=Vysoký kontrast
+ Name[sl]=Visok kontrast
+ Name[sr]=Високи контраст
+ Name[sr@latin]=Visoki kontrast
+@@ -131,7 +131,7 @@
+ Comment[ru]=Стиль, хорошо работающий с высококонтрастными цветовыми схемами
+ Comment[se]=Stiila mii doaibmá bures alla vuostálasvuohta ivdnečoahkkádusain
+ Comment[si]=A style that works well with high contrast color schemes
+-Comment[sk]=Štýl, ktorý dobre ladí s vysoko kontrastnými farebnými schémami
++Comment[sk]=Štýl, ktorý funguje dobre pri schémach s vysokým kontrastom
+ Comment[sl]=Slog, ki se dobro obnese z visokokontrastnimi barvnimi shemami
+ Comment[sr]=Стил који добро ради са висококонтрастним шемама боја
+ Comment[sr@latin]=Stil koji dobro radi sa visokokontrastnim šemama boja
+--- runtime/kurifilter-plugins/ikws/searchprovider.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kurifilter-plugins/ikws/searchprovider.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -66,7 +66,7 @@
+ Comment[ru]=Поисковая машина
+ Comment[se]=Ohcanmotor
+ Comment[si]=සෙවුම් එන්ජිම
+-Comment[sk]=Hľadací nástroj
++Comment[sk]=Vyhľadávací nástroj
+ Comment[sl]=Iskalnik
+ Comment[sr]=Мотор претраге
+ Comment[sr@latin]=Motor pretrage
+--- runtime/kurifilter-plugins/ikws/searchproviders/bugft.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kurifilter-plugins/ikws/searchproviders/bugft.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -65,7 +65,7 @@
+ Name[ru]=Полнотекстовый поиск ошибок в базе KDE
+ Name[se]=KDE dihkkediehtovuođu ollesteakstaohcan
+ Name[si]=KDE Bug Database Fulltext Search
+-Name[sk]=Hľadanie fulltext v KDE databáze chýb
++Name[sk]=Fulltextové hľadanie v databáze chýb KDE
+ Name[sl]=Iskanje besedila po zbirki hroščev v KDE
+ Name[sr]=КДЕ‑ова база грешака (текстуално)
+ Name[sr@latin]=KDE‑ova baza grešaka (tekstualno)
+@@ -97,6 +97,7 @@
+ Query[en_GB]=http://bugs.kde.org/buglist.cgi?quicksearch=\\{@}
+ Query[es]=http://bugs.kde.org/buglist.cgi?quicksearch=\\{@}
+ Query[et]=http://bugs.kde.org/buglist.cgi?quicksearch=\\{@}
++Query[eu]=http://bugs.kde.org/buglist.cgi?quicksearch=\\{@}
+ Query[fi]=http://bugs.kde.org/buglist.cgi?quicksearch=\\{@}
+ Query[fr]=http://bugs.kde.org/buglist.cgi?quicksearch=\\{@}
+ Query[fy]=http://bugs.kde.org/buglist.cgi?quicksearch=\\{@}
+@@ -126,6 +127,7 @@
+ Query[pt_BR]=http://bugs.kde.org/buglist.cgi?quicksearch=\\{@}
+ Query[ro]=http://bugs.kde.org/buglist.cgi?quicksearch=\\{@}
+ Query[ru]=http://bugs.kde.org/buglist.cgi?quicksearch=\\{@}
++Query[sk]=http://bugs.kde.org/buglist.cgi?quicksearch=\\{@}
+ Query[sl]=http://bugs.kde.org/buglist.cgi?quicksearch=\\{@}
+ Query[sr]=http://bugs.kde.org/buglist.cgi?quicksearch=\\{@}
+ Query[sr@latin]=http://bugs.kde.org/buglist.cgi?quicksearch=\\{@}
+--- runtime/kurifilter-plugins/ikws/searchproviders/bugno.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kurifilter-plugins/ikws/searchproviders/bugno.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -96,6 +96,7 @@
+ Query[en_GB]=https://bugs.kde.org/show_bug.cgi?id=\\{@}
+ Query[es]=https://bugs.kde.org/show_bug.cgi?id=\\{@}
+ Query[et]=https://bugs.kde.org/show_bug.cgi?id=\\{@}
++Query[eu]=https://bugs.kde.org/show_bug.cgi?id=\\{@}
+ Query[fi]=https://bugs.kde.org/show_bug.cgi?id=\\{@}
+ Query[fr]=https://bugs.kde.org/show_bug.cgi?id=\\{@}
+ Query[fy]=https://bugs.kde.org/show_bug.cgi?id=\\{@}
+@@ -126,6 +127,7 @@
+ Query[pt_BR]=https://bugs.kde.org/show_bug.cgi?id=\\{@}
+ Query[ro]=https://bugs.kde.org/show_bug.cgi?id=\\{@}
+ Query[ru]=https://bugs.kde.org/show_bug.cgi?id=\\{@}
++Query[sk]=https://bugs.kde.org/show_bug.cgi?id=\\{@}
+ Query[sl]=https://bugs.kde.org/show_bug.cgi?id=\\{@}
+ Query[sr]=https://bugs.kde.org/show_bug.cgi?id=\\{@}
+ Query[sr@latin]=https://bugs.kde.org/show_bug.cgi?id=\\{@}
+--- runtime/kurifilter-plugins/ikws/searchproviders/es2en.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kurifilter-plugins/ikws/searchproviders/es2en.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -65,7 +65,7 @@
+ Name[ru]=Переводчик WordReference.com: испанско-английский
+ Name[se]=WordReference.com – jorgaleapmi: spánskkagielas eŋgelasgillii
+ Name[si]=WordReference.com Translation: Spanish to English
+-Name[sk]=WordReference.com preklad zo španiečiny do angličtiny
++Name[sk]=WordReference.com preklad zo španielčiny do angličtiny
+ Name[sl]=Prevod WordReference.com: španščina v angleščino
+ Name[sr]=Вордреференс: са шпанског на енглески
+ Name[sr@latin]=WordReference: sa španskog na engleski
+--- runtime/kurifilter-plugins/ikws/searchproviders/fsd.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kurifilter-plugins/ikws/searchproviders/fsd.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -65,7 +65,7 @@
+ Name[ru]=Каталог свободного ПО FSF/UNESCO
+ Name[se]=FSF/UNESCO Free Software Directory
+ Name[si]=FSF/UNESCO Free Software Directory
+-Name[sk]=FSF/UNESCO Adresár voľného softwaru
++Name[sk]=FSF/UNESCO Adresár voľného softvéru
+ Name[sl]=Imenik prostega programja FSF/UNESCO
+ Name[sr]=Именик слободног софтвера ЗСС/Унеско
+ Name[sr@latin]=Imenik slobodnog softvera ZSS/Unesco
+--- runtime/kurifilter-plugins/ikws/searchproviders/ethicle.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kurifilter-plugins/ikws/searchproviders/ethicle.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -43,6 +43,7 @@
+ Name[ro]=Ethicle
+ Name[ru]=Ethicle
+ Name[si]=Ethicle
++Name[sk]=Ethicle
+ Name[sl]=Ethicle
+ Name[sr]=Етикл
+ Name[sr@latin]=Ethicle
+@@ -100,6 +101,7 @@
+ Query[ro]=http://www.ethicle.com/search.php?q=\\{@}
+ Query[ru]=http://www.ethicle.com/search.php?q=\\{@}
+ Query[si]=http://www.ethicle.com/search.php?q=\\{@}
++Query[sk]=http://www.ethicle.com/search.php?q=\\{@}
+ Query[sl]=http://www.ethicle.com/search.php?q=\\{@}
+ Query[sr]=http://www.ethicle.com/search.php?q=\\{@}
+ Query[sr@latin]=http://www.ethicle.com/search.php?q=\\{@}
+--- runtime/kurifilter-plugins/ikws/searchproviders/grec.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kurifilter-plugins/ikws/searchproviders/grec.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -88,6 +88,7 @@
+ Query[en_GB]=http://ec.grec.net/cgi-bin/AppDLC3.exe?APP=CERCADLC&GECART=\\{@}
+ Query[es]=http://ec.grec.net/cgi-bin/AppDLC3.exe?APP=CERCADLC&GECART=\\{@}
+ Query[et]=http://ec.grec.net/cgi-bin/AppDLC3.exe?APP=CERCADLC&GECART=\\{@}
++Query[eu]=http://ec.grec.net/cgi-bin/AppDLC3.exe?APP=CERCADLC&GECART=\\{@}
+ Query[fr]=http://ec.grec.net/cgi-bin/AppDLC3.exe?APP=CERCADLC&GECART=\\{@}
+ Query[hr]=http://ec.grec.net/cgi-bin/AppDLC3.exe?APP=CERCADLC&GECART=\\{@}
+ Query[hu]=http://ec.grec.net/cgi-bin/AppDLC3.exe?APP=CERCADLC&GECART=\\{@}
+@@ -101,6 +102,7 @@
+ Query[pl]=http://ec.grec.net/cgi-bin/AppDLC3.exe?APP=CERCADLC&GECART=\\{@}
+ Query[pt]=http://ec.grec.net/cgi-bin/AppDLC3.exe?APP=CERCADLC&GECART=\\{@}
+ Query[pt_BR]=http://ec.grec.net/cgi-bin/AppDLC3.exe?APP=CERCADLC&GECART=\\{@}
++Query[sk]=http://ec.grec.net/cgi-bin/AppDLC3.exe?APP=CERCADLC&GECART=\\{@}
+ Query[sl]=http://ec.grec.net/cgi-bin/AppDLC3.exe?APP=CERCADLC&GECART=\\{@}
+ Query[sr]=http://ec.grec.net/cgi-bin/AppDLC3.exe?APP=CERCADLC&GECART=\\{@}
+ Query[sr@latin]=http://ec.grec.net/cgi-bin/AppDLC3.exe?APP=CERCADLC&GECART=\\{@}
+--- runtime/kurifilter-plugins/ikws/searchproviders/google_lucky.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kurifilter-plugins/ikws/searchproviders/google_lucky.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -64,7 +64,7 @@
+ Name[ro]=Google (Mă simt norocos)
+ Name[ru]=Google: Мне повезёт!
+ Name[se]=Google (Geahččalan lihkku)
+-Name[sk]=Google (Skúsim štastie)
++Name[sk]=Google (Skúsim šťastie)
+ Name[sl]=Google (Počutim se srečnega)
+ Name[sr]=Гугл (из прве руке)
+ Name[sr@latin]=Google (iz prve ruke)
+--- runtime/soliduiserver/soliduiserver.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/soliduiserver/soliduiserver.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -22,7 +22,7 @@
+ Name[et]=Solidi kasutajaliidese server
+ Name[eu]=Solid erabiltzailearen interfaze zerbitzaria
+ Name[fa]=کارساز واسط کاربر Solid
+-Name[fi]=Solid -käyttöliittymäpalvelin
++Name[fi]=Solid-käyttöliittymäpalvelin
+ Name[fr]=Serveur d'interface utilisateur Solid
+ Name[fy]=Solid brûker omjouwing tsjinner
+ Name[ga]=Freastalaí Comhéadain Solid
+@@ -61,7 +61,7 @@
+ Name[ru]=Интерфейс пользователя Solid
+ Name[se]=Solida geavaheaddjiláktabálvá
+ Name[si]=Solid User Interface Server
+-Name[sk]=Server používateľského rozhrania Solid-u
++Name[sk]=Server užívateľského rozhrania Solid-u
+ Name[sl]=Strežnik uporabniškega vmesnika za Solid
+ Name[sr]=Сервер корисничког сучеља за Солид
+ Name[sr@latin]=Server korisničkog sučelja za Solid
+@@ -130,7 +130,7 @@
+ Comment[ru]=Интерфейс пользователя для Solid, подсистемы обнаружения оборудования
+ Comment[se]=Geavaheaddjiláktabálvá, Solid-mašiidnagálvoáicanvuogádahkii
+ Comment[si]=A User Interface server for Solid, the hardware detection system
+-Comment[sk]=Server používateľského rozhrania pre Solid, systém detekcie hardvéru
++Comment[sk]=Server užívateľského rozhrania pre Solid, systém detekcie hardvéru
+ Comment[sl]=Strežnik uporabniškega vmesnika za Solid, sistem za zaznavanje strojne opreme
+ Comment[sr]=Сервер корисничког сучеља за Солид, систем откривања хардвера
+ Comment[sr@latin]=Server korisničkog sučelja za Solid, sistem otkrivanja hardvera
+--- runtime/kglobalaccel/kglobalaccel.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/kglobalaccel/kglobalaccel.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -23,6 +23,7 @@
+ Name[es]=Servidor glbal de accesos rápidos KDED
+ Name[et]=KDE globaalsete kiirklahvide server
+ Name[eu]=KDED laster-tekla globalen zerbitzaria
++Name[fi]=KDEDin järjestelmänlaajuinen pikanäppäinpalvelin
+ Name[fr]=Serveur général de raccourcis KDED
+ Name[fy]=KDED globale fluchtoets tsjinnner
+ Name[ga]=Freastalaí Aicearraí Comhchoiteanna KDED
+@@ -61,7 +62,7 @@
+ Name[ru]=Поддержка глобальных комбинаций клавиш
+ Name[se]=KDED-bálvá globála njuolggobálgáid várás
+ Name[si]=KDED Global Shortcuts Server
+-Name[sk]=KDED Global Shortcuts Server
++Name[sk]=KDED server globálnych skratiek
+ Name[sl]=Strežnik KDED za globalne bližnjice
+ Name[sr]=КДЕД сервер глобалних пречица
+ Name[sr@latin]=KDED server globalnih prečica
+--- runtime/drkonqi/backtraceparser.cpp (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/drkonqi/backtraceparser.cpp (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -236,7 +236,7 @@
+ "0x[0-9a-f]+.*|"
+ "Current language:.*");
+ if (regExp.exactMatch(d->m_line)) {
+- kDebug() << "crap detected:" << d->m_line;
++ kDebug() << "garbage detected:" << d->m_line;
+ d->m_type = Crap;
+ return;
}
-
-- 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/drkonqi/bugzillalib.cpp (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/drkonqi/bugzillalib.cpp (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -41,7 +41,7 @@
+ static const char loginUrl[] = "index.cgi";
+
+ static const char searchUrl[] = "buglist.cgi?query_format=advanced&short_desc_type=anywordssubstr"
+- "&short_desc=%1&product=kde&product=%2&long_desc_type=anywordssubstr&"
++ "&short_desc=%1&product=%2&long_desc_type=allwordssubstr&"
+ "long_desc=%3&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_"
+ "type=allwords&keywords=&emailtype1=substring&email1=&emailtype2=substr"
+ "ing&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=%4&chfieldto="
+--- runtime/drkonqi/drkonqiassistantpages_base.cpp (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/drkonqi/drkonqiassistantpages_base.cpp (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -201,13 +201,13 @@
+
+ switch (use) {
+ case BacktraceParser::ReallyUseful: {
+- needToReport = (canDetails || developersCanContactReporter);
++ needToReport = (canDetails && developersCanContactReporter);
+ explanationHTML += QString("<li>%1</li>").arg(i18nc("@info","The automatically generated "
+ "crash information is useful."));
+ break;
}
---- 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 );
- }
+ case BacktraceParser::MayBeUseful: {
+- needToReport = (canDetails || developersCanContactReporter);
++ needToReport = (canDetails && developersCanContactReporter);
+ explanationHTML += QString("<li>%1</li>").arg(i18nc("@info","The automatically generated "
+ "crash information lacks some "
+ "details "
+@@ -215,7 +215,7 @@
+ break;
}
-+
-+ 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=\\{@}
-+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=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
- 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
+ case BacktraceParser::ProbablyUseless: {
+- needToReport = (canDetails && developersCanContactReporter);
++ needToReport = false;
+ explanationHTML += QString("<li>%1</li>").arg(i18nc("@info","The automatically generated "
+ "crash information lacks important details "
+ "and it is probably not helpful."));
+--- runtime/drkonqi/mappings (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/drkonqi/mappings (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -73,6 +73,7 @@
+ knotificationareaitemtest=plasma|widget-systemtray
+ knotificationicontest=plasma|widget-systemtray
+ lancelot=plasma|widget-lancelot
++plasma-netbook=plasma|plasma-netbook
+
+ #KIO
+ kioclient=kio|general
+--- runtime/l10n/northamerica.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/northamerica.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=আমেরিকা, উত্তর
+ Name[bn_IN]=আমেরিকা, উত্তর
+ Name[br]=Amerika, Norzh
+-Name[ca]=Amèrica, nord
++Name[ca]=Amèrica del Nord
+ Name[ca@valencia]=Amèrica, nord
+ Name[cs]=Amerika, Severní
+ Name[csb]=Nordowô Amerika
+--- runtime/l10n/za/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/za/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -10,7 +10,7 @@
+ Name[bn]=দক্ষিণ আফ্রিকা
+ Name[bn_IN]=দক্ষিণ আফ্রিকা
+ Name[br]=Suafrika
+-Name[ca]=Sudàfrica
++Name[ca]=Sud-àfrica
+ Name[ca@valencia]=Sudàfrica
+ Name[cs]=Jižní Afrika
+ Name[csb]=Pôłniowô Afrika
+--- runtime/l10n/km/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/km/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=কমোরস
+ Name[bn_IN]=কোমোরোস
+ Name[br]=Komoros
+-Name[ca]=Comoros
++Name[ca]=Comores
+ Name[ca@valencia]=Comoros
+ Name[cs]=Komory
+ Name[csb]=Kòmòrë
+--- runtime/l10n/kn/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/kn/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=সেন্ট কিটস এবং নেভিস
+ Name[bn_IN]=সেন্ট কিটস ও নেভিস
+ Name[br]=S. Kitts ha Nevis
+-Name[ca]=St. Kitts i Nevis
++Name[ca]=Saint Chistopher i Nevis
+ Name[ca@valencia]=St. Kitts i Nevis
+ Name[cs]=Sv. Kitts a Nevis
+ Name[csb]=St. Kitts ë Nevis
+--- runtime/l10n/ky/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/ky/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -65,7 +65,7 @@
+ Name[ru]=Каймановы острова
+ Name[se]=Caymansullot
+ Name[si]=කයිමන් දූපත්
+-Name[sk]=Kajmanské Ostrovy
++Name[sk]=Kajmanské ostrovy
+ Name[sl]=Kajmanski otoki
+ Name[sr]=Кајманска острва
+ Name[sr@latin]=Kajmanska ostrva
+--- runtime/l10n/southamerica.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/southamerica.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=আমেরিকা, দক্ষিণ
+ Name[bn_IN]=আমেরিকা, দক্ষিণ
+ Name[br]=Amerika, Su
+-Name[ca]=Amèrica, sud
++Name[ca]=Amèrica del Sud
+ Name[ca@valencia]=Amèrica, sud
+ Name[cs]=Amerika, Jižní
+ Name[csb]=Pôłniowô Amerika
+--- runtime/l10n/lc/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/lc/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=সেন্ট লুসিয়া
+ Name[bn_IN]=সেন্ট লুসিয়া
+ Name[br]=S. Lucia
+-Name[ca]=St. Lucia
++Name[ca]=Saint Lucia
+ Name[ca@valencia]=St. Lucia
+ Name[cs]=Svatá Lucie
+ Name[csb]=St. Lucia
+--- runtime/l10n/ly/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/ly/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -64,7 +64,7 @@
+ Name[ro]=Libia
+ Name[ru]=Ливия
+ Name[se]=Libya
+-Name[sk]=Lýbia
++Name[sk]=Líbya
+ Name[sl]=Libija
+ Name[sr]=Либија
+ Name[sr@latin]=Libija
+--- runtime/l10n/nl/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/nl/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -10,7 +10,7 @@
+ Name[bn]=হল্যাণ্ড
+ Name[bn_IN]=নেদারল্যান্ড
+ Name[br]=Izelvroioù
+-Name[ca]=Holanda
++Name[ca]=Països Baixos
+ Name[ca@valencia]=Holanda
+ Name[cs]=Nizozemí
+ Name[csb]=Néderlandzkô
+--- runtime/l10n/southeastasia.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/southeastasia.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=এসিয়া, দক্ষিণ-পূর্ব
+ Name[bn_IN]=আমেরিকা, দক্ষিণ-পূর্ব
+ Name[br]=Asi, Gevred
+-Name[ca]=Àsia del Sudest
++Name[ca]=Àsia del Sud-Est
+ Name[ca@valencia]=Àsia del Sudest
+ Name[cs]=Asie, Jihovýchodní
+ Name[csb]=Pôłniowô-Pòrénkòwô Azëjô
+--- runtime/l10n/pf/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/pf/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=ফরাসী পলিনেশিয়া
+ Name[bn_IN]=ফ্রেঞ্চ পলিনেশিয়া
+ Name[br]=Polinezi galleg
+-Name[ca]=Polinèsia francessa
++Name[ca]=Polinèsia Francesa
+ Name[ca@valencia]=Polinèsia francessa
+ Name[cs]=Francouzská Polynésie
+ Name[csb]=Francëskô Pòlinezëjô
+--- runtime/l10n/ae/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/ae/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=সংযুক্ত আরব আমিরশাহি
+ Name[bn_IN]=সংযুক্ত আরব আমিরশাহী
+ Name[br]=Stadoù-Unanet Arabeg
+-Name[ca]=Emirats Àrabs Units
++Name[ca]=Unió dels Emirats Àrabs
+ Name[ca@valencia]=Emirats Àrabs Units
+ Name[cs]=Spojené arabské emiráty
+ Name[csb]=Zrzeszóné Abrabsczé Emiratë
+--- runtime/l10n/an/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/an/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -8,7 +8,7 @@
+ Name[bn]=নেদারল্যাণ্ডস অ্যান্টিলেস
+ Name[bn_IN]=নেদারল্যান্ডস অ্যান্টিলিস
+ Name[br]=Antilh an Izelvroioù
+-Name[ca]=Antilles del Països Baixos
++Name[ca]=Antilles Holandeses
+ Name[ca@valencia]=Antilles del Països Baixos
+ Name[cs]=Nizozemské Antily
+ Name[csb]=Hòlandzczi Antile
+--- runtime/l10n/az/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/az/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=আজেরবাইজান
+ Name[bn_IN]=আজারবাইজান
+ Name[br]=Azerbeidjan
+-Name[ca]=Azerbaitjan
++Name[ca]=Azerbaidjan
+ Name[ca@valencia]=Azerbaitjan
+ Name[cs]=Ázerbajdžánský
+ Name[csb]=Azerbejdżan
+--- runtime/l10n/bd/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/bd/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=বাংলাদেশ
+ Name[bn_IN]=বাংলাদেশ
+ Name[br]=Bangladaech
+-Name[ca]=Bangladesh
++Name[ca]=Bangla Desh
+ Name[ca@valencia]=Bangladesh
+ Name[cs]=Bangladéš
+ Name[csb]=Bangladesz
+--- runtime/l10n/southeurope.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/southeurope.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=ইউরোপ, দক্ষিণ
+ Name[bn_IN]=ইউরোপ, দক্ষিণ
+ Name[br]=Europa, Su
+-Name[ca]=Europa, del sud
++Name[ca]=Europa del Sud
+ Name[ca@valencia]=Europa, del sud
+ Name[cs]=Evropa, Jižní
+ Name[csb]=Pôłniowô Eùropa
+--- runtime/l10n/bj/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/bj/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=বেনিন
+ Name[bn_IN]=বেনিন
+ Name[br]=Benin
+-Name[ca]=Benin
++Name[ca]=Benín
+ Name[ca@valencia]=Benin
+ Name[cs]=Benin
+ Name[csb]=Benin
+--- runtime/l10n/cf/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/cf/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=মধ্য আফ্রিকান রিপাবলিক
+ Name[bn_IN]=মধ্য আফ্রিকান প্রজাতন্ত্র
+ Name[br]=Republik centrafricaine
+-Name[ca]=República Centro Africana
++Name[ca]=República Centreafricana
+ Name[ca@valencia]=República Centro Africana
+ Name[cs]=Středoafrická republika
+ Name[csb]=Repùblika Westrzédny Africzi
+--- runtime/l10n/rw/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/rw/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=রোয়ান্ডা
+ Name[bn_IN]=রওয়ান্ডা
+ Name[br]=Rwanda
+-Name[ca]=Ruanda
++Name[ca]=Rwanda
+ Name[ca@valencia]=Ruanda
+ Name[cs]=Rwanda
+ Name[csb]=Ruanda
+--- runtime/l10n/ci/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/ci/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=Cote d'ivoire
+ Name[bn_IN]=আইভরি কোস্ট
+ Name[br]=Aod an Olifant
+-Name[ca]=Costa d'ivori
++Name[ca]=Costa d'Ivori
+ Name[ca@valencia]=Costa d'ivori
+ Name[cs]=Pobřeží slonoviny
+ Name[csb]=Ùbrzég Słoniowegò Gnôta
+--- runtime/l10n/sa/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/sa/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=সৌদি আরব
+ Name[bn_IN]=সৌদি আরব
+ Name[br]=Arabi Saudiet
+-Name[ca]=Aràbia Saurí
++Name[ca]=Aràbia Saudita
+ Name[ca@valencia]=Aràbia Saurí
+ Name[cs]=Saúdská Arábie
+ Name[csb]=Saùdejskô Arabskô
+@@ -64,7 +64,7 @@
+ Name[ro]=Arabia Saudită
+ Name[ru]=Саудовская Аравия
+ Name[se]=Saudi Arábia
+-Name[sk]=Saudská arábia
++Name[sk]=Saudská Arábia
+ Name[sl]=Saudova Arabija
+ Name[sr]=Саудијска Арабија
+ Name[sr@latin]=Saudijska Arabija
+--- runtime/l10n/sb/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/sb/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=সলোমন দ্বীপপুঞ্জ
+ Name[bn_IN]=সলোমান দ্বীপপুঞ্জ
+ Name[br]=Inizi Salaun
+-Name[ca]=Illes Solomon
++Name[ca]=Illes Salomó
+ Name[ca@valencia]=Illes Solomon
+ Name[cs]=Šalamounovy ostrovy
+ Name[csb]=Òstrowë Salomona
+--- runtime/l10n/cx/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/cx/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=ক্রিস্টমাস দ্বীপ
+ Name[bn_IN]=ক্রিস্টমাস দ্বীপপুঞ্জ
+ Name[br]=Inizi Nedeleg
+-Name[ca]=Illa de Pascua
++Name[ca]=Illa Christmas
+ Name[ca@valencia]=Illa de Pascua
+ Name[cs]=Vánoční ostrovy
+ Name[csb]=Gòdowé Òstrowë
+--- runtime/l10n/sh/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/sh/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=সেন্ট হেলেনা
+ Name[bn_IN]=সেন্ট হেলেনা
+ Name[br]=Sant Lena
+-Name[ca]=Santa Helena
++Name[ca]=Saint Helena
+ Name[ca@valencia]=Santa Helena
+ Name[cs]=Svatá Helena
+ Name[csb]=Swiãtô Lena
+--- runtime/l10n/sr/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/sr/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=সুরিনাম
+ Name[bn_IN]=সুরিনাম
+ Name[br]=Surinam
+-Name[ca]=Suriname
++Name[ca]=Surinam
+ Name[ca@valencia]=Suriname
+ Name[cs]=Surinam
+ Name[csb]=Surinam
+--- runtime/l10n/st/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/st/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=সাও টোম এবং প্রিন্সিপ
+ Name[bn_IN]=সাও টোমে ও প্রিন্সিপে
+ Name[br]=Sao Tome ha Principe
+-Name[ca]=Sao Tome i Principe
++Name[ca]=Sao Tomé i Príncipe
+ Name[ca@valencia]=Sao Tome i Principe
+ Name[cs]=Sao Tome a Principe
+ Name[csb]=Sao Tome ë Principe
+--- runtime/l10n/tl/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/tl/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -6,7 +6,7 @@
+ Name[bg]=Тимор-Лесте
+ Name[bn]=টিমোর-লেস্টে
+ Name[bn_IN]=টিমোর-লেস্তে
+-Name[ca]=Timor-Leste
++Name[ca]=Timor Oriental
+ Name[ca@valencia]=Timor-Leste
+ Name[cs]=Timor-Leste
+ Name[csb]=Timor-Leste
+--- runtime/l10n/tm/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/tm/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=তুর্কমেনিস্তান
+ Name[bn_IN]=তুর্কমেনিস্তান
+ Name[br]=Turkmenistan
+-Name[ca]=Turcmenistan
++Name[ca]=Turkmenistan
+ Name[ca@valencia]=Turcmenistan
+ Name[cs]=Turkmenistán
+ Name[csb]=Turkmenistón
+--- runtime/l10n/tp/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/tp/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=পূর্ব টিমর
+ Name[bn_IN]=পূর্ব টিমুর
+ Name[br]=Timor reter
+-Name[ca]=Timor Est
++Name[ca]=Timor Oriental
+ Name[ca@valencia]=Timor Est
+ Name[cs]=Východní Timor
+ Name[csb]=Pòrénkòwi Timòr
+--- runtime/l10n/tt/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/tt/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=ত্রিনিদাদ এবং টোবাগো
+ Name[bn_IN]=ত্রিনিদাদ ও টোবাগো
+ Name[br]=Trinidad ha Tobago
+-Name[ca]=Trinidad i Tobago
++Name[ca]=Trinitat i Tobago
+ Name[ca@valencia]=Trinidad i Tobago
+ Name[cs]=Trinidad a Tobago
+ Name[csb]=Trinidad ë Tobagò
+--- runtime/l10n/fk/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/fk/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=ফকল্যাণ্ড দ্বীপপুঞ্জ (মলভিনাস)
+ Name[bn_IN]=ফল্কল্যান্ড দ্বীপপুঞ্জ (মালভিনাস)
+ Name[br]=Inizi Falklandi (Malvinas)
+-Name[ca]=Illes Falkland (Malvines)
++Name[ca]=Illes Malvines (Falkland)
+ Name[ca@valencia]=Illes Falkland (Malvines)
+ Name[cs]=Falklandy (Malvíny)
+ Name[csb]=Falklandzczé Òstrowë (Malwinë)
+--- runtime/l10n/fm/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/fm/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -8,7 +8,7 @@
+ Name[bg]=Микронезия
+ Name[bn]=মাইক্রোনেশিয়া, ফেডারেটেড স্টেটস অব
+ Name[bn_IN]=মাইক্রোনেশিয়া যুক্তরাজ্য
+-Name[ca]=Micronèsia, Estats Federats de
++Name[ca]=Micronèsia (Estats Federats)
+ Name[ca@valencia]=Micronèsia, Estats Federats de
+ Name[cs]=Mikronésie
+ Name[csb]=Federacëjô Stónów Mikronezëji
+--- runtime/l10n/vc/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/vc/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=সেন্ট ভিনসেন্ট ও গ্রেনাডিন
+ Name[bn_IN]=সেন্ট ভিনসেন্ট ও গ্রেনাডিনস
+ Name[br]=S. Visant hag ar Grenadinez
+-Name[ca]=St. Vincent i les Granadines
++Name[ca]=Saint Vincent i les Grenadines
+ Name[ca@valencia]=St. Vincent i les Granadines
+ Name[cs]=St. Vincent a Grenadiny
+ Name[csb]=St. Vincent ë Grenadyny
+--- runtime/l10n/vg/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/vg/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -8,7 +8,7 @@
+ Name[bg]=Британски Вирджински острови
+ Name[bn]=ভার্জিন আইল্যাণ্ডস, ব্রিটিশ
+ Name[bn_IN]=ব্রিটিশ ভার্জিন দ্বীপ
+-Name[ca]=Illes Verges, Angleses
++Name[ca]=Illes Verges Britàniques
+ Name[ca@valencia]=Illes Verges, Angleses
+ Name[cs]=Virgin Islands, British
+ Name[csb]=Dzéwczëce Òstrowë (Britijsczé)
+--- runtime/l10n/vi/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/vi/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -8,7 +8,7 @@
+ Name[bg]=Американски Вирджински острови
+ Name[bn]=ভার্জিন আইল্যাণ্ডস, মার্কিন যুক্তরাষ্ট্র
+ Name[bn_IN]=মার্কিন ভার্জিন দ্বীপ
+-Name[ca]=Illes Verges, Americanes
++Name[ca]=Illes Verges Americanes
+ Name[ca@valencia]=Illes Verges, Americanes
+ Name[cs]=Panenské ostrovy, U.S.
+ Name[csb]=Dzéwczëce Òstrowë (USA)
+--- runtime/l10n/easteurope.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/easteurope.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=ইউরোপ, পূর্ব
+ Name[bn_IN]=ইউরোপ, পূর্ব
+ Name[br]=Europa, Reter
+-Name[ca]=Europa, de l'est
++Name[ca]=Europa de l'Est
+ Name[ca@valencia]=Europa, de l'est
+ Name[cs]=Evropa, Východní
+ Name[csb]=Pòrénkòwô Eùropa
+--- runtime/l10n/gq/entry.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/gq/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -65,7 +65,7 @@
+ Name[ru]=Экваториальная Гвинея
+ Name[se]=Ekvatorialalaš-Guinea
+ Name[si]=Equatorial Guinea
+-Name[sk]=Rovníkova Guinea
++Name[sk]=Rovníková Guinea
+ Name[sl]=Ekvatorialna Gvineja
+ Name[sr]=Екваторијална Гвинеја
+ Name[sr@latin]=Ekvatorijalna Gvineja
+--- runtime/l10n/northeurope.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/northeurope.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=ইউরোপ, উত্তর
+ Name[bn_IN]=ইউরোপ, উত্তর
+ Name[br]=Europa, Norzh
+-Name[ca]=Europa, del nord
++Name[ca]=Europa del Nord
+ Name[ca@valencia]=Europa, del nord
+ Name[cs]=Evropa, Severní
+ Name[csb]=Nordowô Eùropa
+--- runtime/l10n/centraleurope.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/centraleurope.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=ইউরোপ, মধ্য
+ Name[bn_IN]=ইউরোপ, মধ্য
+ Name[br]=Europa, Kreiz
+-Name[ca]=Europa, central
++Name[ca]=Europa Central
+ Name[ca@valencia]=Europa, central
+ Name[cs]=Evropa, Střední
+ Name[csb]=Westrzédnô Eùropa
+--- runtime/l10n/centralamerica.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/centralamerica.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=আমেরিকা, মধ্য
+ Name[bn_IN]=আমেরিকা, মধ্য
+ Name[br]=Amerika, Kreiz
+-Name[ca]=Amèrica, central
++Name[ca]=Amèrica Central
+ Name[ca@valencia]=Amèrica, central
+ Name[cs]=Amerika, Střední
+ Name[csb]=Westrzédnô Amerika
+--- runtime/l10n/westeurope.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/l10n/westeurope.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -9,7 +9,7 @@
+ Name[bn]=ইউরোপ, পশ্চিম
+ Name[bn_IN]=ইউরোপ, পশ্চিম
+ Name[br]=Europa, Kornaoueg
+-Name[ca]=Europa, oest
++Name[ca]=Europa Occidental
+ Name[ca@valencia]=Europa, oest
+ Name[cs]=Evropa, Západní
+ Name[csb]=Zôpôdnô Eùropa
+--- runtime/plasma/scriptengines/javascript/tests/javascript-config-test/metadata.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/plasma/scriptengines/javascript/tests/javascript-config-test/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -44,6 +44,7 @@
+ Name[ro]=javascript-config-test
+ Name[ru]=javascript-config-test
+ Name[si]=javascript-config-test
++Name[sk]=javascript-config-test
+ Name[sl]=javascript-config-test
+ Name[sr]=javascript-config-test
+ Name[sr@latin]=javascript-config-test
@@ -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
+ Comment[pt_BR]=Widget de teste de objetos de configuração em Javascript
+ Comment[ru]=Тестовый виджет с возможностью настройки, написанный на языке JavaScript
+ Comment[si]=Javascript config object test widget
++Comment[sk]=Prvok pre testovanie JavaScriptu
+ Comment[sl]=Preizkusni gradnik nastavitvenega objekta za Javascript
+ Comment[sr]=Виџет за пробу јаваскриптног објекта поставе
+ Comment[sr@latin]=Vidžet za probu javascript objekta postave
+--- runtime/plasma/scriptengines/javascript/tests/script-digital-clock/metadata.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/plasma/scriptengines/javascript/tests/script-digital-clock/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -45,6 +45,7 @@
+ Name[ro]=script-ceas-digital
+ Name[ru]=script-digital-clock
+ Name[si]=script-digital-clock
++Name[sk]=script-digital-clock
+ Name[sl]=script-digital-clock
+ Name[sr]=script-digital-clock
+ Name[sr@latin]=script-digital-clock
+@@ -102,6 +103,7 @@
+ Comment[ro]=Un ceas digital Javascript
+ Comment[ru]=Цифровые часы, написанные на языке JavaScript
+ Comment[si]=Javascript digital clock
++Comment[sk]=JavaScript digitálne hodiny
+ Comment[sl]=Digitalna ura v Javascriptu
+ Comment[sr]=Јаваскриптни дигитални сат
+ Comment[sr@latin]=Javascript digitalni sat
+--- runtime/plasma/scriptengines/javascript/tests/script-nowplaying/metadata.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/plasma/scriptengines/javascript/tests/script-nowplaying/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -43,6 +43,7 @@
+ Name[ro]=script-înredare
+ Name[ru]=script-nowplaying
+ Name[si]=script-nowplaying
++Name[sk]=script-nowplaying
+ Name[sl]=script-nowplaying
+ Name[sr]=script-nowplaying
+ Name[sr@latin]=script-nowplaying
+@@ -97,6 +98,7 @@
+ Comment[ro]=Pista în redare în versiune Javascript
+ Comment[ru]=Виджет «Сейчас проигрывается», написанный на языке JavaScript
+ Comment[si]=Javascript version current track playing
++Comment[sk]=JavaScriptová verzia aktuálne hranej skladby
+ Comment[sl]=Trenutno predvajana skladba v Javascriptu
+ Comment[sr]=Јаваскриптна верзија тренутне свирке
+ Comment[sr@latin]=Javascript verzija trenutne svirke
+--- runtime/plasma/scriptengines/javascript/tests/tiger/metadata.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/plasma/scriptengines/javascript/tests/tiger/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -109,6 +109,7 @@
+ Comment[pt_BR]=Um adaptador de script
+ Comment[ro]=Adaptor de scripturi
+ Comment[ru]=Адаптер скриптов
++Comment[sk]=Spracovanie skriptu
+ Comment[sl]=Skriptni prilagodilnik
+ Comment[sr]=Адаптор скрипти
+ Comment[sr@latin]=Adaptor skripti
+--- runtime/plasma/scriptengines/javascript/tests/script-mediaplayer/metadata.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
++++ runtime/plasma/scriptengines/javascript/tests/script-mediaplayer/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
+@@ -41,6 +41,7 @@
+ Name[ro]=script-lectormultimedia
+ Name[ru]=script-mediaplayer
+ Name[si]=script-mediaplayer
++Name[sk]=script-mediaplayer
+ Name[sl]=script-mediaplayer
+ Name[sr]=script-mediaplayer
+ Name[sr@latin]=script-mediaplayer
+@@ -95,6 +96,7 @@
+ Comment[ro]=Lector multimedia Javascript
+ Comment[ru]=Проигрыватель, написанный на языке JavaScript
+ Comment[si]=Javascript media player
++Comment[sk]=JavaScript prehrávač médií
+ Comment[sl]=Večpredstavnostni predvajalnik v JavaScriptu
+ Comment[sr]=Јаваскриптни медија плејер
+ Comment[sr@latin]=Javascript medija plejer