packages (DEVEL): kde4-kdebase/kde4-kdebase-branch.diff, kde4-kdebase/kde4-...
arekm
arekm at pld-linux.org
Fri Jan 8 12:36:44 CET 2010
Author: arekm Date: Fri Jan 8 11:36:44 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- up to 4.3.90
---- Files affected:
packages/kde4-kdebase:
kde4-kdebase-branch.diff (1.14 -> 1.15) , kde4-kdebase.spec (1.104.2.15 -> 1.104.2.16)
---- Diffs:
================================================================
Index: packages/kde4-kdebase/kde4-kdebase-branch.diff
diff -u packages/kde4-kdebase/kde4-kdebase-branch.diff:1.14 packages/kde4-kdebase/kde4-kdebase-branch.diff:1.15
--- packages/kde4-kdebase/kde4-kdebase-branch.diff:1.14 Wed Nov 25 10:55:49 2009
+++ packages/kde4-kdebase/kde4-kdebase-branch.diff Fri Jan 8 12:36:38 2010
@@ -1,1378 +1,33 @@
-Index: apps/kappfinder/apps/Graphics/blender.desktop
+Index: apps/konqueror/settings/konq/globalpaths.cpp
===================================================================
---- 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[sr at 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[sr at 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[sr at 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[sr at 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[sr at 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[sr at 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[uz at 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[sr at 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[uz at 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[sr at 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[uz at 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[uz at 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[uz at 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[uz at 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[uz at 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[sr at 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[uz at 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[uz at 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[uz at 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[uz at 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[sr at 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[sr at latin]=Sučelje za miksetu Alse
-+GenericName[sr]=Прочеље за миксету Алсе
-+GenericName[sr at 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[sr at 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[sr at 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[sr at 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[sr at 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[uz at 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 @@
+--- apps/konqueror/settings/konq/globalpaths.cpp (.../tags/KDE/4.3.4/kdebase) (wersja 1058840)
++++ apps/konqueror/settings/konq/globalpaths.cpp (.../branches/KDE/4.3/kdebase) (wersja 1058840)
+@@ -329,6 +329,12 @@
+ return true;
+ if (!QFile::exists(src.toLocalFile()))
+ return true;
++ // Do not move $HOME! #193057
++ const QString translatedPath = translatePath(src.toLocalFile());
++ if (translatedPath == "$HOME" || translatedPath == "$HOME/") {
++ return true;
++ }
++
+ m_ok = true;
+ // TODO: check if the src dir is empty? Nothing to move, then...
- 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();
-+ }
-
- #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[sr at 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[sr at 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[sr at 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)
-+++ apps/konqueror/settings/kio/uasproviders/op962oncurrent.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
-@@ -45,6 +45,7 @@
- Name[ru]=UADescription (Opera 9.62 на текущей системе)
- Name[se]=UA-čilgehus (Opera 9.62 dán mašiinnas)
- Name[si]=UADescription (Opera 9.62 on current)
-+Name[sk]=Popis agenta (Opera 9.62 na aktuálnom)
- Name[sl]=UAOpis (Opera 9.62 na trenutnem)
- Name[sr]=УА‑опис (Опера 9.62 на текућем)
- Name[sr at latin]=UA-opis (Opera 9.62 na tekućem)
-Index: apps/konqueror/settings/kio/uasproviders/android10.desktop
-===================================================================
---- apps/konqueror/settings/kio/uasproviders/android10.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
-+++ apps/konqueror/settings/kio/uasproviders/android10.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
-@@ -45,6 +45,7 @@
- Name[ru]=UADescription (Android Phone 1.0)
- Name[se]=UA-čilgehus (Android telefuvdna 1.0)
- Name[si]=UADescription (Android Phone 1.0)
-+Name[sk]=Popis agenta (Android Phone 1.0)
- Name[sl]=UAOpis (Android Phone 1.0)
- Name[sr]=УА‑опис (андроид телефон 1.0)
- Name[sr at latin]=UA-opis (android telefon 1.0)
-Index: apps/konqueror/settings/kio/uasproviders/ie70onwinnt51.desktop
-===================================================================
---- apps/konqueror/settings/kio/uasproviders/ie70onwinnt51.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
-+++ apps/konqueror/settings/kio/uasproviders/ie70onwinnt51.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
-@@ -45,6 +45,7 @@
- Name[ru]=UADescription (IE 7.0 на Win XP)
- Name[se]=UA-čilgehus (IE 7.0 Win XP:s)
- Name[si]=UADescription (Win XP මත IE 7.0)
-+Name[sk]=Popis agenta (IE 7.0 na Win XP)
- Name[sl]=UAOpis (IE 7.0 na Windows XP)
- Name[sr]=УА‑опис (ИЕ 7.0 на Виндоузу ИксП)
- Name[sr at latin]=UA-opis (IE 7.0 na Windowsu XP)
-Index: apps/konqueror/settings/kio/uasproviders/chrome10onwinnt51.desktop
-===================================================================
---- apps/konqueror/settings/kio/uasproviders/chrome10onwinnt51.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
-+++ apps/konqueror/settings/kio/uasproviders/chrome10onwinnt51.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
-@@ -45,6 +45,7 @@
- Name[ru]=UADescription (Google Chrome 1.0 на Windows XP)
- Name[se]=UA-čilgehus (Google Chrome 1.0 Windows XP:s)
- Name[si]=UADescription (Windows XP මත Google Chrome 1.0)
-+Name[sk]=Popis agenta (Google Chrome 1.0 na Windows XP)
- Name[sl]=UAOpis (Google Chrome 1.0 na Windows XP)
- Name[sr]=УА‑опис (Гугл кроум 1.0 на Виндоузу ИксП)
- Name[sr at latin]=UA-opis (Google Chrome 1.0 na Windowsu XP)
-Index: apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop
-===================================================================
---- apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
-+++ apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
-@@ -45,6 +45,7 @@
- Name[ru]=UADescription (Firefox 3.0 на текущей системе)
- Name[se]=UA-čilgehus (Firefox 3.0 dán mašiinnas)
- Name[si]=UADescription (Firefox 3.0 on current)
-+Name[sk]=Popis agenta (Firefox 3.0 na aktuálnom)
- Name[sl]=UAOpis (Firefox 3.0 na trenutnem)
- Name[sr]=УА‑опис (Фајерфокс 3.0 на текућем)
- Name[sr at latin]=UA-opis (Firefox 3.0 na tekućem)
-Index: apps/konqueror/settings/kio/uasproviders/wgetoncurrent.desktop
-===================================================================
---- apps/konqueror/settings/kio/uasproviders/wgetoncurrent.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
-+++ apps/konqueror/settings/kio/uasproviders/wgetoncurrent.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
-@@ -45,6 +45,7 @@
- Name[ru]=UADescription (Wget 1.11.4)
- Name[se]=UA-čilgehus (Wget 1.11.4)
- Name[si]=UADescription (Wget 1.11.4)
-+Name[sk]=Popis agenta (Wget 1.11.4)
- Name[sl]=UAOpis (Wget 1.11.4)
- Name[sr]=УА‑опис (Вгет 1.11.4)
- Name[sr at latin]=UA-opis (wget 1.11.4)
-Index: apps/konqueror/settings/konqhtml/khtml_general.desktop
-===================================================================
---- apps/konqueror/settings/konqhtml/khtml_general.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
-+++ apps/konqueror/settings/konqhtml/khtml_general.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
-@@ -23,6 +23,7 @@
- Name[en_GB]=General
- Name[es]=General
- Name[et]=Üldine
-+Name[eu]=Orokorra
- Name[fi]=Yleiset
- Name[fr]=Général
- Name[fy]=Algemien
-@@ -52,6 +53,7 @@
- Name[pt_BR]=Geral
- Name[ro]=General
- Name[ru]=Основное
-+Name[sk]=Všeobecné
- Name[sl]=Splošno
- Name[sr]=Опште
- Name[sr at latin]=Opšte
-Index: apps/konqueror/settings/konqhtml/khtml_appearance.desktop
-===================================================================
---- apps/konqueror/settings/konqhtml/khtml_appearance.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
-+++ apps/konqueror/settings/konqhtml/khtml_appearance.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
-@@ -146,6 +146,7 @@
- Comment[ru]=Настройка шрифтов веб-страниц
- Comment[se]=Heivet man láhkai fierpmádatsiiddut čájehuvvot
- Comment[si]=Configure how to display web pages
-+Comment[sk]=Nastavenie zobrazenia webových stránok
- Comment[sl]=Nastavitve načina prikazovanja spletnih strani
- Comment[sr]=Подешавање приказа веб страница
- Comment[sr at latin]=Podešavanje prikaza veb stranica
-Index: apps/konqueror/kfmclient_dir.desktop
-===================================================================
---- apps/konqueror/kfmclient_dir.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
-+++ apps/konqueror/kfmclient_dir.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
-@@ -4,7 +4,8 @@
- Icon=konqueror
- Terminal=false
- MimeType=inode/directory;
--InitialPreference=5
-+# Must be more than gwenview
-+InitialPreference=10
- NoDisplay=true
- Name=Konqueror
- Name[af]=Konqueror
-Index: apps/konqueror/konquerorsu.desktop
-===================================================================
---- apps/konqueror/konquerorsu.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
-+++ apps/konqueror/konquerorsu.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
-@@ -71,7 +71,7 @@
- Name[ru]=Диспетчер файлов (в режиме администратора)
- Name[se]=Fiilagieđahalli – Supergeavaheaddjemodus
- Name[si]=ගොනු කළමණාකරු - විශේෂ පරිශීලක ආකාරය
--Name[sk]=Správca súborov - Superpoužívateľský mód
-+Name[sk]=Správca súborov - superužívateľský režim
- Name[sl]=Upravitelj datotek (skrbniški način)
- Name[sr]=Менаџер фајлова (суперкориснички)
- Name[sr at latin]=Menadžer fajlova (superkorisnički)
-Index: apps/konqueror/preloader/konqy_preloader.desktop
-===================================================================
---- apps/konqueror/preloader/konqy_preloader.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
-+++ apps/konqueror/preloader/konqy_preloader.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
-@@ -65,7 +65,7 @@
- Name[ru]=Предварительная загрузка Konqueror
- Name[se]=KDED-lassemodula mii viežžá Konqueror ovdagihtii
- Name[si]=KDED Konqueror Preloader Module
--Name[sk]=Modul KDED prednahrania Konquerora
-+Name[sk]=KDED modul pre prednahratie Konquerora
- Name[sl]=Modul KDED za prednalaganje Konquerorja
- Name[sr]=КДЕД модул за предучитавање К‑освајача
- Name[sr at latin]=KDED modul za predučitavanje K‑osvajača
-Index: apps/dolphin/src/kcm/kcmdolphinnavigation.desktop
-===================================================================
---- apps/dolphin/src/kcm/kcmdolphinnavigation.desktop (.../tags/KDE/4.3.3/kdebase) (wersja 1053994)
-+++ apps/dolphin/src/kcm/kcmdolphinnavigation.desktop (.../branches/KDE/4.3/kdebase) (wersja 1053994)
-@@ -43,6 +43,7 @@
- Name[ru]=Навигация в Dolphin
- Name[se]=Dolphinnavigašuvdna
- Name[si]=Dolphin සැරිසැරුම
-+Name[sk]=Navigácia Dolphinu
- Name[sl]=Dolphin - krmarjenje
- Name[sr]=Делфинова навигација
- Name[sr at latin]=Dolphinova navigacija
-@@ -97,6 +98,7 @@
- Comment[ro]=Acest serviciu permite configurarea navigării Dolphin.
- Comment[ru]=Эта служба позволяет настраивать навигацию в Dolphin
- Comment[si]=මෙම සේවාව Dolphin සැරිසැරුම සැකසීමට ඉඩ දේ.
<<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.14&r2=1.15&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase/kde4-kdebase.spec?r1=1.104.2.15&r2=1.104.2.16&f=u
More information about the pld-cvs-commit
mailing list