]>
Commit | Line | Data |
---|---|---|
87b537f7 AM |
1 | --- runtime/kuiserver/kuiserver.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) |
2 | +++ runtime/kuiserver/kuiserver.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
3 | @@ -39,6 +39,7 @@ | |
4 | Comment[he]=שרת ממשק משתמש של KDE למידע לגבי התקדמות | |
5 | Comment[hi]=केडीई की प्रगति जानकारी यूआई सर्वर | |
6 | Comment[hne]=केडीई के प्रगति जानकारी यूआई सर्वर | |
7 | +Comment[hr]=Poslužitelj KDE-ovog grafičkog elementa za prikaz napretka | |
8 | Comment[hsb]=KDE-serwer za informaciju wo pokročowanju | |
9 | Comment[hu]=KDE állapotkijelző szolgáltatás | |
10 | Comment[is]=Framvinda miðlunar KDE notendviðmóts | |
11 | --- runtime/knotify/kde.notifyrc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
12 | +++ runtime/knotify/kde.notifyrc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
13 | @@ -248,6 +248,7 @@ | |
14 | Name[he]=השלמת טקסט: סיבוב | |
15 | Name[hi]=पाठ-पूर्णता: रोटेशन | |
16 | Name[hne]=पाठ-पूराकरना: घुमाना | |
17 | +Name[hr]=Dovršetak teksta: rotacija | |
18 | Name[hsb]=Wudospołnjenje teksta: rotacija | |
19 | Name[hu]=Szövegkiegészítés: rotáció | |
20 | Name[is]=Textaklárun: snúningur | |
21 | @@ -317,6 +318,7 @@ | |
22 | Comment[he]=הסוף של רשימת ההתאמות הושג | |
23 | Comment[hi]=मिलान सूची का अंतिम आ पंहुचा. | |
24 | Comment[hne]=मिलाए वाले सूची के आखरी आ गिस | |
25 | +Comment[hr]=Dosegnut je kraj popisa podudarnosti | |
26 | Comment[hsb]=Kónc lisćiny wudospołnjenjow | |
27 | Comment[hu]=A találatok végére értem | |
28 | Comment[is]=Enda hefur verið náð á lista yfir samsvaranir | |
29 | @@ -391,6 +393,7 @@ | |
30 | Name[he]=השלמת טקסט: אין התאמה | |
31 | Name[hi]=पाठ-पूर्णता: मिलान नहीं | |
32 | Name[hne]=पाठ-पूराकरना: कोइ नइ मिलत हे | |
33 | +Name[hr]=Dovršetak teksta: nema podudarnosti | |
34 | Name[hsb]=Wudospołnjenje teksta: žane | |
35 | Name[hu]=Szövegkiegészítés: nincs találat | |
36 | Name[is]=Textaklárun: engin samsvörun | |
37 | @@ -460,6 +463,7 @@ | |
38 | Comment[he]=לא מצאה התאמת השלמה | |
39 | Comment[hi]=कोई मिलता-जुलता पूर्णता नहीं मिला | |
40 | Comment[hne]=पूरा करइया कोइ नइ मिलत हे | |
41 | +Comment[hr]=Nije pronađen podudardni dovršetak | |
42 | Comment[hsb]=Žane wudospołnjenje namakane | |
43 | Comment[hu]=Nincs illeszthető szó | |
44 | Comment[is]=Engin samsvarandi ending fannst | |
45 | @@ -535,6 +539,7 @@ | |
46 | Name[he]=השלמת טקסט: התאמה חלקית | |
47 | Name[hi]=पाठ-पूर्णता: अधूरा मिलान | |
48 | Name[hne]=पाठपूराकरना: आधा-थोड़ा मिलत हे | |
49 | +Name[hr]=Dovršetak teksta: djelomična podudarnost | |
50 | Name[hsb]=Wudospołnjenje teksta: dźělna namakanka | |
51 | Name[hu]=Szövegkiegészítés: részleges találat | |
52 | Name[is]=Textaklárun: samsvörun á hluta | |
53 | @@ -604,6 +609,7 @@ | |
54 | Comment[he]=יש יותר מהתאמה מתאימה אחת | |
55 | Comment[hi]=वहाँ पर एक से अघिक संभव जोड़ मिले हैं | |
56 | Comment[hne]=इहां एक से जादा संभावित मेच हे | |
57 | +Comment[hr]=Postoji više od jedne moguće podudarnosti | |
58 | Comment[hsb]=Wjace hač jedne móžne wudospołnjenje | |
59 | Comment[hu]=Egynél több szó illeszkedik | |
60 | Comment[is]=Það eru fleiri en ein möguleg samsvörun | |
61 | @@ -752,6 +758,7 @@ | |
62 | Comment[he]=התרחשה שגיאה חמורה שגרמה לתכנית להיסגר | |
63 | Comment[hi]=एक अति गंभीर त्रुटि हुई जिसके कारण प्रोग्राम बाहर हो गया | |
64 | Comment[hne]=इहां एक गंभीर गलती हो गिस जे हर प्रोग्राम ल बाहिर कर दिस | |
65 | +Comment[hr]=Došlo je do ozbiljne pogreške koja je uzrokovala završetak programa | |
66 | Comment[hsb]=Chutny zmylk je program zakónčił | |
67 | Comment[hu]=Olyan hiba történt a programban, melynek hatására a program futása befejeződött | |
68 | Comment[is]=Alvarleg villa átti sér stað sem olli því að forritið slökkti á sér | |
69 | @@ -905,6 +912,7 @@ | |
70 | Comment[he]=משהו מיוחד התרחש בתכנית | |
71 | Comment[hi]=प्रोग्राम में कुछ महत्वपूर्ण घटित हुआ | |
72 | Comment[hne]=प्रोग्राम मं कुछ विसेस हो गिस | |
73 | +Comment[hr]=Nešto posebno se je dogodilo u programu | |
74 | Comment[hsb]=Něšto wosebite je so z programom stało | |
75 | Comment[hu]=Valamilyen esemény következett be a programban | |
76 | Comment[is]=Eitthvað sérstakt gerðist í keyrslu forritsins | |
77 | @@ -1057,6 +1065,7 @@ | |
78 | Comment[he]=הייתה שגיאה בתכנית שאולי גרמה לבעיות | |
79 | Comment[hi]=प्रोग्राम में त्रुटि है जिससे समस्या उत्पन्न हो सकती है | |
80 | Comment[hne]=प्रोग्राम मं एक गलती हो गिस जे हर समस्या दे सकही | |
81 | +Comment[hr]=Došlo je do pogreške u programu koja bi mogla uzrokovati probleme | |
82 | Comment[hsb]=Zmylk w programje móže hišće problemy zawinić | |
83 | Comment[hu]=Hiba történt a programban, de a program futása folytatódhat | |
84 | Comment[is]=Villa varð í forritinu og gætið það valdið vandamálum | |
85 | @@ -1196,6 +1205,7 @@ | |
86 | Comment[he]=שגיאה חמורה מאוד התרחשה, שגרמה לתוכנה להיסגר. | |
87 | Comment[hi]=एक अति गंभीर त्रुटि हुई, जिससे प्रोग्राम बाहर हो गया | |
88 | Comment[hne]=एक बहुत बड़े गलती हो गिस जे हर प्रोग्राम ल बाहिर कर दिस. | |
89 | +Comment[hr]=Dogodila se je vrlo ozbiljna pogreška, koja je uzrokovala završetak barem jednog programa | |
90 | Comment[hsb]=Jara chutny zmylk je znajmjeńša program wottřělił. | |
91 | Comment[hu]=Hiba történt a programban, a program futása befejeződött | |
92 | Comment[is]=Mjög alvarleg villa átti sér stað, a.m.k. næg til að forritið slökkti á sér | |
93 | @@ -1584,6 +1594,7 @@ | |
94 | Name[he]=היצאה בוטלה | |
95 | Name[hi]=लॉगआउट रद्द | |
96 | Name[hne]=लागआउट खारिज | |
97 | +Name[hr]=Odjava prekinuta | |
98 | Name[hsb]=Wotzjewjenje přetorhnjene | |
99 | Name[hu]=Kijelentkezés megszakítva | |
100 | Name[is]=Hætt við útskráningu | |
101 | @@ -1659,6 +1670,7 @@ | |
102 | Comment[he]=היציאה מ־KDE בוטלה | |
103 | Comment[hi]=केडीई लॉगआउट रद्द किया गया | |
104 | Comment[hne]=केडीई के लागआउट खारिज | |
105 | +Comment[hr]=Odjava iz KDE-a je prekinuta | |
106 | Comment[hsb]=Wotzjewjenje w KDE je so přetorhnyło | |
107 | Comment[hu]=A KDE kijelentkezési folyamata megszakadt | |
108 | Comment[is]=Hætt var við útskráningu úr KDE | |
109 | --- runtime/kcontrol/locale/kcmlocale.h (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
110 | +++ runtime/kcontrol/locale/kcmlocale.h (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
111 | @@ -66,6 +66,7 @@ | |
112 | private: | |
113 | enum Direction {Up,Down}; | |
114 | void languageMove(Direction direcition); | |
115 | + int selectedRow() const; | |
116 | ||
117 | ||
118 | // NOTE: we need to mantain our own language list instead of using KLocale's | |
119 | --- runtime/kcontrol/locale/kcmlocale.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
120 | +++ runtime/kcontrol/locale/kcmlocale.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
121 | @@ -101,9 +101,19 @@ | |
122 | m_languageList = configGroup.readEntry("Language").split(':',QString::SkipEmptyParts); | |
123 | } | |
124 | ||
125 | +int KLocaleConfig::selectedRow() const | |
126 | +{ | |
127 | + QList<QListWidgetItem *>selectedItems = m_languages->selectedItems(); | |
128 | + | |
129 | + if ( selectedItems.isEmpty() ) { | |
130 | + return -1; | |
131 | + } | |
132 | + return m_languages->row( selectedItems.at(0) ); | |
133 | +} | |
134 | + | |
135 | void KLocaleConfig::slotAddLanguage(const QString & code) | |
136 | { | |
137 | - int pos = m_languages->currentRow(); | |
138 | + int pos = selectedRow(); | |
139 | if ( pos < 0 ) | |
140 | pos = 0; | |
141 | ||
142 | @@ -126,7 +136,7 @@ | |
143 | ||
144 | void KLocaleConfig::slotRemoveLanguage() | |
145 | { | |
146 | - int pos = m_languages->currentRow(); | |
147 | + int pos = selectedRow(); | |
148 | ||
149 | if (pos != -1) | |
150 | { | |
151 | @@ -142,7 +152,7 @@ | |
152 | ||
153 | void KLocaleConfig::languageMove(Direction direcition) | |
154 | { | |
155 | - int pos = m_languages->currentRow(); | |
156 | + int pos = selectedRow(); | |
157 | ||
158 | QStringList::Iterator it1 = m_languageList.begin() + pos - 1*(direcition==Up); | |
159 | QStringList::Iterator it2 = m_languageList.begin() + pos + 1*(direcition==Down); | |
160 | @@ -194,10 +204,10 @@ | |
161 | ||
162 | void KLocaleConfig::slotCheckButtons() | |
163 | { | |
164 | - languageRemove->setEnabled( m_languages->currentRow() != -1 && m_languages->count() > 1 ); | |
165 | - m_upButton->setEnabled( m_languages->currentRow() > 0 ); | |
166 | - m_downButton->setEnabled( m_languages->currentRow() != -1 && | |
167 | - m_languages->currentRow() < (signed)(m_languages->count() - 1) ); | |
168 | + languageRemove->setEnabled( selectedRow() != -1 && m_languages->count() > 1 ); | |
169 | + m_upButton->setEnabled( selectedRow() > 0 ); | |
170 | + m_downButton->setEnabled( selectedRow() != -1 && | |
171 | + selectedRow() < (signed)(m_languages->count() - 1) ); | |
172 | } | |
173 | ||
174 | void KLocaleConfig::slotLocaleChanged() | |
175 | --- runtime/kcontrol/componentchooser/windowmanagers/compiz-custom.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
176 | +++ runtime/kcontrol/componentchooser/windowmanagers/compiz-custom.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
177 | @@ -22,6 +22,7 @@ | |
178 | Name[he]=Compiz מותאם אישית (צור תסריט מעטפת בשם "compiz-kde-launcher" כדי להפעיל אותו) | |
179 | Name[hi]=मनमाफ़िक कॉम्पिज़ (रैपर स्क्रिप्ट 'compiz-kde-launcher' चलाने के लिए बनाएं) | |
180 | Name[hne]=काम्पिज मनपसंद ( लपेट स्क्रिपट 'compiz-kde-launcher' चलाय बर बनाव) | |
181 | +Name[hr]=Compiz prilagođeno (napravite skriptu-ovojnicu 'compiz-kde-launcher' za pokretanje= | |
182 | Name[hsb]=Compizowe wašnje (napišće wobalkowy skript 'compiz-kde-launcher' za wuwjedźenje) | |
183 | Name[hu]=Egyedi Compiz (indításához egy "compiz-kde-launcher" nevű szkript szükséges) | |
184 | Name[is]=Compiz sérsniðið (búa til wrapper skrituna 'compiz-kde-launcher' til að ræsa það) | |
185 | --- runtime/kcontrol/componentchooser/componentservices/kcm_kemail.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
186 | +++ runtime/kcontrol/componentchooser/componentservices/kcm_kemail.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
187 | @@ -16,6 +16,7 @@ | |
188 | Name[gl]=Cliente de correo | |
189 | Name[gu]=ઇમેલ ક્લાયન્ટ | |
190 | Name[hi]=ईमेल क्लाइंट | |
191 | +Name[hr]=Klijent e-pošte | |
192 | Name[hu]=Levelezőprogram | |
193 | Name[is]=Póstforrit | |
194 | Name[it]=Programma di posta elettronica | |
195 | --- runtime/kcontrol/componentchooser/componentservices/kcm_browser.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
196 | +++ runtime/kcontrol/componentchooser/componentservices/kcm_browser.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
197 | @@ -16,6 +16,7 @@ | |
198 | Name[gl]=Navegador Web | |
199 | Name[gu]=વેબ બ્રાઉઝર | |
200 | Name[hi]=वेब ब्राउज़र | |
201 | +Name[hr]=Web preglednik | |
202 | Name[hu]=Webböngésző | |
203 | Name[is]=Vafri | |
204 | Name[it]=Browser Web | |
205 | --- runtime/kcontrol/componentchooser/componentservices/kcm_wm.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
206 | +++ runtime/kcontrol/componentchooser/componentservices/kcm_wm.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
207 | @@ -17,6 +17,7 @@ | |
208 | Name[gl]=Xestor de fiestras | |
209 | Name[gu]=વિન્ડો વ્યવસ્થાપક | |
210 | Name[hi]=विंडो प्रबंधक | |
211 | +Name[hr]=Upravitelj prozorima | |
212 | Name[hu]=Ablakkezelő | |
213 | Name[is]=Gluggastjóri | |
214 | Name[it]=Window manager | |
215 | @@ -75,6 +76,7 @@ | |
216 | Comment[he]=כאן באפשרותך להגדיר את מנהל החלונות שיהיה בשימוש בהפעלת KDE במחשב שלך. | |
217 | Comment[hi]=यहाँ आप विंडो प्रबंधक को चुन सकते हैं जिसे आपके KDE सत्र में चलाया जाना है. | |
218 | Comment[hne]=इहां आप मन विंडो प्रबंधक ल चुन सकथो जे हर आपके केडीई सत्र मं चलही. | |
219 | +Comment[hr]=Ovdje možete odabrati upravitelj prozorima koji će se izvoditi u vašoj KDE sjednici | |
220 | Comment[hsb]=Tule móžeće woknowy manager za swoje KDE-posedźenje wubrać. | |
221 | Comment[hu]=Itt lehet kiválasztani, melyik ablakkezelőt használja a KDE. | |
222 | Comment[is]=Hér geturðu valið gluggastjóra til keyrslu í KDE setum. | |
223 | --- runtime/kcontrol/componentchooser/componentservices/kcm_filemanager.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
224 | +++ runtime/kcontrol/componentchooser/componentservices/kcm_filemanager.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
225 | @@ -16,6 +16,7 @@ | |
226 | Name[gl]=Xestor de ficheiros | |
227 | Name[gu]=ફાઇલ વ્યવસ્થાપક | |
228 | Name[hi]=फ़ाइल प्रबंधक | |
229 | +Name[hr]=Upravitelj datotekama | |
230 | Name[hu]=Fájlkezelő | |
231 | Name[is]=Skráastjóri | |
232 | Name[it]=Gestore file | |
233 | @@ -74,6 +75,7 @@ | |
234 | Comment[he]=כאן באפשרותך להגדיר את מנהל הקבצים שישמש כברירת מחדל. הכניסות בתפריט ה־K יבכל יישומי KDE שבאמצעותם תוכל לפתוח תיקיות ישתמשו במנהל קבצים זה. | |
235 | Comment[hi]=यहाँ पर आप अपने डिफ़ॉल्ट वेब ब्राउज़र को विन्यस्त कर सकते हैं. सभी केडीई अनुप्रयोगों में जिसमें हायपरलिंक चुन सकते हैं, वे इस विन्यास का इस्तेमाल करेंगे. | |
236 | Comment[hne]=इहां आप मन अपन डिफाल्ट फाइल प्रबंधक ल कान्फिगर कर सकथो. केमेन्यू प्रविस्टि अउ सब्बो केडीई अनुपरयोग मन मं जेमां आप फोल्डर खोल सकथो , ओ मन ए फाइल प्रबंधक ल उपयोग करहीं. | |
237 | +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. | |
238 | 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ć. | |
239 | 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. | |
240 | 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. | |
241 | --- runtime/kcontrol/componentchooser/componentservices/kcm_terminal.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
242 | +++ runtime/kcontrol/componentchooser/componentservices/kcm_terminal.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
243 | @@ -17,6 +17,7 @@ | |
244 | Name[gl]=Emulador de terminal | |
245 | Name[gu]=ટર્મિનલ ઇમ્યુલેટર | |
246 | Name[hi]=टर्मिनल एमुलेटर | |
247 | +Name[hr]=Emulator terminala | |
248 | Name[hu]=Terminál | |
249 | Name[is]=Skjáhermir | |
250 | Name[it]=Emulatore di terminale | |
251 | --- runtime/kcontrol/kded/kcmkded.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
252 | +++ runtime/kcontrol/kded/kcmkded.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
253 | @@ -382,7 +382,7 @@ | |
254 | if ( !current.isEmpty() ) | |
255 | { | |
256 | int count = _lvStartup->topLevelItemCount(); | |
257 | - for( int i = 0; !i < count; ++i ) | |
258 | + for( int i = 0; i < count; ++i ) | |
259 | { | |
260 | QTreeWidgetItem *treeitem = _lvStartup->topLevelItem( i ); | |
261 | if ( treeitem->data( StartupService, LibraryRole ).toString() == current ) | |
262 | --- runtime/desktoptheme/oxygen/metadata.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
263 | +++ runtime/desktoptheme/oxygen/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
264 | @@ -53,6 +53,7 @@ | |
265 | Comment[he]=ערכת נושא שמשתמשת בסגנון Oxygen | |
266 | Comment[hi]=प्रसंग को ऑक्सीजन शैली में किया गया है | |
267 | Comment[hne]=प्रसंग ल आक्सीजन सैली मं कर दे गे हे | |
268 | +Comment[hr]=Tema je urađena u Oxygen stilu | |
269 | Comment[hu]=Oxygen-stílusú téma | |
270 | Comment[is]=Þema sem gert er í 'Oxygen' stíl | |
271 | Comment[it]=Tema in stile Oxygen | |
272 | --- runtime/desktoptheme/air/metadata.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
273 | +++ runtime/desktoptheme/air/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
274 | @@ -11,6 +11,7 @@ | |
275 | Name[gl]=Aire | |
276 | Name[gu]=હવા | |
277 | Name[he]=אוויר | |
278 | +Name[hr]=Zrak | |
279 | Name[hu]=Levegő | |
280 | Name[is]=Loft | |
281 | Name[it]=Aria | |
282 | @@ -55,6 +56,7 @@ | |
283 | Comment[fy]=it sykheljen yn de frisse lucht | |
284 | Comment[gl]=Un folgo de ar fresco | |
285 | Comment[hi]=ताज़ा हवा का एक झौंका | |
286 | +Comment[hr]=Malo svježeg zraka | |
287 | Comment[hu]=Friss fuvallat | |
288 | Comment[is]=Ferskir vindar | |
289 | Comment[it]=Un soffio d'aria fresca | |
290 | --- runtime/pics/hicolor/index.theme (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
291 | +++ runtime/pics/hicolor/index.theme (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
292 | @@ -60,6 +60,7 @@ | |
293 | Comment[he]=ערכת סמלים לגיבוי | |
294 | Comment[hi]=फालबैक प्रतीक प्रसंग | |
295 | Comment[hne]=फालबैक चिनहा थीम | |
296 | +Comment[hr]=Pričuvna tema ikona | |
297 | Comment[hsb]=Nuzowa piktogramowa tema | |
298 | Comment[hu]=Másodlagos ikontéma | |
299 | Comment[is]=Táknmyndaþema til vara | |
300 | --- runtime/phonon/platform_kde/phononbackend.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
301 | +++ runtime/phonon/platform_kde/phononbackend.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
302 | @@ -24,6 +24,7 @@ | |
303 | Name[gu]=KDE મલ્ટિમીડિઆ પાશ્વભાગ | |
304 | Name[hi]=केडीई मल्टीमीडिया बैकएण्ड | |
305 | Name[hne]=केडीई मल्टीमीडिया बैकएन्ड | |
306 | +Name[hr]=KDE podrška za multimediju | |
307 | Name[hsb]=KDE Multimedijowy backend | |
308 | Name[hu]=KDE multimédiakezelő | |
309 | Name[is]=KDE margmiðlunarbakendi | |
310 | --- runtime/phonon/platform_kde/phonon.notifyrc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
311 | +++ runtime/phonon/platform_kde/phonon.notifyrc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
312 | @@ -25,6 +25,7 @@ | |
313 | Comment[he]=Phonon: סיפריית המולטימדיה של KDE | |
314 | Comment[hi]=फ़ोनॉन: केडीई का मल्टीमीडिया लाइब्रेरी | |
315 | Comment[hne]=फोनान : केडीई के मल्टीमीडिया लाइब्रेरी | |
316 | +Comment[hr]=Phonon: KDE-ova biblioteka multimedije | |
317 | Comment[hsb]=Phonon: KDE multimedijowa biblioteka | |
318 | Comment[hu]=Phonon: KDE multimédiakezelő | |
319 | Comment[is]=Phonon: margmiðlunarforritasafn KDE | |
320 | @@ -164,6 +165,7 @@ | |
321 | Name[gu]=ધ્વનિ ઉપકરણ પડતીઆધાર | |
322 | Name[hi]=ऑडियो उपकरण फालबैक | |
323 | Name[hne]=आडियो उपकरन फालबैक | |
324 | +Name[hr]=Pričuvni zvučni uređaj | |
325 | Name[hsb]=Nuzowe rozrisanje za zwukowy grat | |
326 | Name[hu]=Másodlagos hangeszköz | |
327 | Name[is]=Varahljóðtæki | |
328 | @@ -223,6 +225,7 @@ | |
329 | Comment[gl]=Notificación ao recorrer á reserva se o dispositivo preferido non está dispoñíbel | |
330 | Comment[gu]=જો પસંદ કરેલ ઉપકરણ પ્રાપ્ત ન હોય તો આપમેળે બીજી પસંદગી પર નોંધણી | |
331 | Comment[hi]=यदि वांछित उपकरण उपलब्ध नहीं हो तो स्वचालित फ़ालबैक पर सूचना | |
332 | +Comment[hr]=Obavijest u slučaju automatskog korištenja pričuvnog uređaja ako prvenstven uređaj nije dostupan | |
333 | Comment[hsb]=Zdźělenka wo awtomatiskim wužiwanju nuzoweho rozrisanja, hdyž preferowany grat njeje přistupny | |
334 | Comment[hu]=Értesítés, ha az elsődleges eszköz valamilyen problémája miatt a másodlagos válik aktívvá | |
335 | Comment[is]=Aðvörun um sjálfvirkjun varatækis ef valið tæki er ekki tiltækt | |
336 | --- runtime/phonon/kcm/xine/kcm_phononxine.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
337 | +++ runtime/phonon/kcm/xine/kcm_phononxine.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
338 | @@ -58,6 +58,7 @@ | |
339 | Comment[gu]=Xine પાશ્વભાગ રૂપરેખાંકન | |
340 | Comment[he]=תצורת מנוע Xine | |
341 | Comment[hi]=Xine बैकेंड विन्यास | |
342 | +Comment[hr]=Konfiguracija Xine podrške | |
343 | Comment[hu]=A Xine modul beállításai | |
344 | Comment[is]=Stillingar Xine bakenda | |
345 | Comment[it]=Configurazione motore Xine | |
346 | --- runtime/phonon/kcm/kcm_phonon.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
347 | +++ runtime/phonon/kcm/kcm_phonon.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
348 | @@ -99,6 +99,7 @@ | |
349 | Comment[he]=הגדרות צליל ווידאו | |
350 | Comment[hi]=आवाज तथा वीडियो कॉन्फ़िगुरेशन | |
351 | Comment[hne]=अवाज अउ वीडियो कान्फिगरेसन | |
352 | +Comment[hr]=Konfiguracija Zvuka i Videa | |
353 | Comment[hsb]=Připrawjenje zwuka a wideja | |
354 | Comment[hu]=Hang- és videobeállítások | |
355 | Comment[is]=Stillingar hljóð- og vídeó | |
356 | --- runtime/phonon/kded-module/phononserver.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
357 | +++ runtime/phonon/kded-module/phononserver.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
358 | @@ -28,6 +28,7 @@ | |
359 | Name[gu]=ધ્વનિ નિતી સર્વર | |
360 | Name[hi]=ध्वनि नियम सर्वर | |
361 | Name[hne]=अवाज पालिसी सर्वर | |
362 | +Name[hr]=Poslužitelj zvučnih pravila | |
363 | Name[hsb]=Serwer za zadźerženje zwuka | |
364 | Name[hu]=Hangrendszer-kezelő | |
365 | Name[is]=Þjónn sem stýrir hljóðmeðhöndlun | |
366 | @@ -85,6 +86,7 @@ | |
367 | Comment[ga]=Freastalaí a láraíonn cinntí agus sonraí d'fheidhmchláir a bhaineann úsáid as Phonon | |
368 | Comment[gl]=Un servidor para centralizar as decisión e datos de programas mediante Phonon | |
369 | Comment[gu]=નિર્ણયો કેન્દ્રિત કરવા અને ફોનોન ઉપયોગ કરતાં કાર્યક્રમોની માહિતી માટે સર્વર | |
370 | +Comment[hr]=Poslužitelj koji centralizira odluke i podatke aplikacija koje koriste Phonon | |
371 | Comment[hsb]=Serwer, kiž rozsudy a daty programow, kotrež Phonon wužiwaja, zjednoći | |
372 | Comment[hu]=Adatkezelő szolgáltatás a Phonon keretrendszert használó alkalmazásoknak | |
373 | Comment[is]=Miðlari sem safnar sillingum og gögnum forrita sem nota Phonon | |
374 | --- runtime/kpasswdserver/kpasswdserver.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
375 | +++ runtime/kpasswdserver/kpasswdserver.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
376 | @@ -100,6 +100,7 @@ | |
377 | Comment[he]=תמיכה במטמון ססמאות | |
378 | Comment[hi]=पासवर्ड कैचिंग समर्थन | |
379 | Comment[hne]=पासवर्ड केचिंग सपोर्ट | |
380 | +Comment[hr]=Podrška za predmemoriranje lozinke | |
381 | Comment[hsb]=Podpěra za spomjatkowanje hesłow | |
382 | Comment[hu]=Jelszómentési támogatás | |
383 | Comment[is]=Skyndiminni fyrir lykilorð | |
384 | --- runtime/khelpcenter/plugins/plasma.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
385 | +++ runtime/khelpcenter/plugins/plasma.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
386 | @@ -26,6 +26,7 @@ | |
387 | Name[he]=המדריך של Plasma | |
388 | Name[hi]=प्लाज़्मा मैनुअल | |
389 | Name[hne]=प्लाज्मा मेनुअल | |
390 | +Name[hr]=Upute za uporabu Plasme | |
391 | Name[hsb]=Přiručka za Plasma | |
392 | Name[hu]=Plasma kézikönyv | |
393 | Name[is]=Plasma handbók | |
394 | --- runtime/khelpcenter/plugins/Tutorials/.directory (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
395 | +++ runtime/khelpcenter/plugins/Tutorials/.directory (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
396 | @@ -106,6 +106,7 @@ | |
397 | Comment[he]=מסמכי הדרכה ומבוא. | |
398 | Comment[hi]=शिक्षण पाठ तथा परिचय दस्तावेज़ | |
399 | Comment[hne]=सिक्छन पाठ अउ परिचय कागद | |
400 | +Comment[hr]=Dokumenti s vodičima i uvodom. | |
401 | Comment[hsb]=Tutorije a zawody | |
402 | Comment[hu]=Bevezető jellegű dokumentumok. | |
403 | Comment[is]=Leiðbeiningar og kynningarskjöl. | |
404 | --- runtime/khelpcenter/plugins/Manpages/.directory (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
405 | +++ runtime/khelpcenter/plugins/Manpages/.directory (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
406 | @@ -26,6 +26,7 @@ | |
407 | Name[he]=דפי הוראות של יוניקס | |
408 | Name[hi]=यूनिक्स निर्देशिका पृष्ठ | |
409 | Name[hne]=यूनिक्स निर्देसिका पेज | |
410 | +Name[hr]=UNIX stranice s uputama | |
411 | Name[hu]=UNIX man oldalak | |
412 | Name[is]=UNIX handbókin | |
413 | Name[it]=Pagine di manuale UNIX | |
414 | --- runtime/menu/desktop/kde-games-logic.directory (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
415 | +++ runtime/menu/desktop/kde-games-logic.directory (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
416 | @@ -27,6 +27,7 @@ | |
417 | Name[he]=משחקי לוגיקה | |
418 | Name[hi]=तर्क-शक्ति के खेल | |
419 | Name[hne]=तर्क वाले खेल | |
420 | +Name[hr]=Logičke igra | |
421 | Name[hsb]=Logikowe hry | |
422 | Name[hu]=Logikai | |
423 | Name[is]=Kænskuleikir | |
424 | --- runtime/menu/desktop/kde-edu-mathematics.directory (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
425 | +++ runtime/menu/desktop/kde-edu-mathematics.directory (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
426 | @@ -32,6 +32,7 @@ | |
427 | Name[he]=מתמטיקה | |
428 | Name[hi]=गणित | |
429 | Name[hne]=गनित | |
430 | +Name[hr]=Matematika | |
431 | Name[hsb]=Matematika | |
432 | Name[hu]=Matematika | |
433 | Name[is]=Stærðfræði | |
434 | --- runtime/platforms/win/config/platform.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
435 | +++ runtime/platforms/win/config/platform.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
436 | @@ -27,6 +27,7 @@ | |
437 | Name[gl]=Plataforma | |
438 | Name[gu]=પ્લેટફોર્મ | |
439 | Name[hi]=प्लैटफॉर्म | |
440 | +Name[hr]=Platforma | |
441 | Name[is]=Stýrikerfi | |
442 | Name[it]=Piattaforma | |
443 | Name[ja]=プラットフォーム | |
444 | @@ -78,6 +79,7 @@ | |
445 | Comment[gl]=Xestor da plataforma Windows | |
446 | Comment[gu]=વિન્ડોસ પ્લેટફોર્મ સંચાલક | |
447 | Comment[hi]=विंडो प्लैटफॉर्म प्रबंधक | |
448 | +Comment[hr]=Upravitelj platformom Windows | |
449 | Comment[hu]=Windows platformkezelő | |
450 | Comment[is]=Windows stýrikerfastjóri | |
451 | Comment[it]=Gestore della piattaforma Windows | |
452 | --- runtime/platforms/win/kwinstartmenu/winstartmenu.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
453 | +++ runtime/platforms/win/kwinstartmenu/winstartmenu.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
454 | @@ -22,6 +22,7 @@ | |
455 | Name[he]=מודול תפריט ההתחל של KDED | |
456 | Name[hi]=केडीईडी विंडोज स्टार्ट मेन्यू मॉड्यूल | |
457 | Name[hne]=केडीईडी विंडोज स्टार्ट मेन्यू माड्यूल | |
458 | +Name[hr]=KDED Windows Start Izbornik Modul | |
459 | Name[hsb]=KDED modul za startowanski meni woknow | |
460 | Name[hu]=KDED Windows Startmenü-kezelő | |
461 | Name[is]=KDED Windows ræsivalmyndareining | |
462 | --- runtime/kwalletd/kwalletd.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
463 | +++ runtime/kwalletd/kwalletd.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
464 | @@ -28,6 +28,7 @@ | |
465 | Name[gu]=વોલેટ સર્વર | |
466 | Name[hi]=वालेट सर्वर | |
467 | Name[hne]=वालेट सर्वर | |
468 | +Name[hr]=Poslužitelj novčanika | |
469 | Name[hsb]=Móšnjowy serwer | |
470 | Name[hu]=Jelszótároló szolgáltatás | |
471 | Name[is]=Veskisþjónn | |
472 | @@ -90,6 +91,7 @@ | |
473 | Comment[gu]=વોલેટ સર્વર | |
474 | Comment[hi]=वालेट सर्वर | |
475 | Comment[hne]=वालेट सर्वर | |
476 | +Comment[hr]=Poslužitelj novčanika | |
477 | Comment[hsb]=Móšnjowy serwer | |
478 | Comment[hu]=Jelszótároló szolgáltatás | |
479 | Comment[is]=Veskisþjónn | |
480 | --- runtime/kwalletd/kwalletd.notifyrc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
481 | +++ runtime/kwalletd/kwalletd.notifyrc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
482 | @@ -21,6 +21,7 @@ | |
483 | Comment[gl]=O daemon de carteiras de KDE | |
484 | Comment[gu]=KDE વોલેટ ડેમન | |
485 | Comment[hi]=केडीई वालेट डेमन | |
486 | +Comment[hr]=Servis KDE lisnice | |
487 | Comment[hu]=KDE jelszótároló szolgáltatás | |
488 | Comment[is]=KDE Veskispúkinn | |
489 | Comment[it]=Demone dei portafogli di KDE | |
490 | @@ -55,6 +56,7 @@ | |
491 | Comment[zh_TW]=KDE 錢包伺服程式 | |
492 | Name=kwalletd | |
493 | Name[hi]=केवालेट | |
494 | +Name[hr]=kwalletd – KNovčanik daemon | |
495 | Name[mai]=केवालेट्ड | |
496 | Name[ml]=കെവാലറ്റ്ഡി | |
497 | Name[nds]=Kwalletd | |
498 | @@ -81,6 +83,7 @@ | |
499 | Name[gl]=Precisa dun contrasinal | |
500 | Name[gu]=પાસવર્ડ જરૂરી છે | |
501 | Name[hi]=पासवर्ड की जरूरत है | |
502 | +Name[hr]=Potrebna lozinka | |
503 | Name[hu]=Jelszó megadása szükséges | |
504 | Name[is]=Þarf lykilorð | |
505 | Name[it]=Necessita di una password | |
506 | @@ -134,6 +137,7 @@ | |
507 | Comment[ga]=Tá Deamhan Sparáin KDE ag iarraidh focal faire | |
508 | Comment[gl]=O Daemon de carteiras de KDE pide un contrasinal | |
509 | Comment[hi]=KDE वालेट डेमॉन एक पासवर्ड के लिए आग्रह करता है | |
510 | +Comment[hr]=KDE-ov novčanik daemon zahtijeva lozinku | |
511 | Comment[hu]=A KDE jelszótároló szolgáltatás jelszót kér | |
512 | Comment[is]=KDE Veskispúkinn biður um lykilorð | |
513 | Comment[it]=Il demone dei portafogli di KDE richiede una password | |
514 | --- runtime/ktimezoned/ktimezoned.h (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
515 | +++ runtime/ktimezoned/ktimezoned.h (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
516 | @@ -21,6 +21,8 @@ | |
517 | #ifndef KTIMEZONED_H | |
518 | #define KTIMEZONED_H | |
519 | ||
520 | +#include "ktimezonedbase.h" | |
521 | + | |
522 | #include <QString> | |
523 | #include <QByteArray> | |
524 | class QFile; | |
525 | @@ -30,35 +32,14 @@ | |
526 | #include <ksystemtimezone.h> | |
527 | ||
528 | ||
529 | -class KTimeZoned : public KDEDModule | |
530 | +class KTimeZoned : public KTimeZonedBase | |
531 | { | |
532 | Q_OBJECT | |
533 | - Q_CLASSINFO("D-Bus Interface", "org.kde.KTimeZoned") | |
534 | ||
535 | public: | |
536 | KTimeZoned(QObject* parent, const QList<QVariant>&); | |
537 | ~KTimeZoned(); | |
538 | ||
539 | - public Q_SLOTS: | |
540 | - /** D-Bus call to initialize the module. | |
541 | - * @param reinit determines whether to reinitialize if the module has already | |
542 | - * initialized itself | |
543 | - */ | |
544 | - Q_SCRIPTABLE void initialize(bool reinit); | |
545 | - | |
546 | - Q_SIGNALS: | |
547 | - /** D-Bus signal emitted when the time zone configuration file has changed. */ | |
548 | - void configChanged(); | |
549 | - /** D-Bus signal emitted when zone.tab contents have changed. | |
550 | - * @param zonetab path to zone.tab | |
551 | - */ | |
552 | - void zonetabChanged(const QString &zonetab); | |
553 | - /** D-Bus signal emitted when the definition (not the identity) of the local | |
554 | - * system time zone has changed. | |
555 | - * @param zone path to time zone definition file | |
556 | - */ | |
557 | - void zoneDefinitionChanged(const QString &zone); | |
558 | - | |
559 | private Q_SLOTS: | |
560 | void zonetab_Changed(const QString& path); | |
561 | void localChanged(const QString& path); | |
562 | @@ -90,6 +71,7 @@ | |
563 | }; | |
564 | typedef QMap<QString, QString> MD5Map; // zone name, checksum | |
565 | ||
566 | + /** reimp */ | |
567 | void init(bool restart); | |
568 | bool findZoneTab(QFile& f); | |
569 | void readZoneTab(QFile& f); | |
570 | @@ -110,8 +92,6 @@ | |
571 | QByteArray mSavedTZ; // last value of TZ if it's used to set local zone | |
572 | KSystemTimeZoneSource *mSource; | |
573 | KTimeZones mZones; // time zones collection | |
574 | - QString mLocalZone; // local system time zone name | |
575 | - QString mConfigLocalZone; // local system time zone name as stored in config file | |
576 | QString mLocalIdFile; // file containing pointer to local time zone definition | |
577 | QString mLocalZoneDataFile; // zoneinfo file containing local time zone definition | |
578 | QString mLocaltimeMd5Sum; // MD5 checksum of /etc/localtime | |
579 | --- runtime/ktimezoned/ktimezoned.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
580 | +++ runtime/ktimezoned/ktimezoned.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
581 | @@ -110,6 +110,7 @@ | |
582 | Comment[he]=שירות איזורי זמן עבור KDE | |
583 | Comment[hi]=केडीई के लिए समय क्षेत्र डेमन | |
584 | Comment[hne]=केडीई बर समय छेत्र डेमन | |
585 | +Comment[hr]=Daemon vremenske zone za KDE | |
586 | Comment[hsb]=KDE demon za časowe pasma | |
587 | Comment[hu]=Időzóna-kezelő szolgáltatás a KDE-hez | |
588 | Comment[is]=Tímabeltaþjónn fyrir KDE | |
589 | --- runtime/ktimezoned/ktimezoned_win.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 0) | |
590 | +++ runtime/ktimezoned/ktimezoned_win.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
591 | @@ -0,0 +1,151 @@ | |
592 | +/* | |
593 | + This file is part of the KDE libraries | |
594 | + Copyright (c) 2009 Till Adam <adam@kde.org> | |
595 | + | |
596 | + This library is free software; you can redistribute it and/or | |
597 | + modify it under the terms of the GNU Library General Public | |
598 | + License as published by the Free Software Foundation; either | |
599 | + version 2 of the License, or (at your option) any later version. | |
600 | + | |
601 | + This library is distributed in the hope that it will be useful, | |
602 | + but WITHOUT ANY WARRANTY; without even the implied warranty of | |
603 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
604 | + Library General Public License for more details. | |
605 | + | |
606 | + You should have received a copy of the GNU Library General Public License | |
607 | + along with this library; see the file COPYING.LIB. If not, write to | |
608 | + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | |
609 | + Boston, MA 02110-1301, USA. | |
610 | +*/ | |
611 | + | |
612 | +#include "ktimezoned_win.moc" | |
613 | +#include "ktimezonedbase.moc" | |
614 | + | |
615 | +#include <climits> | |
616 | +#include <cstdlib> | |
617 | + | |
618 | +#include <QStringList> | |
619 | +#include <QTextStream> | |
620 | +#include <QtDBus/QtDBus> | |
621 | +#include <QThread> | |
622 | +#include <QDebug> | |
623 | + | |
624 | +#include <kglobal.h> | |
625 | +#include <klocale.h> | |
626 | +#include <kcodecs.h> | |
627 | +#include <kdebug.h> | |
628 | +#include <kconfiggroup.h> | |
629 | + | |
630 | +#include <kpluginfactory.h> | |
631 | +#include <kpluginloader.h> | |
632 | + | |
633 | +#ifdef Q_OS_WIN | |
634 | +#include <Windows.h> | |
635 | +#endif | |
636 | + | |
637 | +K_PLUGIN_FACTORY(KTimeZonedFactory, | |
638 | + registerPlugin<KTimeZoned>(); | |
639 | + ) | |
640 | +K_EXPORT_PLUGIN(KTimeZonedFactory("ktimezoned")) | |
641 | + | |
642 | + | |
643 | +// Config file entry names | |
644 | +const char LOCAL_ZONE[] = "LocalZone"; // name of local time zone | |
645 | +static const TCHAR currentTimeZoneKey[] = TEXT("System\\CurrentControlSet\\Control\\TimeZoneInformation"); | |
646 | + | |
647 | +class RegistryWatcherThread : public QThread | |
648 | +{ | |
649 | + public: | |
650 | + RegistryWatcherThread(KTimeZoned* parent) | |
651 | + :QThread(parent),q(parent) | |
652 | + { | |
653 | + } | |
654 | + | |
655 | + ~RegistryWatcherThread() | |
656 | + { | |
657 | + RegCloseKey(key); | |
658 | + } | |
659 | + | |
660 | + void run() | |
661 | + { | |
662 | + if ( RegOpenKeyEx( HKEY_LOCAL_MACHINE, currentTimeZoneKey, 0, KEY_READ, &key ) == ERROR_SUCCESS ) | |
663 | + { | |
664 | + while(true) | |
665 | + { | |
666 | + RegNotifyChangeKeyValue( key, true, REG_NOTIFY_CHANGE_LAST_SET, | |
667 | + NULL, false /*async, we want it to block*/ ); | |
668 | + q->updateLocalZone(); | |
669 | + } | |
670 | + } | |
671 | + } | |
672 | + private: | |
673 | + KTimeZoned* q; | |
674 | + HKEY key; | |
675 | +}; | |
676 | + | |
677 | +KTimeZoned::KTimeZoned(QObject* parent, const QList<QVariant>& l) | |
678 | + : KTimeZonedBase(parent, l), mRegistryWatcherThread(0) | |
679 | +{ | |
680 | + init(false); | |
681 | +} | |
682 | + | |
683 | +KTimeZoned::~KTimeZoned() | |
684 | +{ | |
685 | + if (mRegistryWatcherThread) | |
686 | + { | |
687 | + mRegistryWatcherThread->quit(); | |
688 | + mRegistryWatcherThread->wait(100); | |
689 | + } | |
690 | + delete mRegistryWatcherThread; | |
691 | +} | |
692 | + | |
693 | +void KTimeZoned::init(bool restart) | |
694 | +{ | |
695 | + if (restart) | |
696 | + { | |
697 | + kDebug(1221) << "KTimeZoned::init(restart)"; | |
698 | + delete mRegistryWatcherThread; | |
699 | + mRegistryWatcherThread = 0; | |
700 | + } | |
701 | + | |
702 | + KConfig config(QLatin1String("ktimezonedrc")); | |
703 | + if (restart) | |
704 | + config.reparseConfiguration(); | |
705 | + KConfigGroup group(&config, "TimeZones"); | |
706 | + mConfigLocalZone = group.readEntry(LOCAL_ZONE); | |
707 | + | |
708 | + updateLocalZone(); | |
709 | + if (!mRegistryWatcherThread) | |
710 | + { | |
711 | + mRegistryWatcherThread = new RegistryWatcherThread(this); | |
712 | + mRegistryWatcherThread->start(); | |
713 | + } | |
714 | +} | |
715 | + | |
716 | +// Check if the local zone has been updated, and if so, write the new | |
717 | +// zone to the config file and notify interested parties. | |
718 | +void KTimeZoned::updateLocalZone() | |
719 | +{ | |
720 | + // On Windows, HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones | |
721 | + // holds the time zone database. The TZI binary value is the TIME_ZONE_INFORMATION structure. | |
722 | + | |
723 | + TIME_ZONE_INFORMATION tzinfo; | |
724 | + DWORD res = GetTimeZoneInformation(&tzinfo); | |
725 | + if (res == TIME_ZONE_ID_INVALID) return; // hm | |
726 | + mLocalZone = QString::fromUtf16( reinterpret_cast<ushort*>( tzinfo.StandardName ) ); | |
727 | + | |
728 | + if (mConfigLocalZone != mLocalZone) | |
729 | + { | |
730 | + kDebug(1221) << "Local timezone is now: " << mLocalZone; | |
731 | + KConfig config(QLatin1String("ktimezonedrc")); | |
732 | + KConfigGroup group(&config, "TimeZones"); | |
733 | + mConfigLocalZone = mLocalZone; | |
734 | + group.writeEntry(LOCAL_ZONE, mConfigLocalZone); | |
735 | + group.sync(); | |
736 | + | |
737 | + QDBusMessage message = QDBusMessage::createSignal("/Daemon", "org.kde.KTimeZoned", "configChanged"); | |
738 | + QDBusConnection::sessionBus().send(message); | |
739 | + } | |
740 | +} | |
741 | + | |
742 | + | |
743 | --- runtime/ktimezoned/ktimezoned.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
744 | +++ runtime/ktimezoned/ktimezoned.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
745 | @@ -20,6 +20,7 @@ | |
746 | */ | |
747 | ||
748 | #include "ktimezoned.moc" | |
749 | +#include "ktimezonedbase.moc" | |
750 | ||
751 | #include <climits> | |
752 | #include <cstdlib> | |
753 | @@ -57,8 +58,8 @@ | |
754 | const char LOCAL_ZONE[] = "LocalZone"; // name of local time zone | |
755 | ||
756 | ||
757 | -KTimeZoned::KTimeZoned(QObject* parent, const QList<QVariant>&) | |
758 | - : KDEDModule(parent), | |
759 | +KTimeZoned::KTimeZoned(QObject* parent, const QList<QVariant>& l) | |
760 | + : KTimeZonedBase(parent, l), | |
761 | mSource(0), | |
762 | mZonetabWatch(0), | |
763 | mDirWatch(0) | |
764 | @@ -76,14 +77,6 @@ | |
765 | mDirWatch = 0; | |
766 | } | |
767 | ||
768 | -void KTimeZoned::initialize(bool reinit) | |
769 | -{ | |
770 | - // If we reach here, the module has already been constructed and therefore | |
771 | - // initialized. So only do anything if reinit is true. | |
772 | - if (reinit) | |
773 | - init(true); | |
774 | -} | |
775 | - | |
776 | void KTimeZoned::init(bool restart) | |
777 | { | |
778 | if (restart) | |
779 | @@ -97,11 +90,6 @@ | |
780 | mDirWatch = 0; | |
781 | } | |
782 | ||
783 | -#ifdef Q_OS_WIN | |
784 | - // On Windows, HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones | |
785 | - // holds the time zone database. The TZI binary value is the TIME_ZONE_INFORMATION structure. | |
786 | -#else | |
787 | - // For Unix, read zone.tab. | |
788 | KConfig config(QLatin1String("ktimezonedrc")); | |
789 | if (restart) | |
790 | config.reparseConfiguration(); | |
791 | @@ -111,6 +99,9 @@ | |
792 | mConfigLocalZone = group.readEntry(LOCAL_ZONE); | |
793 | QString ztc = group.readEntry(ZONE_TAB_CACHE, QString()); | |
794 | mZoneTabCache = (ztc == "Solaris") ? Solaris : NoCache; | |
795 | + | |
796 | + // For Unix, read zone.tab. | |
797 | + | |
798 | QString oldZoneinfoDir = mZoneinfoDir; | |
799 | QString oldZoneTab = mZoneTab; | |
800 | CacheType oldCacheType = mZoneTabCache; | |
801 | @@ -164,7 +155,6 @@ | |
802 | mZonetabWatch = new KDirWatch(this); | |
803 | mZonetabWatch->addFile(mZoneTab); | |
804 | connect(mZonetabWatch, SIGNAL(dirty(const QString&)), SLOT(zonetab_Changed(const QString&))); | |
805 | -#endif | |
806 | ||
807 | // Find the local system time zone and set up file monitors to detect changes | |
808 | findLocalZone(); | |
809 | --- runtime/ktimezoned/ktimezonedbase.h (.../tags/KDE/4.3.0/kdebase) (wersja 0) | |
810 | +++ runtime/ktimezoned/ktimezonedbase.h (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
811 | @@ -0,0 +1,73 @@ | |
812 | +/* | |
813 | + This file is part of the KDE libraries | |
814 | + Copyright (c) 2007-2009 David Jarvie <djarvie@kde.org> | |
815 | + Copyright (c) 2009 Till Adam <adam@kde.org> | |
816 | + | |
817 | + This library is free software; you can redistribute it and/or | |
818 | + modify it under the terms of the GNU Library General Public | |
819 | + License as published by the Free Software Foundation; either | |
820 | + version 2 of the License, or (at your option) any later version. | |
821 | + | |
822 | + This library is distributed in the hope that it will be useful, | |
823 | + but WITHOUT ANY WARRANTY; without even the implied warranty of | |
824 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
825 | + Library General Public License for more details. | |
826 | + | |
827 | + You should have received a copy of the GNU Library General Public License | |
828 | + along with this library; see the file COPYING.LIB. If not, write to | |
829 | + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | |
830 | + Boston, MA 02110-1301, USA. | |
831 | +*/ | |
832 | + | |
833 | +#ifndef KTIMEZONEDBASE_H | |
834 | +#define KTIMEZONEDBASE_H | |
835 | + | |
836 | +#include <kdedmodule.h> | |
837 | + | |
838 | + | |
839 | +class KTimeZonedBase : public KDEDModule | |
840 | +{ | |
841 | + Q_OBJECT | |
842 | + Q_CLASSINFO("D-Bus Interface", "org.kde.KTimeZoned") | |
843 | + public: | |
844 | + KTimeZonedBase(QObject* parent, const QList<QVariant>&) | |
845 | + :KDEDModule(parent) {} | |
846 | + virtual ~KTimeZonedBase() {}; | |
847 | + | |
848 | + public Q_SLOTS: | |
849 | + /** D-Bus call to initialize the module. | |
850 | + * @param reinit determines whether to reinitialize if the module has already | |
851 | + * initialized itself | |
852 | + */ | |
853 | + Q_SCRIPTABLE void initialize(bool reinit) | |
854 | + { | |
855 | + // If we reach here, the module has already been constructed and therefore | |
856 | + // initialized. So only do anything if reinit is true. | |
857 | + if (reinit) | |
858 | + init(true); | |
859 | + } | |
860 | + | |
861 | + Q_SIGNALS: | |
862 | + /** D-Bus signal emitted when the time zone configuration has changed. */ | |
863 | + void configChanged(); | |
864 | + | |
865 | + /** D-Bus signal emitted when zone.tab contents have changed. | |
866 | + * @param zonetab path to zone.tab | |
867 | + */ | |
868 | + void zonetabChanged(const QString &zonetab); | |
869 | + | |
870 | + /** D-Bus signal emitted when the definition (not the identity) of the local | |
871 | + * system time zone has changed. | |
872 | + * @param zone path to time zone definition file | |
873 | + */ | |
874 | + void zoneDefinitionChanged(const QString &zone); | |
875 | + | |
876 | + protected: | |
877 | + virtual void init(bool) = 0; | |
878 | + | |
879 | + QString mLocalZone; // local system time zone name | |
880 | + QString mConfigLocalZone; // local system time zone name as stored in config file | |
881 | +}; | |
882 | + | |
883 | + | |
884 | +#endif | |
885 | --- runtime/ktimezoned/ktimezoned_win.h (.../tags/KDE/4.3.0/kdebase) (wersja 0) | |
886 | +++ runtime/ktimezoned/ktimezoned_win.h (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
887 | @@ -0,0 +1,45 @@ | |
888 | +/* | |
889 | + This file is part of the KDE libraries | |
890 | + Copyright (c) 2009 Till Adam <adam@kde.org> | |
891 | + | |
892 | + This library is free software; you can redistribute it and/or | |
893 | + modify it under the terms of the GNU Library General Public | |
894 | + License as published by the Free Software Foundation; either | |
895 | + version 2 of the License, or (at your option) any later version. | |
896 | + | |
897 | + This library is distributed in the hope that it will be useful, | |
898 | + but WITHOUT ANY WARRANTY; without even the implied warranty of | |
899 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
900 | + Library General Public License for more details. | |
901 | + | |
902 | + You should have received a copy of the GNU Library General Public License | |
903 | + along with this library; see the file COPYING.LIB. If not, write to | |
904 | + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | |
905 | + Boston, MA 02110-1301, USA. | |
906 | +*/ | |
907 | + | |
908 | +#ifndef KTIMEZONED_H | |
909 | +#define KTIMEZONED_H | |
910 | + | |
911 | +#include "ktimezonedbase.h" | |
912 | + | |
913 | +class RegistryWatcherThread; | |
914 | + | |
915 | +class KTimeZoned : public KTimeZonedBase | |
916 | +{ | |
917 | + Q_OBJECT | |
918 | + friend class RegistryWatcherThread; | |
919 | + | |
920 | + public: | |
921 | + KTimeZoned(QObject* parent, const QList<QVariant>&); | |
922 | + ~KTimeZoned(); | |
923 | + | |
924 | + private: | |
925 | + /** reimp */ | |
926 | + void init(bool); | |
927 | + void updateLocalZone(); | |
928 | + | |
929 | + RegistryWatcherThread *mRegistryWatcherThread; // thread that watches the timezone registry key | |
930 | +}; | |
931 | + | |
932 | +#endif | |
933 | --- runtime/ktimezoned/CMakeLists.txt (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
934 | +++ runtime/ktimezoned/CMakeLists.txt (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
935 | @@ -1,6 +1,9 @@ | |
936 | -set(kded_ktimezoned_SRCS ktimezoned.cpp) | |
937 | +if (WIN32) | |
938 | + set(kded_ktimezoned_SRCS ktimezoned_win.cpp) | |
939 | +else (WIN32) | |
940 | + set(kded_ktimezoned_SRCS ktimezoned.cpp) | |
941 | +endif (WIN32) | |
942 | ||
943 | - | |
944 | kde4_add_plugin(kded_ktimezoned ${kded_ktimezoned_SRCS}) | |
945 | ||
946 | #qt4_add_dbus_adaptor(kded_ktimezoned_SRCS org.kde.KTimeZoned ktimezonedbus.h DBusHandler) | |
947 | @@ -13,3 +16,5 @@ | |
948 | ||
949 | install( FILES ktimezoned.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) | |
950 | install( FILES org.kde.KTimeZoned.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) | |
951 | + | |
952 | + | |
953 | --- runtime/CMakeLists.txt (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
954 | +++ runtime/CMakeLists.txt (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
3e56ecee | 955 | @@ -16,7 +16,7 @@ |
87b537f7 AM |
956 | include(CheckFunctionExists) |
957 | include(CheckIncludeFiles) | |
958 | ||
959 | -set(SOPRANO_MIN_VERSION "2.2.69") | |
960 | +set(SOPRANO_MIN_VERSION "2.3.0") | |
961 | macro_optional_find_package(Soprano) | |
962 | macro_optional_find_package(Nepomuk) | |
963 | macro_log_feature(Soprano_FOUND "Soprano" "Soprano Libraries" "kdesupport" FALSE "" "Required to build Nepomuk.") | |
964 | --- runtime/kioslave/trash/kcmtrash.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
965 | +++ runtime/kioslave/trash/kcmtrash.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
966 | @@ -25,6 +25,7 @@ | |
967 | Name[he]=אשפה | |
968 | Name[hi]=रद्दी | |
969 | Name[hne]=घुरुवा | |
970 | +Name[hr]=Otpad | |
971 | Name[hsb]=Papjernik | |
972 | Name[hu]=Szemétkosár | |
973 | Name[is]=Rusl | |
974 | @@ -94,6 +95,7 @@ | |
975 | Comment[he]=שירות זה מאפשר הגדרות האשפה. | |
976 | Comment[hi]=यह सेवा आपको रद्दी की टोकरी को विन्यस्त करने देता है. | |
977 | Comment[hne]=ए सेवा घुरवा ल कानफिगर करे बर देथे. | |
978 | +Comment[hr]=Ovaj servis dozvoljava konfiguraciju smeća. | |
979 | Comment[hsb]=Tuta słužba dowoli připrawjenje papjernika. | |
980 | Comment[hu]=A törölt fájlok kezelését lehet itt beállítani. | |
981 | Comment[is]=Þessi þjónusta leyfir stillingar á ruslafötu. | |
982 | @@ -173,6 +175,7 @@ | |
983 | Name[he]=אשפה | |
984 | Name[hi]=रद्दी | |
985 | Name[hne]=घुरुवा | |
986 | +Name[hr]=Otpad | |
987 | Name[hsb]=Papjernik | |
988 | Name[hu]=Szemétkosár | |
989 | Name[is]=Rusl | |
990 | @@ -243,6 +246,7 @@ | |
991 | Comment[he]=הגדר את האשפה | |
992 | Comment[hi]=रद्दी की टोकरी का विन्यास विन्यस्त करें | |
993 | Comment[hne]=कचरापेटी सेटिंग कान्फिगर करव | |
994 | +Comment[hr]=Konfiguriranje postavki otpada | |
995 | Comment[hsb]=Nastajenja papjernika připrawić | |
996 | Comment[hu]=A törölt fájlok beállításai | |
997 | Comment[is]=Stillingar ruslafötu | |
998 | --- runtime/kioslave/trash/tests/testtrash.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
999 | +++ runtime/kioslave/trash/tests/testtrash.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1000 | @@ -208,6 +208,14 @@ | |
1001 | removeDirRecursive( m_trashDir ); | |
1002 | } | |
1003 | ||
1004 | +void TestTrash::cleanupTestCase() | |
1005 | +{ | |
1006 | + // Clean up | |
1007 | + removeDirRecursive( homeTmpDir() ); | |
1008 | + removeDirRecursive( otherTmpDir() ); | |
1009 | + removeDirRecursive( m_trashDir ); | |
1010 | +} | |
1011 | + | |
1012 | void TestTrash::urlTestFile() | |
1013 | { | |
1014 | const KUrl url = TrashImpl::makeURL(1, QString::fromLatin1("fileId"), QString()); | |
1015 | --- runtime/kioslave/trash/tests/testtrash.h (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1016 | +++ runtime/kioslave/trash/tests/testtrash.h (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1017 | @@ -31,6 +31,7 @@ | |
1018 | ||
1019 | private Q_SLOTS: | |
1020 | void initTestCase(); | |
1021 | + void cleanupTestCase(); | |
1022 | ||
1023 | void testIcons(); | |
1024 | ||
1025 | --- runtime/kioslave/thumbnail/directorythumbnail.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1026 | +++ runtime/kioslave/thumbnail/directorythumbnail.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1027 | @@ -20,6 +20,7 @@ | |
1028 | Name[gl]=Cartafoles | |
1029 | Name[gu]=ડિરેક્ટરીઓ | |
1030 | Name[hi]=निर्देशिका | |
1031 | +Name[hr]=Direktoriji | |
1032 | Name[hu]=Mappák | |
1033 | Name[is]=Möppur | |
1034 | Name[it]=Cartelle | |
1035 | --- runtime/kioslave/thumbnail/jpegthumbnail.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1036 | +++ runtime/kioslave/thumbnail/jpegthumbnail.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1037 | @@ -9,6 +9,7 @@ | |
1038 | Name[ga]=JPEG | |
1039 | Name[hi]=जेपीईजी | |
1040 | Name[hne]=जेपीईजी | |
1041 | +Name[hr]=jpeg | |
1042 | Name[hu]=JPEG | |
1043 | Name[is]=JPEG | |
1044 | Name[ja]=JPEG | |
1045 | --- runtime/kioslave/thumbnail/thumbnail.h (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1046 | +++ runtime/kioslave/thumbnail/thumbnail.h (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1047 | @@ -56,6 +56,12 @@ | |
1048 | bool createSubThumbnail(QImage& thumbnail, const QString& filePath, | |
1049 | int segmentWidth, int segmentHeight); | |
1050 | ||
1051 | + /** | |
1052 | + * Scales down the image \p img in a way that it fits into the | |
1053 | + * given maximum width and height. | |
1054 | + */ | |
1055 | + void scaleDownImage(QImage& img, int maxWidth, int maxHeight); | |
1056 | + | |
1057 | private: | |
1058 | QString m_mimeType; | |
1059 | int m_width; | |
1060 | @@ -70,6 +76,7 @@ | |
1061 | QStringList m_enabledPlugins; | |
1062 | QSet<QString> m_propagationDirectories; | |
1063 | QString m_thumbBasePath; | |
1064 | + qint64 m_maxFileSize; | |
1065 | }; | |
3e56ecee | 1066 | |
89942022 | 1067 | #endif |
87b537f7 AM |
1068 | --- runtime/kioslave/thumbnail/desktopthumbnail.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) |
1069 | +++ runtime/kioslave/thumbnail/desktopthumbnail.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1070 | @@ -18,6 +18,7 @@ | |
1071 | Name[gl]=Ficheiros do escritorio | |
1072 | Name[gu]=ડેસ્કટોપ ફાઇલો | |
1073 | Name[hi]=डेस्कटॉप फ़ाइल | |
1074 | +Name[hr]=Datoteke radne površine | |
1075 | Name[hu]=Asztali fájlok | |
1076 | Name[is]=Skjáborðsskrár | |
1077 | Name[it]=File desktop | |
1078 | --- runtime/kioslave/thumbnail/thumbnail.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1079 | +++ runtime/kioslave/thumbnail/thumbnail.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1080 | @@ -139,9 +139,11 @@ | |
1081 | } | |
3e56ecee | 1082 | |
87b537f7 AM |
1083 | ThumbnailProtocol::ThumbnailProtocol(const QByteArray &pool, const QByteArray &app) |
1084 | - : SlaveBase("thumbnail", pool, app) | |
1085 | + : SlaveBase("thumbnail", pool, app), | |
1086 | + m_iconSize(0), | |
1087 | + m_maxFileSize(0) | |
1088 | { | |
1089 | - m_iconSize = 0; | |
1090 | + | |
1091 | } | |
1092 | ||
1093 | ThumbnailProtocol::~ThumbnailProtocol() | |
1094 | @@ -280,14 +282,7 @@ | |
1095 | } | |
1096 | } | |
1097 | ||
1098 | - if (img.width() > m_width || img.height() > m_height) { | |
1099 | - double imgRatio = (double)img.height() / (double)img.width(); | |
1100 | - if (imgRatio > (double)m_height / (double)m_width) { | |
1101 | - img = img.scaled( int(qMax((double)m_height / imgRatio, 1.0)), m_height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); | |
1102 | - } else { | |
1103 | - img = img.scaled(m_width, int(qMax((double)m_width * imgRatio, 1.0)), Qt::IgnoreAspectRatio, Qt::SmoothTransformation); | |
1104 | - } | |
1105 | - } | |
1106 | + scaleDownImage(img, m_width, m_height); | |
1107 | ||
1108 | // ### FIXME | |
1109 | #ifndef USE_KINSTANCE | |
1110 | @@ -499,6 +494,7 @@ | |
1111 | // Directories that the directory preview will be propagated into if there is no direct sub-directories | |
1112 | const KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings"); | |
1113 | m_propagationDirectories = globalConfig.readEntry("PropagationDirectories", QStringList() << "VIDEO_TS").toSet(); | |
1114 | + m_maxFileSize = globalConfig.readEntry("MaximumSize", 5 * 1024 * 1024); // 5 MByte default | |
1115 | } | |
1116 | ||
1117 | const int tiles = 2; //Count of items shown on each dimension | |
1118 | @@ -572,6 +568,12 @@ | |
1119 | break; // Never show the same thumbnail twice | |
1120 | } | |
1121 | ||
1122 | + if (dir.fileInfo().size() > m_maxFileSize) { | |
1123 | + // don't create thumbnails for files that exceed | |
1124 | + // the maximum set file size | |
1125 | + continue; | |
1126 | + } | |
1127 | + | |
1128 | QImage subThumbnail; | |
1129 | if (!createSubThumbnail(subThumbnail, dir.filePath(), segmentWidth, segmentHeight)) { | |
1130 | continue; | |
1131 | @@ -739,6 +741,8 @@ | |
1132 | QString tempFileName; | |
1133 | bool savedCorrectly = false; | |
1134 | if (subCreator->create(filePath, cacheSize, cacheSize, thumbnail)) { | |
1135 | + scaleDownImage(thumbnail, cacheSize, cacheSize); | |
1136 | + | |
1137 | // The thumbnail has been created successfully. Store the thumbnail | |
1138 | // to the cache for future access. | |
1139 | KTemporaryFile temp; | |
1140 | @@ -764,4 +768,16 @@ | |
1141 | return true; | |
1142 | } | |
1143 | ||
1144 | +void ThumbnailProtocol::scaleDownImage(QImage& img, int maxWidth, int maxHeight) | |
1145 | +{ | |
1146 | + if (img.width() > maxWidth || img.height() > maxHeight) { | |
1147 | + const double imgRatio = (double)img.height() / (double)img.width(); | |
1148 | + if (imgRatio > (double)maxHeight / (double)maxWidth) { | |
1149 | + img = img.scaled( int(qMax((double)maxHeight / imgRatio, 1.0)), maxHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); | |
1150 | + } else { | |
1151 | + img = img.scaled(maxWidth, int(qMax((double)maxWidth * imgRatio, 1.0)), Qt::IgnoreAspectRatio, Qt::SmoothTransformation); | |
1152 | + } | |
1153 | + } | |
1154 | +} | |
1155 | ||
1156 | + | |
1157 | --- runtime/kioslave/network/ioslave/network.protocol (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1158 | +++ runtime/kioslave/network/ioslave/network.protocol (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1159 | @@ -23,6 +23,7 @@ | |
1160 | Description[fy]=In kioslave om it network troch te blêdzjen | |
1161 | Description[gl]=Un kioslave para navegar pola rede | |
1162 | Description[hi]=संजाल ब्राउज करने के लिए किओस्लेव | |
1163 | +Description[hr]=Kioslave za kretanje po mreži | |
1164 | Description[hu]=KDE-protokoll hálózatböngészéshez | |
1165 | Description[is]=kioslave fyrir flakk um netið | |
1166 | Description[it]=Un kioslave per navigare la rete | |
1167 | --- runtime/kioslave/network/kded/networkwatcher.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1168 | +++ runtime/kioslave/network/kded/networkwatcher.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1169 | @@ -24,6 +24,7 @@ | |
1170 | Name[gl]=Vixilante da rede | |
1171 | Name[gu]=નેટવર્ક દેખરેખ | |
1172 | Name[hi]=नेटवर्क वाचर | |
1173 | +Name[hr]=Nadzornik mreže | |
1174 | Name[hu]=Hálózatfigyelő | |
1175 | Name[is]=Netskoðunartól | |
1176 | Name[it]=Analizzatore di rete | |
1177 | @@ -69,6 +70,7 @@ | |
1178 | Comment[fr]=Conserve des enregistrements du réseaux et met à jours les contenus des dossiers pour le protocole « network:/ » | |
1179 | Comment[fy]=Hâld de netwurk en fernijings triemtafel listen fan it network:/ protocol yn de gaten | |
1180 | Comment[gl]=Vixía a rede e actualiza as listaxes de cartafoles do protocolo network:/ | |
1181 | +Comment[hr]=Pazi na mrežu i ažurira popis direktorija protokola network:/ | |
1182 | Comment[hu]=Figyeli a hálózat állapotát és frissíti a mappalistákat a network:/ protokollal | |
1183 | Comment[is]=Fylgist með netvirkni og uppfærir möppubreytingar með network:/ samskiptareglunni | |
1184 | Comment[it]=Tiene traccia della rete e aggiorna la lista delle cartelle del protocollo network:/ | |
1185 | --- runtime/kioslave/fish/fish.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1186 | +++ runtime/kioslave/fish/fish.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1187 | @@ -518,8 +518,7 @@ | |
1188 | myDebug( << "select failed, rc: " << rc << ", error: " << strerror(errno) << endl); | |
1189 | return true; | |
1190 | } | |
1191 | - while (FD_ISSET(childFd,&wfds) && outBufPos >= 0) | |
1192 | - { | |
1193 | + if (FD_ISSET(childFd,&wfds) && outBufPos >= 0) { | |
1194 | if (outBuf) rc = ::write(childFd,outBuf+outBufPos,outBufLen-outBufPos); | |
1195 | else rc = 0; | |
1196 | if (rc >= 0) outBufPos += rc; | |
1197 | @@ -536,8 +535,7 @@ | |
1198 | outBufLen = 0; | |
1199 | } | |
1200 | } | |
1201 | - if (FD_ISSET(childFd,&rfds)) | |
1202 | - { | |
1203 | + else if (FD_ISSET(childFd,&rfds)) { | |
1204 | rc = ::read(childFd,buf+offset,32768-offset); | |
1205 | if (rc > 0) { | |
1206 | int noff = establishConnection(buf,rc+offset); | |
1207 | @@ -1445,19 +1443,13 @@ | |
1208 | shutdownConnection(); | |
1209 | return; | |
1210 | } | |
1211 | - // We first write the complete buffer, including all newlines. | |
1212 | - // Do: send command and newlines, expect response then | |
1213 | - // Do not: send commands, expect response, send newlines, expect response on newlines | |
1214 | - // Newlines do not trigger a response. | |
1215 | - while (FD_ISSET(childFd,&wfds) && outBufPos >= 0) | |
1216 | - { | |
1217 | + if (FD_ISSET(childFd,&wfds) && outBufPos >= 0) { | |
1218 | #else | |
1219 | - while (outBufPos >= 0) | |
1220 | - { | |
1221 | + if (outBufPos >= 0) { | |
1222 | #endif | |
1223 | #if 0 | |
1224 | QString debug = QString::fromLatin1(outBuf+outBufPos,outBufLen-outBufPos); | |
1225 | - myDebug( << "now writing " << (outBufLen-outBufPos) << " " << debug << endl); | |
1226 | + myDebug( << "now writing " << (outBufLen-outBufPos) << " " << debug.left(40) << "..." << endl); | |
1227 | #endif | |
1228 | #ifndef Q_WS_WIN | |
1229 | if (outBufLen-outBufPos > 0) rc = ::write(childFd,outBuf+outBufPos,outBufLen-outBufPos); | |
1230 | @@ -1487,10 +1479,10 @@ | |
1231 | } | |
1232 | } | |
1233 | #ifndef Q_WS_WIN | |
1234 | - if (FD_ISSET(childFd,&rfds)) { | |
1235 | + else if (FD_ISSET(childFd,&rfds)) { | |
1236 | rc = ::read(childFd,buf+offset,32768-offset); | |
1237 | #else | |
1238 | - if (childPid->waitForReadyRead(1000)) { | |
1239 | + else if (childPid->waitForReadyRead(1000)) { | |
1240 | rc = childPid->read(buf+offset,32768-offset); | |
1241 | #endif | |
1242 | //myDebug( << "read " << rc << " bytes" << endl); | |
1243 | --- runtime/kioslave/desktop/desktopnotifier.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1244 | +++ runtime/kioslave/desktop/desktopnotifier.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1245 | @@ -24,6 +24,7 @@ | |
1246 | Name[gu]=KDE ડેસ્કટોપ ફોલ્ડર નોટિફાયર | |
1247 | Name[hi]=केडीईडी डेस्कटॉप फ़ोल्डर नोटिफ़ायर | |
1248 | Name[hne]=केडीईडी डेस्कटाप फोल्डर नोटिफायर | |
1249 | +Name[hr]=KDED Obavještavaoc mape radne površine | |
1250 | Name[hsb]=KDED notifier za zapisk 'Dźěłowy powjerch' | |
1251 | Name[hu]=KDED értesítő asztali mappákhoz | |
1252 | Name[is]=KDED skjáborðsmöpputilkynningar | |
1253 | --- runtime/kioslave/desktop/directory.trash (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1254 | +++ runtime/kioslave/desktop/directory.trash (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1255 | @@ -27,6 +27,7 @@ | |
1256 | Name[he]=אשפה | |
1257 | Name[hi]=रद्दी | |
1258 | Name[hne]=घुरुवा | |
1259 | +Name[hr]=Otpad | |
1260 | Name[hsb]=Papjernik | |
1261 | Name[hu]=Szemétkosár | |
1262 | Name[is]=Rusl | |
1263 | --- runtime/solidautoeject/solidautoeject.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1264 | +++ runtime/solidautoeject/solidautoeject.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1265 | @@ -19,6 +19,7 @@ | |
1266 | Name[ga]=Seirbhís Díchurtha Uathoibríoch Solid | |
1267 | Name[gl]=Servizo de expulsión automática de Solid | |
1268 | Name[hi]=ठोस स्वतः बाहर निकालें सेवा | |
1269 | +Name[hr]=Solid usluga automatskog izbacivanja | |
1270 | Name[hu]=Solid automatikus lemezkilökő | |
1271 | Name[is]=Solid þjónusta fyrir sjálfvirka útspýtingu | |
1272 | Name[it]=Servizio di auto espulsione di Solid | |
1273 | @@ -58,10 +59,11 @@ | |
1274 | Comment[el]=Επιτρέπει την αυτόματη εξαγωγή μέσων σε οδηγούς όπου πιέστηκε το πλήκτρο εξαγωγής | |
1275 | Comment[es]=Permite liberar automáticamente los discos cuando se pulsa el botón de expulsión | |
1276 | Comment[et]=Võimaldab plaatidel automaatselt väljuda, kui vajutatakse väljastamisnuppu | |
1277 | -Comment[fr]=Permet de libérer automatiquement les lecteurs de disque quand leur boutton d'éjection est pressé | |
1278 | +Comment[fr]=Permet de libérer automatiquement les lecteurs de disque quand leur bouton d'éjection est pressé | |
1279 | Comment[fy]=Stiet it automatysk ferlossen fan stjoerprogramma's ta as der op har útsmyt knop drukt wurdt | |
1280 | Comment[ga]=Ceadaíonn sé seo tiomántán a scaoileadh nuair a bhrúitear a chnaipe díchurtha | |
1281 | Comment[gl]=Permite expulsar automaticamente os dispositivos cando se lles preme o botón de abrir | |
1282 | +Comment[hr]=Dozvoljava automatsko izbacivanje uređaja nakon pritiska na njihovu tipku za izbacivanje | |
1283 | Comment[hu]=Lehetővé teszi meghajtók leválasztását a kilökés gombbal | |
1284 | Comment[is]=Leyfir að drif séu aftengd sjálfvirkt þegar ýtt er á útspýtingarhnapp þeirra | |
1285 | Comment[it]=Permette di liberare automaticamente i dispositivo rimovibili quando viene premuto il pulsante espelli | |
1286 | --- runtime/nepomuk/kioslaves/search/searchfolder.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1287 | +++ runtime/nepomuk/kioslaves/search/searchfolder.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1288 | @@ -27,7 +27,8 @@ | |
1289 | #include <Soprano/Node> // for qHash( QUrl ) | |
1290 | ||
1291 | #include <Nepomuk/Variant> | |
1292 | - | |
1293 | +#include <Nepomuk/Thing> | |
1294 | +#include <nepomuk/class.h> | |
1295 | #include <QtCore/QMutexLocker> | |
1296 | ||
1297 | #include <KUrl> | |
1298 | @@ -46,11 +47,11 @@ | |
1299 | int start = name.lastIndexOf('.'); | |
1300 | if (start != -1) { | |
1301 | // has a . somewhere, e.g. it has an extension | |
1302 | - newName.insert(start, QString::number( i )); | |
1303 | + newName.insert(start, QString( " (%1)" ).arg( i )); | |
1304 | } | |
1305 | else { | |
1306 | // no extension, just tack it on to the end | |
1307 | - newName += QString::number( i ); | |
1308 | + newName += QString( " (%1)" ).arg( i ); | |
1309 | } | |
1310 | return newName; | |
1311 | } | |
1312 | @@ -78,8 +79,7 @@ | |
1313 | m_query( query ), | |
1314 | m_initialListingFinished( false ), | |
1315 | m_slave( slave ), | |
1316 | - m_listEntries( false ), | |
1317 | - m_statingStarted( false ) | |
1318 | + m_listEntries( false ) | |
1319 | { | |
1320 | kDebug() << name << QThread::currentThread(); | |
1321 | Q_ASSERT( !name.isEmpty() ); | |
1322 | @@ -106,7 +106,7 @@ | |
1323 | ||
1324 | m_client = new Nepomuk::Search::QueryServiceClient(); | |
1325 | ||
1326 | - // results signals are connected directly to update the results cache m_results | |
1327 | + // results signals are connected directly to update the results cache m_resultsQueue | |
1328 | // and the entries cache m_entries, as well as emitting KDirNotify signals | |
1329 | // a queued connection is not possible since we have no event loop after the | |
1330 | // initial listing which means that queued signals would never get delivered | |
1331 | @@ -116,11 +116,9 @@ | |
1332 | connect( m_client, SIGNAL( entriesRemoved( const QList<QUrl>& ) ), | |
1333 | this, SLOT( slotEntriesRemoved( const QList<QUrl>& ) ), | |
1334 | Qt::DirectConnection ); | |
1335 | - | |
1336 | - // slotFinishedListing needs to be called in the GUi thread | |
1337 | connect( m_client, SIGNAL( finishedListing() ), | |
1338 | this, SLOT( slotFinishedListing() ), | |
1339 | - Qt::QueuedConnection ); | |
1340 | + Qt::DirectConnection ); | |
1341 | ||
1342 | m_client->query( m_query ); | |
1343 | exec(); | |
1344 | @@ -134,38 +132,28 @@ | |
1345 | { | |
1346 | kDebug() << m_name << QThread::currentThread(); | |
1347 | ||
1348 | - m_listEntries = !m_initialListingFinished; | |
1349 | - m_statEntry = false; | |
1350 | + m_listEntries = true; | |
1351 | ||
1352 | if ( !isRunning() ) { | |
1353 | start(); | |
1354 | } | |
1355 | - else { | |
1356 | - // list all cached entries | |
1357 | - for ( QHash<QString, SearchEntry*>::const_iterator it = m_entries.constBegin(); | |
1358 | - it != m_entries.constEnd(); ++it ) { | |
1359 | - m_slave->listEntry( ( *it )->entry(), false ); | |
1360 | - } | |
1361 | ||
1362 | - // if there is nothing more to list... | |
1363 | - if ( m_initialListingFinished && | |
1364 | - m_results.isEmpty() ) { | |
1365 | - m_slave->listEntry( KIO::UDSEntry(), true ); | |
1366 | - m_slave->finished(); | |
1367 | - } | |
1368 | - else { | |
1369 | - m_listEntries = true; | |
1370 | - } | |
1371 | + // list all cached entries | |
1372 | + kDebug() << "listing" << m_entries.count() << "cached entries"; | |
1373 | + for ( QHash<QString, SearchEntry*>::const_iterator it = m_entries.constBegin(); | |
1374 | + it != m_entries.constEnd(); ++it ) { | |
1375 | + m_slave->listEntry( ( *it )->entry(), false ); | |
1376 | } | |
1377 | ||
1378 | - // if we have more to list | |
1379 | - if ( m_listEntries ) { | |
1380 | - if ( !m_statingStarted ) { | |
1381 | - QTimer::singleShot( 0, this, SLOT( slotStatNextResult() ) ); | |
1382 | - } | |
1383 | - kDebug() << "entering loop" << m_name << QThread::currentThread(); | |
1384 | - m_loop.exec(); | |
1385 | - } | |
1386 | + // list all results | |
1387 | + statResults(); | |
1388 | + | |
1389 | + kDebug() << "listing done"; | |
1390 | + | |
1391 | + m_listEntries = false; | |
1392 | + | |
1393 | + m_slave->listEntry( KIO::UDSEntry(), true ); | |
1394 | + m_slave->finished(); | |
1395 | } | |
1396 | ||
1397 | ||
1398 | @@ -173,37 +161,34 @@ | |
1399 | { | |
1400 | kDebug() << name; | |
1401 | ||
1402 | + m_listEntries = false; | |
1403 | + | |
1404 | if ( SearchEntry* entry = findEntry( name ) ) { | |
1405 | m_slave->statEntry( entry->entry() ); | |
1406 | m_slave->finished(); | |
1407 | } | |
1408 | - else if ( !isRunning() || | |
1409 | - !m_results.isEmpty() ) { | |
1410 | - m_nameToStat = name; | |
1411 | - m_statEntry = true; | |
1412 | - m_listEntries = false; | |
1413 | - | |
1414 | - if ( !isRunning() ) { | |
1415 | - start(); | |
1416 | - } | |
1417 | - | |
1418 | - if ( !m_statingStarted ) { | |
1419 | - QTimer::singleShot( 0, this, SLOT( slotStatNextResult() ) ); | |
1420 | - } | |
1421 | - m_loop.exec(); | |
1422 | - } | |
1423 | else { | |
1424 | m_slave->error( KIO::ERR_DOES_NOT_EXIST, "nepomuksearch:/" + m_name + '/' + name ); | |
1425 | } | |
1426 | } | |
1427 | ||
1428 | ||
1429 | -Nepomuk::SearchEntry* Nepomuk::SearchFolder::findEntry( const QString& name ) const | |
1430 | +Nepomuk::SearchEntry* Nepomuk::SearchFolder::findEntry( const QString& name ) | |
1431 | { | |
1432 | kDebug() << name; | |
1433 | ||
1434 | - QHash<QString, SearchEntry*>::const_iterator it = m_entries.find( name ); | |
1435 | - if ( it != m_entries.end() ) { | |
1436 | + // | |
1437 | + // get all results in case we do not have them already | |
1438 | + // | |
1439 | + if ( !isRunning() ) | |
1440 | + start(); | |
1441 | + statResults(); | |
1442 | + | |
1443 | + // | |
1444 | + // search for the one we need | |
1445 | + // | |
1446 | + QHash<QString, SearchEntry*>::const_iterator it = m_entries.constFind( name ); | |
1447 | + if ( it != m_entries.constEnd() ) { | |
1448 | kDebug() << "-----> found"; | |
1449 | return *it; | |
1450 | } | |
1451 | @@ -214,7 +199,7 @@ | |
1452 | } | |
1453 | ||
1454 | ||
1455 | -Nepomuk::SearchEntry* Nepomuk::SearchFolder::findEntry( const KUrl& url ) const | |
1456 | +Nepomuk::SearchEntry* Nepomuk::SearchFolder::findEntry( const KUrl& url ) | |
1457 | { | |
1458 | // FIXME | |
1459 | return 0; | |
1460 | @@ -227,7 +212,7 @@ | |
1461 | kDebug() << m_name << QThread::currentThread(); | |
1462 | ||
1463 | m_resultMutex.lock(); | |
1464 | - m_results += results; | |
1465 | + m_resultsQueue += results; | |
1466 | m_resultMutex.unlock(); | |
1467 | ||
1468 | if ( m_initialListingFinished ) { | |
1469 | @@ -235,6 +220,10 @@ | |
1470 | kDebug() << ( "Informing about change in folder nepomuksearch:/" + m_name ); | |
1471 | org::kde::KDirNotify::emitFilesAdded( "nepomuksearch:/" + m_name ); | |
1472 | } | |
1473 | + else { | |
1474 | + kDebug() << "Waking main thread"; | |
1475 | + m_resultWaiter.wakeAll(); | |
1476 | + } | |
1477 | } | |
1478 | ||
1479 | ||
1480 | @@ -263,25 +252,19 @@ | |
1481 | void Nepomuk::SearchFolder::slotFinishedListing() | |
1482 | { | |
1483 | kDebug() << m_name << QThread::currentThread(); | |
1484 | + QMutexLocker lock( &m_resultMutex ); | |
1485 | m_initialListingFinished = true; | |
1486 | - wrap(); | |
1487 | + m_resultWaiter.wakeAll(); | |
1488 | } | |
1489 | ||
1490 | ||
1491 | // always called in main thread | |
1492 | -void Nepomuk::SearchFolder::slotStatNextResult() | |
1493 | +void Nepomuk::SearchFolder::statResults() | |
1494 | { | |
1495 | -// kDebug(); | |
1496 | - m_statingStarted = true; | |
1497 | - | |
1498 | while ( 1 ) { | |
1499 | - // never lock the mutex for the whole duration of the method | |
1500 | - // since it may start an event loop which can result in more | |
1501 | - // newEntries signals to be delivered which would result in | |
1502 | - // a deadlock | |
1503 | m_resultMutex.lock(); | |
1504 | - if( !m_results.isEmpty() ) { | |
1505 | - Search::Result result = m_results.dequeue(); | |
1506 | + if ( !m_resultsQueue.isEmpty() ) { | |
1507 | + Search::Result result = m_resultsQueue.dequeue(); | |
1508 | m_resultMutex.unlock(); | |
1509 | SearchEntry* entry = statResult( result ); | |
1510 | if ( entry ) { | |
1511 | @@ -289,74 +272,73 @@ | |
1512 | kDebug() << "listing" << entry->resource(); | |
1513 | m_slave->listEntry( entry->entry(), false ); | |
1514 | } | |
1515 | - else if ( m_statEntry ) { | |
1516 | - if ( m_nameToStat == entry->entry().stringValue( KIO::UDSEntry::UDS_NAME ) ) { | |
1517 | - kDebug() << "stating" << entry->resource(); | |
1518 | - m_nameToStat.clear(); | |
1519 | - m_slave->statEntry( entry->entry() ); | |
1520 | - } | |
1521 | - } | |
1522 | } | |
1523 | } | |
1524 | + else if ( !m_initialListingFinished ) { | |
1525 | + m_resultWaiter.wait( &m_resultMutex ); | |
1526 | + m_resultMutex.unlock(); | |
1527 | + } | |
1528 | else { | |
1529 | - m_resultMutex.unlock(); | |
1530 | break; | |
1531 | } | |
1532 | } | |
1533 | - | |
1534 | - if ( !m_results.isEmpty() || | |
1535 | - !m_initialListingFinished ) { | |
1536 | - // we need to use the timer since statResource does only create an event loop | |
1537 | - // for files, not for arbitrary resources. | |
1538 | - QTimer::singleShot( 0, this, SLOT( slotStatNextResult() ) ); | |
1539 | - } | |
1540 | - else { | |
1541 | - m_statingStarted = false; | |
1542 | - wrap(); | |
1543 | - } | |
1544 | } | |
1545 | ||
1546 | ||
1547 | -// always called in main thread | |
1548 | -void Nepomuk::SearchFolder::wrap() | |
1549 | -{ | |
1550 | - kDebug() << m_name << QThread::currentThread(); | |
1551 | +namespace { | |
1552 | + /** | |
1553 | + * Stat a file. | |
1554 | + * | |
1555 | + * \param url The url of the file | |
1556 | + * \param success will be set to \p true if the stat was successful | |
1557 | + */ | |
1558 | + KIO::UDSEntry statFile( const KUrl& url, bool& success ) | |
1559 | + { | |
1560 | + success = false; | |
1561 | + KIO::UDSEntry uds; | |
1562 | ||
1563 | - if ( m_results.isEmpty() && | |
1564 | - m_initialListingFinished && | |
1565 | - m_loop.isRunning() ) { | |
1566 | - if ( m_listEntries ) { | |
1567 | - kDebug() << "listing done"; | |
1568 | - m_slave->listEntry( KIO::UDSEntry(), true ); | |
1569 | - m_slave->finished(); | |
1570 | - } | |
1571 | - else if ( m_statEntry ) { | |
1572 | - if ( !m_nameToStat.isEmpty() ) { | |
1573 | - // if m_nameToStat is not empty the name was not found during listing which means that | |
1574 | - // it does not exist | |
1575 | - m_slave->error( KIO::ERR_DOES_NOT_EXIST, "nepomuksearch:/" + m_name + '/' + m_nameToStat ); | |
1576 | - m_nameToStat.clear(); | |
1577 | + if ( !url.isEmpty() && | |
1578 | + url.scheme() != "akonadi" && | |
1579 | + url.scheme() != "nepomuk" ) { // do not stat akonadi resouces here, way too slow, even hangs if akonadi is not running | |
1580 | + kDebug() << "listing file" << url; | |
1581 | + if ( KIO::StatJob* job = KIO::stat( url, KIO::HideProgressInfo ) ) { | |
1582 | + job->setAutoDelete( false ); | |
1583 | + if ( KIO::NetAccess::synchronousRun( job, 0 ) ) { | |
1584 | + uds = job->statResult(); | |
1585 | + if ( url.isLocalFile() ) { | |
1586 | + uds.insert( KIO::UDSEntry::UDS_LOCAL_PATH, url.toLocalFile() ); | |
1587 | + } | |
1588 | + success = true; | |
1589 | + } | |
1590 | + else { | |
1591 | + kDebug() << "failed to stat" << url; | |
1592 | + } | |
1593 | + delete job; | |
1594 | } | |
1595 | - else | |
1596 | - m_slave->finished(); | |
1597 | } | |
1598 | ||
1599 | - m_statingStarted = false; | |
1600 | - m_listEntries = false; | |
1601 | - m_statEntry = false; | |
1602 | - kDebug() << m_name << QThread::currentThread() << "exiting loop"; | |
1603 | - m_loop.exit(); | |
1604 | + return uds; | |
1605 | } | |
1606 | + | |
1607 | + | |
1608 | + /** | |
1609 | + * Workaround a missing Nepomuk::Variant feature which is in trunk but not in 4.3.0. | |
1610 | + */ | |
1611 | + QUrl extractUrl( const Nepomuk::Variant& v ) { | |
1612 | + QList<Nepomuk::Resource> rl = v.toResourceList(); | |
1613 | + if ( !rl.isEmpty() ) | |
1614 | + return rl.first().resourceUri(); | |
1615 | + return QUrl(); | |
1616 | + } | |
1617 | } | |
1618 | ||
1619 | - | |
1620 | // always called in main thread | |
1621 | Nepomuk::SearchEntry* Nepomuk::SearchFolder::statResult( const Search::Result& result ) | |
1622 | { | |
1623 | - kDebug() << result.resourceUri(); | |
1624 | - | |
1625 | - KIO::UDSEntry uds; | |
1626 | - | |
1627 | + // | |
1628 | + // First we check if the resource is a file itself. For that we first get | |
1629 | + // the URL (being backwards compatible with Xesam data) and then stat that URL | |
1630 | + // | |
1631 | KUrl url = result[Nepomuk::Vocabulary::NIE::url()].uri(); | |
1632 | if ( url.isEmpty() ) { | |
1633 | url = result[Soprano::Vocabulary::Xesam::url()].uri(); | |
1634 | @@ -364,36 +346,49 @@ | |
1635 | url = result.resourceUri(); | |
1636 | } | |
1637 | bool isFile = false; | |
1638 | - if ( !url.isEmpty() && url.scheme() != "akonadi" ) { // do not stat akonadi resouces here, way too slow, even hangs if akonadi is not running | |
1639 | - kDebug() << "listing file" << url; | |
1640 | - if ( KIO::StatJob* job = KIO::stat( url, KIO::HideProgressInfo ) ) { | |
1641 | - job->setAutoDelete( false ); | |
1642 | - if ( KIO::NetAccess::synchronousRun( job, 0 ) ) { | |
1643 | - uds = job->statResult(); | |
1644 | - if ( url.isLocalFile() ) { | |
1645 | - uds.insert( KIO::UDSEntry::UDS_LOCAL_PATH, url.toLocalFile() ); | |
1646 | - } | |
1647 | - isFile = true; | |
1648 | - } | |
1649 | - else { | |
1650 | - kDebug() << "failed to stat" << url; | |
1651 | - } | |
1652 | - delete job; | |
1653 | - } | |
1654 | + KIO::UDSEntry uds = statFile( url, isFile ); | |
1655 | + | |
1656 | + | |
1657 | + if ( isFile ) { | |
1658 | + uds.insert( KIO::UDSEntry::UDS_TARGET_URL, url.url() ); | |
1659 | } | |
1660 | ||
1661 | // | |
1662 | - // The nepomuk resource listing is the same as in the nepomuk kio slave. | |
1663 | - // So either only depend on that or let the nepomuk kio slave fail on each | |
1664 | - // stat. (the latter means that we need the nepomuk kio slave in kdebase) | |
1665 | + // If it is not a file we get inventive: | |
1666 | + // In case it is a pimo thing, we see if it has a grounding occurrence | |
1667 | + // which is a file. If so, we merge the two by taking the file URL and the thing's | |
1668 | + // label and icon if set | |
1669 | // | |
1670 | - if ( !isFile ) { | |
1671 | + else { | |
1672 | kDebug() << "listing resource" << result.resourceUri(); | |
1673 | ||
1674 | + // | |
1675 | + // We only create a resource here since this is a rather slow process and | |
1676 | + // a lot of file results could become slow then. | |
1677 | + // | |
1678 | Nepomuk::Resource res( result.resourceUri() ); | |
1679 | ||
1680 | - QString name = res.genericLabel(); | |
1681 | + // | |
1682 | + // let's see if it is a pimo thing which refers to a file | |
1683 | + // | |
1684 | + bool isPimoThingLinkedFile = false; | |
1685 | + if ( res.pimoThing() == res ) { | |
1686 | + if ( !res.pimoThing().groundingOccurrences().isEmpty() ) { | |
1687 | + Nepomuk::Resource fileRes = res.pimoThing().groundingOccurrences().first(); | |
1688 | + url = extractUrl( fileRes.property( Nepomuk::Vocabulary::NIE::url() ) ); | |
1689 | + if ( url.isEmpty() ) { | |
1690 | + url = extractUrl( fileRes.property( Soprano::Vocabulary::Xesam::url() ) ); | |
1691 | + if ( url.isEmpty() ) | |
1692 | + url = result.resourceUri(); | |
1693 | + } | |
1694 | + uds = statFile( url, isPimoThingLinkedFile ); | |
1695 | + } | |
1696 | + } | |
1697 | ||
1698 | + QString name = res.label(); | |
1699 | + if ( name.isEmpty() && !isPimoThingLinkedFile ) | |
1700 | + name = res.genericLabel(); | |
1701 | + | |
1702 | // make sure name is not the URI (which is the fallback of genericLabel() and will lead to crashes in KDirModel) | |
1703 | if ( name.contains( '/' ) ) { | |
1704 | name = name.section( '/', -1 ); | |
1705 | @@ -403,28 +398,45 @@ | |
1706 | name = res.resourceUri().toString().replace( '/', '_' ); | |
1707 | } | |
1708 | ||
1709 | - uds.insert( KIO::UDSEntry::UDS_NAME, name ); | |
1710 | - uds.insert( KIO::UDSEntry::UDS_DISPLAY_NAME, name ); | |
1711 | + // | |
1712 | + // We always use the pimo things label, even if it points to a file | |
1713 | + // | |
1714 | + if ( !name.isEmpty() ) { | |
1715 | + uds.insert( KIO::UDSEntry::UDS_NAME, name ); | |
1716 | + uds.insert( KIO::UDSEntry::UDS_DISPLAY_NAME, name ); | |
1717 | + } | |
1718 | ||
1719 | + // | |
1720 | + // An icon set on the pimo thing overrides the file's icon | |
1721 | + // | |
1722 | QString icon = res.genericIcon(); | |
1723 | if ( !icon.isEmpty() ) { | |
1724 | uds.insert( KIO::UDSEntry::UDS_ICON_NAME, icon ); | |
1725 | } | |
1726 | - else { | |
1727 | + else if ( !isPimoThingLinkedFile ) { | |
1728 | uds.insert( KIO::UDSEntry::UDS_ICON_NAME, "nepomuk" ); | |
1729 | } | |
1730 | ||
1731 | - uds.insert( KIO::UDSEntry::UDS_CREATION_TIME, res.property( Soprano::Vocabulary::NAO::created() ).toDateTime().toTime_t() ); | |
1732 | + // | |
1733 | + // Generate some dummy values | |
1734 | + // | |
1735 | + if ( !isPimoThingLinkedFile ) { | |
1736 | + uds.insert( KIO::UDSEntry::UDS_CREATION_TIME, res.property( Soprano::Vocabulary::NAO::created() ).toDateTime().toTime_t() ); | |
1737 | + uds.insert( KIO::UDSEntry::UDS_ACCESS, 0700 ); | |
1738 | + uds.insert( KIO::UDSEntry::UDS_USER, KUser().loginName() ); | |
1739 | +// uds.insert( KIO::UDSEntry::UDS_MIME_TYPE, "application/x-nepomuk-resource" ); | |
1740 | + } | |
1741 | ||
1742 | - uds.insert( KIO::UDSEntry::UDS_ACCESS, 0700 ); | |
1743 | - uds.insert( KIO::UDSEntry::UDS_USER, KUser().loginName() ); | |
1744 | - | |
1745 | -// uds.insert( KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR ); | |
1746 | - uds.insert( KIO::UDSEntry::UDS_MIME_TYPE, "application/x-nepomuk-resource" ); | |
1747 | + // | |
1748 | + // Although in KDE 4.3 the target url is sort of deprecated, we still set it. | |
1749 | + // Cannot hurt. | |
1750 | + // | |
1751 | + if ( isPimoThingLinkedFile ) | |
1752 | + uds.insert( KIO::UDSEntry::UDS_TARGET_URL, url.url() ); | |
1753 | + else | |
1754 | + uds.insert( KIO::UDSEntry::UDS_TARGET_URL, result.resourceUri().toString() ); | |
1755 | } | |
1756 | ||
1757 | - uds.insert( KIO::UDSEntry::UDS_TARGET_URL, result.resourceUri().toString() ); | |
1758 | - | |
1759 | // | |
1760 | // make sure we have no duplicate names | |
1761 | // | |
1762 | --- runtime/nepomuk/kioslaves/search/kio_nepomuksearch.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1763 | +++ runtime/nepomuk/kioslaves/search/kio_nepomuksearch.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1764 | @@ -347,7 +347,7 @@ | |
1765 | KDE_EXPORT int kdemain( int argc, char **argv ) | |
1766 | { | |
1767 | // necessary to use other kio slaves | |
1768 | - KComponentData( "kio_nepomuksearch" ); | |
1769 | + KComponentData comp( "kio_nepomuksearch" ); | |
1770 | QCoreApplication app( argc, argv ); | |
1771 | ||
1772 | if ( Nepomuk::ResourceManager::instance()->init() ) { | |
1773 | --- runtime/nepomuk/kioslaves/search/searchfolder.h (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1774 | +++ runtime/nepomuk/kioslaves/search/searchfolder.h (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1775 | @@ -25,6 +25,7 @@ | |
1776 | #include <QtCore/QEventLoop> | |
1777 | #include <QtCore/QQueue> | |
1778 | #include <QtCore/QMutex> | |
1779 | +#include <QtCore/QWaitCondition> | |
1780 | ||
1781 | #include "term.h" | |
1782 | #include "result.h" | |
1783 | @@ -73,17 +74,21 @@ | |
1784 | QString name() const { return m_name; } | |
1785 | QList<SearchEntry*> entries() const { return m_entries.values(); } | |
1786 | ||
1787 | - SearchEntry* findEntry( const QString& name ) const; | |
1788 | - SearchEntry* findEntry( const KUrl& url ) const; | |
1789 | + SearchEntry* findEntry( const QString& name ); | |
1790 | + SearchEntry* findEntry( const KUrl& url ); | |
1791 | ||
1792 | void list(); | |
1793 | void stat( const QString& name ); | |
1794 | ||
1795 | private Q_SLOTS: | |
1796 | + /// connected to the QueryServiceClient in the search thread | |
1797 | void slotNewEntries( const QList<Nepomuk::Search::Result>& ); | |
1798 | + | |
1799 | + /// connected to the QueryServiceClient in the search thread | |
1800 | void slotEntriesRemoved( const QList<QUrl>& ); | |
1801 | + | |
1802 | + /// connected to the QueryServiceClient in the search thread | |
1803 | void slotFinishedListing(); | |
1804 | - void slotStatNextResult(); | |
1805 | ||
1806 | private: | |
1807 | // reimplemented from QThread -> does handle the query | |
1808 | @@ -93,17 +98,24 @@ | |
1809 | void run(); | |
1810 | ||
1811 | /** | |
1812 | + * This method will stat all entries in m_resultsQueue until | |
1813 | + * the search thread is finished. It is run in the main thread. | |
1814 | + */ | |
1815 | + void statResults(); | |
1816 | + | |
1817 | + /** | |
1818 | * Stats the result and returns the entry. | |
1819 | */ | |
1820 | SearchEntry* statResult( const Search::Result& result ); | |
1821 | - void wrap(); | |
1822 | ||
1823 | // folder properties | |
1824 | QString m_name; | |
1825 | Search::Query m_query; | |
1826 | ||
1827 | - // result cache | |
1828 | - QQueue<Search::Result> m_results; | |
1829 | + // result cache, filled by the search thread | |
1830 | + QQueue<Search::Result> m_resultsQueue; | |
1831 | + | |
1832 | + // final results, filled by the main thread in statResults | |
1833 | QHash<QString, SearchEntry*> m_entries; | |
1834 | QHash<QUrl, QString> m_resourceNameMap; | |
1835 | ||
1836 | @@ -119,27 +131,16 @@ | |
1837 | // the parent slave used for listing and stating | |
1838 | KIO::SlaveBase* m_slave; | |
1839 | ||
1840 | - // if set, this is the name that was requested through | |
1841 | - // stat(). Used during initial listing when not all results | |
1842 | - // are available yet | |
1843 | - QString m_nameToStat; | |
1844 | - | |
1845 | - // true if stating of an entry has been requested (name of entry in m_nameToStat) | |
1846 | - bool m_statEntry; | |
1847 | - | |
1848 | // true if listing of entries has been requested | |
1849 | bool m_listEntries; | |
1850 | ||
1851 | - // true if the stat loop is running | |
1852 | - bool m_statingStarted; | |
1853 | - | |
1854 | - // used to make all calls sync | |
1855 | - QEventLoop m_loop; | |
1856 | - | |
1857 | Search::QueryServiceClient* m_client; | |
1858 | ||
1859 | // mutex to protect the results | |
1860 | QMutex m_resultMutex; | |
1861 | + | |
1862 | + // used to wait in the main thread for the serch thread to deliver results | |
1863 | + QWaitCondition m_resultWaiter; | |
1864 | }; | |
1865 | } | |
1866 | ||
1867 | --- runtime/nepomuk/services/ontologyloader/nepomukontologyloader.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1868 | +++ runtime/nepomuk/services/ontologyloader/nepomukontologyloader.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1869 | @@ -26,6 +26,7 @@ | |
1870 | Name[gu]=નેપોમુક ઓન્ટોલોજી લાવનાર | |
1871 | Name[hi]=नेपोमक ऑन्टोलॉज़ी लोडर | |
1872 | Name[hne]=नेपोमक ओन्टोलोजी लोडर | |
1873 | +Name[hr]=Nepomuk Učitavač Ontologije | |
1874 | Name[hsb]=Nepomuk začitanje ontologije | |
1875 | Name[hu]=Nepomuk ontológiabetöltő | |
1876 | Name[is]=Nepomuk verufræðihöndlari (Ontology Loader) | |
1877 | @@ -85,6 +86,7 @@ | |
1878 | Comment[gl]=O servizo de Nepomuk que mantén as ontoloxías que teña instaladas no sistema | |
1879 | Comment[gu]=નેપોમુક સેવા જે સિસ્ટમમાં સ્થાપિત થયેલ ઓન્ટોલોજીની જાળવણી કરે છે | |
1880 | Comment[hne]=नेपोमक सेवा जउन सिस्टम मं इस्टाल ओन्टोलोजी मन ल मेंटेन करथे | |
1881 | +Comment[hr]=Nepomukova usluga koja održava ontologije instalirane na sustav | |
1882 | Comment[hsb]=Nepomukowa słužba, kiž so stara wo instalowane ontologije | |
1883 | Comment[hu]=Nepomuk-szolgáltatás a rendszer ontológiáinak karbantartásához | |
1884 | Comment[is]=Nepomuk þjónusta sem viðheldur þeim verufræðitengingum (ontologies) sem uppsettar eru á kerfinu | |
1885 | --- runtime/nepomuk/services/strigi/nepomukstrigiservice.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1886 | +++ runtime/nepomuk/services/strigi/nepomukstrigiservice.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1887 | @@ -94,6 +94,7 @@ | |
1888 | Comment[ga]=An tSeirbhís Nepomuk a rialaíonn an strigidaemon, .i. a dhéanann innéacsú de chomhaid ar an deasc | |
1889 | Comment[gl]=Un servido de Nepomuk que controla o daemon de strigi, i.e. indexa os ficheiros do escritorio | |
1890 | Comment[gu]=નેપોમુક સેવા જે સ્ટ્રિગિડેમનને નિયંત્રિત કરે છે, દા.ત. ડેસ્કટોપ પર ફાઇલોને અનુક્રમિત કરવી | |
1891 | +Comment[hr]=Nepomukova usluga koja upravlja strigidaemonom, tj. indeksira datoteke na računalu | |
1892 | Comment[hsb]=Nepomukowa słužba za strigidemon, to su indeksowe dataje na dźěłowym powjerchu | |
1893 | Comment[hu]=A Strigi szolgáltatást kezeli, amely fájlok indexelését végzi | |
1894 | Comment[is]=Nepomuk þjónusta sem stýrir strigidaemon, þ.e. býr til yfirlit um skrár á skjáborði | |
1895 | --- runtime/nepomuk/services/strigi/nepomukstrigiservice.notifyrc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1896 | +++ runtime/nepomuk/services/strigi/nepomukstrigiservice.notifyrc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1897 | @@ -22,6 +22,7 @@ | |
1898 | Comment[gu]=નેપોમુક સ્ટ્રિગિ ફાઇલ ઇન્ડેક્સર | |
1899 | Comment[hi]=नेपोमक स्ट्रिगी फ़ाइल सूची बनाने वाला | |
1900 | Comment[hne]=नेपोमक स्ट्रिगि फाइल सूची बनइया | |
1901 | +Comment[hr]=Nepomuk Strigi indekser datoteka | |
1902 | Comment[hsb]=Nepomukowy strigi-indekser za dataje | |
1903 | Comment[hu]=Nepomuk Strigi fájlindexelő | |
1904 | Comment[is]=Nepomuk Strigi skráayfirlitsgerð | |
1905 | @@ -87,6 +88,7 @@ | |
1906 | Name[he]=החל תהליך האינדוקס הראשוני | |
1907 | Name[hi]=आरंभिक सूची बनाना प्रारंभ हो गया | |
1908 | Name[hne]=सूची बनाना सुरू हो गे | |
1909 | +Name[hr]=Prvotno indeksiranje je započelo | |
1910 | Name[hsb]=Prěnje tworjenje indeksa startowane | |
1911 | Name[hu]=A kezdeti index elkészítése folyik | |
1912 | Name[is]=Gerð upphafsyfirlits er hafin | |
1913 | @@ -147,6 +149,7 @@ | |
1914 | Comment[gl]=Strigi comezou a indexación inicial dos ficheiros locais para facer procuras rápidas no escritorio | |
1915 | Comment[gu]=સ્ટ્રીગીએ ઝડપી ડેસ્કટોપ શોધ માટે સ્થાનિક ફાઇલોનું શરૂઆતી ઇન્ડેક્સીંગ ચાલુ કર્યું છે | |
1916 | Comment[hne]=डेस्कटाप मं तेजी से खोजे बर स्ट्रिगि हर लोकल फाइल के सूची बनाय बर चालू कर दिस | |
1917 | +Comment[hr]=Strigi je započeo prvotno indeksiranje lokalnih datoteka za brzo pretraživanje računala | |
1918 | Comment[hsb]=Strigi je prěnje tworjenje indeksa za lokalne dataje startował, za spěšne pytanje na dźěłowym powjerchu | |
1919 | Comment[hu]=A Strigi fájlindexelő elkészítette a kezdeti helyi indexet | |
1920 | Comment[is]=Strigi hóf gerð upphafsyfirlits um skrár á tölvunni til að styðja við hraðar skjáborðsleitir | |
1921 | @@ -210,6 +213,7 @@ | |
1922 | Name[he]=תהליך האינדוקס הראשוני הסתיים | |
1923 | Name[hi]=आरंभिक सूची बना लिया गया | |
1924 | Name[hne]=सुरू के सूची बनाए के काम पूरा हो गे | |
1925 | +Name[hr]=Prvotno indeksiranje je završilo | |
1926 | Name[hsb]=Prěni indeks dotwarjeny | |
1927 | Name[hu]=A kiindulási index elkészült | |
1928 | Name[is]=Gerð upphafsyfirlits er lokið | |
1929 | @@ -270,6 +274,7 @@ | |
1930 | Comment[gl]=Strigi rematou a indexación inicial dos ficheiros locais para facer procuras rápidas no escritorio | |
1931 | Comment[gu]=સ્ટ્રીગીએ ઝડપી ડેસ્કટોપ શોધ માટે સ્થાનિક ફાઇલોનું શરૂઆતી ઇન્ડેક્સીંગ પૂર્ણ કર્યું છે | |
1932 | Comment[hne]=तेज डेस्कटाप खोज बर स्ट्रिगि सुरु के इंडेक्सिंग लोकल फाइल बर पूरा कर लिस | |
1933 | +Comment[hr]=Strigi je završio prvotno indeksiranje lokalnih datoteka za brzo pretraživanje računala | |
1934 | Comment[hsb]=Strigi je prěnje tworjenje indeksa za lokalne dataje zakónčił, za spěšne pytanje na dźěłowym powjerchu | |
1935 | Comment[hu]=A Strigi fájlindexelő elkészítette a kezdeti helyi indexet | |
1936 | Comment[is]=Strigi hefur lokið gerð upphafsyfirlits um skrár á tölvunni til að styðja við hraðar skjáborðsleitir | |
1937 | @@ -333,6 +338,7 @@ | |
1938 | Name[he]=האינדוקס הופסק | |
1939 | Name[hi]=सूची बनाना निलंबित | |
1940 | Name[hne]=इंडेक्सिंग सस्पेंड हे | |
1941 | +Name[hr]=Indeksiranje je pauzirano | |
1942 | Name[hsb]=Tworjenje indeksa zastajene | |
1943 | Name[hu]=Az indexelés felfüggesztve | |
1944 | Name[is]=Hætt við yfirlitsgerð | |
1945 | @@ -393,6 +399,7 @@ | |
1946 | Comment[gu]=સ્ટ્રીગીએ ફાઇલ ઇન્ડેક્સીંગ બંધ કરવામાં આવ્યું છે | |
1947 | Comment[hi]=स्ट्रिगी फ़ाइल सूची बनाना निलंबित किया गया है | |
1948 | Comment[hne]=स्ट्रिगि फाइल इन्डेक्सिंग सस्पेंड हे | |
1949 | +Comment[hr]=Strigi indeksiranje datoteka je pauzirano | |
1950 | Comment[hsb]=Indeksowanje Strigija bu zastajene | |
1951 | Comment[hu]=A Strigi fájlindexelő felfüggesztve | |
1952 | Comment[is]=Gerð skráayfirlits með Strigi hefur verið frestað | |
1953 | @@ -458,6 +465,7 @@ | |
1954 | Name[he]=האינדוקס הומשך | |
1955 | Name[hi]=सूची बनाना पुनरारंभ | |
1956 | Name[hne]=इन्डेक्सिंग वापस चालू | |
1957 | +Name[hr]=Indeksiranje nastavljeno | |
1958 | Name[hsb]=Indeks so dale twari | |
1959 | Name[hu]=Az indexelés folytatódik | |
1960 | Name[is]=Yfirlitsgerð er hafin aftur | |
1961 | @@ -518,6 +526,7 @@ | |
1962 | Comment[gu]=સ્ટ્રીગીએ ફાઇલ ઇન્ડેક્સીંગ પુન: શરૂ કરવામાં આવ્યું છે | |
1963 | Comment[hi]=स्ट्रिगी फ़ाइल सूची बनाना पुनरारंभ | |
1964 | Comment[hne]=स्ट्रिगि फाइल इन्डेक्सिंग वापस चालू होगे | |
1965 | +Comment[hr]=Strigi indeksiranje datoteka je nastavljeno | |
1966 | Comment[hsb]=Twarjenje indeksa za Strigi so pokročuje | |
1967 | Comment[hu]=A Strigi fájlindexelő futása folytatódik | |
1968 | Comment[is]=Gerð skráayfirlits með Strigi er hafin aftur | |
1969 | --- runtime/nepomuk/services/storage/nepomukstorage.notifyrc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
1970 | +++ runtime/nepomuk/services/storage/nepomukstorage.notifyrc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
1971 | @@ -25,6 +25,7 @@ | |
1972 | Name[he]=שירותי אחסון של Nepomuk | |
1973 | Name[hi]=नेपोमक डाटा भंडार | |
1974 | Name[hne]=नेपोमक डाटा भंडार | |
1975 | +Name[hr]=Nepomuk Pohrana Podataka | |
1976 | Name[hsb]=Nepomuk składowanje datow | |
1977 | Name[hu]=Nepomuk adattároló | |
1978 | Name[is]=Nepomuk gagnageymsla | |
1979 | @@ -87,6 +88,7 @@ | |
1980 | Comment[he]=שירותי האחסון המידע של Nepomuk | |
1981 | Comment[hi]=नेपोमक भंडार सेवा | |
1982 | Comment[hne]=नेपोमक भंडार सेवा | |
1983 | +Comment[hr]=Nepomuk Usluga Pohrane | |
1984 | Comment[hsb]=Nepomuk Storage Service | |
1985 | Comment[hu]=Nepomuk-tároló | |
1986 | Comment[is]=Nepomuk gagnageymslumiðlari | |
1987 | @@ -151,6 +153,7 @@ | |
1988 | Name[he]=בונה מחדש את האינדקס של Neapomuk | |
1989 | Name[hi]=नेपोमक निर्देशिका फिर से बनाया जा रहा है | |
1990 | Name[hne]=नेपोमक सूची फिर से बनावत हे | |
1991 | +Name[hr]=Ponovno izgrađujem Nepomukov index | |
1992 | Name[hsb]=Indeks za Nepomuk znowa natwarjam | |
1993 | Name[hu]=Az index újraépítése | |
1994 | Name[is]=Endurbyggi Nepomuk yfirlit | |
1995 | @@ -208,6 +211,7 @@ | |
1996 | Comment[gl]=O índice de procuras de texto completo de Nepomuk está a ser reconstruído para dispor de novas funcionalidades | |
1997 | Comment[gu]=નવી લાક્ષણિકતાઓ માટે નેપોમુક પૂર્ણ લખાણ શોધ અનુક્રમણિકા ફરી બની રહી છે | |
1998 | Comment[hne]=नवा फीचर बर नेपोमक पूरा पाठ खोज सूची फिर से बनावत हे | |
1999 | +Comment[hr]=Nepomukov index pretrage punog teksta je ponovno izgrađen s novim mogućnostima | |
2000 | Comment[hsb]=Nepomukowy indeks za połnotekstowe pytanje so znowa natwarja za instalowanje nowych móžnosćow | |
2001 | Comment[hu]=A Nepomuk kereső újraépíti az indexet strukturális változások miatt | |
2002 | Comment[is]=Yfirlit Nepomuk um leit í öllum texta er endurbyggt vegna nýrra möguleika | |
2003 | @@ -270,6 +274,7 @@ | |
2004 | Name[gu]=નેપોમુક અનુક્રમ ફરી બનાવવાનું પૂર્ણ | |
2005 | Name[hi]=नेपोमक निर्देशिका फिर से बना लिया गया | |
2006 | Name[hne]=नेपोमक सूची फिर से बन गिस | |
2007 | +Name[hr]=Ponovna izgradnja Nepomukovog indeksa je završila. | |
2008 | Name[hsb]=Indeks za Nepomuk znowa natwarjeny | |
2009 | Name[hu]=Az index frissítése befejeződött | |
2010 | Name[is]=Endurbygging Nepomuk yfirlits er lokið | |
2011 | @@ -329,6 +334,7 @@ | |
2012 | Comment[gu]=નેપોમુક પૂર્ણ લખાણ શોધ અનુક્રમણિકા બનાવવાનું પૂર્ણ થયેલ છે. | |
2013 | Comment[hi]=नेपोमक पूरा पाठ खोज निर्देशिका फिर से बना लिया गया | |
2014 | Comment[hne]=नेपोमक पूरा पाठ खोज सूची फिर से बन गिस | |
2015 | +Comment[hr]=Ponovna izgradnja Nepomukovog indeksa pretrage punog teksta je završila. | |
2016 | Comment[hsb]=Nepomukowy indeks za połnotekstowe pytanje je donatwarjeny | |
2017 | Comment[hu]=Az index frissítése befejeződött. | |
2018 | Comment[is]=Endurbygging yfirlits Nepomuk um leit í öllum texta er lokið. | |
2019 | @@ -391,6 +397,7 @@ | |
2020 | Name[gu]=નેપોમુક માહિતી ફેરવે છે | |
2021 | Name[hi]=नेपोमक डाटा बदला जा रहा है | |
2022 | Name[hne]=नेपोमक डाटा ल बदलत हे | |
2023 | +Name[hr]=Pretvaram Nepomukove podatke | |
2024 | Name[hsb]=Konwertěruju Nepomukowe daty | |
2025 | Name[hu]=Indexadatok konvertálása folyik | |
2026 | Name[is]=Umbreyti Nepomuk gögnum | |
2027 | @@ -449,6 +456,7 @@ | |
2028 | Comment[gu]=બધી નેપોમુક માહિતી નવાં સંગ્રહ બેકએન્ડમાં ફેરવાઇ ગઇ છે | |
2029 | Comment[hi]=सभी नेपोमक डाटा को नया भंडार बैकएण्ड में परिवर्तित कर लिया गया | |
2030 | Comment[hne]=नवा भंडार बेकएन्ड मं सब्बो नेपोमक डाटा बदल गे हे | |
2031 | +Comment[hr]=Svi Nepomukovi podaci su pretvoreni u format novog načina pohrane | |
2032 | Comment[hsb]=Wšě Nepomukowe daty buchu za nowy składowanski backend konwertěrowane | |
2033 | Comment[hu]=Sikerült átkonvertálni minden adatot az új tárolómodul számára | |
2034 | Comment[is]=Öllum Nepomuk er umbreytt fyrir nýja geymslubakendann | |
2035 | @@ -511,6 +519,7 @@ | |
2036 | Name[gu]=નેપોમુક માહિતી ફેરવવાનું નિષ્ફળ | |
2037 | Name[hi]=नेपोमक डाटा परिवर्तित करने में असफल | |
2038 | Name[hne]=नेपोमक डाटा ल बदले मं फेल होगे | |
2039 | +Name[hr]=Pretvaranje Nepomukovih podataka nije uspjelo. | |
2040 | Name[hsb]=Konwertěrowanje Nepomukowych datow zwrěšćene | |
2041 | Name[hu]=Adatkonvertálási hiba történt a Nepomukban | |
2042 | Name[is]=Umbreyting Nepomuk gagna mistókst | |
2043 | @@ -570,6 +579,7 @@ | |
2044 | Comment[gu]=નેપોમુક માહિતીને નવાં બેકએન્ડમાં ફેરવવાનું નિષ્ફળ ગયું | |
2045 | Comment[hi]=नेपोमक डाटा को नए बैकएण्ड में परिवर्तित करने में असफल | |
2046 | Comment[hne]=नेपोमक डाटा ल नवा बेकएंड मं बदले मं फेल होगे | |
2047 | +Comment[hr]=Pretvaranje Nepomukovih podataka u novi format nije uspjelo. | |
2048 | Comment[hsb]=Konwertěrowanje Nepomukowych datow za nowy backend je zwrěšćiło. | |
2049 | Comment[hu]=Ne sikerült átkonvertálni Nepomuk-adatokat egy új kezelőmodul számára | |
2050 | Comment[is]=Umbreyting Nepomuk gagna fyrir nýjan bakenda mistókst | |
2051 | @@ -632,6 +642,7 @@ | |
2052 | Name[gu]=નેપોમુક માહિતી ફેરવવાનું પૂર્ણ | |
2053 | Name[hi]=नेपोमक डाटा परिवर्तित हो गया | |
2054 | Name[hne]=नेपोमक डाटा बदल दे गिस | |
2055 | +Name[hr]=Pretvarane Nepomukovih podataka je završilo. | |
2056 | Name[hsb]=Konwertěrowanje Nepomukowych datow zakónčene | |
2057 | Name[hu]=Nepomuk adatkonverzió befejeződött | |
2058 | Name[is]=Umbreyting Nepomuk gagna er lokið | |
2059 | @@ -691,6 +702,7 @@ | |
2060 | Comment[gu]=નેપોમુક માહિતીને નવા બેકએન્ડમાં સફળતાપૂર્વક ફેરવી દેવામાં આવી | |
2061 | Comment[hi]=नेपोमक डाटा को नए बैकएण्ड में सफलतापूर्वक परिवर्तित किया गया | |
2062 | Comment[hne]=नवा बेकएंड मं नेपोमक डाटा ल सफलता से बदल दे गिस | |
2063 | +Comment[hr]=Nepomukovi podaci su uspješno pretvoreni u novi format. | |
2064 | Comment[hsb]=Konwertěrowanje Nepomukowych datow za nowy backend wuspěšne. | |
2065 | Comment[hu]=Sikerült átkonvertálni minden Nepomuk-adatot az új tárolómodulhoz | |
2066 | Comment[is]=Umbreyting Nepomuk gagna fyrir nýjan bakenda tókst | |
2067 | --- runtime/nepomuk/services/storage/repository.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2068 | +++ runtime/nepomuk/services/storage/repository.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2069 | @@ -279,6 +279,7 @@ | |
2070 | ||
2071 | void Nepomuk::Repository::rebuildingIndexFinished() | |
2072 | { | |
2073 | +#if defined(HAVE_SOPRANO_INDEX) && defined(HAVE_CLUCENE) && SOPRANO_IS_VERSION(2,1,64) | |
2074 | KNotification::event( "rebuldingNepomukIndexDone", | |
2075 | i18nc("@info - notification message", | |
2076 | "Rebuilding Nepomuk full text search index for new features done."), | |
2077 | @@ -291,6 +292,7 @@ | |
2078 | // inform that we are open and done | |
2079 | m_state = OPEN; | |
2080 | emit opened( this, true ); | |
2081 | +#endif | |
2082 | } | |
2083 | ||
2084 | ||
2085 | --- runtime/nepomuk/services/storage/nepomukstorage.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2086 | +++ runtime/nepomuk/services/storage/nepomukstorage.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2087 | @@ -29,6 +29,7 @@ | |
2088 | Name[he]=שירותי אחסון של Nepomuk | |
2089 | Name[hi]=नेपोमक डाटा भंडार | |
2090 | Name[hne]=नेपोमक डाटा भंडार | |
2091 | +Name[hr]=Nepomuk Pohrana Podataka | |
2092 | Name[hsb]=Nepomuk składowanje datow | |
2093 | Name[hu]=Nepomuk adattároló | |
2094 | Name[is]=Nepomuk gagnageymsla | |
2095 | @@ -92,6 +93,7 @@ | |
2096 | Comment[he]=הליבה של שירותי אחסון המידע של Nepomuk | |
2097 | Comment[hi]=कोर नेपोमक डाटा भंडार सेवा | |
2098 | Comment[hne]=कोर नेपोमक डाटा भंडार सेवा | |
2099 | +Comment[hr]=Nepomukova sržna usluga pohrane podataka | |
2100 | Comment[hsb]=Centralna Nepomukowa słužba za składowanje datow | |
2101 | Comment[hu]=Nepomuk adattároló alapszolgáltatás | |
2102 | Comment[is]=Kjarni Nepomuk gagnageymslumiðlunar | |
2103 | --- runtime/nepomuk/services/filewatch/nepomukfilewatch.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2104 | +++ runtime/nepomuk/services/filewatch/nepomukfilewatch.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2105 | @@ -13,6 +13,7 @@ | |
2106 | Name[gu]=નેપોમુકફાઇલવોચ | |
2107 | Name[hi]=नेपोमक-फ़ाइल-वाच | |
2108 | Name[hne]=नेपोमकफाइलवाच | |
2109 | +Name[hr]=Nepomuk nadgledanje datoteka | |
2110 | Name[is]=Nepomuk skráavörður | |
2111 | Name[kn]=ನೆಪೋಮುಕ್ ಕಡತ ಕಾವಲು | |
2112 | Name[ku]=NepomukNihêrînaPelê | |
2113 | @@ -53,6 +54,7 @@ | |
2114 | Comment[gu]=નેપોમુક ફાઇલ વોચ સર્વિસ ફાઇલ ફેરફારો પર નજર રાખે છે | |
2115 | Comment[hi]=फ़ाइल परिवर्तनों की मॉनिटरिंग के लिए नेपोमक फ़ाइल निगरानी सेवा | |
2116 | Comment[hne]=फाइल मं बदलाव बर नेपोमक फाइल देखइया सेवा | |
2117 | +Comment[hr]=Nepomukova usluga nadgledanja datoteka za otkrivanje promjena nad istima | |
2118 | Comment[hsb]=Nepomukowe wobkedźbowanje datajow za zwěsćenje změnow | |
2119 | Comment[hu]=Nepomuk fájlfigyelő szolgáltatás fájlváltozások követéséhez | |
2120 | Comment[is]=Nepomuk skráavarslan fylgist með breytingum á skrám | |
2121 | --- runtime/nepomuk/services/queryservice/searchcore.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2122 | +++ runtime/nepomuk/services/queryservice/searchcore.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2123 | @@ -31,7 +31,7 @@ | |
2124 | { | |
2125 | public: | |
2126 | Private() | |
2127 | - : cutOffScore( 0.25 ), | |
2128 | + : cutOffScore( 0.0 ), | |
2129 | active( false ), | |
2130 | canceled( false ) { | |
2131 | } | |
2132 | --- runtime/nepomuk/services/queryservice/searchcore.h (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2133 | +++ runtime/nepomuk/services/queryservice/searchcore.h (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2134 | @@ -58,7 +58,7 @@ | |
2135 | void cancel(); | |
2136 | ||
2137 | /** | |
2138 | - * Default: 0.25 | |
2139 | + * Default: 0.0 | |
2140 | */ | |
2141 | void setCutOffScore( double score ); | |
2142 | ||
2143 | --- runtime/nepomuk/services/queryservice/nepomukqueryservice.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2144 | +++ runtime/nepomuk/services/queryservice/nepomukqueryservice.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2145 | @@ -16,6 +16,7 @@ | |
2146 | Name[gu]=નેપોમુકપ્રશ્નસેવા | |
2147 | Name[hi]=नेपोमक-क्वैरी-सेवाएँ | |
2148 | Name[hne]=नेपोमक-क्वेरी-सर्विस | |
2149 | +Name[hr]=Nepomuk Upitna Usluga | |
2150 | Name[hu]=Nepomuk-lekérdezés | |
2151 | Name[is]=Nepomuk fyrirspurnamiðlari | |
2152 | Name[ja]=Nepomuk クエリサービス | |
2153 | @@ -57,6 +58,7 @@ | |
2154 | Comment[ga]=Soláthraíonn Seirbhís Iarratais Nepomuk comhéadan le fillteáin sheasmhacha iarratais | |
2155 | Comment[gl]=O servizo de procura de Nepomuk fornece unha interface para cartafoles persistente de procuras | |
2156 | Comment[hi]=नेपोमक क्वैरी सेवा जो परसिस्टैंस क्वैरी फ़ोल्डरों को इंटरफेस प्रदान करता है | |
2157 | +Comment[hr]=Nepomuk Upitna Usluga pruža sučelje za trajne upitne direktorije | |
2158 | Comment[hsb]=Nepomukowa naprašowanska słužba staji intefejs za persistentne naprašowanske zapiski k dispoziciji. | |
2159 | Comment[hu]=A Nepomuk lekérdező szolgáltatás keresőmappákhoz nyújt felületet | |
2160 | Comment[is]=Nepomuk fyrirspurnamiðlarinn er viðmót fyrir viðvarandi fyrirspurnamöppur (persistent query folders) | |
2161 | --- runtime/nepomuk/services/migration1/nepomukmigration1.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2162 | +++ runtime/nepomuk/services/migration1/nepomukmigration1.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2163 | @@ -26,6 +26,7 @@ | |
2164 | Comment[gu]=નેપોમુક માહિતી વહન સ્તર ૧ | |
2165 | Comment[hi]=नेपोमक डाटा माइग्रेशन स्तर 1 | |
2166 | Comment[hne]=नेपोमक डाटा माइग्रेसन लेवल १ | |
2167 | +Comment[hr]=Nepomuk Seoba Podataka Razina 1 | |
2168 | Comment[hsb]=Nepomuk migracija datow runina 1 | |
2169 | Comment[hu]=Nepomuk adatmigráció 1. szint | |
2170 | Comment[is]=Nepomuk gagnaflutningur, stig 1 | |
2171 | --- runtime/nepomuk/server/nepomukserver.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2172 | +++ runtime/nepomuk/server/nepomukserver.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2173 | @@ -97,6 +97,7 @@ | |
2174 | Comment[gu]=નેપોમુક સર્વર સંગ્રહ સેવાઓ અને સ્ટ્રીગી નિયંત્રણો પૂરાં પાડે છે | |
2175 | Comment[hi]=नेपोमक सर्वर - भंडारण सेवाएँ तथा स्ट्रिगि नियंत्रण प्रदान करता है | |
2176 | Comment[hne]=नेपोमक सर्वर जउन भंडार सेवा अउ स्ट्रिगि कंट्रोल देथे | |
2177 | +Comment[hr]=Nepomuk poslužitelj koji pruža usluge pohrane i upravljanja Strigijem | |
2178 | Comment[hsb]=Nepomuk-serwer staji składowanske słužby a strigi-kontrolu k dispoziciji. | |
2179 | Comment[hu]=A Nepomuk szolgáltatás tárolási lehetőséget biztosít és a Strigi vezérlését végzi | |
2180 | Comment[is]=Nepomuk miðlarinn heldur utanum geymsluþjónustur og Strigi stýringu | |
2181 | --- runtime/nepomuk/kcm/nepomukserverkcm.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2182 | +++ runtime/nepomuk/kcm/nepomukserverkcm.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2183 | @@ -24,7 +24,6 @@ | |
2184 | #include <KPluginLoader> | |
2185 | #include <KAboutData> | |
2186 | #include <KSharedConfig> | |
2187 | -#include <KLed> | |
2188 | #include <KMessageBox> | |
2189 | ||
2190 | #include <QtGui/QTreeView> | |
2191 | @@ -51,6 +50,30 @@ | |
2192 | expandRecursively( index.parent(), view ); | |
2193 | } | |
2194 | } | |
2195 | + | |
2196 | + bool isDirHidden( const QString& dir ) { | |
2197 | + QDir d( dir ); | |
2198 | + while ( !d.isRoot() ) { | |
2199 | + if ( QFileInfo( d.path() ).isHidden() ) | |
2200 | + return true; | |
2201 | + if ( !d.cdUp() ) | |
2202 | + return false; // dir does not exist or is not readable | |
2203 | + } | |
2204 | + return false; | |
2205 | + } | |
2206 | + | |
2207 | + QStringList removeHiddenFolders( const QStringList& folders ) { | |
2208 | + QStringList newFolders( folders ); | |
2209 | + for ( QStringList::iterator it = newFolders.begin(); it != newFolders.end(); /* do nothing here */ ) { | |
2210 | + if ( isDirHidden( *it ) ) { | |
2211 | + it = newFolders.erase( it ); | |
2212 | + } | |
2213 | + else { | |
2214 | + ++it; | |
2215 | + } | |
2216 | + } | |
2217 | + return newFolders; | |
2218 | + } | |
2219 | } | |
2220 | ||
2221 | ||
2222 | @@ -137,6 +160,17 @@ | |
2223 | strigiConfig.group( "General" ).readPathEntry( "exclude folders", QStringList() ) ); | |
2224 | m_editStrigiExcludeFilters->setItems( strigiConfig.group( "General" ).readEntry( "exclude filters", defaultExcludeFilters() ) ); | |
2225 | ||
2226 | + // make sure we do not have a hidden folder to expand which would make QFileSystemModel crash | |
2227 | + // + it would be weird to have a hidden folder indexed but not shown | |
2228 | + if ( !m_checkShowHiddenFolders->isChecked() ) { | |
2229 | + foreach( const QString& dir, m_folderModel->includeFolders() + m_folderModel->excludeFolders() ) { | |
2230 | + if ( isDirHidden( dir ) ) { | |
2231 | + m_checkShowHiddenFolders->setChecked( true ); | |
2232 | + break; | |
2233 | + } | |
2234 | + } | |
2235 | + } | |
2236 | + | |
2237 | // make sure that the tree is expanded to show all selected items | |
2238 | foreach( const QString& dir, m_folderModel->includeFolders() + m_folderModel->excludeFolders() ) { | |
2239 | expandRecursively( m_folderModel->index( dir ), m_viewIndexFolders ); | |
2240 | @@ -150,6 +184,15 @@ | |
2241 | ||
2242 | void Nepomuk::ServerConfigModule::save() | |
2243 | { | |
2244 | + QStringList includeFolders = m_folderModel->includeFolders(); | |
2245 | + QStringList excludeFolders = m_folderModel->excludeFolders(); | |
2246 | + | |
2247 | + // 0. remove all hidden dirs from the folder lists if hidden folders are not to be indexed | |
2248 | + if ( !m_checkShowHiddenFolders->isChecked() ) { | |
2249 | + includeFolders = removeHiddenFolders( includeFolders ); | |
2250 | + excludeFolders = removeHiddenFolders( excludeFolders ); | |
2251 | + } | |
2252 | + | |
2253 | // 1. change the settings (in case the server is not running) | |
2254 | KConfig config( "nepomukserverrc" ); | |
2255 | config.group( "Basic Settings" ).writeEntry( "Start Nepomuk", m_checkEnableNepomuk->isChecked() ); | |
2256 | @@ -158,8 +201,8 @@ | |
2257 | ||
2258 | // 2. update Strigi config | |
2259 | KConfig strigiConfig( "nepomukstrigirc" ); | |
2260 | - strigiConfig.group( "General" ).writePathEntry( "folders", m_folderModel->includeFolders() ); | |
2261 | - strigiConfig.group( "General" ).writePathEntry( "exclude folders", m_folderModel->excludeFolders() ); | |
2262 | + strigiConfig.group( "General" ).writePathEntry( "folders", includeFolders ); | |
2263 | + strigiConfig.group( "General" ).writePathEntry( "exclude folders", excludeFolders ); | |
2264 | strigiConfig.group( "General" ).writeEntry( "exclude filters", m_editStrigiExcludeFilters->items() ); | |
2265 | strigiConfig.group( "General" ).writeEntry( "index hidden folders", m_checkShowHiddenFolders->isChecked() ); | |
2266 | ||
2267 | --- runtime/kstyles/themes/mega.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2268 | +++ runtime/kstyles/themes/mega.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2269 | @@ -27,6 +27,7 @@ | |
2270 | Name[he]=סגנון MegaGradient בעל צבעים גבוהים | |
2271 | Name[hi]=मेगाग्रंडिएंट उच्चरंग शैली | |
2272 | Name[hne]=मेगाग्रेडिएंट हाईकलर सैली | |
2273 | +Name[hr]=MegaGradient obojeni stil | |
2274 | Name[hsb]=MegaGradient wjelebarbny stil | |
2275 | Name[hu]=MegaGradiens sokszínű stílus | |
2276 | Name[is]=MegaLitstigull hálitastíll | |
2277 | --- runtime/kstyles/themes/light-v2.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2278 | +++ runtime/kstyles/themes/light-v2.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2279 | @@ -25,6 +25,7 @@ | |
2280 | Name[he]=סגנון קליל, גרסה שנייה | |
2281 | Name[hi]=लाइट शैली, 2रा संशोधन | |
2282 | Name[hne]=लाइट स्टाइल, २ रा संस्करन | |
2283 | +Name[hr]=Svjetli stil, 2. verzija | |
2284 | Name[hsb]=Light Style, druha wersija | |
2285 | Name[hu]=Light stílus (2. verzió) | |
2286 | Name[is]=Léttur stíll, 2 útgáfa | |
2287 | @@ -91,6 +92,7 @@ | |
2288 | Comment[he]=הגרסה השנייה של הסגנון הפשוט והאלגנטי, ערכת הפקדים ה"קלילה". | |
2289 | Comment[hi]=सादा और सुरूचिकर 'लाइट' विजेट शैली का दूसरा संशोधन. | |
2290 | Comment[hne]=लाइट विजेट स्टाइल के सादा अउ एलिगेंट विजेट सैली के दूसरा संस्करन | |
2291 | +Comment[hr]=Druga verzija jednostavnog i elegantnog svjetlog stila grafičkih elemenata. | |
2292 | Comment[hsb]=Druha wersija jednoreho a elegantneho 'Light' stila. | |
2293 | Comment[hu]=Az egyszerű, de elegáns Light elemstílus 2. verziója. | |
2294 | Comment[is]=Önnur útgáfa af fáguðum og einföldum 'Létta' stílnum | |
2295 | --- runtime/kstyles/themes/light-v3.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2296 | +++ runtime/kstyles/themes/light-v3.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2297 | @@ -25,6 +25,7 @@ | |
2298 | Name[he]=סגנון קליל, גרסה שלישית | |
2299 | Name[hi]=लाइट शैली, 3रा संशोधन | |
2300 | Name[hne]=लाइट स्टाइल, ३ रा संस्करन | |
2301 | +Name[hr]=Svjetli stil, 3. verzija | |
2302 | Name[hsb]=Light Style, třeća wersija | |
2303 | Name[hu]=Light stílus (3. verzió) | |
2304 | Name[is]=Léttur stíll, 3 útgáfa | |
2305 | @@ -91,6 +92,7 @@ | |
2306 | Comment[he]=הגרסה השלישית של הסגנון הפשוט והאלגנטי, ערכת הפקדים ה"קלילה". | |
2307 | Comment[hi]=सादा और सुरूचिकर 'लाइट' विजेट शैली का तीसरा संशोधन. | |
2308 | Comment[hne]=लाइट विजेट स्टाइल के सादा अउ एलिगेंट विजेट सैली के तीसरा संस्करन | |
2309 | +Comment[hr]=Treća verzija jednostavnog i elegantnog svjetlog stila grafičkih elemenata. | |
2310 | Comment[hsb]=Třeća wersija jednoreho a elegantneho 'Light' stila. | |
2311 | Comment[hu]=Az egyszerű, de elegáns Light elemstílus 3. verziója. | |
2312 | Comment[is]=Þriðja útgáfa af fáguðum og einföldum 'Léttum' stíl. | |
2313 | --- runtime/kstyles/themes/highcolor.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2314 | +++ runtime/kstyles/themes/highcolor.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2315 | @@ -25,6 +25,7 @@ | |
2316 | Name[he]=צבע גבוהה קלאסי | |
2317 | Name[hi]=उच्च-रंग क्लासिक | |
2318 | Name[hne]=जादा-रंग क्लासिक | |
2319 | +Name[hr]=Klasična obojanost | |
2320 | Name[hu]=Sokszínű Classic | |
2321 | Name[is]=Sterklita klassík | |
2322 | Name[it]=Classico HighColor | |
2323 | @@ -89,6 +90,7 @@ | |
2324 | Comment[he]=גרסה בעלת צבע גבוהה של הערכה הקלאסית | |
2325 | Comment[hi]=क्लाशिक शैली का उच्च-रंग संस्करण | |
2326 | Comment[hne]=क्लासिक सैली के जादा-रंग संस्करन | |
2327 | +Comment[hr]=Obojana verzija klasičnog stila | |
2328 | Comment[hsb]=Wjelebarbna wersija klasiskeho stila | |
2329 | Comment[hu]=A Classic stílus sok színt használó változata | |
2330 | Comment[is]=Klassískur stíll í sterkum litum | |
2331 | --- runtime/kstyles/themes/qtplatinum.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2332 | +++ runtime/kstyles/themes/qtplatinum.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2333 | @@ -54,6 +54,7 @@ | |
2334 | Comment[he]=ערכה מובנית בסגנון Platinum | |
2335 | Comment[hi]=अंतर्निर्मित बगैर-प्रसंग प्लेटिनम शैली | |
2336 | Comment[hne]=बिना थीम के भीतरे मं बने प्लेटिनम सैली | |
2337 | +Comment[hr]=Ugrađeni netematski Platinum stil | |
2338 | Comment[hsb]=Integrowany Platinum-stil bjez temow | |
2339 | Comment[hu]=Beépített Platinum stílus | |
2340 | Comment[is]=Innbyggður óþemaður Platínu stíll | |
2341 | --- runtime/kstyles/themes/qtwindows.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2342 | +++ runtime/kstyles/themes/qtwindows.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2343 | @@ -39,6 +39,7 @@ | |
2344 | Comment[he]=מובנה חסר ערכת־נושא בסגנון חלונות 9x | |
2345 | Comment[hi]=अंतर्निर्मित विंडोज़ 9x शैली | |
2346 | Comment[hne]=बिना थीम के भीतरे मं बने विंडोज९xीई सैली | |
2347 | +Comment[hr]=Ugrađeni netematski Windows 9x stil | |
2348 | Comment[hsb]=Integrowany WIndows 9x stil bjez temow | |
2349 | Comment[hu]=Beépített Windows 9x stílus | |
2350 | Comment[is]=Innbyggður óþemaður Windows 9x stíll | |
2351 | --- runtime/kstyles/themes/qtcde.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2352 | +++ runtime/kstyles/themes/qtcde.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2353 | @@ -34,6 +34,7 @@ | |
2354 | Comment[he]=מובנה בסגנון CDE | |
2355 | Comment[hi]=अंतर्निर्मित बगैर-प्रसंग सीडीई शैली | |
2356 | Comment[hne]=बिना थीम के भीतरे मं बने सीडीई सैली | |
2357 | +Comment[hr]=Ugrađeni netematski CDE stil | |
2358 | Comment[hsb]=Integrowany CDE-stil bjez temow | |
2359 | Comment[hu]=Beépített CDE stílus | |
2360 | Comment[is]=Innbyggður óþemaður CDE stíll | |
2361 | --- runtime/kstyles/themes/keramik.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2362 | +++ runtime/kstyles/themes/keramik.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2363 | @@ -58,6 +58,7 @@ | |
2364 | Comment[he]=סגנון המשתמש מיזוג צבעים | |
2365 | Comment[hi]=अल्फाबेंडिंग के उपयोग से डिफ़ॉल्ट शैली | |
2366 | Comment[hne]=एक स्टाइल जे हर अल्फाब्लेंडिंग उपयोग करथे | |
2367 | +Comment[hr]=Stil koji koristi blendiranje | |
2368 | Comment[hsb]=Stil z alphablendingom | |
2369 | Comment[hu]=Áttetszőséget használó stílus | |
2370 | Comment[is]=Stíll sem notar blöndun með gegnsæi | |
2371 | --- runtime/kstyles/themes/qtmotif.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2372 | +++ runtime/kstyles/themes/qtmotif.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2373 | @@ -39,6 +39,7 @@ | |
2374 | Comment[he]=מובנה בסגנון Motif ללא ערכת נושא | |
2375 | Comment[hi]=अंतर्निर्मित बगैर-प्रसंग मोटिफ शैली | |
2376 | Comment[hne]=बिना थीम के भीतरे मं बने मोटिफ सैली | |
2377 | +Comment[hr]=Ugrađeni netematski Motif stil | |
2378 | Comment[hsb]=Integrowany Motif-stil bjez temy | |
2379 | Comment[hu]=Beépített Motif stílus | |
2380 | Comment[is]=Innbyggður óþemaður Mótíf stíll | |
2381 | --- runtime/kstyles/themes/b3.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2382 | +++ runtime/kstyles/themes/b3.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2383 | @@ -36,6 +36,7 @@ | |
2384 | Comment[he]=B3/שינוי של B2 | |
2385 | Comment[hi]=B3/ B2 का संशोधन | |
2386 | Comment[hne]=बी३/बी२ मं सुधार | |
2387 | +Comment[hr]=B3/Promjena B2 | |
2388 | Comment[hsb]=B3/modifikacija wot B2 | |
2389 | Comment[hu]=B3: Feljavított B2 stílus | |
2390 | Comment[is]=B3/Breyting á B2 | |
2391 | --- runtime/kstyles/themes/qtmotifplus.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2392 | +++ runtime/kstyles/themes/qtmotifplus.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2393 | @@ -46,6 +46,7 @@ | |
2394 | Comment[he]=ערכה מובנית בסגנון Motig משופר | |
2395 | Comment[hi]=अंतर्निर्मित एनहेंस्ड मोटिफ शैली | |
2396 | Comment[hne]=भीतरे मं बने एनहेंस्ड मोटिफ सैली | |
2397 | +Comment[hr]=Ugrađeni poboljšani Motif stil | |
2398 | Comment[hsb]=Integrowany, polěpšeny Motif-stil | |
2399 | Comment[hu]=Beépített Motif stílus | |
2400 | Comment[is]=Innbyggður endurbættur Mótíf stíll | |
2401 | --- runtime/kstyles/themes/qtsgi.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2402 | +++ runtime/kstyles/themes/qtsgi.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2403 | @@ -34,6 +34,7 @@ | |
2404 | Comment[he]=מובנה בסגנון SGI | |
2405 | Comment[hi]=अंतर्निर्मित एसजीआई शैली | |
2406 | Comment[hne]=भीतरे मं बने एसजीआई सैली | |
2407 | +Comment[hr]=Ugrađeni SGI stil | |
2408 | Comment[hsb]=Integrowany SGI-stil | |
2409 | Comment[hu]=Beépített SGI stílus | |
2410 | Comment[is]=Innbyggður SGI stíll | |
2411 | --- runtime/kstyles/oxygen/oxygen.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2412 | +++ runtime/kstyles/oxygen/oxygen.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2413 | @@ -53,6 +53,7 @@ | |
2414 | Comment[he]=הסגנון של הדור הבא של שולחן העבודה | |
2415 | Comment[hi]=अगली पीढ़ी के डेस्कटॉप की शैलियाँ | |
2416 | Comment[hne]=अगला जनरेसन डेस्कटाप के स्टाइलिंग | |
2417 | +Comment[hr]=Stil sljedeće generacije radnih okruženja | |
2418 | Comment[hsb]=Stil za dźěłowy powjerch přichodneje generacije | |
2419 | Comment[hu]=Új generációs stílus | |
2420 | Comment[is]=Stílar fyrir næstu kynslóðar skjáborð | |
2421 | --- runtime/kstyles/oxygen/oxygen.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2422 | +++ runtime/kstyles/oxygen/oxygen.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2423 | @@ -322,6 +322,7 @@ | |
2424 | p->setClipRegion(rbOpt->rect); | |
2425 | p->drawRect(rbOpt->rect.adjusted(0,0,-1,-1)); | |
2426 | p->restore(); | |
2427 | + return; | |
2428 | } | |
2429 | break; | |
2430 | } | |
2431 | @@ -354,6 +355,7 @@ | |
2432 | cb->palette, cb->state & State_Enabled, cb->currentText); | |
2433 | } | |
2434 | p->restore(); | |
2435 | + return; | |
2436 | } | |
2437 | break; | |
2438 | } | |
2439 | --- runtime/kstyles/web/web.themerc (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2440 | +++ runtime/kstyles/web/web.themerc (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2441 | @@ -99,6 +99,7 @@ | |
2442 | Comment[he]=סגנון Widget אינטרנטי | |
2443 | Comment[hi]=वेब विज़ेट शैली | |
2444 | Comment[hne]=वेब विजेट सैली | |
2445 | +Comment[hr]=Stil web grafičkih elemenata | |
2446 | Comment[hsb]=Web - widgetowy stil | |
2447 | Comment[hu]=Webes elemstílus | |
2448 | Comment[is]=Vefgræju stíll | |
2449 | --- runtime/kurifilter-plugins/ikws/searchproviders/bugft.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2450 | +++ runtime/kurifilter-plugins/ikws/searchproviders/bugft.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2451 | @@ -80,6 +80,7 @@ | |
3e56ecee AM |
2452 | Name[zh_CN]=KDE Bug 数据库全文检索 |
2453 | Name[zh_TW]=KDE 臭蟲資料庫全文檢索 | |
87b537f7 AM |
2454 | Query=http://bugs.kde.org/buglist.cgi?quicksearch=\\{@} |
2455 | +Query[hr]=http://bugs.kde.org/show_bug.cgi?id=\\{@} | |
2456 | Query[x-test]=xxhttp://bugs.kde.org/buglist.cgi?quicksearch=\\{@}xx | |
2457 | X-KDE-ServiceTypes=SearchProvider | |
2458 | Type=Service | |
2459 | --- runtime/kurifilter-plugins/ikws/searchproviders/bugno.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2460 | +++ runtime/kurifilter-plugins/ikws/searchproviders/bugno.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2461 | @@ -82,6 +82,7 @@ | |
3e56ecee AM |
2462 | Name[zh_CN]=KDE Bug 数据库按 Bug 编号搜索 |
2463 | Name[zh_TW]=KDE 臭蟲資料庫按錯誤編號搜索 | |
87b537f7 AM |
2464 | Query=https://bugs.kde.org/show_bug.cgi?id=\\{@} |
2465 | +Query[hr]=http://bugs.kde.org/show_bug.cgi?id=\\{@} | |
2466 | Query[it]=http://bugs.kde.org/show_bug.cgi?id=\\{@} | |
2467 | Query[tg]=http://bugs.kde.org/show_bug.cgi?id=\\{@} | |
2468 | Query[x-test]=xxhttps://bugs.kde.org/show_bug.cgi?id=\\{@}xx | |
2469 | --- runtime/kurifilter-plugins/ikws/searchproviders/fr2de.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2470 | +++ runtime/kurifilter-plugins/ikws/searchproviders/fr2de.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2471 | @@ -29,7 +29,7 @@ | |
2472 | Name[he]=LEO - תרגום בין צרפתית וגרמנית | |
2473 | Name[hi]=लिओ - फ्रांसीसी तथा जर्मनी के बीच अनुवाद | |
2474 | Name[hne]=लिओ - फ्रांसीसी अउ जर्मनी के बीच अनुवाद | |
2475 | -Name[hr]=LEO - Prevođenje između francuskog i njemačkog | |
2476 | +Name[hr]=LEO – Prevođenje između francuskog i njemačkog | |
2477 | Name[hsb]=LEO - přełožowanje z francošćiny a němčiny | |
2478 | Name[hu]=LEO - Fordítás franciáról németre (mindkét irányban) | |
2479 | Name[is]=LEO - Þýða á milli frönsku og þýsku | |
2480 | --- runtime/kurifilter-plugins/ikws/searchproviders/docbook.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2481 | +++ runtime/kurifilter-plugins/ikws/searchproviders/docbook.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2482 | @@ -26,7 +26,7 @@ | |
2483 | Name[he]=DocBook - המדריך האולטימטיבי | |
2484 | Name[hi]=डॉकबुक - निर्णायक मार्गदर्शक | |
2485 | Name[hne]=डाकबुक - निर्नायक मार्गदर्सक | |
2486 | -Name[hr]=DocBook - Definitivni vodič | |
2487 | +Name[hr]=DocBook – Definitivni vodič | |
2488 | Name[is]=DocBook - Opinbera handbókin | |
2489 | Name[it]=DocBook - La guida definitiva | |
2490 | Name[ja]=DocBook - 完全ガイド | |
2491 | --- runtime/kurifilter-plugins/ikws/searchproviders/multitran-esru.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2492 | +++ runtime/kurifilter-plugins/ikws/searchproviders/multitran-esru.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2493 | @@ -29,7 +29,7 @@ | |
2494 | Name[he]=Multitran - תרגום בין ספרדית לרוסית | |
2495 | Name[hi]=मल्टीट्रान - रूसी तथा स्पेनी के बीच अनुवाद | |
2496 | Name[hne]=मल्टीट्रान - स्पेनी अउ रूसी के बीच अनुवाद | |
2497 | -Name[hr]=Multitran - Prevođenje između španjolskog i ruskog | |
2498 | +Name[hr]=Multitran – Prevođenje između španjolskog i ruskog | |
2499 | Name[hsb]=Multitran - přełožowanje ze španšćiny a rušćiny | |
2500 | Name[hu]=Multitran - Fordítás spanyolról oroszra (mindkét irányban) | |
2501 | Name[is]=Multitran - Þýða á milli spænsku og rússnesku | |
2502 | --- runtime/kurifilter-plugins/ikws/searchproviders/wiktionary.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2503 | +++ runtime/kurifilter-plugins/ikws/searchproviders/wiktionary.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2504 | @@ -30,7 +30,7 @@ | |
2505 | Name[he]=ויקימילון - המילון החופשי | |
2506 | Name[hi]=विकिपेडिया- मुफ्त विश्वकोश | |
2507 | Name[hne]=विकिपेडिया- फोकट विस्वकोस | |
2508 | -Name[hr]=Wiktionary - besplatna enciklopedija | |
2509 | +Name[hr]=Wiktionary – besplatna enciklopedija | |
2510 | Name[hsb]=Wikisłownik - Swobodny słownik | |
2511 | Name[hu]=Wiktionary | |
2512 | Name[is]=Wiktionary - Frjálsa orðabókin | |
2513 | --- runtime/kurifilter-plugins/ikws/searchproviders/multitran-deru.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2514 | +++ runtime/kurifilter-plugins/ikws/searchproviders/multitran-deru.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2515 | @@ -29,7 +29,7 @@ | |
2516 | Name[he]=Multitran - תרגם מין גרמנית לרוסית | |
2517 | Name[hi]=मल्टीट्रान - जर्मनी तथा रूसी के बीच अनुवाद | |
2518 | Name[hne]=मल्टीट्रान - जर्मनी अउ रूसी के बीच अनुवाद | |
2519 | -Name[hr]=Multitran - Prevođenje između njemačkog i ruskog | |
2520 | +Name[hr]=Multitran – Prevođenje između njemačkog i ruskog | |
2521 | Name[hsb]=Multitran - přełožowanje z němčiny a rušćiny | |
2522 | Name[hu]=Multitran - Fordítás németről oroszra (mindkét irányban) | |
2523 | Name[is]=Multitran - Þýða á milli þýsku og rússnesku | |
2524 | --- runtime/kurifilter-plugins/ikws/searchproviders/ethicle.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2525 | +++ runtime/kurifilter-plugins/ikws/searchproviders/ethicle.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2526 | @@ -14,4 +14,5 @@ | |
3e56ecee | 2527 | X-KDE-ServiceTypes=SearchProvider |
87b537f7 AM |
2528 | Keys=et,ethicle |
2529 | Query=http://www.ethicle.com/search.php?q=\\{@} | |
2530 | +Query[hr]=http://info.alexa.com/search?q=\\{@} | |
2531 | Query[x-test]=xxhttp://www.ethicle.com/search.php?q=\\{@}xx | |
2532 | --- runtime/kurifilter-plugins/ikws/searchproviders/mamma.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2533 | +++ runtime/kurifilter-plugins/ikws/searchproviders/mamma.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2534 | @@ -27,7 +27,7 @@ | |
2535 | Name[he]=Mamma - אם כל מנועי החיפוש | |
2536 | Name[hi]=मम्मा- सभी खोज इंजिन की अम्मा | |
2537 | Name[hne]=मम्मा- सब्बो खोज इंजिन के अम्मा | |
2538 | -Name[hr]=Mamma - Majka svih tražilica | |
2539 | +Name[hr]=Mamma – Majka svih tražilica | |
2540 | Name[hu]=Mamma | |
2541 | Name[is]=Mamma - Mamma allra leitarvéla | |
2542 | Name[it]=Mamma - Madre di tutti i motori di ricerca | |
2543 | --- runtime/kurifilter-plugins/ikws/searchproviders/multitran-frru.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2544 | +++ runtime/kurifilter-plugins/ikws/searchproviders/multitran-frru.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2545 | @@ -29,7 +29,7 @@ | |
2546 | Name[he]=Multitran - תרגום בין צרפתית ורוסית | |
2547 | Name[hi]=मल्टीट्रान - फ्रांसीसी तथा रूसी के बीच अनुवाद | |
2548 | Name[hne]=मल्टीट्रान - फ्रांसीसी अउ रूसी के बीच अनुवाद | |
2549 | -Name[hr]=Multitran - Prevođenje između francuskog i ruskog | |
2550 | +Name[hr]=Multitran – Prevođenje između francuskog i ruskog | |
2551 | Name[hsb]=Multitran - přełožowanje z francošćiny a rušćiny | |
2552 | Name[hu]=Multitran - Fordítás franciáról oroszra (mindkét irányban) | |
2553 | Name[is]=Multitran - Þýða á milli frönsku og rússnesku | |
2554 | --- runtime/kurifilter-plugins/ikws/searchproviders/multitran-nlru.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2555 | +++ runtime/kurifilter-plugins/ikws/searchproviders/multitran-nlru.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2556 | @@ -29,7 +29,7 @@ | |
2557 | Name[he]=Multitran - תרגום בין הולנדית ורוסית | |
2558 | Name[hi]=मल्टीट्रान - डच तथा रूसी के बीच अनुवाद | |
2559 | Name[hne]=मल्टीट्रान - डच अउ रूसी के बीच अनुवाद | |
2560 | -Name[hr]=Multitran - Prevođenje između nizozemskog i ruskog | |
2561 | +Name[hr]=Multitran – Prevođenje između nizozemskog i ruskog | |
2562 | Name[hsb]=Multitran - přełožowanje z nižozemčiny a rušćiny | |
2563 | Name[hu]=Multitran - Fordítás hollandról oroszra (mindkét irányban) | |
2564 | Name[is]=Multitran - Þýða á milli hollensku og rússnesku | |
2565 | --- runtime/kurifilter-plugins/ikws/searchproviders/cpan.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2566 | +++ runtime/kurifilter-plugins/ikws/searchproviders/cpan.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2567 | @@ -21,7 +21,7 @@ | |
2568 | Name[gu]=CPAN - કોમ્પ્રેસિવ પર્લ અર્કાઇવ નેટવર્ક | |
2569 | Name[hi]=CPAN - कॉम्प्रेहेंसिव पर्ल आर्काइव नेटवर्क | |
2570 | Name[hne]=CPAN - काम्प्रेहेंसिव पर्ल आर्काइव नेटवर्क | |
2571 | -Name[hr]=CPAN - Perl mreža sveobuhvatne arhive | |
2572 | +Name[hr]=CPAN – Perl mreža sveobuhvatne arhive | |
2573 | Name[kk]=CPAN - Perl скрипттер архив желісі | |
2574 | Name[kn]=CPAN -ವ್ಯಾಪಕ ಪರ್ಲ್ ಕಡತಾಗಾರ (ಆರ್ಕೈವ್) ಜಾಲ | |
2575 | Name[ku]=CPAN - Tora Arşîva Perl yê Bikitekit | |
2576 | --- runtime/kurifilter-plugins/ikws/searchproviders/ctan.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2577 | +++ runtime/kurifilter-plugins/ikws/searchproviders/ctan.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2578 | @@ -21,7 +21,7 @@ | |
2579 | Name[gu]=CTAN - કોમ્પ્રેસિવ ટેક અર્કાઇવ નેટવર્ક | |
2580 | Name[hi]=CTAN - कॉम्प्रेहेंसिव टीईएक्स आर्काइव नेटवर्क | |
2581 | Name[hne]=सीटीएएन - काम्प्रेहेंसिव टीईएक्स आर्काइव नेटवर्क | |
2582 | -Name[hr]=CTAN - TeX mreža sveobuhvatne arhive | |
2583 | +Name[hr]=CTAN – TeX mreža sveobuhvatne arhive | |
2584 | Name[kk]=CTAN - TeX архив желісі | |
2585 | Name[kn]=CTAN -ವ್ಯಾಪಕ ಟೆಕ್ ( TeX) ಕಡತಾಗಾರ (ಆರ್ಕೈವ್) ಜಾಲ | |
2586 | Name[ku]=CTAN - Tora Arşîva TeX yê Bikitekit | |
2587 | --- runtime/kurifilter-plugins/ikws/searchproviders/multitran-enru.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2588 | +++ runtime/kurifilter-plugins/ikws/searchproviders/multitran-enru.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2589 | @@ -29,7 +29,7 @@ | |
2590 | Name[he]=Multitran - תרגום בין אנגלית ורוסית | |
2591 | Name[hi]=मल्टीट्रान - रूसी तथा अंग्रेज़ी के बीच अनुवाद | |
2592 | Name[hne]=मल्टीट्रान - अंग्रेजी अउ रूसी के बीच अनुवाद | |
2593 | -Name[hr]=Multitran - Prevođenje između engleskog i ruskog | |
2594 | +Name[hr]=Multitran – Prevođenje između engleskog i ruskog | |
2595 | Name[hsb]=Multitran - přełožowanje z jendźelšćiny a rušćiny | |
2596 | Name[hu]=Multitran - Fordítás angolról oroszra (mindkét irányban) | |
2597 | Name[is]=Multitran - Þýða á milli ensku og rússnesku | |
2598 | --- runtime/kurifilter-plugins/ikws/searchproviders/multitran-itru.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2599 | +++ runtime/kurifilter-plugins/ikws/searchproviders/multitran-itru.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2600 | @@ -29,7 +29,7 @@ | |
2601 | Name[he]=Multitran - תרגום בין איטלקית ורוסית | |
2602 | Name[hi]=मल्टीट्रान - रूसी तथा इतालवी के बीच अनुवाद | |
2603 | Name[hne]=मल्टीट्रान - इतालवी अउ रूसी के बीच अनुवाद | |
2604 | -Name[hr]=Multitran - Prevođenje između talijanskog i ruskog | |
2605 | +Name[hr]=Multitran – Prevođenje između talijanskog i ruskog | |
2606 | Name[hsb]=Multitran - přełožowanje z italšćiny a rušćiny | |
2607 | Name[hu]=Multitran - Fordítás olaszról oroszra (mindkét irányban) | |
2608 | Name[is]=Multitran - Þýða á milli ítölsku og rússnesku | |
2609 | --- runtime/kurifilter-plugins/ikws/searchproviders/de2fr.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2610 | +++ runtime/kurifilter-plugins/ikws/searchproviders/de2fr.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2611 | @@ -29,7 +29,7 @@ | |
2612 | Name[he]=LEO - תרגום בין גרמנית לצרפתית | |
2613 | Name[hi]=लिओ - जर्मनी तथा फ्रेंच के बीच अनुवाद | |
2614 | Name[hne]=लिओ - जर्मनी अउ फ्रेंच के बीच अनुवाद | |
2615 | -Name[hr]=LEO - Prevođenje između njemačkog i francuskog | |
2616 | +Name[hr]=LEO – Prevođenje između njemačkog i francuskog | |
2617 | Name[hsb]=LEO - přełožowanje z němčiny a francošćiny | |
2618 | Name[hu]=LEO - Fordítás németről franciára (mindkét irányban) | |
2619 | Name[is]=LEO - Þýða á milli þýsku og frönsku | |
2620 | --- runtime/kurifilter-plugins/ikws/searchproviders/wikipedia.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2621 | +++ runtime/kurifilter-plugins/ikws/searchproviders/wikipedia.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2622 | @@ -31,7 +31,7 @@ | |
2623 | Name[he]=ויקיפדיה - האנציקלופדיה החופשית | |
2624 | Name[hi]=विकिपेडिया- मुफ्त विश्वकोश | |
2625 | Name[hne]=विकिपीडिया- फोकट विस्वकोस | |
2626 | -Name[hr]=Wikipedia - besplatna enciklopedija | |
2627 | +Name[hr]=Wikipedia – besplatna enciklopedija | |
2628 | Name[hsb]=Wikipedia - Swobodna encyklopedija | |
2629 | Name[hu]=Wikipedia | |
2630 | Name[is]=Wikipedia - Frjálst alfræðiorðasafn | |
2631 | --- runtime/soliduiserver/soliduiserver.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2632 | +++ runtime/soliduiserver/soliduiserver.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2633 | @@ -30,6 +30,7 @@ | |
2634 | Name[he]=שרת ממשק משתמש של Solid | |
2635 | Name[hi]=ठोस उपयोक्ता अंतरफलक सर्वर | |
2636 | Name[hne]=सालिड यूजर इंटरफेस सर्वर | |
2637 | +Name[hr]=Solid Poslužitelj Korsničkog Sučelja | |
2638 | Name[hsb]=Solid User Interface Serwer | |
2639 | Name[hu]=Solid felületkezelő szolgáltatás | |
2640 | Name[is]=Solid miðlari fyrir notendaviðmót | |
2641 | @@ -95,6 +96,7 @@ | |
2642 | Comment[gu]=સોલિડ માટે યુઝર ઇન્ટરફેસ સર્વર, હાર્ડેવર શોધવાની સિસ્ટમ | |
2643 | Comment[he]=שרת ממשק משתמש ל־Solid, מערכת זיהוי החומרה | |
2644 | Comment[hne]=सालिड - हार्डवेयर पता लगइया तंत्र बर यूजर इंटरफेस | |
2645 | +Comment[hr]=Poslužitelj korisničkog sučelja za Solid, sustav detekcije hardvera | |
2646 | Comment[hsb]=Wužiwarski intefejs za Solid, system za namakanje hardware | |
2647 | Comment[hu]=Felhasználói felület a Solid hardverdetektáló rendszerhez | |
2648 | Comment[is]=Miðlari fyrir notendaviðmót í Solid vélbúnaðarkönnuðinn | |
2649 | --- runtime/keditfiletype/tests/filetypestest.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2650 | +++ runtime/keditfiletype/tests/filetypestest.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2651 | @@ -137,8 +137,8 @@ | |
2652 | QVERIFY(patterns.contains("*.txt")); | |
2653 | QVERIFY(!patterns.contains("*.toto")); | |
2654 | const QStringList origPatterns = patterns; | |
2655 | - if (KMimeType::sharedMimeInfoVersion() >= KDE_MAKE_VERSION(0, 60, 0)) { | |
2656 | - // <glob-deleteall> is only supported by shared-mime-info >= 0.60 | |
2657 | + if (KMimeType::sharedMimeInfoVersion() >= KDE_MAKE_VERSION(0, 61, 0)) { | |
2658 | + // <glob-deleteall> is only supported by shared-mime-info > 0.60 | |
2659 | patterns.removeAll("*.txt"); | |
2660 | } | |
2661 | patterns.append("*.toto"); // yes, a french guy wrote this, as you can see | |
2662 | --- runtime/kglobalaccel/kglobalaccel.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2663 | +++ runtime/kglobalaccel/kglobalaccel.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2664 | @@ -30,6 +30,7 @@ | |
2665 | Name[he]=שרת הקיצורי מקשים גלובליים KDED | |
2666 | Name[hi]=केडीईडी ग्लोबल शॉर्टकट सर्वर | |
2667 | Name[hne]=केडीईडी वैस्विक सार्टकट सर्वर | |
2668 | +Name[hr]=KDED Globalni poslužitelj prečaca tipkovnice | |
2669 | Name[hsb]=Serwer za globalne KDE-skrótšenki | |
2670 | Name[hu]=KDE-szolgáltatás a globális billentyűparancsok lekérdezéséhez | |
2671 | Name[is]=KDED víðtækur tenglaþjónn | |
2672 | --- runtime/drkonqi/drkonqiassistantpages_bugzilla.cpp (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2673 | +++ runtime/drkonqi/drkonqiassistantpages_bugzilla.cpp (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2674 | @@ -495,6 +495,13 @@ | |
2675 | ||
2676 | ui.m_statusWidget->setBusy(i18nc("@info:status","Searching for duplicates (from %1 to %2)...", | |
2677 | startDateStr, endDateStr)); | |
2678 | + | |
2679 | + //Bugzilla will not search on Today bugs if we send the date. | |
2680 | + //we need to send "Now" | |
2681 | + if (m_searchingEndDate == QDate::currentDate()) { | |
2682 | + endDateStr = QLatin1String("Now"); | |
2683 | + } | |
2684 | + | |
2685 | BugReport report = reportInfo()->newBugReportTemplate(); | |
2686 | bugzillaManager()->searchBugs(m_currentKeywords, report.product(), report.bugSeverity(), | |
2687 | startDateStr, endDateStr, reportInfo()->firstBacktraceFunctions().join(" ")); | |
2688 | @@ -808,7 +815,6 @@ | |
2689 | KIcon("document-preview"), | |
2690 | i18nc("@info:tooltip", "Use this button to show the generated " | |
2691 | "report information about this crash."))); | |
2692 | - ui.m_showReportContentsButton->setVisible(false); | |
2693 | connect(ui.m_showReportContentsButton, SIGNAL(clicked()), this, SLOT(openReportContents())); | |
2694 | ||
2695 | ui.m_retryButton->setVisible(false); | |
2696 | @@ -822,7 +828,6 @@ | |
2697 | ||
2698 | void BugzillaSendPage::retryClicked() | |
2699 | { | |
2700 | - ui.m_showReportContentsButton->setVisible(false); | |
2701 | ui.m_retryButton->setEnabled(false); | |
2702 | aboutToShow(); | |
2703 | } | |
2704 | @@ -861,8 +866,6 @@ | |
2705 | ui.m_statusWidget->setIdle(i18nc("@info:status","Error sending the crash report: " | |
2706 | "<message>%1.</message>", errorString)); | |
2707 | ||
2708 | - ui.m_showReportContentsButton->setVisible(true); | |
2709 | - | |
2710 | ui.m_retryButton->setEnabled(true); | |
2711 | ui.m_retryButton->setVisible(true); | |
2712 | } | |
2713 | --- runtime/l10n/eastafrica.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2714 | +++ runtime/l10n/eastafrica.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2715 | @@ -25,6 +25,7 @@ | |
2716 | Name[he]=אפריקה, מזרח | |
2717 | Name[hi]=पूर्वी अफ्रीका | |
2718 | Name[hne]=अफ्रीका, पस्चिमी | |
2719 | +Name[hr]=Afrika, istočna | |
2720 | Name[hsb]=Afrika, Wuchodna | |
2721 | Name[hu]=Kelet-Afrika | |
2722 | Name[is]=Afríka, Austur-Afríka | |
2723 | --- runtime/l10n/sg/entry.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2724 | +++ runtime/l10n/sg/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2725 | @@ -86,7 +86,7 @@ | |
2726 | NegativeMonetarySignPosition=3 | |
2727 | DateFormat=%d %B %Y | |
2728 | DateFormatShort=%d/%m/%Y | |
2729 | -TimeFormat=%p %H:%M:%S | |
2730 | +TimeFormat=%p %l:%M:%S | |
2731 | WeekStartDay=7 | |
2732 | PageSize=0 | |
2733 | MeasureSystem=0 | |
2734 | --- runtime/l10n/sk/entry.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2735 | +++ runtime/l10n/sk/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2736 | @@ -48,7 +48,7 @@ | |
2737 | Name[mk]=Словачка | |
2738 | Name[ml]=സ്ലോവാക്ക്യ | |
2739 | Name[mr]=स्लोवाकिया | |
2740 | -Name[nds]=Slowakei | |
2741 | +Name[nds]=Slowakien | |
2742 | Name[ne]=स्लोभाकिया | |
2743 | Name[nl]=Slowakije | |
2744 | Name[oc]=Eslòvac | |
2745 | --- runtime/l10n/ec/entry.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2746 | +++ runtime/l10n/ec/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2747 | @@ -19,6 +19,7 @@ | |
2748 | Name[he]=אקוודור | |
2749 | Name[hi]=इक्वाडॉर | |
2750 | Name[hne]=इक्वेडार | |
2751 | +Name[hr]=Ekvador | |
2752 | Name[is]=Ekvador | |
2753 | Name[ja]=エクアドル | |
2754 | Name[kk]=Эквадор | |
2755 | --- runtime/l10n/ee/entry.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2756 | +++ runtime/l10n/ee/entry.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2757 | @@ -44,7 +44,7 @@ | |
2758 | Name[ml]=എസ്റ്റോണിയ | |
2759 | Name[mr]=इस्टोनिया | |
2760 | Name[nb]=Estland | |
2761 | -Name[nds]=Estland | |
2762 | +Name[nds]=Eestland | |
2763 | Name[ne]=इस्टोनिया | |
2764 | Name[nl]=Estland | |
2765 | Name[nn]=Estland | |
2766 | --- runtime/plasma/scriptengines/javascript/plasma-scriptengine-runner-javascript.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2767 | +++ runtime/plasma/scriptengines/javascript/plasma-scriptengine-runner-javascript.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2768 | @@ -21,6 +21,7 @@ | |
2769 | Name[gu]=જાવાસ્ક્રિપ્ટ ચલાવનાર | |
2770 | Name[hi]=जावास्क्रिप्ट चलाने वाला | |
2771 | Name[hne]=जावास्क्रिप्ट चलइया | |
2772 | +Name[hr]=JavaScript Pokretač | |
2773 | Name[hu]=JavaScript-indító | |
2774 | Name[is]=JavaScript keyrari | |
2775 | Name[it]=Esecutore JavaScript | |
2776 | @@ -81,6 +82,7 @@ | |
2777 | Comment[gu]=જાવાસ્ક્રિપ્ટ ચલાવનાર | |
2778 | Comment[hi]=जावास्क्रिप्ट चलाने वाला | |
2779 | Comment[hne]=जावास्क्रिप्ट चलइया | |
2780 | +Comment[hr]=JavaScript pokretač | |
2781 | Comment[hu]=JavaScript-indító | |
2782 | Comment[is]=JavaScript keyrari | |
2783 | Comment[it]=Esecutore JavaScript | |
2784 | --- runtime/plasma/scriptengines/javascript/plasma-scriptengine-applet-simple-javascript.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2785 | +++ runtime/plasma/scriptengines/javascript/plasma-scriptengine-applet-simple-javascript.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2786 | @@ -21,6 +21,7 @@ | |
2787 | Name[gu]=જાવાસ્ક્રિપ્ટ વિજેટ | |
2788 | Name[hi]=जावास्क्रिप्ट विज़ेट | |
2789 | Name[hne]=जावास्क्रिप्ट विजेट | |
2790 | +Name[hr]=JavaScript Spravica | |
2791 | Name[hu]=JavaScript-objektum | |
2792 | Name[is]=JavaScript græja | |
2793 | Name[it]=Oggetto JavaScript | |
2794 | @@ -81,6 +82,7 @@ | |
2795 | Comment[gu]=જાવાસ્ક્રિપ્ટમાં લખાયેલ મૂળભૂત પ્લાઝમા વિજેટ | |
2796 | Comment[hi]=जावास्क्रिप्ट में लिखा गया नेटिव प्लाज्मा विजेट | |
2797 | Comment[hne]=जावास्क्रिप्ट मं लिखे नेटिव प्लाज्मा विजेट | |
2798 | +Comment[hr]=Izvorna Plasma spravica napisana u JavaScriptu | |
2799 | Comment[hu]=Plasma-elem Javasciptben elkészítve | |
2800 | Comment[is]=Upprunabundin Plasma græja skrifuð í JavaScript | |
2801 | Comment[it]=Oggetto nativo di Plasma scritto in JavaScript | |
2802 | --- runtime/plasma/scriptengines/javascript/tests/javascript-config-test/metadata.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2803 | +++ runtime/plasma/scriptengines/javascript/tests/javascript-config-test/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2804 | @@ -4,6 +4,7 @@ | |
2805 | Name[es]=test-de-config-javascript | |
2806 | Name[fy]=javaskript-konfig-test | |
2807 | Name[gu]=જાવાસ્ક્રિપ્ટ-રૂપરેખાંકન-ચકાસણી | |
2808 | +Name[hr]=javascript-test-konfiguracije | |
2809 | Name[is]=JavaScript stillingaprófun | |
2810 | Name[lt]=javascript-config-testas | |
2811 | Name[nds]=JavaScript-Instellen-Test | |
2812 | @@ -28,6 +29,7 @@ | |
2813 | Comment[gl]=Widget de proba da configuración do obxecto en Javascript | |
2814 | Comment[gu]=જાવાસ્ક્રિપ્ટ રૂપરેખાંકન ઓબ્જેક્ટ ચકાસણી વિજેટ | |
2815 | Comment[hi]=जावास्क्रिप्ट कान्फिग वस्तु जाँच विज़ेट | |
2816 | +Comment[hr]=Spravica za testiranje Javascript konfiguracijskog objekta | |
2817 | Comment[hu]=JavaScript-tesztobjektum | |
2818 | Comment[is]=Javascript græja til stillingaprófana | |
2819 | Comment[it]=Oggetto di prova per la gestione della configurazione in JavaScript | |
2820 | --- runtime/plasma/scriptengines/javascript/tests/script-digital-clock/metadata.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2821 | +++ runtime/plasma/scriptengines/javascript/tests/script-digital-clock/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2822 | @@ -6,6 +6,7 @@ | |
2823 | Name[fy]=skript-digitale-klok | |
2824 | Name[gu]=સ્ક્રિપ્ટ-ડિજીટલ-ઘડિયાળ | |
2825 | Name[hi]=स्क्रिप्ट-डिजिटल-घड़ी | |
2826 | +Name[hr]=script-digitalni-sat | |
2827 | Name[is]=Stafræn klukkuskrifta | |
2828 | Name[km]=នាឡិកាឌីជីថលស្គ្រីប | |
2829 | Name[kn]=ಸ್ಕ್ರಿಪ್ಟ್-ಅಂಕೀಯ (ಡಿಜಿಟಲ್)-ಗಡಿಯಾರ | |
2830 | @@ -39,6 +40,7 @@ | |
2831 | Comment[gl]=Reloxo dixital escrito en JavaScript | |
2832 | Comment[gu]=જાવાસ્ક્રિપ્ટ ડિજીટલ ઘડિયાળ | |
2833 | Comment[hi]=जावास्क्रिप्ट डिजिटल घड़ी | |
2834 | +Comment[hr]=Jednostavan digitalni sat | |
2835 | Comment[hu]=JavaScript-alapú digitális óra | |
2836 | Comment[is]=JavaScript stafræn klukka | |
2837 | Comment[it]=Orologio digitale JavaScript | |
2838 | --- runtime/plasma/scriptengines/javascript/tests/script-nowplaying/metadata.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2839 | +++ runtime/plasma/scriptengines/javascript/tests/script-nowplaying/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2840 | @@ -5,6 +5,7 @@ | |
2841 | Name[es]=script-ejecutando | |
2842 | Name[fy]=skript-no ôfspyljend | |
2843 | Name[hi]=स्क्रिप्ट-अब बजा रहा है | |
2844 | +Name[hr]=script-sadasvira | |
2845 | Name[is]=spilanúna-skrifta | |
2846 | Name[kn]=ಸ್ಕ್ರಿಪ್ಟ್-ಈಗ ಚಾಲನೆಯಲ್ಲಿರುವ | |
2847 | Name[lt]=scenarijus-dabar groja | |
2848 | @@ -37,6 +38,7 @@ | |
2849 | Comment[ga]=Amhrán á sheinm anois in JavaScript | |
2850 | Comment[gl]=Versión en Javascript da pista a reproducir | |
2851 | Comment[hi]=जावास्क्रिप्ट संस्करण मौजूदा ट्रैक प्लेइंग | |
2852 | +Comment[hr]=Javascript verzija spravice za prikaz trenutne pjesme koja svira | |
2853 | Comment[hu]=JavaScript-függvény az éppen lejátszott szám jellemzőihez | |
2854 | Comment[is]=Javascript útgáfa núverandi spilunar | |
2855 | Comment[it]=La traccia attualmente in riproduzione (versione JavaScript) | |
2856 | --- runtime/plasma/scriptengines/javascript/tests/tiger/metadata.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2857 | +++ runtime/plasma/scriptengines/javascript/tests/tiger/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2858 | @@ -13,6 +13,7 @@ | |
2859 | Name[he]=נמר | |
2860 | Name[hi]=शेर | |
2861 | Name[hne]=टाइगर | |
2862 | +Name[hr]=Tigar | |
2863 | Name[it]=Tigre | |
2864 | Name[ja]=タイガー | |
2865 | Name[kk]=Жолбарыс | |
2866 | @@ -59,6 +60,7 @@ | |
2867 | Comment[gl]=Un adaptador de script | |
2868 | Comment[gu]=સ્ક્રિપ્ટ એડપ્ટર | |
2869 | Comment[hi]=स्क्रिप्ट एडाप्टर | |
2870 | +Comment[hr]=Prilagodnik skripte | |
2871 | Comment[hu]=Szkriptkezelő modul | |
2872 | Comment[is]=Skriftumótari | |
2873 | Comment[it]=Script adattatore | |
2874 | --- runtime/plasma/scriptengines/javascript/tests/script-mediaplayer/metadata.desktop (.../tags/KDE/4.3.0/kdebase) (wersja 1013412) | |
2875 | +++ runtime/plasma/scriptengines/javascript/tests/script-mediaplayer/metadata.desktop (.../branches/KDE/4.3/kdebase) (wersja 1013412) | |
2876 | @@ -5,6 +5,7 @@ | |
2877 | Name[fy]=script-mediaspiler | |
2878 | Name[gu]=સ્ક્રિપ્ટ-મીડિઆપ્લેયર | |
2879 | Name[hi]=स्क्रिप्ट-मीडिया प्लेयर | |
2880 | +Name[hr]=script-multimedijski_program | |
2881 | Name[is]=margmiðlunarspilara-skrifta | |
2882 | Name[kn]=ಸ್ಕ್ರಿಪ್ಟ್-ಮಾಧ್ಯಮನಿರೂಪಕ | |
2883 | Name[mai]=स्क्रिप्ट मीडिया प्लेयर | |
2884 | @@ -37,6 +38,7 @@ | |
2885 | Comment[gl]=Reprodutor multimedia escrito en Javascript | |
2886 | Comment[gu]=જાવાસ્ક્રિપ્ટ મિડીઆ પ્લેયર | |
2887 | Comment[hi]=जावास्क्रिप्ट मीडिया प्लेयर | |
2888 | +Comment[hr]=Multimedijski program | |
2889 | Comment[hu]=JavaScript-alapú médialejátszó | |
2890 | Comment[is]=JavaScript margmiðlunarspilari | |
2891 | Comment[it]=Riproduttore multimediale JavaScript |