Author: arekm Date: Wed Nov 25 09:55:55 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; branch diff updated
---- Files affected: packages/kde4-kdebase: kde4-kdebase-branch.diff (1.13 -> 1.14) , kde4-kdebase.spec (1.110 -> 1.111) ---- Diffs: ================================================================ Index: packages/kde4-kdebase/kde4-kdebase-branch.diff diff -u packages/kde4-kdebase/kde4-kdebase-branch.diff:1.13 packages/kde4-kdebase/kde4-kdebase-branch.diff:1.14 --- packages/kde4-kdebase/kde4-kdebase-branch.diff:1.13 Thu Oct 8 18:13:02 2009 +++ packages/kde4-kdebase/kde4-kdebase-branch.diff Wed Nov 25 10:55:49 2009 @@ -1,305 +1,1378 @@ -Index: apps/konqueror/konqueror.desktop +Index: apps/kappfinder/apps/Graphics/blender.desktop =================================================================== ---- apps/konqueror/konqueror.desktop (.../tags/KDE/4.3.2/kdebase) (wersja 1032821) -+++ apps/konqueror/konqueror.desktop (.../branches/KDE/4.3/kdebase) (wersja 1032821) -@@ -120,7 +120,7 @@ - Comment[he]=מנהל הקבצים ודפדפן האינטרנט של KDE - Comment[hi]=केडीई फ़ाइल प्रबंधक व वेब ब्राउज़र - Comment[hne]=केडीई फाइल प्रबंधक अउ वेब ब्राउजर --Comment[hr]=KDE upravitelj datotekama i web preglednik -+Comment[hr]=KDE-ov upravitelj datoteka i web preglednik - Comment[hsb]=KDE datajowy manager & web browser - Comment[hu]=KDE fájlkezelő és webböngésző - Comment[is]=KDE skráastjóri og vafri -Index: apps/konqueror/konquerorsu.desktop -=================================================================== ---- apps/konqueror/konquerorsu.desktop (.../tags/KDE/4.3.2/kdebase) (wersja 1032821) -+++ apps/konqueror/konquerorsu.desktop (.../branches/KDE/4.3/kdebase) (wersja 1032821) -@@ -38,7 +38,7 @@ - Name[he]=מנהל קבצים - מצב משתמש־על - Name[hi]=फ़ाइल प्रबंधक- सुपर यूजर मोड - Name[hne]=फाइल प्रबंधक- सुपर यूजर मोड --Name[hr]=Upravitelj datotekama – za administratora -+Name[hr]=Upravitelj datoteka – za administratora - Name[hsb]=Datajowy manager - modus superwužiwarja - Name[hu]=Fájlkezelő (rendszergazdai mód) - Name[is]=Skráastjóri (sem kerfisstjóri) -Index: apps/dolphin/src/panels/terminal/terminalpanel.cpp -=================================================================== ---- apps/dolphin/src/panels/terminal/terminalpanel.cpp (.../tags/KDE/4.3.2/kdebase) (wersja 1032821) -+++ apps/dolphin/src/panels/terminal/terminalpanel.cpp (.../branches/KDE/4.3/kdebase) (wersja 1032821) -@@ -23,7 +23,6 @@ - #include <kde_terminal_interface_v2.h> - #include <kparts/part.h> - #include <kshell.h> --#include <kio/netaccess.h> - - #include <QBoxLayout> - #include <QShowEvent> -@@ -58,13 +57,12 @@ - } +--- apps/kappfinder/apps/Graphics/blender.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Graphics/blender.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -149,7 +149,7 @@ + GenericName[ru]=Трёхмерный редактор + GenericName[se]=3d-modelleren/-čájeheapmi + GenericName[si]=3D ආදර්ශක/නිවේදිත +-GenericName[sk]=3D modelovanie/rendrovanie scén ++GenericName[sk]=3D modelovanie/renderovanie scén + GenericName[sl]=Modelirnik/upodabljalnik 3D scen + GenericName[sr]=3Д моделар и рендерар + genericname...@latin]=3d modelar i renderar +Index: apps/kappfinder/apps/Graphics/gv.desktop +=================================================================== +--- apps/kappfinder/apps/Graphics/gv.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Graphics/gv.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -150,7 +150,7 @@ + GenericName[ru]=Просмотр PostScript + GenericName[se]=Postscript čájeheaddji + GenericName[si]=Postscript දසුන +-GenericName[sk]=Prehliadač postskriptových súborov ++GenericName[sk]=Prehliadač postscriptových súborov + GenericName[sl]=Pregledovalnik za PostScript + GenericName[sr]=Приказивач постскрипта + genericname...@latin]=prikazivač PostScripta +Index: apps/kappfinder/apps/Graphics/GnomeIconEditor.desktop +=================================================================== +--- apps/kappfinder/apps/Graphics/GnomeIconEditor.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Graphics/GnomeIconEditor.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -65,7 +65,7 @@ + Name[ru]=GNOME Icon Editor + Name[se]=GNOME govašdoaimmaheaddji + Name[si]=GNOME අයිකන සැකසුම +-Name[sk]=GNOME Editor ikon ++Name[sk]=GNOME editor ikon + Name[sl]=Urejevalnik ikon za Gnome + Name[sr]=Гномов уређивач икона + name...@latin]=gnomeov uređivač ikona +Index: apps/kappfinder/apps/Graphics/gimp.desktop +=================================================================== +--- apps/kappfinder/apps/Graphics/gimp.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Graphics/gimp.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -139,7 +139,7 @@ + GenericName[ru]=Управление изображениями + GenericName[se]=Govvagieđahallanprográmma + GenericName[si]=පිංතූර හැසිරවීමේ වැඩසටහන +-GenericName[sk]=Program pre úpravu obrázkov ++GenericName[sk]=Program na úpravu obrázkov + GenericName[sl]=Program za obdelavo slik + GenericName[sr]=Програм за обраду слика + genericname...@latin]=program za obradu slika +Index: apps/kappfinder/apps/Graphics/GnomeColorSelector.desktop +=================================================================== +--- apps/kappfinder/apps/Graphics/GnomeColorSelector.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Graphics/GnomeColorSelector.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -65,7 +65,7 @@ + Name[ru]=GNOME Color Selector + Name[se]=GNOME ivdneválljejeaddji + Name[si]=GNOME වර්ණ තෝරනය +-Name[sk]=GNOME Výber farby ++Name[sk]=GNOME výber farby + Name[sl]=Izbirnik barv za Gnome + Name[sr]=Гномов бирач боја + name...@latin]=gnomov birač boja +Index: apps/kappfinder/apps/Development/eclipse.desktop +=================================================================== +--- apps/kappfinder/apps/Development/eclipse.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Development/eclipse.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -149,7 +149,7 @@ + GenericName[ru]=Eclipse IDE + GenericName[se]=Eclipse IDE + GenericName[si]=Eclipse IDE +-GenericName[sk]=IDE Eclipse ++GenericName[sk]=Eclipse IDE + GenericName[sl]=Integrirano razvojno okolje + GenericName[sr]=Развојно окружење Еклипс + genericname...@latin]=razvojno okruženje Eclipse +Index: apps/kappfinder/apps/Internet/mozilla.desktop +=================================================================== +--- apps/kappfinder/apps/Internet/mozilla.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Internet/mozilla.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -165,7 +165,7 @@ + GenericName[tg]=Намоишгари Интернет + GenericName[th]=เว็บเบราว์เซอร์ + GenericName[tr]=Web Tarayıcı +-GenericName[uk]=Навігатор Тенет ++GenericName[uk]=Переглядач інтернету + GenericName[uz]=Veb-brauzer + genericname...@cyrillic]=Веб-браузер + GenericName[vi]=Trình duyệt mạng +Index: apps/kappfinder/apps/Internet/gnomemeeting.desktop +=================================================================== +--- apps/kappfinder/apps/Internet/gnomemeeting.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Internet/gnomemeeting.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -149,7 +149,7 @@ + GenericName[ru]=Видео-конференции + GenericName[se]=Videočoahkkin + GenericName[si]=වීඩියෝ සංවාද +-GenericName[sk]=Videokonferencia ++GenericName[sk]=Videokonferencie + GenericName[sl]=Video konferenčne zveze + GenericName[sr]=Видео конференције + genericname...@latin]=video konferencije +Index: apps/kappfinder/apps/Internet/arena.desktop +=================================================================== +--- apps/kappfinder/apps/Internet/arena.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Internet/arena.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -163,7 +163,7 @@ + GenericName[tg]=Намоишгари Интернет + GenericName[th]=เว็บเบราว์เซอร์ + GenericName[tr]=Web Tarayıcı +-GenericName[uk]=Навігатор Тенет ++GenericName[uk]=Переглядач інтернету + GenericName[uz]=Veb-brauzer + genericname...@cyrillic]=Веб-браузер + GenericName[vi]=Trình duyệt mạng +Index: apps/kappfinder/apps/Internet/mldonkey_gui.desktop +=================================================================== +--- apps/kappfinder/apps/Internet/mldonkey_gui.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Internet/mldonkey_gui.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -66,7 +66,7 @@ + Name[ru]=MLDonkey GTK+ Core Controller + Name[se]=MLDonkey GTK+ guovddášstivrejeaddji + Name[si]=MLDonkey GTK+ Core Controller +-Name[sk]=MLDonkey GTK+ ovládač jadra ++Name[sk]=MLDonkey GTK+ + Name[sl]=Nadzornik jedra za eDonkey2000 + Name[sr]=ГТК+ контролор језгра за МЛдонки + name...@latin]=gtk+ kontrolor jezgra za MLDonkey +Index: apps/kappfinder/apps/Internet/netscape6.desktop +=================================================================== +--- apps/kappfinder/apps/Internet/netscape6.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Internet/netscape6.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -150,7 +150,7 @@ + GenericName[tg]=Намоишгари Интернет + GenericName[th]=เว็บเบราว์เซอร์ + GenericName[tr]=Web Tarayıcı +-GenericName[uk]=Навігатор Тенет ++GenericName[uk]=Переглядач інтернету + GenericName[uz]=Veb-brauzer + genericname...@cyrillic]=Веб-браузер + GenericName[vi]=Trình duyệt mạng +Index: apps/kappfinder/apps/Internet/Galeon.desktop +=================================================================== +--- apps/kappfinder/apps/Internet/Galeon.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Internet/Galeon.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -161,7 +161,7 @@ + GenericName[tg]=Намоишгари Интернет + GenericName[th]=เว็บเบราว์เซอร์ + GenericName[tr]=Web Tarayıcı +-GenericName[uk]=Навігатор Тенет ++GenericName[uk]=Переглядач інтернету + GenericName[uz]=Veb-brauzer + genericname...@cyrillic]=Веб-браузер + GenericName[vi]=Trình duyệt mạng +Index: apps/kappfinder/apps/Internet/opera.desktop +=================================================================== +--- apps/kappfinder/apps/Internet/opera.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Internet/opera.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -162,7 +162,7 @@ + GenericName[tg]=Намоишгари Интернет + GenericName[th]=เว็บเบราว์เซอร์ + GenericName[tr]=Web Tarayıcı +-GenericName[uk]=Навігатор Тенет ++GenericName[uk]=Переглядач інтернету + GenericName[uz]=Veb-brauzer + genericname...@cyrillic]=Веб-браузер + GenericName[vi]=Trình duyệt mạng +Index: apps/kappfinder/apps/Internet/mozilla-firefox.desktop +=================================================================== +--- apps/kappfinder/apps/Internet/mozilla-firefox.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Internet/mozilla-firefox.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -164,7 +164,7 @@ + GenericName[tg]=Намоишгари Интернет + GenericName[th]=เว็บเบราว์เซอร์ + GenericName[tr]=Web Tarayıcı +-GenericName[uk]=Навігатор Тенет ++GenericName[uk]=Переглядач інтернету + GenericName[uz]=Veb-brauzer + genericname...@cyrillic]=Веб-браузер + GenericName[vi]=Trình duyệt mạng +Index: apps/kappfinder/apps/Internet/epiphany.desktop +=================================================================== +--- apps/kappfinder/apps/Internet/epiphany.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Internet/epiphany.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -160,7 +160,7 @@ + GenericName[tg]=Намоишгари Интернет + GenericName[th]=เว็บเบราว์เซอร์ + GenericName[tr]=Web Tarayıcı +-GenericName[uk]=Навігатор Тенет ++GenericName[uk]=Переглядач інтернету + GenericName[uz]=Veb-brauzer + genericname...@cyrillic]=Веб-браузер + GenericName[vi]=Trình duyệt mạng +Index: apps/kappfinder/apps/Internet/ed2k_gui.desktop +=================================================================== +--- apps/kappfinder/apps/Internet/ed2k_gui.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Internet/ed2k_gui.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -66,7 +66,7 @@ + Name[ru]=eDonkey2000 GTK+ Core Controller + Name[se]=eDonkey2000 GTK+ guovddášstivrejeaddji + Name[si]=eDonkey2000 GTK+ Core Controller +-Name[sk]=eDonkey2000 GTK+ ovládač jadra ++Name[sk]=eDonkey2000 GTK+ + Name[sl]=eDonkey2000 GTK+ Core Controller + Name[sr]=ГТК+ контролор језгра за Едонки 2000 + name...@latin]=gtk+ kontrolor jezgra za eDonkey 2000 +Index: apps/kappfinder/apps/Internet/netscape.desktop +=================================================================== +--- apps/kappfinder/apps/Internet/netscape.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Internet/netscape.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -165,7 +165,7 @@ + GenericName[tg]=Намоишгари Интернет + GenericName[th]=เว็บเบราว์เซอร์ + GenericName[tr]=Web Tarayıcı +-GenericName[uk]=Навігатор Тенет ++GenericName[uk]=Переглядач інтернету + GenericName[uz]=Veb-brauzer + genericname...@cyrillic]=Веб-браузер + GenericName[vi]=Trình duyệt mạng +Index: apps/kappfinder/apps/Internet/Terminal/Lynx.desktop +=================================================================== +--- apps/kappfinder/apps/Internet/Terminal/Lynx.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Internet/Terminal/Lynx.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -161,7 +161,7 @@ + GenericName[tg]=Намоишгари Интернет + GenericName[th]=เว็บเบราว์เซอร์ + GenericName[tr]=Web Tarayıcı +-GenericName[uk]=Навігатор Тенет ++GenericName[uk]=Переглядач інтернету + GenericName[uz]=Veb-brauzer + genericname...@cyrillic]=Веб-браузер + GenericName[vi]=Trình duyệt mạng +Index: apps/kappfinder/apps/Internet/Terminal/Links.desktop +=================================================================== +--- apps/kappfinder/apps/Internet/Terminal/Links.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Internet/Terminal/Links.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -162,7 +162,7 @@ + GenericName[tg]=Намоишгари Интернет + GenericName[th]=เว็บเบราว์เซอร์ + GenericName[tr]=Web Tarayıcı +-GenericName[uk]=Навігатор Тенет ++GenericName[uk]=Переглядач інтернету + GenericName[uz]=Veb-brauzer + genericname...@cyrillic]=Веб-браузер + GenericName[vi]=Trình duyệt mạng +Index: apps/kappfinder/apps/Internet/Terminal/w3m.desktop +=================================================================== +--- apps/kappfinder/apps/Internet/Terminal/w3m.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Internet/Terminal/w3m.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -161,7 +161,7 @@ + GenericName[tg]=Намоишгари Интернет + GenericName[th]=เว็บเบราว์เซอร์ + GenericName[tr]=Web Tarayıcı +-GenericName[uk]=Навігатор Тенет ++GenericName[uk]=Переглядач інтернету + GenericName[uz]=Veb-brauzer + genericname...@cyrillic]=Веб-браузер + GenericName[vi]=Trình duyệt mạng +Index: apps/kappfinder/apps/Multimedia/jazz.desktop +=================================================================== +--- apps/kappfinder/apps/Multimedia/jazz.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Multimedia/jazz.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -150,7 +150,7 @@ + GenericName[ru]=Звуковой процессор + GenericName[se]=Jietnagieđahalli + GenericName[si]=ශබ්ද සකසනය +-GenericName[sk]=MIDI sekvencér ++GenericName[sk]=Zvukový procesor + GenericName[sl]=Obdelovalnik zvoka + GenericName[sr]=Обрађивач звука + genericname...@latin]=obrađivač zvuka +Index: apps/kappfinder/apps/Multimedia/alsamixergui.desktop +=================================================================== +--- apps/kappfinder/apps/Multimedia/alsamixergui.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Multimedia/alsamixergui.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -151,8 +151,8 @@ + GenericName[si]=Alsa Mixer Frontend + GenericName[sk]=Rozhranie pre zvukový mixér Alsa + GenericName[sl]=Vmesnik mešalnika Alsa +-GenericName[sr]=Сучеље за миксету Алсе +-genericname...@latin]=sučelje za miksetu Alse ++GenericName[sr]=Прочеље за миксету Алсе ++genericname...@latin]=pročelje za miksetu Alse + GenericName[sv]=Gränssnitt till Alsa-mixer + GenericName[ta]=Alsa கலவை முன்தோற்றம் + GenericName[te]=ఆల్సా మిక్సర్ యొక్క ఫ్రంటెండ్ +Index: apps/kappfinder/apps/Multimedia/jamin.desktop +=================================================================== +--- apps/kappfinder/apps/Multimedia/jamin.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Multimedia/jamin.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -140,7 +140,7 @@ + GenericName[ru]=Jack Mastering Tool + GenericName[se]=Jack mastering-reaidu + GenericName[si]=Jack Mastering Tool +-GenericName[sk]=Masteringový program ++GenericName[sk]=Jack Mastering nástroj + GenericName[sl]=Orodje za mastering za Jack + GenericName[sr]=Алатка за мастеровање за Џек + genericname...@latin]=alatka za masterovanje za Jack +Index: apps/kappfinder/apps/Office/netscapeaddressbook.desktop +=================================================================== +--- apps/kappfinder/apps/Office/netscapeaddressbook.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Office/netscapeaddressbook.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -12,6 +12,7 @@ + Name[en_GB]=Netscape Address Book + Name[es]=Libreta de direcciones de Netscape + Name[et]=Netscape'i aadressiraamat ++Name[eu]=Netscape helbide-liburua + Name[fi]=Netscapen osoitekirja + Name[fr]=Carnet d'adresses Netscape + Name[fy]=Netscape Adresboek +@@ -41,6 +42,7 @@ + Name[pt_BR]=Livro de endereços do Netscape + Name[ro]=Carte de adrese Netscape + Name[ru]=Адресная книга Netscape ++Name[sk]=Kniha adries Netscape + Name[sl]=Netscape Address Book + Name[sr]=Нетскејпов адресар + name...@latin]=netscapeov adresar +Index: apps/kappfinder/apps/Games/Arcade/alephone.desktop +=================================================================== +--- apps/kappfinder/apps/Games/Arcade/alephone.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kappfinder/apps/Games/Arcade/alephone.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -64,7 +64,7 @@ + Name[ru]=Alephone без OpenGL + Name[se]=Alephone – OpenGL:a haga + Name[si]=Alephone - OpenGL නැත +-Name[sk]=Alephone - Žiadne OpenGL ++Name[sk]=Alephone - bez OpenGL + Name[sl]=Alephone - brez OpenGL + Name[sr]=Алефона - без опенГЛ‑а + name...@latin]=alephone - bez OpenGL‑a +Index: apps/kdepasswd/kcm/kcm_useraccount.desktop +=================================================================== +--- apps/kdepasswd/kcm/kcm_useraccount.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/kdepasswd/kcm/kcm_useraccount.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -197,7 +197,7 @@ + Comment[ru]=Сведения о пользователе, такие как пароль, имя и e-mail + Comment[se]=Geavaheaddjedieđut nugo beassansátni, namma ja e-boasta + Comment[si]=User information such as password, name and email +-Comment[sk]=Informácie o používateľovi, ako heslo, meno a e-mail ++Comment[sk]=Informácie o užívateľovi, ako heslo, meno a e-mail + Comment[sl]=Uporabniške informacije, kot so geslo, ime in e-pošta + Comment[sr]=Подаци о кориснику, попут лозинке, имена и е‑поште + comment...@latin]=podaci o korisniku, poput lozinke, imena i e‑pošte +Index: apps/konqueror/konqbrowser.desktop +=================================================================== +--- apps/konqueror/konqbrowser.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/konqueror/konqbrowser.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -166,7 +166,7 @@ + GenericName[tg]=Намоишгари Интернет + GenericName[th]=เว็บเบราว์เซอร์ + GenericName[tr]=Web Tarayıcı +-GenericName[uk]=Навігатор Тенет ++GenericName[uk]=Переглядач інтернету + GenericName[uz]=Veb-brauzer + genericname...@cyrillic]=Веб-браузер + GenericName[vi]=Trình duyệt mạng +Index: apps/konqueror/src/konqviewmanager.cpp +=================================================================== +--- apps/konqueror/src/konqviewmanager.cpp (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/konqueror/src/konqviewmanager.cpp (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -1180,9 +1180,11 @@ - Panel::setUrl(url); -- KUrl mostLocalUrl = KIO::NetAccess::mostLocalUrl(url, 0); - const bool sendInput = (m_terminal != 0) - && (m_terminal->foregroundProcessId() == -1) - && isVisible() -- && mostLocalUrl.isLocalFile(); -+ && url.isLocalFile(); - if (sendInput) { -- m_terminal->sendInput("cd " + KShell::quoteArg(mostLocalUrl.toLocalFile()) + '\n'); -+ m_terminal->sendInput("cd " + KShell::quoteArg(url.toLocalFile()) + '\n'); - } - - } -Index: apps/keditbookmarks/bookmarkmodel.cpp -=================================================================== ---- apps/keditbookmarks/bookmarkmodel.cpp (.../tags/KDE/4.3.2/kdebase) (wersja 1032821) -+++ apps/keditbookmarks/bookmarkmodel.cpp (.../branches/KDE/4.3/kdebase) (wersja 1032821) -@@ -78,7 +78,7 @@ - //Text - if(index.isValid() && (role == Qt::DisplayRole || role == Qt::EditRole)) - { -- KBookmark bk = bookmarkForIndex(index); -+ const KBookmark bk = bookmarkForIndex(index); - if(bk.address().isEmpty()) - { - if(index.column() == 0) -@@ -100,12 +100,12 @@ - : subnode.firstChild().toText().data(); - } - case 3: { //Status column -- QString text1 = ""; //FIXME favicon state -- QString text2 = ""; //FIXME link state -- if(text1.isNull() || text2.isNull()) -- return QVariant( text1 + text2); -+ QString text1; //FIXME favicon state -+ QString text2; //FIXME link state -+ if(text1.isEmpty() || text2.isEmpty()) -+ return QVariant( text1 + text2 ); - else -- return QVariant( text1 + " -- " + text2); -+ return QVariant( text1 + " -- " + text2 ); - } - default: - return QVariant( QString() ); //can't happen -@@ -141,12 +141,14 @@ - return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled; - } - else -+ { - if(index.column() < 3) -- return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled; -+ return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled; + if (!childView->isFollowActive()) + childView->setLinkedView( cfg.readEntry( QString::fromLatin1( "LinkedView" ).prepend( prefix ), false ) ); +- childView->setToggleView( cfg.readEntry( QString::fromLatin1( "ToggleView" ).prepend( prefix ), false ) ); +- if( !cfg.readEntry( QString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) ) +- childView->frame()->statusbar()->hide(); ++ const bool isToggleView = cfg.readEntry(QString::fromLatin1("ToggleView").prepend(prefix), false); ++ childView->setToggleView( isToggleView ); ++ if (isToggleView /*100373*/ || !cfg.readEntry(QString::fromLatin1("ShowStatusBar").prepend(prefix), true)) { ++ childView->frame()->statusbar()->hide(); + } - } - - // root -- return Qt::ItemIsEnabled | Qt::ItemIsSelectable; -+ return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled; - } - - bool KBookmarkModel::setData(const QModelIndex &index, const QVariant &value, int role) -@@ -187,7 +189,7 @@ - return createIndex(row, column, d->mRootItem); - - TreeItem * item = static_cast<TreeItem *>(parent.internalPointer()); -- if(row == item->childCount()) {// Received drop below last row, simulate drop on last row -+ if(row == item->childCount()) {// Received drop below last row, simulate drop on last row - return createIndex(row-1, column, item->child(row-1)); - } - -@@ -284,22 +286,42 @@ - bool KBookmarkModel::dropMimeData(const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent) - { -- Q_UNUSED(action) -- - //FIXME this only works for internal drag and drops - //FIXME Moving is *very* buggy -- -- QModelIndex idx; -+ QModelIndex dropDestIndex; -+ bool isInsertBetweenOp = false; - if(row == -1) -- idx = parent; -+ { -+ dropDestIndex = parent; -+ } - else -- idx = index(row, column, parent); -+ { -+ isInsertBetweenOp = true; -+ dropDestIndex= index(row, column, parent); -+ } - -- KBookmark bk = bookmarkForIndex(idx); -- QString addr = bk.address(); -- if(bk.isGroup()) -- addr += "/0"; -+ KBookmark dropDestBookmark = bookmarkForIndex(dropDestIndex); -+ if (dropDestBookmark.isNull()) -+ { -+ // Presumably an invalid index: assume we want to place this in the root bookmark -+ // folder. -+ dropDestBookmark = d->mRoot; -+ } - -+ QString addr = dropDestBookmark.address(); -+ if(dropDestBookmark.isGroup() && !isInsertBetweenOp) -+ { -+ addr += "/0"; -+ } -+ // bookmarkForIndex(...) does not distinguish between the last item in the folder -+ // and the point *after* the last item in the folder (and its hard to see how to -+ // modify it so it does), so do the check here. -+ if (isInsertBetweenOp && row == dropDestBookmark.positionInParent() + 1) -+ { -+ // Attempting to insert underneath the last item in a folder; adjust the address. -+ addr = KBookmark::nextAddress(addr); -+ } -+ - if(action == Qt::CopyAction) - { - KEBMacroCommand * cmd = CmdGen::insertMimeSource("Copy", data, addr); -@@ -338,6 +360,10 @@ - - KBookmark KBookmarkModel::bookmarkForIndex(const QModelIndex& index) const - { -+ if (!index.isValid()) -+ { -+ return KBookmark(); -+ } - return static_cast<TreeItem *>(index.internalPointer())->bookmark(); - } - -Index: apps/keditbookmarks/bookmarklistview.cpp + #if 0 // currently unused + KonqConfigEvent ev( cfg.config(), prefix+'_', false/*load*/); +Index: apps/konqueror/settings/ebrowsing/ebrowsing.desktop +=================================================================== +--- apps/konqueror/settings/ebrowsing/ebrowsing.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/konqueror/settings/ebrowsing/ebrowsing.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -74,7 +74,7 @@ + Name[ru]=Сокращения + Name[se]=Fierpmádatlávkestagat + Name[si]=වෙබ් කෙටිමං +-Name[sk]=Internetové skratky ++Name[sk]=Webové skratky + Name[sl]=Spletne bližnjice + Name[sr]=Веб пречице + name...@latin]=veb prečice +Index: apps/konqueror/settings/kio/uasproviders/safari30oniphone.desktop +=================================================================== +--- apps/konqueror/settings/kio/uasproviders/safari30oniphone.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/konqueror/settings/kio/uasproviders/safari30oniphone.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -45,6 +45,7 @@ + Name[ru]=UADescription (Safari 3.0 на iPhone) + Name[se]=UA-čilgehus (Safari 3.0 iPhones) + Name[si]=UADescription (iPhone මත Safari 3.0) ++Name[sk]=Popis agenta (Safari 3.0 na iPhone) + Name[sl]=UAOpis (Safari 3.0 na iPhone) + Name[sr]=УА‑опис (Сафари 3.0 на и‑фону) + name...@latin]=ua-opis (Safari 3.0 na iPhoneu) +Index: apps/konqueror/settings/kio/uasproviders/safari32.desktop +=================================================================== +--- apps/konqueror/settings/kio/uasproviders/safari32.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) ++++ apps/konqueror/settings/kio/uasproviders/safari32.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994) +@@ -45,6 +45,7 @@ + Name[ru]=UADescription (Safari 3.2 на Mac OS X) + Name[se]=UA-čilgehus (Safari 3.2 MacOS X:s) + Name[si]=UADescription (MacOS X මත Safari 3.2) ++Name[sk]=Popis agenta (Safari 3.2 na MacOS X) + Name[sl]=UAOpis (Safari 3.2 na MacOS X) + Name[sr]=УА‑опис (Сафари 3.2 на МекОС‑у X) + name...@latin]=ua-opis (Safari 3.2 na MacOS‑u X) +Index: apps/konqueror/settings/kio/uasproviders/op962oncurrent.desktop +=================================================================== +--- apps/konqueror/settings/kio/uasproviders/op962oncurrent.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994) <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase/kde4-kdebase-branch.diff?r1=1.13&r2=1.14&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase/kde4-kdebase.spec?r1=1.110&r2=1.111&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit