---- runtime/cmake/modules/FindPulseAudio.cmake (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/cmake/modules/FindPulseAudio.cmake (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -30,8 +30,8 @@
-
- FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h
- HINTS
-- ${PC_PULSEADUIO_INCLUDEDIR}
-- ${PC_PULSEADUIO_INCLUDE_DIRS}
-+ ${PC_PULSEAUDIO_INCLUDEDIR}
-+ ${PC_PULSEAUDIO_INCLUDE_DIRS}
- )
-
- FIND_LIBRARY(PULSEAUDIO_LIBRARY NAMES pulse libpulse
---- runtime/knotify/kde.notifyrc (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/knotify/kde.notifyrc (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -752,7 +752,7 @@
- Comment[pt]=Ocorreu um erro sério que fez com que o programa saísse
- Comment[pt_BR]=Houve um erro sério, que fez com que o programa fosse fechado
- Comment[ro]=A avut loc o eroare gravă ce a determinat ieșirea programului
--Comment[ru]=Произошла серьезная ошибка, приведшая к завершению работы программы
-+Comment[ru]=Произошла серьёзная ошибка, приведшая к завершению работы программы
- Comment[se]=Duođalaš meattáhus bissehii prográmma
- Comment[sk]=Stala sa vážna chyba, ktorá zapríčinila ukončenie programu
- Comment[sl]=Prišlo je do resne napake, zaradi katere se je program končal
-@@ -1181,7 +1181,7 @@
- Comment[pt]=Ocorreu um erro muito sério, que fez pelo menos com que o programa saísse
- Comment[pt_BR]=Um erro muito sério aconteceu, que causou (no mínimo) o fechamento do programa
- Comment[ro]=A intervenit o eroare foarte gravă, cauzînd cel puțin ieșirea programului
--Comment[ru]=Произошла очень серьезная ошибка, как минимум, вызвавшая завершение работы программы
-+Comment[ru]=Произошла очень серьёзная ошибка, как минимум, вызвавшая завершение работы программы
- Comment[sk]=Stala sa veľmi vážna chyba, ktorá zapríčinila minimálne ukončenie programu
- Comment[sl]=Prišlo je do zelo resne napake, zaradi katere se je program končal
- Comment[sr]=Дошло је до врло озбиљне грешке, због које је бар програм обустављен
-@@ -1389,7 +1389,7 @@
- Name[kn]=ನಿರ್ಗಮಿಸು (ಲಾಗೌಟ್)
- Name[ko]=로그아웃
- Name[ku]=Derketin
--Name[lt]=Atsijungti
-+Name[lt]=Atsijungimas
- Name[lv]=Atteikties
- Name[mai]=लाग आउट
- Name[mk]=Одјавување
---- runtime/kcontrol/componentchooser/componentservices/kcm_filemanager.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/kcontrol/componentchooser/componentservices/kcm_filemanager.desktop (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -111,6 +111,7 @@
- Comment[kn]=ಇಲ್ಲಿ ನೀನು ನಿನ್ನ ಪೂರ್ವನಿಯೋಜಿತ ಕಡತ ವ್ಯವಸ್ಥಾಪಕವನ್ನು ಸಂರಚಿಸಬಹುದು. ಕೆಮೆನು ನಮೂದುಗಳು ಹಾಗೂ ಕಡತಕೋಶಗಳನ್ನು ತೆರೆಯಬಹುದಾದ ಎಲ್ಲಾ ಕೆಡಿಇ ಅನ್ವಯಗಳೂ ಈ ಕಡತ ವ್ಯವಸ್ಥಾಪಕವನ್ನು ಬಳಸುತ್ತವೆ.
- Comment[ko]=여기에서 기본 파일 관리자를 설정할 수 있습니다. K 메뉴 항목과 폴더를 열 수 있는 모든 KDE 프로그램에서는 이 설정을 따라야 합니다.
- Comment[ku]=Li vir tu dikarî rêveberê xwe yê pelê a standard mîheng bikî. Hemû sepanên di pêşeka K de û yên di KDE de tu dikarî dê bi vê rêveberê ve vebin.
-+Comment[lt]=Čia galite nustatyti, kuri failų tvarkytuvė bus numatytoji. Visi įrašai K meniu bei visos KDE programos, kuriomis atveriami aplankai, naudos šią failų tvarkytuvę.
- Comment[lv]=Šeit varat konfigurēt noklusēto failu pārvaldnieku. K izvēlnes ieraksti un visas KDE programmas izmantos šo parametru mapju atvēršanai.
- Comment[mk]=Тука може да го конфигурирате Вашиот стандарден менаџер на датотеки. Елементите од менито на KDE и сите KDE-апликации во кои може да отворате папки ќе го користат овој менаџер.
- Comment[ml]=നിങ്ങളുടെ സ്വാഭാവിക ഫയല് കാര്യസ്ഥന് നിങ്ങള്ക്കിവിടെ ക്രമീകരിയ്ക്കാം. കെ വിഭവസൂചികയിലുള്ള എണ്ട്രികളും എല്ലാ കെഡിഇ പ്രയോഗങ്ങളും ഈ ഫയല് കാര്യസ്ഥന് ഉപയോഗിക്കും.
---- runtime/kcontrol/componentchooser/componentservices/kcm_terminal.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/kcontrol/componentchooser/componentservices/kcm_terminal.desktop (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -121,7 +121,7 @@
- Comment[kn]=ಈ ಸೇವೆಯು ನಿನ್ನ ಪೂರ್ವನಿಯೋಜಿತ ಆದೇಶತೆರೆ ಅನುವರ್ತಕವನ್ನು (ಎಮುಲೇಟರ್) ಸಂರಚಿಸಲು ಅನುವುಮಾಡಿಕೊಡುತ್ತದೆ. ಆದೇಶತೆರೆ ಅನುವರ್ತಕವನ್ನು ಕೋರುವ ಎಲ್ಲಾ ಕೆಡಿಇ ಅನ್ವಯಗಳೂ ಈ ಸಂಯೋಜನೆಗಳನ್ನು ಗೌರವಿಸಬೇಕಾಗುತ್ತದೆ.
- Comment[ko]=이 서비스에서는 기본 터미널 에뮬레이터를 설정할 수 있습니다. 터미널 에뮬레이터에 접근하려고 하는 모든 KDE 프로그램에서는 이 설정을 따라야 합니다.
- Comment[ku]=Ev xizmet destûrê dide te ku amulatora termînalê ya standard mîheng bikî. Hemû sepanên KDE'yê yên ku tu dikarî hyperlînkê hilbijêrî dê vê mîhengê erê bikin.
--Comment[lt]=Ši tarnyba leidžia jumos nustatyti Jūsų numatytą pašto klientą. Visos KDE programos, kurios iškviečia terminalo emuliatoriaus programa, turėtų atsižvelgti į šį nustatymą.
-+Comment[lt]=Ši tarnyba leidžia jumos nustatyti Jūsų numatytą pašto klientą. Visos KDE programos, kurios iškviečia terminalo emuliatoriaus programą, turėtų atsižvelgti į šį nustatymą.
- Comment[lv]=Šis serviss jums ļauj iestatīt noklusēto termināla emulatoru. Visas KDE programmas, kurām vajag termināla emulatoru, izmantos šo parametru.
- Comment[mai]=ई सेवा अहाँक अहाँक मूलभूत टर्मिनल एमुलेटर केँ बिन्यस्त करबाक स्वीकृति देत अछि. सबहि केडीई अनुप्रयोग जे टर्मिनल एमुलेटर अनुप्रयोग चालू करैत अछि, ओ एहि सेटिंग इस्तेमाल करताह.
- Comment[mk]=Овој сервис ви овозможува да го конфигурирате вашиот стандарден терминалски емулатор. Сите KDE-апликации кои стартуваат апликација во терминалски емулатор ќе ги почитуваат овие поставувања.
---- runtime/desktoptheme/metadata.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/desktoptheme/metadata.desktop (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -50,7 +50,7 @@
- Comment[gu]=થીમ ઓક્સિજન શૈલીમાં બનાવાઇ છે
- Comment[he]=ערכת נושא שמשתמשת בסגנון Oxygen
- Comment[hi]=प्रसंग को ऑक्सीजन शैली में किया गया है
--Comment[hne]=प्रसंग ल ओक्सीजन सैली मं कर दे गे हे
-+Comment[hne]=प्रसंग ल आक्सीजन सैली मं कर दे गे हे
- Comment[hu]=Oxygen-stílusú téma
- Comment[is]=Þema sem gert er í 'Oxygen' stíl
- Comment[it]=Tema in stile Oxygen
---- runtime/renamedlgplugins/audio/renaudiodlg.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/renamedlgplugins/audio/renaudiodlg.desktop (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -38,7 +38,7 @@
- Name[kn]=ಶ್ರವ್ಯಾಂಶ (ಧ್ವನಿ) ಮುನ್ನೋಟ
- Name[ko]=오디오 미리 듣기
- Name[ku]=Pêşdîtina Deng
--Name[lt]=aUDIO PERKLAUSA
-+Name[lt]=Audio perklausa
- Name[lv]=Audio priekšapskate
- Name[mk]=Аудиопреглед
- Name[ml]=ഓഡിയോ കേട്ട് നോക്കുക
---- runtime/phonon/kcm/xine/kcm_phononxine.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/phonon/kcm/xine/kcm_phononxine.desktop (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -61,7 +61,7 @@
- Comment[kn]=ಕ್ಸೈನ್ ಹಿಂಬದಿ (ಬ್ಯಾಕ್ ಎಂಡ್) ಸಂರಚನೆ
- Comment[ko]=Xine 백엔드 설정
- Comment[ku]=Veavakirina Binesazî ya Xine
--Comment[lt]=Xine programinės sąsajos konfigūravimas
-+Comment[lt]=Xine sąsajos konfigūravimas
- Comment[lv]=Xine aizmugures konfigurācija
- Comment[mk]=Конфигурација на задниот крај на Xine
- Comment[mr]=Xine बॅकएन्ड संयोजना
---- runtime/phonon/kcm/kcm_phonon.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/phonon/kcm/kcm_phonon.desktop (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -105,6 +105,7 @@
- Comment[kn]=ಶ್ರವ್ಯಾಂಶ ಮತ್ತು ದೃಶ್ಯಾಂಶ (ಧ್ವನಿ ಮತ್ತು ವಿಡಿಯೋ) ಸಂರಚನೆ
- Comment[ko]=소리와 동영상 설정
- Comment[ku]=Veavakirina Deng û Vîdeoyê
-+Comment[lt]=Garso ir video konfigūravimas
- Comment[lv]=Skaņas un Video konfigurācija
- Comment[mk]=Конфигурација на звук и видео
- Comment[ml]=ശബ്ദ-ചലചിത്ര ക്രമീകരണം
---- runtime/phonon/kded-module/phononserver.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/phonon/kded-module/phononserver.desktop (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -34,6 +34,7 @@
- Name[kn]=ಧ್ವನಿ ಕಾರ್ಯನೀತಿ (ಪಾಲಿಸಿ) ಪರಿಚಾರಕ
- Name[ko]=소리 정책 서버
- Name[ku]=Pêşkêşkerê Qayde yê Dengê
-+Name[lt]=Garsų nuostatų serveris
- Name[lv]=Skaņu politikas serveris
- Name[ml]=ശബ്ദ പോളിസി സര്വര്
- Name[mr]=साऊन्ड करार सर्वर
---- runtime/menu/desktop/kde-utilities-accessibility.directory (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/menu/desktop/kde-utilities-accessibility.directory (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -44,7 +44,7 @@
- Name[kn]=ನಿಲುಕಣೆ (ಆಕ್ಸೆಸಿಬಿಲಿಟಿ)
- Name[ko]=내게 필요한 설정
- Name[ku]=Gihîştin
--Name[lt]=Prieinamumas
-+Name[lt]=Pritaikymas neįgaliesiems
- Name[lv]=Pieejamība
- Name[mai]=अभिगम्यता
- Name[mk]=Пристапливост
-@@ -128,7 +128,7 @@
- Comment[kn]=ನಿಲುಕಣೆ (ಆಕ್ಸೆಸಿಬಿಲಿಟಿ)
- Comment[ko]=내게 필요한 설정
- Comment[ku]=Gihîştin
--Comment[lt]=Prieinamumas
-+Comment[lt]=Pritaikymas neįgaliesiems
- Comment[lv]=Pieejamība
- Comment[mai]=अभिगम्यता
- Comment[mk]=Пристапливост
---- runtime/menu/desktop/kde-graphics.directory (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/menu/desktop/kde-graphics.directory (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -16,7 +16,7 @@
- Name[csb]=Grafika
- Name[cy]=Graffeg
- Name[da]=Grafik
--Name[de]=Graphik
-+Name[de]=Grafik
- Name[el]=Γραφικά
- Name[eo]=Grafiko
- Name[es]=Gráficos
---- runtime/khelpcenter/kcmhelpcenter.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/khelpcenter/kcmhelpcenter.desktop (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -120,7 +120,7 @@
- Comment[gu]=મદદ કેન્દ્ર શોધ અનુક્રમણિકા રૂપરેખાંકન અને બનાવટ
- Comment[he]=שינוי הגדרות ויצירת אינדקס החיפוש של מרכז העזרה
- Comment[hi]=मदद केंद्र खोज तालिका कॉन्फ़िगरेशन तथा ज़ेनरेशन
--Comment[hne]=मदद केंद्र खोज तालिका कान्फिगरेसन अउ जेनरेसन
-+Comment[hne]=मदद केंद्र खोज टेबल कान्फिगरेसन अउ जेनरेसन
- Comment[hr]=Konfiguriranje i generiranje indeksa za pretraživanje pomoći
- Comment[hsb]=Připrawjenje a stworjenje pytanskeho indeksa za pomhanišćo
- Comment[hu]=A dokumentáció keresési indexének beállításai
---- runtime/doc/kcontrol/bookmarks/index.docbook (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/doc/kcontrol/bookmarks/index.docbook (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -61,7 +61,7 @@
- <varlistentry>
- <term><guilabel>Flatten bookmarks tree</guilabel></term>
- <listitem>
--<para>Sub-folders are show within their parent by default. If you activate this option, sub-folders are displayed on their own. It looks less nice but it may help if you have a very big folder you want to spread in two columns.</para>
-+<para>Sub-folders are shown within their parent by default. If you activate this option, sub-folders are displayed on their own. It looks less nice but it may help if you have a very big folder you want to spread in two columns.</para>
- </listitem>
- </varlistentry>
-
---- runtime/doc/kcontrol/kcmlaunch/index.docbook (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/doc/kcontrol/kcmlaunch/index.docbook (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -13,8 +13,8 @@
- <!-- TRANS:ROLES_OF_TRANSLATORS -->
- </authorgroup>
-
--<date>2006-06-24</date>
--<releaseinfo>3.5.2</releaseinfo>
-+<date>2009-02-10</date>
-+<releaseinfo>&kde; 4.2</releaseinfo>
-
- <keywordset>
- <keyword>KDE</keyword>
-@@ -54,17 +54,18 @@
- replaced by a spinning hourglass to let you know something is
- happening. You can toggle this behavior on and off with the
- <guilabel>Enable taskbar notification</guilabel> checkbox, and when it's
--enabled, you can set a time in the <guilabel>Startup indication timeout
--:</guilabel> spinbox.</para>
-+enabled, you can set a time in the
-+<guilabel>Startup indication timeout</guilabel> spinbox.</para>
-
- <para>Not all applications that you start will eventually show a
- window, or an entry in the taskbar. Some of them, for example, are
- docked into the &kde; system tray. Alternatively, it might be that you
--sent it off to a different virtual desktop, and <guilabel>Show windows
--from all desktops</guilabel> is unchecked in the &kcontrolcenter; module
--<guimenuitem>Taskbar</guimenuitem>. Setting a timeout ensures that,
-+sent it off to a different virtual desktop, and in the <guilabel>Filters</guilabel>
-+section of the <ulink url="help:/plasma/index.html#panel">
-+<guilabel>Task Manager Settings</guilabel></ulink> the option <guilabel>Only show
-+tasks from the current desktop</guilabel> is checked. Setting a timeout ensures that,
- even in these cases, you can still get launch feedback, but also that
- it will go away when the job is done.</para>
-
- </sect1>
--</article>
-\ No newline at end of file
-+</article>
---- runtime/doc/userguide/kde-for-admins.docbook (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/doc/userguide/kde-for-admins.docbook (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -828,7 +828,7 @@
-
- <para>The &kde; startup sequence starts with the
- <filename>startkde</filename> script. In most cases this script gets called
--from the display manager (&kdm;) once the user has been authenticated. Their
-+from the display manager (&kdm;) once the user has been authenticated. There
- are two very important lines in the <filename>startkde</filename>
- script:</para>
-
-@@ -2029,7 +2029,7 @@
- <variablelist>
- <varlistentry>
- <term><option>action/options_configure</option></term>
--<listitem><para>The <guimenuitem>Configure</guimenuitem> option form the
-+<listitem><para>The <guimenuitem>Configure</guimenuitem> option from the
- <guimenu>Settings</guimenu> menu</para></listitem>
- </varlistentry>
- <varlistentry>
---- runtime/doc/userguide/standard-menu-entries.docbook (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/doc/userguide/standard-menu-entries.docbook (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -117,8 +117,8 @@
- </shortcut><guimenuitem>Print...</guimenuitem>
- </menuchoice></term>
- <listitem><para>This menu entry displays the &kde;
--<quote>Print</quote> dialog, read to print the current
--document. Youcan find more information about the options available in
-+<quote>Print</quote> dialog, ready to print the current
-+document. You can find more information about the options available in
- this dialog in <xref linkend="printing-from-apps"/>.</para>
- </listitem>
- </varlistentry>
---- runtime/doc/userguide/under-the-hood.docbook (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/doc/userguide/under-the-hood.docbook (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -67,7 +67,7 @@
- (or the corresponding $<envar>KDEHOME</envar> directory). Backups are anyway
- a good idea in case of a major failure of &kde; that would
- destroy important configuration files (for example your &kmail; settings,
--which are in in the file <filename>kmailrc</filename>).
-+which are in the file <filename>kmailrc</filename>).
- (Such a major failure should not happen but it still can happen.)</para>
- </sect2>
-
---- runtime/doc/userguide/groupware-kontact.docbook (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/doc/userguide/groupware-kontact.docbook (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -497,11 +497,6 @@
- <para>Now enable &kmail; groupware functionality, and in <guilabel>Resource
- folders are subfolders of</guilabel> put the
- <guimenuitem>inbox</guimenuitem> that is subfolder of
--<quote>office_gwdata</quote>.</para>
+--- runtime/knotify/kde.notifyrc (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/knotify/kde.notifyrc (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -803,7 +803,7 @@
+ Comment[et]=Tekkis tõsine viga, mis sundis programmi tööd lõpetama
+ Comment[eu]=Errore larria egon da programa ateraraziz
+ Comment[fi]=Vakava virhe aiheutti ohjelman keskeytymisen
+-Comment[fr]=Une erreur sérieuse a entraîné la fin le programme
++Comment[fr]=Une erreur sérieuse a entraîné la fin du programme
+ Comment[fy]=Der wie in serieuse flater wertroch it programma sluten is
+ Comment[ga]=Tharla earráid thromchúiseach a thug ar an gclár éirí as
+ Comment[gl]=Aconteceu un erro grave que fixo que o programa se pechase inesperadamente
+@@ -2617,7 +2617,7 @@
+ Comment[et]=Esitatakse küsimus
+ Comment[eu]=Galdera bat egiten ari da
+ Comment[fi]=Esitetään kysymys
+-Comment[fr]=une question vous est posée
++Comment[fr]=Une question vous est posée
+ Comment[fy]=In fraach wurdt stelt
+ Comment[ga]=Ceist á fiafraí
+ Comment[gl]=Está a facerse unha pregunta
+--- runtime/solid-device-automounter/kcm/device_automounter_kcm.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/solid-device-automounter/kcm/device_automounter_kcm.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -88,7 +88,7 @@
+ Comment[et]=Eemaldatavate andmekandjate automaatse käitlemise seadistamine
+ Comment[eu]=Biltegiratzeko euskarri aldagarrien maneiu automatikoaren konfiguraketa
+ Comment[fi]=Muokkaa irrotettavan tallennusmedian automaattista käsittelyä
+-Comment[fr]=Configure la prise en charge automatique des média de stockage amovible
++Comment[fr]=Configure la prise en charge automatique des médias de stockage amovibles
+ Comment[fy]=IT automatysk ôfhanneljen fan útnimbere opslach media ynstelle
+ Comment[ga]=Cumraigh láimhseáil uathoibríoch meán inbhainte stórála
+ Comment[he]=הגדרת תפעול אוטומטי להתקני אחסון נשלפים.
+--- runtime/localization/currency/khr.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/khr.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -17,7 +17,7 @@
+ Name[es]=Riel camboyano
+ Name[et]=Kambodža riel
+ Name[eu]=Kanbodiako riel
+-Name[fi]=Kambodzan riel
++Name[fi]=Kambodžan riel
+ Name[fr]=Riel cambodgien
+ Name[fy]=Cambodjaanske riel
+ Name[ga]=Riel na Cambóide
+--- runtime/localization/currency/ats.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/ats.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -13,7 +13,7 @@
+ Name[csb]=Aùstrëjacczi Sziling
+ Name[da]=Østrigsk schilling
+ Name[de]=Österreichischer Schilling
+-Name[el]=Αυστρία σκίλινγκ
++Name[el]=Σελίνι Αυστρίας
+ Name[en_GB]=Austrian Schilling
+ Name[eo]=Aŭstra ŝilingo
+ Name[es]=Chelín austriaco
+--- runtime/localization/currency/eek.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/eek.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -13,7 +13,7 @@
+ Name[csb]=Estóńskô Kòróna
+ Name[da]=Estisk kroon
+ Name[de]=Estnische Krone
+-Name[el]=Εσθονική κορώνα
++Name[el]=Εσθονική κορόνα
+ Name[en_GB]=Estonian Kroon
+ Name[eo]=Estona krono
+ Name[es]=Corona estonia
+--- runtime/localization/currency/fkp.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/fkp.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -17,7 +17,7 @@
+ Name[es]=Libra malvinense
+ Name[et]=Falklandi saarte nael
+ Name[eu]=Malvinak Uharteetako (Falkland islands) libra
+-Name[fi]=Falklandin saarten (Malvinassaarten) punta
++Name[fi]=Falklandinsaarten (Malvinassaarten) punta
+ Name[fr]=Livre des Îles Falkland
+ Name[fy]=Falklânske pûn
+ Name[ga]=Punt na nOileán Fáclainne
+--- runtime/localization/currency/kyd.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/kyd.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -17,7 +17,7 @@
+ Name[es]=Dólar de las Islas Caimán
+ Name[et]=Kaimanisaarte dollar
+ Name[eu]=Kaiman Uharteetako dolar
+-Name[fi]=Cayman-saarien dollari
++Name[fi]=Caymansaarten dollari
+ Name[fr]=Dollar des Îles Caïman
+ Name[fy]=Kayman eilânske dollar
+ Name[ga]=Dollar na nOileáin Cayman
+--- runtime/localization/currency/thb.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/thb.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -12,7 +12,7 @@
+ Name[csb]=Tajsczi Baht
+ Name[da]=Thailandsk baht
+ Name[de]=Baht
+-Name[el]=Μπαχτ Ταϊλανδίας
++Name[el]=Μπατ Ταϊλάνδης
+ Name[en_GB]=Thai Baht
+ Name[eo]=Tajlanda bahto
+ Name[es]=Baht tailandés
+--- runtime/localization/currency/mgf.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/mgf.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -12,7 +12,7 @@
+ Name[csb]=Madagarsczi Frank
+ Name[da]=Malagassisk franc
+ Name[de]=Madagaskar-Franc
+-Name[el]=Φράγκο Μαλγασίκας
++Name[el]=Φράγκο Μαδαγασκάρης
+ Name[en_GB]=Malagasy Franc
+ Name[eo]=Madagaskara franko
+ Name[es]=Franco malgache
+--- runtime/localization/currency/tjs.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/tjs.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -17,7 +17,7 @@
+ Name[es]=Somoni tayiko
+ Name[et]=Tadžikistani somoni
+ Name[eu]=Tadjikistaneko somoni
+-Name[fi]=Tajikistanin somoni
++Name[fi]=Tadžikistanin somoni
+ Name[fr]=Somoni tadjik
+ Name[fy]=Tadjikistaanske somoni
+ Name[ga]=Somoni na Táidsíceastáine
+--- runtime/localization/currency/azm.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/azm.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -18,7 +18,7 @@
+ Name[es]=Manat azerí
+ Name[et]=Aserbaidžaani manat
+ Name[eu]=Azerbaijan Manat
+-Name[fi]=Azerbaidzanin manat
++Name[fi]=Azerbaidžanin manat
+ Name[fr]=Manat d'Azerbaïjan
+ Name[fy]=Azerbeidjaanske manat
+ Name[ga]=Manat na hAsarbainseáine
+--- runtime/localization/currency/azn.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/azn.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -18,7 +18,7 @@
+ Name[es]=Manat azerí
+ Name[et]=Aserbaidžaani manat
+ Name[eu]=Azerbaijan Manat
+-Name[fi]=Azerbaidzanin manat
++Name[fi]=Azerbaidžanin manat
+ Name[fr]=Manat d'Azerbaïjan
+ Name[fy]=Azerbeidjaanske manat
+ Name[ga]=Manat na hAsarbainseáine
+--- runtime/localization/currency/bam.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/bam.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -18,7 +18,7 @@
+ Name[es]=Marco convertible de Bosnia y Herzegovina
+ Name[et]=Bosnia ja Hertsegovina konverteeritav mark
+ Name[eu]=Bosnia eta Herzegovinako marko aldagarria
+-Name[fi]=Bosnia ja Herzegovinan vaihdettava markka
++Name[fi]=Bosnia ja Hertsegovinan vaihdettava markka
+ Name[fr]=Mark convertible de Bosnie-Herzégovine
+ Name[fy]=Bosnië en Herzegovina convertible mark
+ Name[ga]=Marc insóinseáilte Bhoisnia agus Heirseagaivéin
+--- runtime/localization/currency/sgd.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/sgd.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -13,7 +13,7 @@
+ Name[csb]=Singapùrsczi Dolar
+ Name[da]=Singaporeansk dollar
+ Name[de]=Singapur-Dollar
+-Name[el]=Δολάριο Σινγκαπούρης
++Name[el]=Δολάριο Σιγκαπούρης
+ Name[en_GB]=Singapore Dollar
+ Name[eo]=Singapura dolaro
+ Name[es]=Dólar de Singapur
+--- runtime/localization/currency/isk.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/isk.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -13,7 +13,7 @@
+ Name[csb]=Islandkô Kòróna
+ Name[da]=Islandsk krone
+ Name[de]=Isländische Krone
+-Name[el]=Ισλανδική κορώνα
++Name[el]=Ισλανδική κορόνα
+ Name[en_GB]=Icelandic Krona
+ Name[eo]=Islanda krono
+ Name[es]=Corona islandesa
+--- runtime/localization/currency/byr.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/byr.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -19,7 +19,7 @@
+ Name[es]=Rublo bielorruso
+ Name[et]=Valgevene rubla
+ Name[eu]=Belorrusiako Errubloa
+-Name[fi]=Valkovenäjän rupla
++Name[fi]=Valko-Venäjän rupla
+ Name[fr]=Rouble biélorusse
+ Name[fy]=Wyt-Russyske rubbel
+ Name[ga]=Rúbal na Bealarúise
+--- runtime/kcontrol/locale/language.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kcontrol/locale/language.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -36,7 +36,7 @@
+ Name[eu]=Herrialdea/eskualdea eta hizkuntza
+ Name[fa]=کشور/منطقه و زبان
+ Name[fi]=Alue ja kieli
+-Name[fr]=Pays & langue
++Name[fr]=Pays / Région & langue
+ Name[fy]=Lân/regio en taal
+ Name[ga]=Tír/Réigiún agus Teanga
+ Name[gl]=País/Rexión e lingua
+--- runtime/kcontrol/componentchooser/componentservices/kcm_kemail.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_kemail.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -84,7 +84,7 @@
+ Comment[cy]=Mae'r gwasanaeth ymayn gadael i chi ffurfweddu eich dibynnydd ebost cyffredinol. Dylai bob raglen KDE sydd angen cyrchiad i ddibynnydd ebost ddefnyddio'r gosodiad yma.
+ Comment[da]=Denne service tillader dig at indstille din e-mail-klient. Alle KDE-programmer der behøver adgang til en e-mail-klient skulle respektere denne indstilling.
+ Comment[de]=Hier können Sie Ihr E-Mail-Programm einrichten. Alle KDE-Anwendungen, die Zugriff auf ein solches Programm benötigen, sollten diese Einstellungen verwenden.
+-Comment[el]=Αυτή η υπηρεσία σας επιτρέπει να ρυθμίσετε τον προκαθορισμένο πελάτη email σας. Όλες οι εφαρμογές του KDE που χρειάζονται πρόσβαση σε μια εφαρμογή πελάτη email θα πρέπει να χρησιμοποιούν αυτή τη ρύθμιση.
++Comment[el]=Αυτή η υπηρεσία σας επιτρέπει να ρυθμίσετε τον προκαθορισμένο πελάτη της ηλ. αλληλογραφίας σας. Όλες οι εφαρμογές του KDE που χρειάζονται πρόσβαση σε μια εφαρμογή πελάτη ηλ. αλληλογραφίας θα πρέπει να χρησιμοποιούν αυτή τη ρύθμιση.
+ Comment[en_GB]=This service allows you to configure your default email client. All KDE applications which need access to an email client application should honour this setting.
+ Comment[eo]=Tiu servo ebligas, ke vi elektas vian defaŭltan retpoŝtilon. Ĉiuj KDEaj aplikoj, kiuj bezonas retpoŝtilon, uzos tiun agordon.
+ Comment[es]=Este servicio le permite configurar su cliente de correo predeterminado. Todas las aplicaciones KDE que precisen acceso a una aplicación de cliente de correo deberían reconocer esta opción.
+--- runtime/kcontrol/componentchooser/componentservices/kcm_wm.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_wm.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -19,7 +19,7 @@
+ Name[et]=Aknahaldur
+ Name[eu]=Leiho kudeatzailea
+ Name[fi]=Ikkunahallinta
+-Name[fr]=Gestionnaire de fenêtre
++Name[fr]=Gestionnaire de fenêtres
+ Name[fy]=Finsterbehearder
+ Name[ga]=Bainisteoir Fuinneog
+ Name[gl]=Xestor de fiestras
+@@ -87,7 +87,7 @@
+ Comment[et]=Siin saab valida KDE seansis kasutatava aknahalduri.
+ Comment[eu]=Hemen zure KDE saioan erabili nahi duzun leiho kudeatzailea hautatu dezakezu.
+ Comment[fi]=Tästä voit valita KDE-työpöydän käyttämän ikkunaohjelman.
+-Comment[fr]=Vous pouvez choisir ici le gestionnaire de fenêtre que vous souhaitez utiliser dans votre session KDE.
++Comment[fr]=Vous pouvez choisir ici le gestionnaire de fenêtres que vous souhaitez utiliser dans votre session KDE.
+ Comment[fy]=Hjir kinne jo de finstersbehearder dy jo yn jo KDE-sesje brûke wolle selektearje.
+ Comment[ga]=Anseo is féidir leat an bainisteoir fuinneog a rithfear i do sheisiún KDE.
+ Comment[gl]=Aquí pode escoller o xestor de fiestras que desexe executar na sesión de KDE.
+--- runtime/kcontrol/componentchooser/componentservices/kcm_filemanager.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_filemanager.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -87,7 +87,7 @@
+ Comment[et]=Siin saab seadistada vaikimisi kasutatavat failihaldurit. Kõik KDE rakendused, kus saab avada katalooge, peaksid siinsete seadistustega arvestama.
+ Comment[eu]=Hemen zure web arakatzaile lehenetsia konfigura dezakezu. K menuk eta KDE aplikazioek hau erabiliko dute karpetak irekitzerakoan
+ Comment[fi]=Tässä voit muokata käytettävää oletustiedostonhallintaohjelmaa. Kaikki KDE-sovellukset käyttävät tätä tiedostonhallintaohjelmaa.
+-Comment[fr]=Vous pouvez configurer ici votre gestionnaire de fichiers par défaut. Les entrées du menu K et toutes les applications KDE avec lesquels vous pouvez ouvrir des dossiers, utiliseront ce gestionnaire de fichiers.
++Comment[fr]=Vous pouvez configurer ici votre gestionnaire de fichiers par défaut. Les entrées du menu K et toutes les applications KDE avec lesquelles vous pouvez ouvrir des dossiers, utiliseront ce gestionnaire de fichiers.
+ Comment[fy]=Hjir kinne jo de standert triembehearder ynstelle. Alle ynfieren yn it K menu en alle KDE applikaasjes wêryn jo mappen iepenje kinne sille dizze triembehearder brûke.
+ Comment[ga]=Anseo is féidir leat bainisteoir comhad réamhshocraithe a chumrú. Úsáidfidh iontrálacha sa roghchlár K an bainisteoir comhad seo, chomh maith le gach feidhmchlár KDE is féidir fillteáin a oscailt.
+ Comment[gl]=Aquí pode configurar o xestor de ficheiros predeterminado. As entradas no menú K e todos os programas de KDE nos que poida abrir cartafoles han empregar este xestor de ficheiros.
+--- runtime/phonon/platform_kde/phononbackend.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/phonon/platform_kde/phononbackend.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -21,7 +21,7 @@
+ Name[et]=KDE multimeedia taustaprogramm
+ Name[eu]=KDE multimedia interfazea
+ Name[fi]=KDE-multimediataustaosa
+-Name[fr]=Moteur de traitement multimédia de KDE
++Name[fr]=Module multimédia de KDE
+ Name[fy]=KDE Multymedia efterein
+ Name[ga]=Inneall Ilmheán KDE
+ Name[gl]=Infraestrutura multimedia de KDE
+--- runtime/kpasswdserver/kpasswdserver.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kpasswdserver/kpasswdserver.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -75,7 +75,7 @@
+ Comment[et]=Ajutine parooli puhverdamine
+ Comment[eu]=Pasahitzen aldiuneko cachea
+ Comment[fi]=Väliaikainen salasanavälimuisti
+-Comment[fr]=Masquage du mot de passe temporaire
++Comment[fr]=Masquage temporaire du mot de passe
+ Comment[ga]=Taisce Shealadach Focal Faire
+ Comment[gu]=કામચલાઉ પાસવર્ડ કેશીંગ
+ Comment[he]=שמירה זמנית של סיסמאות בזיכרון מטמון
+--- runtime/platforms/win/kwinstartmenu/winstartmenu.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/platforms/win/kwinstartmenu/winstartmenu.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -19,7 +19,7 @@
+ Name[et]=KDED Windowsi startmenüü moodul
+ Name[eu]=KDED leiho abiorako menuaren modulua
+ Name[fi]=KDED Windows-aloitusvalikkomoduuli
+-Name[fr]=Module KDED de lancement de fenêtres
++Name[fr]=Module KDED de lancement Windows
+ Name[fy]=KDED Windows Start Menu Module
+ Name[ga]=Modúl Roghchláir Tosaithe Windows KDED
+ Name[gl]=Módulo de menú de inicio de Windows de KDED
+--- runtime/kwalletd/kwalletd.notifyrc (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kwalletd/kwalletd.notifyrc (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -215,7 +215,7 @@
+ Comment[et]=KDE turvalaeka deemon nõuab parooli
+ Comment[eu]=KDE diruzorroaren deabruak pasahitza eskatzen du
+ Comment[fi]=KDE:n Lompakkotaustaprosessi pyytää salasanaa
+-Comment[fr]=Le démon du porte-feuille de KDE requiers un mot de passe
++Comment[fr]=Le démon du portefeuille de KDE requiert un mot de passe
+ Comment[fy]=The KDE slûf daemon fereasket in wachtwurd
+ Comment[ga]=Tá Deamhan Sparáin KDE ag iarraidh focal faire
+ Comment[gl]=O Daemon de carteiras de KDE pide un contrasinal
+--- runtime/kioslave/thumbnail/desktopthumbnail.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kioslave/thumbnail/desktopthumbnail.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -18,7 +18,7 @@
+ Name[et]=Töölauafailid
+ Name[eu]=Mahaigain fitxategiak
+ Name[fi]=Työpöytätiedostot
+-Name[fr]=Fichier du bureau
++Name[fr]=Fichiers du bureau
+ Name[fy]=Buroblêd triemmen
+ Name[ga]=Comhaid Deisce
+ Name[gl]=Ficheiros do escritorio
+--- runtime/kioslave/remote/kdedmodule/remotedirnotify.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kioslave/remote/kdedmodule/remotedirnotify.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -15,7 +15,7 @@
+ Name[et]=Mujalasuva URL-i muutumise teadustaja
+ Name[eu]=Urruneko URL aldaketa jakinarazlea
+ Name[fi]=Etäverkko-osoitteiden muutosten huomautin
+-Name[fr]=Notifieur de changement d'URL distante
++Name[fr]=Notificateur de changement d'URL distante
+ Name[gu]=દૂરસ્થ URL ફેરફાર નોંધણી
+ Name[he]=שירות הודעות על שינוי כתובות מרוחקות
+ Name[hi]=रिमोट आधारित यूआरएल नोटिफ़ायर
+--- runtime/nepomuk/services/strigi/nepomukstrigiservice.notifyrc (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/nepomuk/services/strigi/nepomukstrigiservice.notifyrc (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -291,7 +291,7 @@
+ Comment[et]=Lõpetati kohalike failide esimene indekseerimine kiire töölauaotsingu võimaldamiseks.
+ Comment[eu]=Bilaketa azkarretarako fitxategi lokalen hasierako indexaketata osatu da.
+ Comment[fi]=Paikallisten tiedostojen alustava indeksointi työpöydän pikahakua varten on valmis.
+-Comment[fr]=L'indexation initiale des fichiers locaux pour des recherches rapides est terminé.
++Comment[fr]=L'indexation initiale des fichiers locaux pour des recherches rapides est terminée.
+ Comment[fy]=De earste yndeksearring fan lokale triemmen foar flugge buroblêd-sykopdrachten is foltôge.
+ Comment[ga]=Tá an chéad innéacsú de chomhaid logánta críochnaithe.
+ Comment[gl]=Completouse a indexación inicial dos ficheiros locais para facer procuras rápidas no escritorio.
+--- runtime/nepomuk/services/backupsync/service/identificationset.cpp (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/nepomuk/services/backupsync/service/identificationset.cpp (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -97,10 +97,10 @@
+ while( iter.hasNext() ) {
+ const QUrl & uri = iter.next();
+ done.insert( uri );
++
++ uris.append( Soprano::Node::resourceToN3( uri ) );
++
+ iter.remove();
-
--<para>Now enable &kmail; groupware functionality, and in <guilabel>Resource
--folders are subfolders of</guilabel> put the
--<guimenuitem>inbox</guimenuitem> that is subfolder of
- <guisubmenu>office_gwdata</guisubmenu>.</para>
-
- <para>Now you have two branches of folder under
---- runtime/platforms/win/kwinstartmenu/winstartmenu.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/platforms/win/kwinstartmenu/winstartmenu.desktop (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -34,7 +34,7 @@
- Name[lv]=KDED Windows sākšanas izvēlnes modulis
- Name[ml]=KDE ജാലകത്തിനു് തുടക്കത്തിലെ മെനുവിനുള്ള ഘടകം
- Name[mr]=KDED Windows प्रारंभ मेन्यू विभाग
--Name[nb]=KDEDs start-meny modul
-+Name[nb]=KDED-modul for Windows-Start-meny
- Name[nds]=KDED-Moduul för't Windows-Startmenü
- Name[nl]=KDED Windows-startmenumodule
- Name[nn]=KDED-modul for Windows-Start-meny
---- runtime/kioslave/trash/trash.protocol (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/kioslave/trash/trash.protocol (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -49,7 +49,7 @@
- ExtraNames[gu]=મૂળભૂત પાથ,દૂર કરવાની તારીખ
- ExtraNames[he]=נתיב מקורי,תאריך מחיקה
- ExtraNames[hi]=मूल पथ, मिटाने की तिथि
--ExtraNames[hne]=मूल पथ, मेटारव के तारीक
-+ExtraNames[hne]=मूल पथ, मेटाव के तारीक
- ExtraNames[hr]=Izvorna putanja,Datum brisanja
- ExtraNames[hsb]=Originalny puć, datum zničenja
- ExtraNames[hu]=Eredeti elérési út,Törlési dátum
---- runtime/kioslave/trash/kcmtrash.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/kioslave/trash/kcmtrash.desktop (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -101,6 +101,7 @@
- Comment[kn]=ಈ ಸೇವೆಯು ಕಸಬುಟ್ಟಿಯ ಸಂರಚನೆಗೆ ಅನುವುಮಾಡಿಕೊಡುತ್ತದೆ.
- Comment[ko]=이 서비스는 휴지통을 설정합니다.
- Comment[ku]=Ev servîs destûrê dide veavakirina xuyakirina Çopê.
-+Comment[lt]=Ši tarnyba leidžia konfigūruoti šiukšliadėžę.
- Comment[lv]=Šis serviss ļauj konfigurēt Miskasti.
- Comment[mk]=Овој сервис овозможува конфигурација на корпата.
- Comment[ml]=ട്രാഷ് ക്രമീകരിയ്ക്കാന് ഈ സേവനം അനുവദിയ്ക്കുന്നു.
-@@ -243,6 +244,7 @@
- Comment[kn]=ಕಸಬುಟ್ಟಿ ಸಂಯೋಜನೆಗಳನ್ನು ಸಂರಚಿಸು
- Comment[ko]=휴지통 설정
- Comment[ku]=Mîhengên çopê ava bike
-+Comment[lt]=Konfigūruoti šiukšliadėžės nustatymus
- Comment[lv]=Konfigurēt miskastes iestatījumus
- Comment[mk]=Конфигурирајте ги поставувањата за корпата
- Comment[ml]=ട്രാഷ് സജ്ജീകരണങ്ങള് ക്രമീകരിക്കുക
---- runtime/kioslave/desktop/desktop.protocol (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/kioslave/desktop/desktop.protocol (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -1,6 +1,7 @@
- [Protocol]
- exec=kio_desktop
- protocol=desktop
-+Icon=user-desktop
- input=none
- output=filesystem
- listing=Name,Type,Size,Date,AccessDate,Access,Owner,Group,Link
---- runtime/kioslave/sftp/sftpfileattr.cpp (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/kioslave/sftp/sftpfileattr.cpp (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -230,7 +230,7 @@
- }
-
- /** No descriptions */
--kdbgstream& operator<< (kdbgstream& s, sftpFileAttr& a) {
-+QDebug operator<<(QDebug s, sftpFileAttr& a) {
- s << "Filename: " << a.mFilename
- << ", Uid: " << a.mUid
- << ", Gid: " << a.mGid
-@@ -250,11 +250,6 @@
- return s;
- }
-
--/** Make sure it builds with NDEBUG */
--kndbgstream& operator<< (kndbgstream& s, sftpFileAttr& ) {
-- return s;
--}
+- uris.append( Soprano::Node::resourceToN3( uri ) );
-
- /** Clear all attributes and flags. */
- void sftpFileAttr::clear(){
- clearAtime();
---- runtime/kioslave/sftp/ksshprocess.cpp (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/kioslave/sftp/ksshprocess.cpp (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -232,13 +232,12 @@
- #else
- mSshPath = KStandardDirs::findExe(QString::fromLatin1("plink"));
- #endif
-- kDebug(KSSHPROC) << "KSshProcess::KSshProcess(): ssh path [" <<
-- mSshPath << "]" << endl;
-+ kDebug(KSSHPROC) << "ssh path [" << mSshPath << "]";
-
- installSignalHandlers();
- }
-
--KSshProcess::KSshProcess(QString pathToSsh)
-+KSshProcess::KSshProcess(const QString& pathToSsh)
- : mSshPath(pathToSsh), mVersion(UNKNOWN_VER), mConnected(false),
- mRunning(false), mConnectState(0) {
- installSignalHandlers();
-@@ -252,7 +251,7 @@
- }
- }
-
--bool KSshProcess::setSshPath(QString pathToSsh) {
-+bool KSshProcess::setSshPath(const QString& pathToSsh) {
- mSshPath = pathToSsh;
- version();
- if( mVersion == UNKNOWN_VER )
-@@ -268,8 +267,7 @@
- // Get version string from ssh client.
- FILE *p;
- if( (p = popen(cmd.toLatin1(), "r")) == NULL ) {
-- kDebug(KSSHPROC) << "KSshProcess::version(): "
-- "failed to start ssh: " << strerror(errno) << endl;
-+ kDebug(KSSHPROC) << "failed to start ssh: " << strerror(errno);
- return UNKNOWN_VER;
- }
-
-@@ -277,20 +275,17 @@
- size_t len;
- char buf[128];
- if( (len = fread(buf, sizeof(char), sizeof(buf)-1, p)) == 0 ) {
-- kDebug(KSSHPROC) << "KSshProcess::version(): "
-- "Read of ssh version string failed " <<
-- strerror(ferror(p)) << endl;
-+ kDebug(KSSHPROC) << "read of ssh version string failed " << strerror(ferror(p));
- return UNKNOWN_VER;
- }
- if( pclose(p) == -1 ) {
-- kError(KSSHPROC) << "KSshProcess::version(): pclose failed." << endl;
-+ kError(KSSHPROC) << "pclose failed.";
- }
- buf[len] = '\0';
-- QString ver;
-- ver = buf;
-- kDebug(KSSHPROC) << "KSshProcess::version(): "
-- "got version string [" << ver << "]" << endl;
-
-+ QString ver = QString::fromLocal8Bit(buf).simplified();
-+ kDebug(KSSHPROC) << "got version string [" << ver << "]";
-+
- mVersion = UNKNOWN_VER;
- for(int i = 0; i < SSH_VER_MAX; i++) {
- if( ver.indexOf(versionStrs[i]) != -1 ) {
-@@ -299,12 +294,10 @@
+ if( uris.size() == maxIterationSize )
+ break;
}
- }
+--- runtime/nepomuk/services/backupsync/lib/CMakeLists.txt (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/nepomuk/services/backupsync/lib/CMakeLists.txt (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -46,10 +46,10 @@
+
+ install(TARGETS nepomuksync EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+-install(FILES
+- resourceidentifier.h
+- resourcemerger.h
+- simpleresource.h
+- nepomuksync_export.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/nepomuk COMPONENT Devel
+-)
++#install(FILES
++# resourceidentifier.h
++# resourcemerger.h
++# simpleresource.h
++# nepomuksync_export.h
++# DESTINATION ${INCLUDE_INSTALL_DIR}/nepomuk COMPONENT Devel
++#)
+--- runtime/nepomuk/services/storage/nepomukstorage.notifyrc (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/nepomuk/services/storage/nepomukstorage.notifyrc (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -15,7 +15,7 @@
+ Name[et]=Semantiline andmesalvesti
+ Name[eu]=Datu semantikoen biltegiratzea
+ Name[fi]=Semanttinen tietovarasto
+-Name[fr]=Stockage de données sémantique
++Name[fr]=Stockage de données sémantiques
+ Name[ga]=Stóráil Sonraí Séimeantacha
+ Name[gu]=નેપોમુક માહિતી સંગ્રહ
+ Name[he]=אחסון מידע סמנטי
+--- runtime/kurifilter-plugins/ikws/searchproviders/imdb.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kurifilter-plugins/ikws/searchproviders/imdb.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -26,7 +26,7 @@
+ Name[eu]=Interneteko filmeen datu-basea
+ Name[fa]=دادگان فیلم اینترنت
+ Name[fi]=Internet Movie Database
+-Name[fr]=Base de données vidéo sur Internet
++Name[fr]=Base de données de films sur Internet
+ Name[fy]=Ynternetfilm-databank
+ Name[ga]=Internet Movie Database
+ Name[gl]=Base de datos de filmes de Internet
+--- runtime/kurifilter-plugins/ikws/searchproviders/identica_groups.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kurifilter-plugins/ikws/searchproviders/identica_groups.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -18,7 +18,7 @@
+ Name[et]=Identi.ca grupid
+ Name[eu]=Identi.ca Taldeak
+ Name[fi]=Identi.ca Ryhmät
+-Name[fr]=Groupes Icenti.ca
++Name[fr]=Groupes Identi.ca
+ Name[ga]=Grúpaí Identi.ca
+ Name[gu]=આઈડેન્ટિ.કા સમૂહો
+ Name[he]=Identi.ca Groups
+--- runtime/kurifilter-plugins/ikws/searchproviders/rae.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kurifilter-plugins/ikws/searchproviders/rae.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -28,7 +28,7 @@
+ Name[eu]=Gazteleraren Akademiaren hiztegia (RAE)
+ Name[fa]=واژهنامه فرهنگستان اسپانیایی (RAE)
+ Name[fi]=Espanjan Akatemian sanakirja (RAE)
+-Name[fr]=Dictionnaire de l'Académie Espagnole (RAE)
++Name[fr]=Dictionnaire de l'Académie Espagnole (RAE)Dictionnaire de l'Académie Espagnole (RAE)
+ Name[fy]=Wurdboek fan de Spaanske akademy (RAE)
+ Name[ga]=Diccionario de la lengua española (RAE)
+ Name[gl]=Dicionario da real academia española (RAE)
+--- runtime/kurifilter-plugins/ikws/searchproviders/kde_apps.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kurifilter-plugins/ikws/searchproviders/kde_apps.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -25,7 +25,7 @@
+ Name[eu]=KDEren aplikazio bilaketa
+ Name[fa]=جستجوی کاربرد KDE
+ Name[fi]=KDE-sovellusten haku
+-Name[fr]=Application de recherche de KDE
++Name[fr]=Chercher dans les applications de KDE
+ Name[fy]=Programma's sykje
+ Name[ga]=Cuardach Feidhmchláir KDE
+ Name[gl]=Programas de KDE
+--- runtime/kglobalaccel/kglobalaccel.notifyrc (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kglobalaccel/kglobalaccel.notifyrc (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -492,7 +492,7 @@
+ Comment[et]=Kasutaja kasutas globaalset kiirklahvi
+ Comment[eu]=Erabiltzaileak laster-tekla global bat abiarazi du
+ Comment[fi]=Käyttäjän liipaisema yleispikanäppäin
+-Comment[fr]=L'utilisateur a déclenché un raccourcis global
++Comment[fr]=L'utilisateur a déclenché un raccourci global
+ Comment[fy]=De brûker hat in globale fluchtoets aktivearre
+ Comment[ga]=Ghníomhachtaigh an t-úsáideoir aicearra comhchoiteann
+ Comment[gl]=O usuario iniciou un atallo global
+--- runtime/attica/kcm/kcm_attica.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/attica/kcm/kcm_attica.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -86,7 +86,7 @@
+ Comment[et]=Sotsiaalse töölaua pakkujate haldamine
+ Comment[eu]=Kudeatu Gizarte Mahaigain Hornitzaileak
+ Comment[fi]=Hallinnoi sosiaalisen työpöydän tarjoajia
+-Comment[fr]=Gérer les fournisseurs de bureaux sociaux
++Comment[fr]=Gérer les fournisseurs de bureau social
+ Comment[ga]=Bainistigh Soláthraithe na Deisce Shóisialta
+ Comment[he]=משמש לניהול ספקי שולחן עבודה חברתי
+ Comment[hr]=Upravljanje pružateljima društvene radne površine
+--- runtime/l10n/kg/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/kg/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Kõrgõzstan
+ Name[eu]=Kirgizistan
+ Name[fa]=قرقیزستان
+-Name[fi]=Kyrgyzstan
++Name[fi]=Kirgisia
+ Name[fr]=Kirghizistan
+ Name[fy]=Kyrgyzstan
+ Name[ga]=An Chirgeastáin
+--- runtime/l10n/kh/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/kh/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Kambodža
+ Name[eu]=Kanbodia
+ Name[fa]=کامبوج
+-Name[fi]=Kambodza
++Name[fi]=Kambodža
+ Name[fr]=Cambodge
+ Name[fy]=Cambodja
+ Name[ga]=An Chambóid
+--- runtime/l10n/ky/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/ky/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Kaimanisaared
+ Name[eu]=Kaiman Uharteak
+ Name[fa]=جزایر کایمن
+-Name[fi]=Cayman-saaret
++Name[fi]=Caymansaaret
+ Name[fr]=Îles Caïman
+ Name[fy]=Kaaiman Eilannen
+ Name[ga]=Oileáin na gCadhman
+--- runtime/l10n/ne/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/ne/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Niger
+ Name[eu]=Niger
+ Name[fa]=نیجر
+-Name[fi]=Nigeria
++Name[fi]=Niger
+ Name[fr]=Niger
+ Name[fy]=Niger
+ Name[ga]=An Nígir
+--- runtime/l10n/ni/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/ni/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Nikaraagua
+ Name[eu]=Nikaragua
+ Name[fa]=نیکاراگوئه
+-Name[fi]=Nikaragua
++Name[fi]=Nicaragua
+ Name[fr]=Nicaragua
+ Name[fy]=Nicaragua
+ Name[ga]=Nicearagua
+--- runtime/l10n/nl/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/nl/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -43,7 +43,7 @@
+ Name[it]=Paesi Bassi
+ Name[ja]=オランダ
+ Name[ka]=ჰოლანდია
+-Name[kk]=Нидерланды
++Name[kk]=Нидерландия
+ Name[km]=ហុល្លង់
+ Name[kn]=ನೆದರ್ಲ್ಯಾಂಡ್ಸ್
+ Name[ko]=네덜란드
+--- runtime/l10n/ae/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/ae/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -25,7 +25,7 @@
+ Name[eu]=Arabiar Emirerri Batuak
+ Name[fa]=امارات متحده عربی
+ Name[fi]=Yhdistyneet Arabiemiraatit
+-Name[fr]=Émirats arabes unis
++Name[fr]=Émirats Arabes Unis
+ Name[fy]=Ferienigde Arabyske Emiraten
+ Name[ga]=Aontas na nÉimíríochtaí Arabacha
+ Name[gl]=Emiratos Árabes Unidos
+--- runtime/l10n/ag/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/ag/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Antigua ja Barbuda
+ Name[eu]=Antigua eta Barbuda
+ Name[fa]=آنتیگوا و باربودا
+-Name[fi]=Antigua ja Barbados
++Name[fi]=Antigua ja Barbuda
+ Name[fr]=Antigua-et-Barbuda
+ Name[fy]=Antigua en Barbuda
+ Name[ga]=Antigua agus Barbúda
+--- runtime/l10n/az/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/az/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Aserbaidžaan
+ Name[eu]=Azerbaijan
+ Name[fa]=آذربایجان
+-Name[fi]=Azerbaidzan
++Name[fi]=Azerbaidžan
+ Name[fr]=Azerbaïjan
+ Name[fy]=Azerbeidjan
+ Name[ga]=An Asarbaiseáin
+--- runtime/l10n/ba/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/ba/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Bosnia ja Hertsegovina
+ Name[eu]=Bosnia-Herzegovina
+ Name[fa]=بوسنی و هرزگوین
+-Name[fi]=Bosnia ja Herzegovina
++Name[fi]=Bosnia ja Hertsegovina
+ Name[fr]=Bosnie-Herzégovine
+ Name[fy]=Bosnië en Herzegovina
+ Name[ga]=An Bhoisnia-Heirseagaivéin
+--- runtime/l10n/by/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/by/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -25,7 +25,7 @@
+ Name[et]=Valgevene
+ Name[eu]=Bielorrusia
+ Name[fa]=بلوروس
+-Name[fi]=Valkovenäjä
++Name[fi]=Valko-Venäjä
+ Name[fr]=Biélorussie
+ Name[fy]=Wyt-Rusland
+ Name[ga]=An Bhílearúis
+--- runtime/l10n/cc/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/cc/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Kookossaared
+ Name[eu]=Cocos (Keeling) Uharteak
+ Name[fa]=جزایر کوکوس )کیلینگ(
+-Name[fi]=Cookinsaaret
++Name[fi]=Kookossaaret
+ Name[fr]=Îles Cocos
+ Name[fy]=Cocos (Keeling) Islands
+ Name[ga]=Oileán na gCócónna (Keeling)
+--- runtime/l10n/ck/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/ck/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Cooki saared
+ Name[eu]=Cook Uharteak
+ Name[fa]=جزایر کوک
+-Name[fi]=Cooksaaret
++Name[fi]=Cookinsaaret
+ Name[fr]=Îles Cook
+ Name[fy]=Cook islands
+ Name[ga]=Oileáin Chook
+--- runtime/l10n/sb/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/sb/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Saalomoni saared
+ Name[eu]=Solomon Uharteak
+ Name[fa]=جزایر سلیمان
+-Name[fi]=Salomon-saaret
++Name[fi]=Salomonsaaret
+ Name[fr]=Îles Salomon
+ Name[fy]=Solomon Eilannen
+ Name[ga]=Oileáin Sholamón
+--- runtime/l10n/sg/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/sg/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -17,7 +17,7 @@
+ Name[cy]=Singap?r
+ Name[da]=Singapore
+ Name[de]=Singapur
+-Name[el]=Σινγκαπούρη
++Name[el]=Σιγκαπούρη
+ Name[en_GB]=Singapore
+ Name[eo]=Singapuro
+ Name[es]=Singapur
+--- runtime/l10n/sn/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/sn/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Senegal
+ Name[eu]=Senegal
+ Name[fa]=سنگال
+-Name[fi]=Senegali
++Name[fi]=Senegal
+ Name[fr]=Sénégal
+ Name[fy]=Senegal
+ Name[ga]=An tSeineagáil
+--- runtime/l10n/tc/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/tc/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -23,7 +23,7 @@
+ Name[et]=Turks ja Caicos
+ Name[eu]=Turk eta Caicoak Uharteak
+ Name[fa]=جزایر ترکها و کایکوها
+-Name[fi]=Turks- ja Caicos-saaret
++Name[fi]=Turks- ja Caicossaaret
+ Name[fr]=Îles Turques-et-Caïques
+ Name[fy]=Turks en Caicos Eilânen
+ Name[ga]=Oileáin Turks agus Caicos
+--- runtime/l10n/tj/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/tj/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Tadžikistan
+ Name[eu]=Tadjikistan
+ Name[fa]=تاجیکستان
+-Name[fi]=Tajikistan
++Name[fi]=Tadžikistan
+ Name[fr]=Tadjikistan
+ Name[fy]=Tajikistan
+ Name[ga]=An Táidsíceastáin
+--- runtime/l10n/ee/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/ee/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Eesti
+ Name[eu]=Estonia
+ Name[fa]=استونی
+-Name[fi]=Eesti
++Name[fi]=Viro
+ Name[fr]=Estonie
+ Name[fy]=Estland
+ Name[ga]=An Eastóin
+--- runtime/l10n/fj/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/fj/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Fidži
+ Name[eu]=Fiji
+ Name[fa]=فیجی
+-Name[fi]=Fiji
++Name[fi]=Fidži
+ Name[fr]=Fidji
+ Name[fy]=Fiji
+ Name[ga]=Fidsí
+--- runtime/l10n/fk/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/fk/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Falklandi saared (Malviinid)
+ Name[eu]=Malvinak Uharteak (Falkland Uharteak)
+ Name[fa]=جزایر فالکلند )مالویناس(
+-Name[fi]=Falklandin saaret (Malvinassaaret)
++Name[fi]=Falklandinsaaret (Malvinassaaret)
+ Name[fr]=Îles Falkland (Malvinas)
+ Name[fy]=Falkland Eilannen (Malvinas)
+ Name[ga]=Oileáin Fháclainne (Malvinas)
+--- runtime/l10n/vg/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/vg/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -23,7 +23,7 @@
+ Name[et]=Briti Neitsisaared
+ Name[eu]=Birjinak Uharteak, Britainiarrak
+ Name[fa]=جزایر ویرجین انگلیس
+-Name[fi]=Brittien Neitsytsaaret
++Name[fi]=Brittiläiset Neitsytsaaret
+ Name[fr]=Îles Vierges britanniques
+ Name[fy]=Virgin Eilannen, Britse
+ Name[ga]=Oileáin Bhriotanacha na Maighdean
+--- runtime/l10n/vi/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/vi/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -23,7 +23,7 @@
+ Name[et]=USA Neitsisaared
+ Name[eu]=Birjinak Uharteak, AEB
+ Name[fa]=جزایر ویرجین آمریکا
+-Name[fi]=USA:n Neitsytsaaret
++Name[fi]=Yhdysvaltain Neitsytsaaret
+ Name[fr]=Îles Vierges américaines
+ Name[fy]=Virgin Eilannen, U.S.
+ Name[ga]=Oileáin na Maighdean S.A.M.
+--- runtime/l10n/gf/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/gf/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -14,7 +14,7 @@
+ Name[es]=Guyana Francesa
+ Name[et]=Prantsuse Guajaana
+ Name[eu]=Frantziar Guyana
+-Name[fi]=Ranskan Guiana
++Name[fi]=Ranskan Guyana
+ Name[fr]=Guyane française
+ Name[fy]=Frânsk Guiana
+ Name[ga]=Guáin na Fraince
+--- runtime/plasma/declarativeimports/core/datamodel.h (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/declarativeimports/core/datamodel.h (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -132,6 +132,7 @@
+ QMap<QString, QVector<QVariant> > m_items;
+ QHash<int, QByteArray> m_roleNames;
+ QHash<QString, int> m_roleIds;
++ int m_maxRoleId;
+ };
-- kDebug(KSSHPROC) << "KSshPRocess::version(): version number = "
-- << mVersion << endl;
-+ kDebug(KSSHPROC) << "version number = " << mVersion;
-
- if( mVersion == UNKNOWN_VER ) {
-- kDebug(KSSHPROC) << "KSshProcess::version(): "
-- "Sorry, I don't know about this version of ssh" << endl;
-+ kDebug(KSSHPROC) << "sorry, I don't know about this version of ssh";
- mError = ERR_UNKNOWN_VERSION;
- return UNKNOWN_VER;
- }
-@@ -324,8 +317,6 @@
- */
+ int DataModel::countItems() const
+--- runtime/plasma/declarativeimports/core/datamodel.cpp (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/declarativeimports/core/datamodel.cpp (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -125,7 +125,8 @@
- bool KSshProcess::setOptions(const SshOptList& opts) {
-- kDebug(KSSHPROC) << "KSshProcess::setOptions()";
+ DataModel::DataModel(QObject* parent)
+ : QAbstractItemModel(parent),
+- m_dataSource(0)
++ m_dataSource(0),
++ m_maxRoleId(Qt::UserRole)
+ {
+ setObjectName("DataModel");
+ connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+@@ -217,21 +218,21 @@
+ m_items[sourceName] = list.toVector();
+
+ if (!list.isEmpty()) {
+- int role = Qt::UserRole;
+- m_roleNames.clear();
+- m_roleIds.clear();
-
- if( mVersion == UNKNOWN_VER ) {
- // we don't know the ssh version yet, so find out
- version();
-@@ -448,14 +439,12 @@
- break;
-
- default:
-- kDebug(KSSHPROC) << "KSshProcess::setOptions(): "
-- "unrecognized ssh opt " << (*it).opt << endl;
-+ kDebug(KSSHPROC) << "unrecognized ssh opt " << (*it).opt;
- }
- }
-
- if( !subsystem.isEmpty() && !cmd.isEmpty() ) {
-- kDebug(KSSHPROC) << "KSshProcess::setOptions(): "
-- "cannot use a subsystem and command at the same time" << endl;
-+ kDebug(KSSHPROC) << "cannot use a subsystem and command at the same time";
- mError = ERR_CMD_SUBSYS_CONFLICT;
- mErrorMsg = i18n("Cannot specify a subsystem and command at the same time.");
- return false;
-@@ -476,8 +465,7 @@
- }
-
- if( mHost.isEmpty() ) {
-- kDebug(KSSHPROC) << "KSshProcess::setOptions(): "
-- "a host name must be supplied" << endl;
-+ kDebug(KSSHPROC) << "a host name must be supplied";
- return false;
- }
- else {
-@@ -497,15 +485,12 @@
- }
-
- void KSshProcess::printArgs() {
-- QList<QByteArray>::Iterator it;
-- for( it = mArgs.begin(); it != mArgs.end(); ++it) {
-- kDebug(KSSHPROC) << "arg: " << *it;
-- }
-+ foreach(const QByteArray& arg, mArgs)
-+ kDebug(KSSHPROC) << "arg: " << arg;
- }
-
-
- int KSshProcess::error(QString& msg) {
-- kDebug(KSSHPROC) << "KSshProcess::error()";
- kDebug() << mErrorMsg;
- msg = mErrorMsg;
- return mError;
-@@ -514,31 +499,27 @@
- void KSshProcess::kill(int signal) {
- int pid = ssh.pid();
-
-- kDebug(KSSHPROC) << "KSshProcess::kill(signal:" << signal
-- << "): ssh pid is " << pid << endl;
-- kDebug(KSSHPROC) << "KSshPRocess::kill(): we are "
-- << (mConnected ? "" : "not ") << "connected" << endl;
-- kDebug(KSSHPROC) << "KSshProcess::kill(): we are "
-- << (mRunning ? "" : "not ") << "running a ssh process" << endl;
-+ kDebug(KSSHPROC) << "signal:" << signal << "): ssh pid is " << pid;
-+ kDebug(KSSHPROC) << "we are " << (mConnected ? "" : "not ") << "connected";
-+ kDebug(KSSHPROC) << "we are " << (mRunning ? "" : "not ") << "running a ssh process";
-
- if( mRunning && pid > 1 ) {
-- // Kill the child process...
-- if ( ::kill(pid, signal) == 0 ) {
-- // clean up if we tried to kill the process
-- if( signal == SIGTERM || signal == SIGKILL ) {
-- while(waitpid(-1, NULL, WNOHANG) > 0) {
-- ;
-- }
-- mConnected = false;
-- mRunning = false;
-+ // Kill the child process...
-+ if ( ::kill(pid, signal) == 0 ) {
-+ // clean up if we tried to kill the process
-+ if( signal == SIGTERM || signal == SIGKILL ) {
-+ while(waitpid(-1, NULL, WNOHANG) > 0) {
-+ ;
- }
-+ mConnected = false;
-+ mRunning = false;
- }
-- else
-- kDebug(KSSHPROC) << "KSshProcess::kill(): kill failed";
-+ }
-+ else
-+ kDebug(KSSHPROC) << "kill failed";
- }
- else
-- kDebug(KSSHPROC) << "KSshProcess::kill(): "
-- "Refusing to kill ssh process" << endl;
-+ kDebug(KSSHPROC) << "refusing to kill ssh process";
- }
-
-
-@@ -588,13 +569,12 @@
-
-
- void KSshProcess::acceptHostKey(bool accept) {
-- kDebug(KSSHPROC) << "KSshProcess::acceptHostKey(accept:"
-- << accept << ")" << endl;
-+ kDebug(KSSHPROC) << "accept host key ? " << accept;
- mAcceptHostKey = accept;
- }
-
--void KSshProcess::setPassword(QString password) {
-- kDebug(KSSHPROC) << "KSshProcess::setPassword(password:xxxxxxxx)";
-+void KSshProcess::setPassword(const QString& password) {
-+ kDebug(KSSHPROC) << "setPassword(password:xxxxxxxx)";
- mPassword = password;
- }
-
-@@ -627,8 +607,8 @@
- // not be anything on the pty or stderr. Setup a select()
- // to wait for some data from SSH.
- if( buffer.empty() ) {
-- //kDebug(KSSHPROC) << "KSshProcess::getLine(): " <<
-- // "Line buffer empty, calling select() to wait for data." << endl;
-+ //kDebug(KSSHPROC) << "getLine(): " <<
-+ // "Line buffer empty, calling select() to wait for data.";
- int errfd = ssh.stderrFd();
- int ptyfd = ssh.fd();
- fd_set rfds;
-@@ -656,14 +636,12 @@
-
- // Handle any errors from select
- if( ret == 0 ) {
-- kDebug(KSSHPROC) << "KSshProcess::connect(): " <<
-- "timed out waiting for a response" << endl;
-+ kDebug(KSSHPROC) << "timed out waiting for a response";
- mError = ERR_TIMED_OUT;
- return QString();
- }
- else if( ret == -1 ) {
-- kDebug(KSSHPROC) << "KSshProcess::connect(): "
-- << "select error: " << strerror(errno) << endl;
-+ kDebug(KSSHPROC) << "select error: " << strerror(errno);
- mError = ERR_INTERNAL;
- return QString();
- }
-@@ -674,25 +652,21 @@
- if( FD_ISSET(ptyfd, &rfds) ) {
- ptyLine = ssh.readLineFromPty(false);
- buffer.prepend(QString(ptyLine));
-- //kDebug(KSSHPROC) << "KSshProcess::getLine(): "
-- // "line from pty -" << ptyLine << endl;
-+ //kDebug(KSSHPROC) << "line from pty -" << ptyLine;
- }
-
- if( FD_ISSET(errfd, &rfds) ) {
- errLine = ssh.readLineFromStderr(false);
- buffer.prepend(QString(errLine));
-- //kDebug(KSSHPROC) << "KSshProcess::getLine(): "
-- // "line from err -" << errLine << endl;
-+ //kDebug(KSSHPROC) << "line from err -" << errLine;
+ if (list.first().canConvert<QVariantHash>()) {
+ foreach (const QString& roleName, list.first().value<QVariantHash>().keys()) {
+- ++role;
+- m_roleNames[role] = roleName.toLatin1();
+- m_roleIds[roleName] = role;
++ if (!m_roleIds.contains(roleName)) {
++ ++m_maxRoleId;
++ m_roleNames[m_maxRoleId] = roleName.toLatin1();
++ m_roleIds[roleName] = m_maxRoleId;
++ }
}
-
- if( FD_ISSET(ptyfd, &efds) ) {
-- kDebug(KSSHPROC) << "KSshProcess::getLine(): "
-- "Exception on pty file descriptor." << endl;
-+ kDebug(KSSHPROC) << "exception on pty file descriptor.";
- }
-
- if( FD_ISSET(errfd, &efds) ) {
-- kDebug(KSSHPROC) << "KSshProcess::getLine(): "
-- "Exception on std err file descriptor." << endl;
-+ kDebug(KSSHPROC) << "exception on std err file descriptor.";
+ } else {
+ foreach (const QString& roleName, list.first().value<QVariantMap>().keys()) {
+- ++role;
+- m_roleNames[role] = roleName.toLatin1();
+- m_roleIds[roleName] = role;
++ if (!m_roleIds.contains(roleName)) {
++ ++m_maxRoleId;
++ m_roleNames[m_maxRoleId] = roleName.toLatin1();
++ m_roleIds[roleName] = m_maxRoleId;
++ }
}
-
}
-@@ -712,11 +686,8 @@
- buffer.pop_back();
- }
-
--// kDebug(KSSHPROC) << "KSshProcess::getLine(): " <<
--// buffer.count() << " lines in buffer" << endl;
-- kDebug(KSSHPROC) << "KSshProcess::getLine(): "
-- "ssh: " << line << endl;
--
-+// kDebug(KSSHPROC) << buffer.count() << " lines in buffer";
-+ kDebug(KSSHPROC) << line.simplified();
- return line;
- #endif
-@@ -775,8 +746,7 @@
- int transitionLimit = 500;
+--- runtime/plasma/containments/newspaper/appletsview.cpp (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/containments/newspaper/appletsview.cpp (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -42,6 +42,7 @@
+ m_dragTimeout(1000)
+ {
+ m_dragCountdown = new DragCountdown(this);
++ setAlignment(Qt::AlignCenter);
- while(--transitionLimit) {
-- kDebug(KSSHPROC) << "KSshProcess::connect(): "
-- << "Connect state " << stateStr(mConnectState) << endl;
-+ kDebug(KSSHPROC) << "connect state " << stateStr(mConnectState);
-
- QString line; // a line from ssh
- QString msgBuf; // buffer for important messages from ssh
-@@ -795,22 +765,20 @@
- mKnownHostsFile.clear();
-
- if( mArgs.isEmpty() ) {
-- kDebug(KSSHPROC) << "KSshProcess::connect(): ssh options "
-- "need to be set first using setArgs()" << endl;
-+ kDebug(KSSHPROC) << "ssh options need to be set first using setArgs()";
- mError = ERR_NO_OPTIONS;
- mErrorMsg = i18n("No options provided for ssh execution.");
- return false;
- }
+ connect(m_dragCountdown, SIGNAL(dragRequested()), this, SLOT(appletDragRequested()));
- if( ssh.exec(mSshPath.toLatin1(), mArgs) ) {
-- kDebug(KSSHPROC) <<
-- "KSshProcess::connect(): ssh exec failed" << endl;
-+ kDebug(KSSHPROC) << "ssh exec failed";
- mError = ERR_CANNOT_LAUNCH;
- mErrorMsg = i18n("Failed to execute ssh process.");
- return false;
- }
-
-- kDebug(KSSHPROC) << "KSshPRocess::connect(): ssh pid = " << ssh.pid();
-+ kDebug(KSSHPROC) << "ssh pid = " << ssh.pid();
-
- // set flag to indicate what have started a ssh process
- mRunning = true;
-@@ -827,8 +795,7 @@
- case STATE_WAIT_PROMPT:
- line = getLine();
- if( line.isNull() ) {
-- kDebug(KSSHPROC) << "KSshProcess::connect(): "
-- "Got null line in STATE_WAIT_PROMPT." << endl;
-+ kDebug(KSSHPROC) << "Got null line in STATE_WAIT_PROMPT.";
- mError = ERR_INTERACT;
- mErrorMsg =
- i18n("Error encountered while talking to ssh.");
-@@ -855,9 +822,7 @@
- }
- else if( line.indexOf(continuePrompt[mVersion]) != -1 ) {
- //mConnectState = STATE_SEND_CONTINUE;
-- kDebug(KSSHPROC) << "KSshProcess:connect(): "
-- "Got continue prompt where we shouldn't (STATE_WAIT_PROMPT)"
-- << endl;
-+ kDebug(KSSHPROC) << "KSshProcess:connect(): Got continue prompt where we shouldn't (STATE_WAIT_PROMPT)";
- mError = ERR_INTERACT;
- mErrorMsg =
- i18n("Error encountered while talking to ssh.");
-@@ -906,8 +871,7 @@
- mConnectState = STATE_WAIT_PROMPT;
- }
- else {
-- kDebug(KSSHPROC) << "KSshProcess::connect() "
-- "Need password from caller." << endl;
-+ kDebug(KSSHPROC) << "need password from caller.";
- // The caller needs to supply a password before
- // connecting can continue.
- mError = ERR_NEED_PASSWD;
-@@ -945,8 +909,7 @@
- mConnectState = STATE_WAIT_PROMPT;
- }
- else {
-- kDebug(KSSHPROC) << "KSshProcess::connect() "
-- "Need passphrase from caller." << endl;
-+ kDebug(KSSHPROC) << "need passphrase from caller.";
- // The caller needs to supply a passphrase before
- // connecting can continue.
- mError = ERR_NEED_PASSPHRASE;
-@@ -975,8 +938,7 @@
- case STATE_NEW_KEY_WAIT_CONTINUE:
- line = getLine();
- if( line.isNull() ) {
-- kDebug(KSSHPROC) << "KSshProcess::connect(): "
-- "Got null line in STATE_NEW_KEY_WAIT_CONTINUE." << endl;
-+ kDebug(KSSHPROC) << "Got null line in STATE_NEW_KEY_WAIT_CONTINUE.";
- mError = ERR_INTERACT;
- mErrorMsg =
- i18n("Error encountered while talking to ssh.");
-@@ -1047,8 +1009,7 @@
- case STATE_DIFF_KEY_WAIT_CONTINUE:
- line = getLine();
- if( line.isNull() ) {
-- kDebug(KSSHPROC) << "KSshProcess::connect(): "
-- "Got null line in STATE_DIFF_KEY_WAIT_CONTINUE." << endl;
-+ kDebug(KSSHPROC) << "Got null line in STATE_DIFF_KEY_WAIT_CONTINUE.";
- mError = ERR_INTERACT;
- mErrorMsg =
- i18n("Error encountered while talking to ssh.");
-@@ -1108,14 +1069,12 @@
- // We found a continue prompt. Send our answer.
- case STATE_SEND_CONTINUE:
- if( mAcceptHostKey ) {
-- kDebug(KSSHPROC) << "KSshProcess::connect(): "
-- "host key accepted" << endl;
-+ kDebug(KSSHPROC) << "host key accepted";
- ssh.writeLine("yes");
- mConnectState = STATE_WAIT_PROMPT;
- }
- else {
-- kDebug(KSSHPROC) << "KSshProcess::connect(): "
-- "host key rejected" << endl;
-+ kDebug(KSSHPROC) << "host key rejected";
- ssh.writeLine("no");
- mError = ERR_HOST_KEY_REJECTED;
- mErrorMsg = i18n("Host key was rejected.");
-@@ -1139,16 +1098,14 @@
- return false;
-
- default:
-- kDebug(KSSHPROC) << "KSshProcess::connect(): "
-- "Invalid state number - " << mConnectState << endl;
-+ kDebug(KSSHPROC) << "Invalid state number - " << mConnectState;
- mError = ERR_INVALID_STATE;
- mConnectState = STATE_FATAL;
- }
+@@ -187,6 +188,12 @@
}
-
- // we should never get here
-- kDebug(KSSHPROC) << "KSshProcess::connect(): " <<
-- "After switch(). We shouldn't be here." << endl;
-+ kDebug(KSSHPROC) << "After switch(). We shouldn't be here.";
- mError = ERR_INTERNAL;
- return false;
}
---- runtime/kioslave/sftp/sftpfileattr.h (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/kioslave/sftp/sftpfileattr.h (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -251,16 +251,15 @@
- void setDirAttrsFlag(bool flag){ mDirAttrs = flag; }
-
- /** Gets the DirAttrs flag. */
-- bool getDirAttrsFlag() const { return mDirAttrs; }
--
-- friend kdbgstream& operator<< (kdbgstream& s, sftpFileAttr& a);
-- friend kndbgstream& operator<< (kndbgstream& s, sftpFileAttr& a);
--
-+ bool getDirAttrsFlag() const { return mDirAttrs; }
-+
- /** Returns the file type as determined from the file permissions */
- mode_t fileType() const;
- /** Set the encoding of the remote file system */
- void setEncoding( KRemoteEncoding* encoding );
++void AppletsView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
++{
++ Plasma::ScrollWidget::mouseReleaseEvent(event);
++ m_appletsContainer->setCurrentApplet(0);
++}
+
-+ friend QDebug operator<<(QDebug s, sftpFileAttr& a);
- };
-
- #endif
---- runtime/kioslave/sftp/ksshprocess.h (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/kioslave/sftp/ksshprocess.h (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -321,7 +321,7 @@
- * @param pathToSsh The fully qualified path name of the ssh binary
- * KSshProcess should use to setup a SSH connection.
- */
-- KSshProcess(QString pathToSsh);
-+ KSshProcess(const QString& pathToSsh);
- ~KSshProcess();
-
- /**
-@@ -334,7 +334,7 @@
- * recognizes the version.
- *
- */
-- bool setSshPath(QString pathToSsh);
-+ bool setSshPath(const QString& pathToSsh);
-
- /**
- * Get the ssh version.
-@@ -483,7 +483,7 @@
- *
- * @param password The user password to give ssh.
- */
-- void setPassword(QString password);
-+ void setPassword(const QString& password);
-
- /**
- * Access to standard in and out of the ssh process.
---- runtime/kioslave/sftp/kio_sftp.cpp (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/kioslave/sftp/kio_sftp.cpp (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -133,14 +133,14 @@
- : SlaveBase("kio_sftp", pool_socket, app_socket),
- mConnected(false), mPort(-1), mMsgId(0) {
- #ifndef Q_WS_WIN
-- kDebug(KIO_SFTP_DB) << "sftpProtocol(): pid = " << getpid();
-+ kDebug(KIO_SFTP_DB) << "pid = " << getpid();
- #endif
- }
-
-
- sftpProtocol::~sftpProtocol() {
- #ifndef Q_WS_WIN
-- kDebug(KIO_SFTP_DB) << "~sftpProtocol(): pid = " << getpid();
-+ kDebug(KIO_SFTP_DB) << "pid = " << getpid();
- #endif
- closeConnection();
- }
-@@ -186,7 +186,7 @@
- return sftpVersion >= 3 ? true : false;
- default:
- kDebug(KIO_SFTP_DB) << "isSupportedOperation(type:"
-- << type << "): unrecognized operation type" << endl;
-+ << type << "): unrecognized operation type";
- break;
- }
-
-@@ -195,7 +195,7 @@
-
- void sftpProtocol::copy(const KUrl &src, const KUrl &dest, int permissions, KIO::JobFlags flags)
+ void AppletsView::appletDragRequested()
{
-- kDebug(KIO_SFTP_DB) << "copy(): " << src << " -> " << dest;
-+ kDebug(KIO_SFTP_DB) << src << " -> " << dest;
-
- bool srcLocal = src.isLocalFile();
- bool destLocal = dest.isLocalFile();
-@@ -210,7 +210,7 @@
-
- void sftpProtocol::sftpCopyGet(const KUrl& dest, const KUrl& src, int mode, KIO::JobFlags flags)
+ if (!m_appletMoved) {
+--- runtime/plasma/containments/newspaper/appletsview.h (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/containments/newspaper/appletsview.h (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -54,6 +54,7 @@
+ void manageMouseMoveEvent(QGraphicsSceneMouseEvent *event);
+ void manageMouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+ void showSpacer(const QPointF &pos);
++ void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+
+ protected Q_SLOTS:
+ void appletDragRequested();
+--- runtime/plasma/containments/newspaper/appletscontainer.cpp (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/containments/newspaper/appletscontainer.cpp (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -107,7 +107,26 @@
+ const int margin = 4 + (m_mainLayout->count() - 1) * m_mainLayout->spacing();
+
+ QSizeF viewportSize = m_scrollWidget->viewportGeometry().size();
++ QSizeF maxSize;
+
++ //try to figure out the column size from the applets size hints
++ if (m_orientation == Qt::Vertical && m_containment) {
++ foreach (Plasma::Applet *applet, m_containment->applets()) {
++ QSizeF appletSize = applet->effectiveSizeHint(Qt::PreferredSize);
++ if (appletSize.width() > maxSize.width()) {
++ maxSize.setWidth(appletSize.width());
++ }
++ if (appletSize.height() > maxSize.height()) {
++ maxSize.setHeight(appletSize.height());
++ }
++ }
++ const QSizeF sizeFromHints = maxSize * m_mainLayout->count();
++ //a bit of snap to avoid contents just too large
++ if (qAbs(sizeFromHints.width() - viewportSize.width()) > 128) {
++ viewportSize = sizeFromHints;
++ }
++ }
++
+ for (int i = 0; i < m_mainLayout->count(); ++i) {
+ QGraphicsLinearLayout *lay = dynamic_cast<QGraphicsLinearLayout *>(m_mainLayout->itemAt(i));
+
+--- runtime/plasma/scriptengines/javascript/simplebindings/size.cpp (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/scriptengines/javascript/simplebindings/size.cpp (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -52,7 +52,7 @@
+ DECLARE_SELF(QSizeF, height);
+ if (ctx->argumentCount() > 0) {
+ qreal height = ctx->argument(0).toNumber();
+- self->setWidth(height);
++ self->setHeight(height);
+ }
+
+ return QScriptValue(eng, self->height());
+--- runtime/plasma/scriptengines/javascript/simplebindings/rect.cpp (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/scriptengines/javascript/simplebindings/rect.cpp (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -149,7 +149,7 @@
{
-- kDebug(KIO_SFTP_DB) << "sftpCopyGet(): " << src << " -> " << dest;
-+ kDebug(KIO_SFTP_DB) << src << " -> " << dest;
-
- // Attempt to establish a connection...
- openConnection();
-@@ -253,7 +253,7 @@
- if (canResume( buff_part.st_size ))
- {
- offset = buff_part.st_size;
-- kDebug(KIO_SFTP_DB) << "sftpCopyGet: Resuming @ " << offset;
-+ kDebug(KIO_SFTP_DB) << "Resuming @ " << offset;
- }
- }
-
-@@ -285,7 +285,7 @@
-
- if(fd == -1)
- {
-- kDebug(KIO_SFTP_DB) << "sftpCopyGet: Unable to open (" << fd << ") for writing.";
-+ kDebug(KIO_SFTP_DB) << "Unable to open (" << fd << ") for writing.";
- if (errno == EACCES)
- error (ERR_WRITE_ACCESS_DENIED, dest.prettyUrl());
- else
-@@ -322,7 +322,7 @@
- }
-
- data(QByteArray());
-- kDebug(KIO_SFTP_DB) << "sftpCopyGet(): emit finished()";
-+ kDebug(KIO_SFTP_DB) << "emit finished()";
- finished();
+ DECLARE_SELF(QRectF, moveLeft);
+ qreal left = ctx->argument(0).toNumber();
+- self->moveBottom(left);
++ self->moveLeft(left);
+ return QScriptValue();
}
-@@ -335,7 +335,7 @@
- res.code = 0;
- res.size = 0;
-
-- kDebug(KIO_SFTP_DB) << "sftpGet(): " << src;
-+ kDebug(KIO_SFTP_DB) << src;
-
- // stat the file first to get its size
- if( (code = sftpStat(src, attr)) != SSH2_FX_OK ) {
-@@ -373,7 +373,7 @@
- quint32 len = 60*1024;
- code = SSH2_FX_OK;
-
-- kDebug(KIO_SFTP_DB) << "sftpGet(): offset = " << offset;
-+ kDebug(KIO_SFTP_DB) << "offset = " << offset;
- while( code == SSH2_FX_OK ) {
- if( (code = sftpRead(handle, offset, len, buff)) == SSH2_FX_OK ) {
- offset += buff.size();
-@@ -387,8 +387,7 @@
- if( mimeBuffer.size() > 1024 || offset == fileSize ) {
- // determine mimetype
- KMimeType::Ptr mime = KMimeType::findByNameAndContent(src.fileName(), mimeBuffer);
-- kDebug(KIO_SFTP_DB) << "sftpGet(): mimetype is " <<
-- mime->name() << endl;
-+ kDebug(KIO_SFTP_DB) << "mimetype is " << mime->name();
- mimeType(mime->name());
-
- if (abortAfterMimeType)
-@@ -508,8 +507,7 @@
- if(mConnected)
- return;
-
-- kDebug(KIO_SFTP_DB) << "openConnection(): " << mUsername << "@"
-- << mHost << ":" << mPort << endl;
-+ kDebug(KIO_SFTP_DB) << "username=" << mUsername << ", host=" << mHost << ", port=" << mPort;
-
- infoMessage( i18n("Opening SFTP connection to host %1:%2", mHost, mPort));
-
-@@ -519,7 +517,6 @@
- return;
- }
-
-- ////////////////////////////////////////////////////////////////////////////
- // Setup AuthInfo for use with password caching and the
- // password dialog box.
- AuthInfo info;
-@@ -533,10 +530,8 @@
- info.username = mUsername;
- info.keepPassword = true;
-
-- ///////////////////////////////////////////////////////////////////////////
-- // Check for cached authentication info if a username AND password were
-- // not specified in setHost().
-- if( mUsername.isEmpty() && mPassword.isEmpty() ) {
-+ // Check for cached authentication info if no password is specified...
-+ if( mPassword.isEmpty() ) {
- kDebug(KIO_SFTP_DB) << "openConnection(): checking cache "
- << "info.username = " << info.username
- << ", info.url = " << info.url.prettyUrl() << endl;
-@@ -596,14 +591,14 @@
- if( !mUsername.isEmpty() ) {
- opt.opt = KSshProcess::SSH_USERNAME;
- opt.str = mUsername;
-- opts.append(opt);
-+ opts.append(opt);
- usernameIt = opts.end()-1;
- }
-
- if( !mPassword.isEmpty() ) {
- opt.opt = KSshProcess::SSH_PASSWD;
- opt.str = mPassword;
-- opts.append(opt);
-+ opts.append(opt);
- passwdIt = opts.end()-1;
- }
-
-@@ -622,8 +617,7 @@
-
- while( !(mConnected = ssh.connect()) ) {
- err = ssh.error();
-- kDebug(KIO_SFTP_DB) << "openConnection(): "
-- "Got " << err << " from KSshProcess::connect()" << endl;
-+ kDebug(KIO_SFTP_DB) << "Got " << err << " from KSshProcess::connect()";
-
- switch(err) {
- case KSshProcess::ERR_NEED_PASSWD:
-@@ -637,23 +631,16 @@
- else
- info.prompt = i18n("Please enter your username and password.");
-
-- kDebug(KIO_SFTP_DB) << "openConnection(): info.username = " << info.username
-- << ", info.url = " << info.url.prettyUrl() << endl;
-+ kDebug(KIO_SFTP_DB) << "info.username = " << info.username
-+ << ", info.url = " << info.url.prettyUrl();
-
- if( firstTime )
- dlgResult = openPasswordDialog(info);
- else
- dlgResult = openPasswordDialog(info, i18n("Incorrect username or password"));
-
-- if( dlgResult ) {
-- if( info.username.isEmpty() || info.password.isEmpty() ) {
-- error(ERR_COULD_NOT_AUTHENTICATE,
-- i18n("Please enter a username and password"));
-- continue;
-- }
-- }
-- else {
-- // user canceled or dialog failed to open
-+ // handle user canceled or dialog failed to open...
-+ if( !dlgResult ) {
- error(ERR_USER_CANCELED, QString());
- kDebug(KIO_SFTP_DB) << "openConnection(): user canceled, dlgResult = " << dlgResult;
- closeConnection();
-@@ -669,8 +656,8 @@
- // the password option so the user is not prompted for
- // it again.
- if( mUsername != info.username ) {
-- kDebug(KIO_SFTP_DB) << "openConnection(): Username changed from "
-- << mUsername << " to " << info.username << endl;
-+ kDebug(KIO_SFTP_DB) << "Username changed from " << mUsername
-+ << " to " << info.username;
-
- ssh.disconnect();
-
-@@ -679,18 +666,16 @@
- // the iterators will be equal to the empty iterator.
- // Create the opts now and add them to the opt list.
- if( usernameIt == KSshProcess::SshOptListIterator() ) {
-- kDebug(KIO_SFTP_DB) << "openConnection(): "
-- "Adding username to options list" << endl;
-+ kDebug(KIO_SFTP_DB) << "Adding username to options list";
- opt.opt = KSshProcess::SSH_USERNAME;
-- opts.append(opt);
-+ opts.append(opt);
- usernameIt = opts.end()-1;
- }
-
- if( passwdIt == KSshProcess::SshOptListIterator() ) {
-- kDebug(KIO_SFTP_DB) << "openConnection(): "
-- "Adding password to options list" << endl;
-+ kDebug(KIO_SFTP_DB) << "Adding password to options list";
- opt.opt = KSshProcess::SSH_PASSWD;
-- opts.append(opt);
-+ opts.append(opt);
- passwdIt = opts.end()-1;
- }
-
-@@ -766,7 +751,7 @@
- default:
- infoMessage(i18n("Connection failed."));
- // Don't call messageBox! Leave GUI handling to the apps (#108812)
-- caption = i18n("Unexpected SFTP error: %1", err);
-+ caption = i18n("unexpected SFTP error: %1", err);
- msg = ssh.errorMsg();
- if (!msg.isEmpty()) {
- caption += '\n';
-@@ -832,8 +817,8 @@
- info.url.setUser(mUsername);
- info.username = mUsername;
- info.password = mPassword;
-- kDebug(KIO_SFTP_DB) << "sftpProtocol(): caching info.username = " << info.username <<
-- ", info.url = " << info.url.prettyUrl() << endl;
-+ kDebug(KIO_SFTP_DB) << "Caching info.username = " << info.username
-+ << ", info.url = " << info.url.prettyUrl();
- cacheAuthentication(info);
- mConnected = true;
- connected();
-@@ -848,7 +833,7 @@
-
- void sftpProtocol::open(const KUrl &url, QIODevice::OpenMode mode)
- {
-- _DEBUG << url.url() << endl;
-+ _DEBUG << url;
- openConnection();
- if (!mConnected) {
- error(KIO::ERR_CONNECTION_BROKEN, url.prettyUrl());
-@@ -859,19 +844,19 @@
- sftpFileAttr attr(remoteEncoding());
-
- if ((code = sftpStat(url, attr)) != SSH2_FX_OK) {
-- _DEBUG << "stat error" << endl;
-+ _DEBUG << "stat error";
- processStatus(code, url.prettyUrl());
- return;
- }
-
- // don't open a directory
- if (attr.fileType() == S_IFDIR) {
-- _DEBUG << "a directory" << endl;
-+ _DEBUG << "a directory";
- error(KIO::ERR_IS_DIRECTORY, url.prettyUrl());
- return;
- }
- if (attr.fileType() != S_IFREG) {
-- _DEBUG << "not a regular file" << endl;
-+ _DEBUG << "not a regular file";
- error(KIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyUrl());
- return;
- }
-@@ -899,7 +884,7 @@
-
- code = sftpOpen(url, pflags, attr, openHandle);
- if (code != SSH2_FX_OK) {
-- _DEBUG << "sftpOpen error" << endl;
-+ _DEBUG << "Got error code " << code;
- processStatus(code, url.prettyUrl());
- return;
- }
-@@ -912,7 +897,7 @@
- QByteArray buffer;
- code = sftpRead(openHandle, 0, 1024, buffer);
- if ((code != SSH2_FX_OK) && (code != SSH2_FX_EOF)){
-- _DEBUG << "error on mime type detection" << endl;
-+ _DEBUG << "error on mime type detection";
- processStatus(code, url.prettyUrl());
- close();
- return;
-@@ -930,7 +915,7 @@
-
- void sftpProtocol::read(KIO::filesize_t bytes)
- {
-- _DEBUG << "read, offset = " << openOffset << ", bytes = " << bytes << endl;
-+ _DEBUG << "read, offset = " << openOffset << ", bytes = " << bytes;
- QByteArray buffer;
- int code = sftpRead(openHandle, openOffset, bytes, buffer);
- if ((code == SSH2_FX_OK) || (code == SSH2_FX_EOF)) {
-@@ -944,7 +929,7 @@
-
- void sftpProtocol::write(const QByteArray &data)
- {
-- _DEBUG << "write" << endl;
-+ _DEBUG << "write";
- int code = sftpWrite(openHandle, openOffset, data);
- if (code == SSH2_FX_OK) {
- openOffset += data.size();
-@@ -957,7 +942,7 @@
-
- void sftpProtocol::seek(KIO::filesize_t offset)
- {
-- _DEBUG << "seek, offset = " << offset << endl;
-+ _DEBUG << "seek, offset = " << offset;
- openOffset = offset;
- position(offset);
- }
-@@ -965,7 +950,7 @@
- void sftpProtocol::close()
+@@ -157,7 +157,7 @@
{
- sftpClose(openHandle);
-- _DEBUG << "emitting finished" << endl;
-+ _DEBUG << "emitting finished";
- finished();
- }
- #undef _DEBUG
-@@ -1010,9 +995,7 @@
- if( !mConnected )
- return;
-
-- kDebug(KIO_SFTP_DB) << "sftpPut(): " << dest
-- << ", resume=" << (flags & KIO::Resume)
-- << ", overwrite=" << (flags & KIO::Overwrite) << endl;
-+ kDebug(KIO_SFTP_DB) << dest << ", resume=" << (flags & KIO::Resume) << ", overwrite=" << (flags & KIO::Overwrite);
-
- KUrl origUrl( dest );
- sftpFileAttr origAttr(remoteEncoding());
-@@ -1022,7 +1005,7 @@
- int code = sftpStat(origUrl, origAttr);
-
- if( code == SSH2_FX_OK ) {
-- kDebug(KIO_SFTP_DB) << "sftpPut(): <file> already exists";
-+ kDebug(KIO_SFTP_DB) << qPrintable(origUrl.url()) << " already exists!";
-
- // Delete remote file if its size is zero
- if( origAttr.fileSize() == 0 ) {
-@@ -1061,7 +1044,7 @@
- code = sftpStat(partUrl, partAttr);
-
- if( code == SSH2_FX_OK ) {
-- kDebug(KIO_SFTP_DB) << "sftpPut(): .part file already exists";
-+ kDebug(KIO_SFTP_DB) << ".part file already exists";
- partExists = true;
- offset = partAttr.fileSize();
-
-@@ -1088,7 +1071,7 @@
- else
- flags |= canResume( offset ) ? KIO::Resume : KIO::DefaultFlags;
-
-- kDebug(KIO_SFTP_DB) << "sftpPut(): can resume = " << (flags & KIO::Resume)
-+ kDebug(KIO_SFTP_DB) << "can resume = " << (flags & KIO::Resume)
- << ", offset = " << offset;
-
- if( !(flags & KIO::Resume) ) {
-@@ -1229,13 +1212,13 @@
-
- void sftpProtocol::put ( const KUrl& url, int permissions, KIO::JobFlags flags ) {
- kDebug(KIO_SFTP_DB) << "put(): " << url << ", overwrite = " << (flags & KIO::Overwrite)
-- << ", resume = " << (flags & KIO::Resume) << endl;
-+ << ", resume = " << (flags & KIO::Resume);
-
- sftpPut( url, permissions, flags );
- }
-
- void sftpProtocol::stat ( const KUrl& url ){
-- kDebug(KIO_SFTP_DB) << "stat(): " << url;
-+ kDebug(KIO_SFTP_DB) << url;
-
- openConnection();
- if( !mConnected )
-@@ -1267,19 +1250,19 @@
- }
- else {
- //kDebug() << "We sent and received stat packet ok";
-- attr.setFilename(url.fileName());
-+ //attr.setFilename(url.fileName());
- statEntry(attr.entry());
- }
-
- finished();
-
-- kDebug(KIO_SFTP_DB) << "stat: END";
-+ //kDebug(KIO_SFTP_DB) << "END";
- return;
- }
-
-
- void sftpProtocol::mimetype ( const KUrl& url ){
-- kDebug(KIO_SFTP_DB) << "mimetype(): " << url;
-+ kDebug(KIO_SFTP_DB) << url;
-
- openConnection();
- if( !mConnected )
-@@ -1298,7 +1281,7 @@
-
-
- void sftpProtocol::listDir(const KUrl& url) {
-- kDebug(KIO_SFTP_DB) << "listDir(): " << url;
-+ kDebug(KIO_SFTP_DB) << url;
-
- openConnection();
- if( !mConnected )
-@@ -1318,7 +1301,7 @@
- QByteArray handle;
-
- if( (code = sftpOpenDirectory(url, handle)) != SSH2_FX_OK ) {
-- kError(KIO_SFTP_DB) << "listDir(): open directory failed" << endl;
-+ kError(KIO_SFTP_DB) << "listDir(): open directory failed";
- processStatus(code, url.prettyUrl());
- return;
- }
-@@ -1333,7 +1316,7 @@
- }
-
- if( (code = sftpClose(handle)) != SSH2_FX_OK ) {
-- kError(KIO_SFTP_DB) << "listdir(): closing of directory failed" << endl;
-+ kError(KIO_SFTP_DB) << "listdir(): closing of directory failed";
- processStatus(code, url.prettyUrl());
- return;
- }
-@@ -1351,7 +1334,7 @@
- */
- void sftpProtocol::mkdir(const KUrl&url, int permissions){
-
-- kDebug(KIO_SFTP_DB) << "mkdir() creating dir: " << url.path();
-+ kDebug(KIO_SFTP_DB) << "create directory: " << url.path();
-
- openConnection();
- if( !mConnected )
-@@ -1386,14 +1369,14 @@
-
- r >> type >> id;
- if( id != expectedId ) {
-- kError(KIO_SFTP_DB) << "mkdir: sftp packet id mismatch" << endl;
-+ kError(KIO_SFTP_DB) << "mkdir: sftp packet id mismatch";
- error(ERR_COULD_NOT_MKDIR, path);
- finished();
- return;
- }
-
- if( type != SSH2_FXP_STATUS ) {
-- kError(KIO_SFTP_DB) << "mkdir(): unexpected packet type of " << type << endl;
-+ kError(KIO_SFTP_DB) << "mkdir(): unexpected packet type of " << type;
- error(ERR_COULD_NOT_MKDIR, path);
- finished();
- return;
-@@ -1402,7 +1385,7 @@
- int code;
- r >> code;
- if( code != SSH2_FX_OK ) {
-- kError(KIO_SFTP_DB) << "mkdir(): failed with code " << code << endl;
-+ kError(KIO_SFTP_DB) << "mkdir(): failed with code " << code;
-
- // Check if mkdir failed because the directory already exists so that
- // we can return the appropriate message...
-@@ -1420,7 +1403,7 @@
- }
-
- void sftpProtocol::rename(const KUrl& src, const KUrl& dest, KIO::JobFlags flags) {
-- kDebug(KIO_SFTP_DB) << "rename(" << src << " -> " << dest << ")";
-+ kDebug(KIO_SFTP_DB) << src << " -> " << dest;
-
- if (!isSupportedOperation(SSH2_FXP_RENAME)) {
- error(ERR_UNSUPPORTED_ACTION,
-@@ -1465,11 +1448,11 @@
- }
-
- finished();
-- kDebug(KIO_SFTP_DB) << "rename(): END";
-+ kDebug(KIO_SFTP_DB) << "END";
+ DECLARE_SELF(QRectF, moveRight);
+ qreal right = ctx->argument(0).toNumber();
+- self->moveBottom(right);
++ self->moveRight(right);
+ return QScriptValue();
}
- void sftpProtocol::symlink(const QString& target, const KUrl& dest, KIO::JobFlags flags) {
-- kDebug(KIO_SFTP_DB) << "symlink()";
-+ kDebug(KIO_SFTP_DB) << "link " << target << "->" << dest;
-
- if (!isSupportedOperation(SSH2_FXP_SYMLINK)) {
- error(ERR_UNSUPPORTED_ACTION,
-@@ -1521,8 +1504,9 @@
- void sftpProtocol::chmod(const KUrl& url, int permissions){
- QString perms;
- perms.setNum(permissions, 8);
-- kDebug(KIO_SFTP_DB) << "chmod(" << url << ", " << perms << ")";
-
-+ kDebug(KIO_SFTP_DB) << "change permission of " << url << " to " << perms;
-+
- openConnection();
- if( !mConnected )
- return;
-@@ -1534,7 +1518,7 @@
-
- int code;
- if( (code = sftpSetStat(url, attr)) != SSH2_FX_OK ) {
-- kError(KIO_SFTP_DB) << "chmod(): sftpSetStat failed with error " << code << endl;
-+ kError(KIO_SFTP_DB) << "cannot stat failed with error " << code;
- if( code == SSH2_FX_FAILURE )
- error(ERR_CANNOT_CHMOD, QString());
- else
-@@ -1545,7 +1529,7 @@
-
-
- void sftpProtocol::del(const KUrl &url, bool isfile){
-- kDebug(KIO_SFTP_DB) << "del(" << url << ", " << (isfile?"file":"dir") << ")";
-+ kDebug(KIO_SFTP_DB) << "delete " << (isfile ? "file: " : "directory: ") << url;
-
- openConnection();
- if( !mConnected )
-@@ -1553,16 +1537,14 @@
-
- int code;
- if( (code = sftpRemove(url, isfile)) != SSH2_FX_OK ) {
-- kError(KIO_SFTP_DB) << "del(): sftpRemove failed with error code " << code << endl;
-+ kError(KIO_SFTP_DB) << "delete failed with error code " << code;
- processStatus(code, url.prettyUrl());
- }
- finished();
+--- runtime/plasma/scriptengines/javascript/plasmoid/appletinterface.cpp (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/scriptengines/javascript/plasmoid/appletinterface.cpp (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -124,25 +124,21 @@
+ m_appletScriptEngine->setConfigurationRequired(needsConfiguring, reason);
}
- void sftpProtocol::slave_status() {
-- kDebug(KIO_SFTP_DB) << "slave_status(): connected to "
-- << mHost << "? " << mConnected << endl;
+-#ifdef USE_JS_SCRIPTENGINE
-
-+ kDebug(KIO_SFTP_DB) << "connected to " << mHost << "? " << mConnected;
- slaveStatus ((mConnected ? mHost : QString()), mConnected);
+-void AppletInterface::update(const QRectF &rect)
++void JsAppletInterface::update(const QRectF &rect)
+ {
+ applet()->update(rect);
}
-@@ -1579,8 +1561,8 @@
- ssize_t len = atomicio(ssh.stdioFd(), buf.data(), 4, true /*read*/);
- #endif
- if( len == 0 || len == -1 ) {
-- kDebug(KIO_SFTP_DB) << "getPacket(): read of packet length failed, ret = "
-- << len << ", error =" << strerror(errno) << endl;
-+ kDebug(KIO_SFTP_DB) << "read of packet length failed, ret = "
-+ << len << ", error =" << strerror(errno);
- closeConnection();
- error( ERR_CONNECTION_BROKEN, mHost);
- msg.resize(0);
-@@ -1591,7 +1573,7 @@
- QDataStream s(buf);
- s >> msgLen;
-
-- //kDebug(KIO_SFTP_DB) << "getPacket(): Message size = " << msgLen;
-+ //kDebug(KIO_SFTP_DB) << "message size = " << msgLen;
-
- msg.resize(0);
-
-@@ -1611,8 +1593,7 @@
- errmsg = i18n("Connection closed");
- else
- errmsg = i18n("Could not read SFTP packet");
-- kDebug(KIO_SFTP_DB) << "getPacket(): nothing to read, ret = " <<
-- len << ", error =" << strerror(errno) << endl;
-+ kDebug(KIO_SFTP_DB) << "nothing to read, ret = " << len << ", error =" << strerror(errno);
- closeConnection();
- error(ERR_CONNECTION_BROKEN, errmsg);
- b.close();
-@@ -1621,8 +1602,8 @@
-
- b.write(buf.data(), len);
-
-- //kDebug(KIO_SFTP_DB) << "getPacket(): Read Message size = " << len;
-- //kDebug(KIO_SFTP_DB) << "getPacket(): Copy Message size = " << msg.size();
-+ //kDebug(KIO_SFTP_DB) << "read Message size = " << len;
-+ //kDebug(KIO_SFTP_DB) << "copy Message size = " << msg.size();
-
- msgLen -= len;
- }
-@@ -1642,8 +1623,7 @@
- ret = atomicio(ssh.stdioFd(), p.data(), p.size(), false /*write*/);
- #endif
- if( ret <= 0 ) {
-- kDebug(KIO_SFTP_DB) << "putPacket(): write failed, ret =" << ret <<
-- ", error = " << strerror(errno) << endl;
-+ kDebug(KIO_SFTP_DB) << "write failed, ret =" << ret << ", error = " << strerror(errno);
- return false;
- }
-
-@@ -1656,7 +1636,7 @@
- Returns the canonicalized url. */
- int sftpProtocol::sftpRealPath(const KUrl& url, KUrl& newUrl){
-
-- kDebug(KIO_SFTP_DB) << "sftpRealPath(" << url << ", newUrl)";
-+ kDebug(KIO_SFTP_DB) << "get the real path of " << url;
-
- QByteArray path = remoteEncoding()->encode(url.path());
- uint len = path.length();
-@@ -1679,7 +1659,7 @@
-
- r >> type >> id;
- if( id != expectedId ) {
-- kError(KIO_SFTP_DB) << "sftpRealPath: sftp packet id mismatch" << endl;
-+ kError(KIO_SFTP_DB) << "sftp packet id mismatch";
- return -1;
- }
-
-@@ -1690,14 +1670,14 @@
- }
-
- if( type != SSH2_FXP_NAME ) {
-- kError(KIO_SFTP_DB) << "sftpRealPath(): unexpected packet type of " << type << endl;
-+ kError(KIO_SFTP_DB) << "unexpected packet type of " << type;
- return -1;
- }
-
- quint32 count;
- r >> count;
- if( count != 1 ) {
-- kError(KIO_SFTP_DB) << "sftpRealPath(): Bad number of file attributes for realpath command" << endl;
-+ kError(KIO_SFTP_DB) << "bad number of file attributes for realpath command";
- return -1;
- }
-
-@@ -1707,8 +1687,9 @@
- newPath.truncate(newPath.size());
- if (newPath.isEmpty())
- newPath = "/";
-- newUrl.setPath(newPath);
-+ newUrl.setPath(remoteEncoding()->decode(newPath));
-
-+ kDebug(KIO_SFTP_DB) << "real path is " << newUrl;
- return SSH2_FX_OK;
+-QGraphicsLayout *AppletInterface::layout() const
++QGraphicsLayout *JsAppletInterface::layout() const
+ {
+ return applet()->layout();
}
-@@ -1762,7 +1743,7 @@
- /** Opens a directory handle for url.path. Returns true if succeeds. */
- int sftpProtocol::sftpOpenDirectory(const KUrl& url, QByteArray& handle){
-
-- kDebug(KIO_SFTP_DB) << "sftpOpenDirectory(" << url << ", handle)";
-+ kDebug(KIO_SFTP_DB) << " open directory " << url;
-
- QByteArray path = remoteEncoding()->encode(url.path());
- uint len = path.length();
-@@ -1785,8 +1766,8 @@
-
- r >> type >> id;
- if( id != expectedId ) {
-- kError(KIO_SFTP_DB) << "sftpOpenDirectory: sftp packet id mismatch: " <<
-- "expected " << expectedId << ", got " << id << endl;
-+ kError(KIO_SFTP_DB) << "sftp packet id mismatch: " <<
-+ "expected " << expectedId << ", got " << id;
- return -1;
- }
-
-@@ -1797,25 +1778,23 @@
- }
-
- if( type != SSH2_FXP_HANDLE ) {
-- kError(KIO_SFTP_DB) << "sftpOpenDirectory: unexpected message type of " << type << endl;
-+ kError(KIO_SFTP_DB) << "unexpected message type of " << type;
- return -1;
- }
-
- r >> handle;
- if( handle.size() > 256 ) {
-- kError(KIO_SFTP_DB) << "sftpOpenDirectory: handle exceeds max length" << endl;
-+ kError(KIO_SFTP_DB) << "Handle exceeds max length";
- return -1;
- }
-
-- kDebug(KIO_SFTP_DB) << "sftpOpenDirectory: handle (" << handle.size() << "): [" << handle << "]";
-+ kDebug(KIO_SFTP_DB) << "directory handle (" << handle.size() << "): [" << handle << "]";
- return SSH2_FX_OK;
+-void AppletInterface::setLayout(QGraphicsLayout *layout)
++void JsAppletInterface::setLayout(QGraphicsLayout *layout)
+ {
+ applet()->setLayout(layout);
}
- /** Closes a directory or file handle. */
- int sftpProtocol::sftpClose(const QByteArray& handle){
-
-- kDebug(KIO_SFTP_DB) << "sftpClose()";
--
- quint32 id, expectedId;
- id = expectedId = mMsgId++;
-
-@@ -1834,19 +1813,19 @@
-
- r >> type >> id;
- if( id != expectedId ) {
-- kError(KIO_SFTP_DB) << "sftpClose: sftp packet id mismatch" << endl;
-+ kError(KIO_SFTP_DB) << "sftp packet id mismatch";
- return -1;
- }
-
- if( type != SSH2_FXP_STATUS ) {
-- kError(KIO_SFTP_DB) << "sftpClose: unexpected message type of " << type << endl;
-+ kError(KIO_SFTP_DB) << "unexpected message type of " << type;
- return -1;
- }
-
- quint32 code;
- r >> code;
- if( code != SSH2_FX_OK ) {
-- kError(KIO_SFTP_DB) << "sftpClose: close failed with err code " << code << endl;
-+ kError(KIO_SFTP_DB) << "close failed with err code " << code;
- }
-
- return code;
-@@ -1855,7 +1834,7 @@
- /** Set a files attributes. */
- int sftpProtocol::sftpSetStat(const KUrl& url, const sftpFileAttr& attr){
-
-- kDebug(KIO_SFTP_DB) << "sftpSetStat(" << url << ", attr)";
-+ kDebug(KIO_SFTP_DB) << "stating url " << url;
-
- QByteArray path = remoteEncoding()->encode(url.path());
- uint len = path.length();
-@@ -1879,20 +1858,20 @@
-
- r >> type >> id;
- if( id != expectedId ) {
-- kError(KIO_SFTP_DB) << "sftpSetStat(): sftp packet id mismatch" << endl;
-+ kError(KIO_SFTP_DB) << "sftp packet id mismatch";
- return -1;
- // XXX How do we do a fatal error?
- }
-
- if( type != SSH2_FXP_STATUS ) {
-- kError(KIO_SFTP_DB) << "sftpSetStat(): unexpected message type of " << type << endl;
-+ kError(KIO_SFTP_DB) << "unexpected message type of " << type;
- return -1;
- }
-
- quint32 code;
- r >> code;
- if( code != SSH2_FX_OK ) {
-- kError(KIO_SFTP_DB) << "sftpSetStat(): set stat failed with err code " << code << endl;
-+ kError(KIO_SFTP_DB) << "set stat failed with err code " << code;
- }
-
- return code;
-@@ -1901,7 +1880,7 @@
- /** Sends a sftp command to remove a file or directory. */
- int sftpProtocol::sftpRemove(const KUrl& url, bool isfile){
-
-- kDebug(KIO_SFTP_DB) << "sftpRemove(): " << url << ", isFile ? " << isfile;
-+ kDebug(KIO_SFTP_DB) << "deleting " << (isfile ? "file " : "directory ") << url;
-
- QByteArray path = remoteEncoding()->encode(url.path());
- uint len = path.length();
-@@ -1924,19 +1903,19 @@
-
- r >> type >> id;
- if( id != expectedId ) {
-- kError(KIO_SFTP_DB) << "del(): sftp packet id mismatch" << endl;
-+ kError(KIO_SFTP_DB) << "sftp packet id mismatch";
- return -1;
- }
-
- if( type != SSH2_FXP_STATUS ) {
-- kError(KIO_SFTP_DB) << "del(): unexpected message type of " << type << endl;
-+ kError(KIO_SFTP_DB) << "unexpected message type of " << type;
- return -1;
- }
-
- quint32 code;
- r >> code;
- if( code != SSH2_FX_OK ) {
-- kError(KIO_SFTP_DB) << "del(): del failed with err code " << code << endl;
-+ kError(KIO_SFTP_DB) << "delete failed with error code " << code;
- }
-
- return code;
-@@ -1945,7 +1924,7 @@
- /** Send a sftp command to rename a file or directory. */
- int sftpProtocol::sftpRename(const KUrl& src, const KUrl& dest){
-
-- kDebug(KIO_SFTP_DB) << "sftpRename(" << src << " -> " << dest << ")";
-+ kDebug(KIO_SFTP_DB) << src << " -> " << dest;
-
- QByteArray srcPath = remoteEncoding()->encode(src.path());
- QByteArray destPath = remoteEncoding()->encode(dest.path());
-@@ -1974,19 +1953,19 @@
-
- r >> type >> id;
- if( id != expectedId ) {
-- kError(KIO_SFTP_DB) << "sftpRename(): sftp packet id mismatch" << endl;
-+ kError(KIO_SFTP_DB) << "sftp packet id mismatch";
- return -1;
- }
-
- if( type != SSH2_FXP_STATUS ) {
-- kError(KIO_SFTP_DB) << "sftpRename(): unexpected message type of " << type << endl;
-+ kError(KIO_SFTP_DB) << "unexpected message type of " << type;
- return -1;
- }
-
- int code;
- r >> code;
- if( code != SSH2_FX_OK ) {
-- kError(KIO_SFTP_DB) << "sftpRename(): rename failed with err code " << code << endl;
-+ kError(KIO_SFTP_DB) << "rename failed with err code " << code;
- }
-
- return code;
-@@ -1994,7 +1973,7 @@
- /** Get directory listings. */
- int sftpProtocol::sftpReadDir(const QByteArray& handle, const KUrl& url){
- // url is needed so we can lookup the link destination
-- kDebug(KIO_SFTP_DB) << "sftpReadDir(): " << url;
-+ kDebug(KIO_SFTP_DB) << url;
-
- quint32 id, expectedId, count;
- quint8 type;
-@@ -2017,7 +1996,7 @@
- r >> type >> id;
-
- if( id != expectedId ) {
-- kError(KIO_SFTP_DB) << "sftpReadDir(): sftp packet id mismatch" << endl;
-+ kError(KIO_SFTP_DB) << "sftp packet id mismatch";
- return -1;
- }
-
-@@ -2028,12 +2007,12 @@
- }
-
- if( type != SSH2_FXP_NAME ) {
-- kError(KIO_SFTP_DB) << "kio_sftpProtocol::sftpReadDir(): Unexpected message" << endl;
-+ kError(KIO_SFTP_DB) << "unexpected message";
- return -1;
- }
-
- r >> count;
-- kDebug(KIO_SFTP_DB) << "sftpReadDir(): got " << count << " entries";
-+ kDebug(KIO_SFTP_DB) << "got " << count << " entries";
-
- while(count--) {
- r >> attr;
-@@ -2060,13 +2039,13 @@
-
- int sftpProtocol::sftpReadLink(const KUrl& url, QString& target){
-
-- kDebug(KIO_SFTP_DB) << "sftpReadLink(): " << url;
-+ kDebug(KIO_SFTP_DB) << url;
-
- QByteArray path = remoteEncoding()->encode(url.path());
- uint len = path.length();
-
-- //kDebug(KIO_SFTP_DB) << "sftpReadLink(): Encoded Path: " << path;
-- //kDebug(KIO_SFTP_DB) << "sftpReadLink(): Encoded Size: " << len;
-+ //kDebug(KIO_SFTP_DB) << "Encoded Path: " << path;
-+ //kDebug(KIO_SFTP_DB) << "Encoded Size: " << len;
-
- quint32 id, expectedId;
- id = expectedId = mMsgId++;
-@@ -2087,26 +2066,26 @@
-
- r >> type >> id;
- if( id != expectedId ) {
-- kError(KIO_SFTP_DB) << "sftpReadLink(): sftp packet id mismatch" << endl;
-+ kError(KIO_SFTP_DB) << "sftp packet id mismatch";
- return -1;
- }
-
- if( type == SSH2_FXP_STATUS ) {
- quint32 code;
- r >> code;
-- kDebug(KIO_SFTP_DB) << "sftpReadLink(): read link failed with code " << code;
-+ kDebug(KIO_SFTP_DB) << "read link failed with code " << code;
- return code;
- }
-
- if( type != SSH2_FXP_NAME ) {
-- kError(KIO_SFTP_DB) << "sftpReadLink(): unexpected packet type of " << type << endl;
-+ kError(KIO_SFTP_DB) << "unexpected packet type of " << type;
- return -1;
- }
-
- quint32 count;
- r >> count;
- if( count != 1 ) {
-- kError(KIO_SFTP_DB) << "sftpReadLink(): Bad number of file attributes for realpath command" << endl;
-+ kError(KIO_SFTP_DB) << "bad number of file attributes for realpath command";
- return -1;
- }
-
-@@ -2114,7 +2093,7 @@
- r >> linkAddress;
-
- linkAddress.truncate(linkAddress.size());
-- kDebug(KIO_SFTP_DB) << "sftpReadLink(): Link address: " << linkAddress;
-+ kDebug(KIO_SFTP_DB) << "link address: " << linkAddress;
-
- target = remoteEncoding()->decode(linkAddress);
-
-@@ -2128,7 +2107,7 @@
- uint dlen = destPath.length();
- uint tlen = target.length();
-
-- kDebug(KIO_SFTP_DB) << "sftpSymLink(" << target << " -> " << destPath << ")";
-+ kDebug(KIO_SFTP_DB) << "(" << target << " -> " << destPath << ")";
-
- quint32 id, expectedId;
- id = expectedId = mMsgId++;
-@@ -2151,19 +2130,19 @@
-
- r >> type >> id;
- if( id != expectedId ) {
-- kError(KIO_SFTP_DB) << "sftpSymLink(): sftp packet id mismatch" << endl;
-+ kError(KIO_SFTP_DB) << "sftp packet id mismatch";
- return -1;
- }
-
- if( type != SSH2_FXP_STATUS ) {
-- kError(KIO_SFTP_DB) << "sftpSymLink(): unexpected message type of " << type << endl;
-+ kError(KIO_SFTP_DB) << "unexpected message type of " << type;
- return -1;
- }
-
- quint32 code;
- r >> code;
- if( code != SSH2_FX_OK ) {
-- kError(KIO_SFTP_DB) << "sftpSymLink(): rename failed with err code " << code << endl;
-+ kError(KIO_SFTP_DB) << "rename failed with err code " << code;
- }
-
- return code;
-@@ -2172,7 +2151,7 @@
- /** Stats a file. */
- int sftpProtocol::sftpStat(const KUrl& url, sftpFileAttr& attr) {
-
-- kDebug(KIO_SFTP_DB) << "sftpStat(): " << url;
-+ kDebug(KIO_SFTP_DB) << url;
-
- QByteArray path = remoteEncoding()->encode(url.path());
- uint len = path.length();
-@@ -2195,25 +2174,25 @@
-
- r >> type >> id;
- if( id != expectedId ) {
-- kError(KIO_SFTP_DB) << "sftpStat(): sftp packet id mismatch" << endl;
-+ kError(KIO_SFTP_DB) << "sftp packet id mismatch";
- return -1;
- }
-
- if( type == SSH2_FXP_STATUS ) {
- quint32 errCode;
- r >> errCode;
-- kError(KIO_SFTP_DB) << "sftpStat(): stat failed with code " << errCode << endl;
-+ kError(KIO_SFTP_DB) << "stat failed with code " << errCode;
- return errCode;
- }
-
- if( type != SSH2_FXP_ATTRS ) {
-- kError(KIO_SFTP_DB) << "sftpStat(): unexpected message type of " << type << endl;
-+ kError(KIO_SFTP_DB) << "unexpected message type of " << type;
- return -1;
- }
-
- r >> attr;
- attr.setFilename(url.fileName());
-- kDebug(KIO_SFTP_DB) << "sftpStat(): " << attr;
-+ kDebug(KIO_SFTP_DB) << attr;
-
- // If the stat'ed resource is a symlink, perform a recursive stat
- // to determine the actual destination's type (file/dir).
-@@ -2223,11 +2202,11 @@
- int code = sftpReadLink( url, target );
-
- if ( code != SSH2_FX_OK ) {
-- kError(KIO_SFTP_DB) << "sftpStat(): Unable to stat symlink destination" << endl;
-+ kError(KIO_SFTP_DB) << "unable to stat symlink destination";
- return -1;
- }
-
-- kDebug(KIO_SFTP_DB) << "sftpStat(): Resource is a symlink to -> " << target;
-+ kDebug(KIO_SFTP_DB) << "resource is a symlink that points to " << target;
-
- KUrl dest( url );
- if( target[0] == '/' )
-@@ -2249,8 +2228,7 @@
- attr.setLinkType(attr2.linkType());
-
- attr.setLinkDestination(target);
+-#endif
-
-- kDebug(KIO_SFTP_DB) << "sftpStat(): File type: " << attr.fileType();
-+ attr.setPermissions(attr2.permissions());
- }
- }
-
-@@ -2260,7 +2238,7 @@
-
- int sftpProtocol::sftpOpen(const KUrl& url, const quint32 pflags,
- const sftpFileAttr& attr, QByteArray& handle) {
-- kDebug(KIO_SFTP_DB) << "sftpOpen(" << url << ", handle";
-+ kDebug(KIO_SFTP_DB) << url;
-
- QByteArray path = remoteEncoding()->encode(url.path());
- uint len = path.length();
-@@ -2287,7 +2265,7 @@
-
- r >> type >> id;
- if( id != expectedId ) {
-- kError(KIO_SFTP_DB) << "sftpOpen(): sftp packet id mismatch" << endl;
-+ kError(KIO_SFTP_DB) << "sftp packet id mismatch";
- return -1;
- }
-
-@@ -2298,24 +2276,24 @@
- }
-
- if( type != SSH2_FXP_HANDLE ) {
-- kError(KIO_SFTP_DB) << "sftpOpen(): unexpected message type of " << type << endl;
-+ kError(KIO_SFTP_DB) << "unexpected message type of " << type;
- return -1;
- }
-
- r >> handle;
- if( handle.size() > 256 ) {
-- kError(KIO_SFTP_DB) << "sftpOpen(): handle exceeds max length" << endl;
-+ kError(KIO_SFTP_DB) << "handle exceeds max length";
- return -1;
- }
-
-- kDebug(KIO_SFTP_DB) << "sftpOpen(): handle (" << handle.size() << "): [" << handle << "]";
-+ kDebug(KIO_SFTP_DB) << "URL handle (" << handle.size() << "): [" << handle << "]";
- return SSH2_FX_OK;
- }
-
-
- int sftpProtocol::sftpRead(const QByteArray& handle, KIO::filesize_t offset, quint32 len, QByteArray& data)
+ QString AppletInterface::activeConfig() const
{
-- // kDebug(KIO_SFTP_DB) << "sftpRead( offset = " << offset << ", len = " << len << ")";
-+ // kDebug(KIO_SFTP_DB) << "( offset = " << offset << ", len = " << len << ")";
- QByteArray p;
- QDataStream s(&p, QIODevice::WriteOnly);
-
-@@ -2338,19 +2316,19 @@
-
- r >> type >> id;
- if( id != expectedId ) {
-- kError(KIO_SFTP_DB) << "sftpRead: sftp packet id mismatch" << endl;
-+ kError(KIO_SFTP_DB) << "sftp packet id mismatch";
- return -1;
- }
-
- if( type == SSH2_FXP_STATUS ) {
- quint32 errCode;
- r >> errCode;
-- kError(KIO_SFTP_DB) << "sftpRead: read failed with code " << errCode << endl;
-+ kError(KIO_SFTP_DB) << "Read failed with code " << errCode;
- return errCode;
- }
-
- if( type != SSH2_FXP_DATA ) {
-- kError(KIO_SFTP_DB) << "sftpRead: unexpected message type of " << type << endl;
-+ kError(KIO_SFTP_DB) << "unexpected message type of " << type;
- return -1;
- }
-
-@@ -2362,7 +2340,7 @@
-
- int sftpProtocol::sftpWrite(const QByteArray& handle, KIO::filesize_t offset, const QByteArray& data){
- // kDebug(KIO_SFTP_DB) << "sftpWrite( offset = " << offset <<
--// ", data sz = " << data.size() << ")" << endl;
-+// ", data sz = " << data.size() << ")";
- QByteArray p;
- QDataStream s(&p, QIODevice::WriteOnly);
-
-@@ -2378,28 +2356,28 @@
- s << offset; // we don't have a convienient 64 bit int so set upper int to zero
- s << data;
-
--// kDebug(KIO_SFTP_DB) << "sftpWrite(): SSH2_FXP_WRITE, id:"
--// << id << ", handle:" << handle << ", offset:" << offset << ", some data" << endl;
-+// kDebug(KIO_SFTP_DB) << "SSH2_FXP_WRITE, id:"
-+// << id << ", handle:" << handle << ", offset:" << offset << ", some data";
-
--// kDebug(KIO_SFTP_DB) << "sftpWrite(): send packet [" << p << "]";
-+// kDebug(KIO_SFTP_DB) << "Send packet [" << p << "]";
-
- putPacket(p);
- getPacket(p);
-
--// kDebug(KIO_SFTP_DB) << "sftpWrite(): received packet [" << p << "]";
-+// kDebug(KIO_SFTP_DB) << "Received packet [" << p << "]";
-
- QDataStream r(p);
- quint8 type;
-
- r >> type >> id;
- if( id != expectedId ) {
-- kError(KIO_SFTP_DB) << "sftpWrite(): sftp packet id mismatch, got "
-- << id << ", expected " << expectedId << endl;
-+ kError(KIO_SFTP_DB) << "sftp packet id mismatch, got "
-+ << id << ", expected " << expectedId;
- return -1;
- }
-
- if( type != SSH2_FXP_STATUS ) {
-- kError(KIO_SFTP_DB) << "sftpWrite(): unexpected message type of " << type << endl;
-+ kError(KIO_SFTP_DB) << "unexpected message type of " << type;
- return -1;
- }
-
-@@ -2407,5 +2385,3 @@
- r >> code;
- return code;
- }
--
--
---- runtime/kioslave/sftp/process.cpp (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/kioslave/sftp/process.cpp (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -69,7 +69,7 @@
- m_pPTY = new KPty();
- if (!m_pPTY->open())
- {
-- kError(PTYPROC) << k_lineinfo << "Master setup failed.\n" << endl;
-+ kError(PTYPROC) << k_lineinfo << "Master setup failed.";
- return -1;
- }
- #else
-@@ -148,7 +148,7 @@
- int flags = fcntl(fd, F_GETFL);
- if (flags < 0)
- {
-- kError(PTYPROC) << k_lineinfo << "fcntl(F_GETFL): " << perror << "\n";
-+ kError(PTYPROC) << k_lineinfo << "fcntl(F_GETFL): " << perror;
- return ret;
- }
- if (block)
-@@ -157,7 +157,7 @@
- flags |= O_NONBLOCK;
- if (fcntl(fd, F_SETFL, flags) < 0)
- {
-- kError(PTYPROC) << k_lineinfo << "fcntl(F_SETFL): " << perror << "\n";
-+ kError(PTYPROC) << k_lineinfo << "fcntl(F_SETFL): " << perror;
- return ret;
- }
-
-@@ -244,7 +244,7 @@
- int slave = open(m_pPTY->ttyName(), O_RDWR);
- if (slave < 0)
- {
-- kError(PTYPROC) << k_lineinfo << "Could not open slave pty.\n";
-+ kError(PTYPROC) << k_lineinfo << "Could not open slave pty.";
- return -1;
- }
-
-@@ -265,7 +265,7 @@
-
- if ((m_Pid = fork()) == -1)
- {
-- kError(PTYPROC) << k_lineinfo << "fork(): " << perror << "\n";
-+ kError(PTYPROC) << k_lineinfo << "fork(): " << perror;
- return -1;
- }
+ return m_currentConfig.isEmpty() ? "main" : m_currentConfig;
+@@ -379,7 +375,7 @@
-@@ -287,7 +287,7 @@
- if( !ok )
- {
-- kError(PTYPROC) << "dup of socket descriptor failed" << endl;
-+ kError(PTYPROC) << "dup of socket descriptor failed";
- _exit(1);
- }
-
-@@ -308,7 +308,7 @@
- QString file = KStandardDirs::findExe(command);
- if (file.isEmpty())
- {
-- kError(PTYPROC) << k_lineinfo << command << " not found\n";
-+ kError(PTYPROC) << k_lineinfo << command << " not found";
- _exit(1);
- }
- path = QFile::encodeName(file);
-@@ -324,7 +324,7 @@
- }
- argp[i] = 0L;
- execv(path, (char * const *)argp);
-- kError(PTYPROC) << k_lineinfo << "execv(\"" << path << "\"): " << perror << "\n";
-+ kError(PTYPROC) << k_lineinfo << "execv(\"" << path << "\"): " << perror;
- _exit(1);
- return -1; // Shut up compiler. Never reached.
- #endif
-@@ -346,7 +346,7 @@
- int slave = open(m_pPTY->ttyName(), O_RDWR);
- if (slave < 0)
- {
-- kError(PTYPROC) << k_lineinfo << "Could not open slave tty.\n";
-+ kError(PTYPROC) << k_lineinfo << "Could not open slave tty.";
- return -1;
- }
-
-@@ -356,7 +356,7 @@
- {
- if (tcgetattr(slave, &tio) < 0)
- {
-- kError(PTYPROC) << k_lineinfo << "tcgetattr(): " << perror << "\n";
-+ kError(PTYPROC) << k_lineinfo << "tcgetattr(): " << perror;
- close(slave);
- return -1;
- }
-@@ -417,7 +417,7 @@
- if (errno == EINTR) continue;
- else
- {
-- kError(PTYPROC) << k_lineinfo << "select(): " << perror << "\n";
-+ kError(PTYPROC) << k_lineinfo << "select(): " << perror;
- return -1;
- }
- }
-@@ -445,7 +445,7 @@
- if (errno == ECHILD)
- retval = 0;
- else
-- kError(PTYPROC) << k_lineinfo << "waitpid(): " << perror << "\n";
-+ kError(PTYPROC) << k_lineinfo << "waitpid(): " << perror;
- break;
- }
- if (ret == m_Pid)
-@@ -488,13 +488,13 @@
- struct ::termios tio;
- if (m_pPTY->tcGetAttr(&tio) < 0)
- {
-- kError(PTYPROC) << k_lineinfo << "tcgetattr(): " << perror << "\n";
-+ kError(PTYPROC) << k_lineinfo << "tcgetattr(): " << perror;
- return -1;
- }
- tio.c_oflag &= ~OPOST;
- if (m_pPTY->tcSetAttr(&tio) < 0)
- {
-- kError(PTYPROC) << k_lineinfo << "tcsetattr(): " << perror << "\n";
-+ kError(PTYPROC) << k_lineinfo << "tcsetattr(): " << perror;
- return -1;
- }
- #endif
---- runtime/nepomuk/services/strigi/nepomukstrigiservice.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/nepomuk/services/strigi/nepomukstrigiservice.desktop (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -99,6 +99,7 @@
- Comment[kn]=ಸ್ಟ್ರಿಗಿ ನೇಪಥಿಕನನ್ನು (ಡೀಮನ್) ನಿಯಂತ್ರಣದಲ್ಲಿಡುವ ನೆಪೋಮುಕ್ ಸೇವೆ, ಅರ್ಥಾತ್, ಗಣಕತೆರೆಯಲ್ಲಿರುವ ಕಡತಗಳ ಅನುಕ್ರಮಣಿಯನ್ನು (ಇಂಡೆಕ್ಸ್)ಮಾಡುತ್ತದೆ
- Comment[ko]=데스크톱의 파일을 정리하는 strigidaemon을 제어하는 Nepomuk 서비스입니다.
- Comment[ku]=Servîsa Nepomuk yê ku strigidaemon kontrol dike, mînak, pelên sermasê pêrist dike
-+Comment[lt]=Nepomuk tarnyba, valdanti strigidaemon, t.y., valdanti failų darbastalyje indeksavimo procesą
- Comment[lv]=Nepomuk serviss, kas kontrolē Strigi dēmoni - indeksē darbvirsmas failus
- Comment[mk]=Сервис Nepomuk што го контролира strigidaemon, т.е. ги индексира датотеките на работната површина
- Comment[ml]=strigidaemon നിയന്ത്രിക്കുന്ന Nepomuk സേവനം, i.e. പണിയിടത്തില് ഫയലുകള് ലഭ്യമാക്കുന്നു
---- runtime/nepomuk/services/strigi/nepomukstrigiservice.notifyrc (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/nepomuk/services/strigi/nepomukstrigiservice.notifyrc (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -28,6 +28,7 @@
- Comment[kn]=ನೆಪೋಮುಕ್ ಸ್ಟ್ರಿಗಿ ಕಡತ ಅನುಕ್ರಮಣಕಾರ (ಇಂಡೆಕ್ಸರ್)
- Comment[ko]=Nepomuk Strigi 파일 인덱서
- Comment[ku]=Nepomuk Strigi pêrist kirina pelê
-+Comment[lt]=Nepomuk Strigi failų indeksavimo priemonė
- Comment[lv]=Nepomuk Strigi failu indeksētājs
- Comment[ml]=Nepomuk Strigi ഫയല് ഇന്ഡെക്സര്
- Comment[mr]=Nepomuk Strigi फाइल इन्डेक्सर
-@@ -85,6 +86,7 @@
- Name[kn]=ಮೊದಲ ಅನುಕ್ರಮಣಿಕೆ ಪ್ರಾರಂಭವಾಗಿದೆ
- Name[ko]=초기 인덱싱 시작됨
- Name[ku]=Pêrist kirina Seretayî Destpê kirin
-+Name[lt]=Pirminis indeksavimas pradėtas
- Name[lv]=Sākta sākotnējā indeksēšana
- Name[mk]=Стартувано е иницијалното индексирање
- Name[ml]=തുടക്കത്തിലുള്ള ഇന്ഡെക്സിങ്ങ് തുടങ്ങി
-@@ -137,6 +139,7 @@
- Comment[kn]=ಶೀಘ್ರ ಗಣಕತೆರೆ ಶೋಧಕ್ಕೆ ಸ್ಟ್ರಿಗಿ ಸ್ಥಳೀಯ ಕಡತಗಳ ಮೊದಲ ಅನುಕ್ರಮಣಿಕೆಯ (ಇಂಡೆಕ್ಸ್) ತಯಾರಿಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿದೆ
- Comment[ko]=Strigi에서 빠른 데스크톱 검색을 위한 로컬 파일의 초기 인덱싱을 시작함
- Comment[ku]=Strigi pêrist kirina seretayî yê pelên herêmî ji bo lêgerîna lez yê sermasê destpê kir
-+Comment[lt]=Strigi pradėjo pirminį vietinių failų indeksavimą, kurį baigus bus galima atlikti greitas vietinių failų paieškas
- Comment[lv]=Strigi sāka sākotnējo lokālo failu indeksēšanu, lai varētu veikt ātru meklēšanu
- Comment[ml]=സ്റ്റ്രിജി വേഗത്തിലുള്ള ഡെസ്ക്ടോപ് തിരയലുകള്ക്കായ് പ്രാദേശിക ഫയലുകളുടെ തുടക്കത്തിലുള്ള ഇന്ഡെക്സിങ്ങ് തുടങ്ങി
- Comment[nb]=Strigi startet den første indekseringen av lokale filer som vil gjøre søk raskere
-@@ -194,6 +197,7 @@
- Name[kn]=ಮೊದಲ ಅನುಕ್ರಮಣೆಕೆಯ ತಯಾರಿಕೆ ಮುಗಿದಿದೆ
- Name[ko]=초기 인덱싱 완료됨
- Name[ku]=Pêrist kirina Seretayî qedand
-+Name[lt]=Pirminis indeksavimas baigtas
- Name[lv]=Sākotnējā indeksēšana pabeigta
- Name[mk]=Иницијалното индексирање заврши
- Name[ml]=തുടക്കത്തിലുള്ള ഇന്ഡെക്സിങ്ങ് കഴിഞ്ഞു
-@@ -239,13 +243,14 @@
- Comment[hne]=तेज डेस्कटाप खोज बर स्ट्रिगि सुरु के इंडेक्सिंग लोकल फाइल बर पूरा कर लिस
- Comment[hsb]=Strigi je prěnje tworjenje indeksa za lokalne dataje zakónčił, za spěšne pytanje na dźěłowym powjerchu
- Comment[is]=Strigi hefur lokið gerð upphafsyfirlits um skrár á tölvunni til að styðja við hraðar skjáborðsleitir
--Comment[it]=Strigi ha completato l'indicizzazione iniziale dei file locali per velocizzare le ricerch desktop
-+Comment[it]=Strigi ha completato l'indicizzazione iniziale dei file locali per velocizzare le ricerche desktop
- Comment[ja]=Strigi が、デスクトップ検索を高速化するためのローカルファイルの最初のインデックス作成を完了しました
- Comment[kk]=Іздеуді тездету үшін Strigi жергілікті файлдарды индекстеуін аяқтады
- Comment[km]=បានបញ្ចប់កការបង្កើតលិបិក្រមរបស់ Strigi នៃឯកសារមូលដ្ឋានសម្រាប់ការស្វែងរកផ្ទៃតុរហ័ស
- Comment[kn]=ಶೀಘ್ರ ಗಣಕತೆರೆ ಶೋಧಕ್ಕೆ ಸ್ಥಳೀಯ ಕಡತಗಳ ಮೊದಲ ಅನುಕ್ರಮಣಿಕೆಯ (ಇಂಡೆಕ್ಸ್) ತಯಾರಿಕೆಯನ್ನು ಸ್ಟ್ರಿಗಿ ಮುಗಿಸಿದೆ
- Comment[ko]=Strigi에서 빠른 데스크톱 검색을 위한 로컬 파일의 초기 인덱싱을 완료함
- Comment[ku]=Strigi pêrist kirina seretayî yê pelên herêmî ji bo lêgerîna lez yê sermasê qedand
-+Comment[lt]=Strigi baigė pirminį vietinių failų indeksavimą ir gali atlikti greitas paieškas
- Comment[lv]=Strigi pabeidza sākotnējo lokālo failu indeksēšanu ātrai meklēšanai
- Comment[ml]=സ്റ്റ്രിജി വേഗത്തിലുള്ള ഡെസ്ക്ടോപ് തിരയലുകള്ക്കായ് പ്രാദേശിക ഫയലുകളുടെ തുടക്കത്തിലുള്ള ഇന്ഡെക്സിങ്ങ് കഴിഞ്ഞു
- Comment[nb]=Strigi gjorde ferdig første indeksering av lokale filer som vil gjøre søk raskere
-@@ -357,6 +362,7 @@
- Comment[kn]=ಸ್ಟ್ರಿಗಿಯ ಕಡತಗಳ ಅನುಕ್ರಮ ತಯಾರಿಕೆಯನ್ನು ಅಮಾನತ್ತುಗೊಳಿಸಲಾಗಿದೆ
- Comment[ko]=Strigi 파일 인덱싱 중지됨
- Comment[ku]=Strigi pêrist kirina pelan hate sekinandin
-+Comment[lt]=Strigi failo indeksuoklio veikla sustabdyta
- Comment[lv]=Strigi failu indeksēšana tika apturēta
- Comment[ml]=സ്റ്റ്രിജി ഫയല് ഇന്ഡെക്സിങ്ങ് താല്കാലികമായ് നിര്ത്തിയിരിക്കുന്നു
- Comment[mr]=Strigi फाइल इन्डेक्सींग वगळले गेले आहे
-@@ -469,6 +475,7 @@
- Comment[kn]=ಸ್ಟ್ರಿಗಿಯ ಕಡತಗಳ ಅನುಕ್ರಮ ತಯಾರಿಕೆಯನ್ನು ಪುನರಾರಂಭಿಸಲಾಗಿದೆ
- Comment[ko]=Strigi 파일 인덱싱 다시 시작됨
- Comment[ku]=Strigi pêrist kirina pelan hate dom kirin
-+Comment[lt]=Strigi failų indeksuoklio veikla atnaujinta
- Comment[lv]=Strigi failu indeksēšana tika atsākta
- Comment[ml]=സ്റ്റ്രിജി ഫയല് ഇന്ഡെക്സിങ്ങ് തുടരുന്നു
- Comment[mr]=Strigi फाइल इन्डेक्सींग पुन्हा सुरू झाले
---- runtime/nepomuk/services/storage/nepomukstorage.notifyrc (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/nepomuk/services/storage/nepomukstorage.notifyrc (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -90,6 +90,7 @@
- Comment[km]=សេវាផ្ទុករបស់ Nepomuk
- Comment[ko]=Nepomuk 저장소 서비스
- Comment[ku]=Nepomuk Servîsa Hîser Kirinê
-+Comment[lt]=Nepomuk saugojimo tarnyba
- Comment[lv]=Nepomuk glabāšanas serviss
- Comment[ml]=നെപോമുക് സൂക്ഷിപ്പു് സേവനം
- Comment[mr]=Nepomuk संचयन सेवा
-@@ -145,6 +146,7 @@
- Name[km]=ស្ថាបនាលិបិក្រម Nepomuk ឡើងវិញ
- Name[ko]=Nepomuk 인덱스 다시 생성하는 중
- Name[ku]=Nû ve Çêkirina Pêrista Nepomuk
-+Name[lt]=Atstatomas Nepomuk indeksas
- Name[lv]=Pārbūvē Nepomuk indeksu
- Name[ml]=നെപോമുക് സൂചിക വിണ്ടും ഉണ്ടാക്കിക്കൊണ്ടിരിയ്ക്കുന്നു
- Name[nb]=Bygger om Nepomuk-registeret
-@@ -194,6 +196,7 @@
- Comment[km]=លិបិក្រមអត្ថបទពេញលេញរបស់ Nepomuk ត្រូវបានស្ថាបនាសម្រាប់លក្ខណៈពិសេសថ្មីៗ
- Comment[ko]=새로운 기능을 지원하도록 Nepomuk 전문 검색 인덱스를 다시 생성하였습니다
- Comment[ku]=Pêrista lêgerîna hemû nivîsê yê Nepomuk nû ve hat çêkirin ji bo taybetiyên nû
-+Comment[lt]=Nepomuk viso teksto paieškos indeksas yra atstatytas dėl naujų savybių
- Comment[lv]=Nepomuk meklēšanas indekss tiek pārbūvēts, lai iekļautu jaunas iespējas
- Comment[ml]=പുതിയ കഴിവുകള്ക്കായി നെപോമുക്കിന്റം മുഴുവന് പദാവലിയുടേയും സൂചിക വീണ്ടും ഉണ്ടാക്കിക്കൊണ്ടിരിയ്ക്കുന്നു
- Comment[nb]=Nepomuks register for fulltekst-søk blir bygget på nytt for nye muligheter
-@@ -249,6 +252,7 @@
- Name[km]=ការស្ថាបនាលិបិក្រម Nepomuk បានធ្វើរួច
- Name[ko]=Nepomuk 인덱스를 다시 생성하였습니다
- Name[ku]=Nû ve Çêkirina Pêrista Nepomuk hat qedandin
-+Name[lt]=Nepomuk indekso atstatymas atliktas
- Name[lv]=Nepomuk indeksa pārbūvēšana pabeigta
- Name[ml]=നെപോമുക് സൂചിക വിണ്ടും ഉണ്ടാക്കുന്നതു് തീര്ന്നു
- Name[nb]=Nepomuk-registeret er ferdig ombygget
-@@ -301,6 +305,7 @@
- Comment[km]=ការស្ថាបនាលិបិក្រមស្វែងរកអត្ថបទពេញលេញរបស់ Nepomuk ត្រូវបានធ្វើរួច ។
- Comment[ko]=Nepomuk 전문 검색 인덱스를 다시 생성하였습니다
- Comment[ku]=Nû ve çêkirina pêrista lêgerîna hemû nivîsê yê Nepomuk hat qedandin.
-+Comment[lt]=Nepomuk viso teksto paieškos indekso atstatymas atliktas.
- Comment[lv]=Pabeigta Nepomuk pilnas teksta meklēšanas indeksa pārbūve.
- Comment[ml]=പുതിയ കഴിവുകള്ക്കായി നെപോമുക്കിന്റം മുഴുവന് പദാവലിയുടേയും സൂചിക വീണ്ടും ഉണ്ടാക്കുന്നതു് തീര്ന്നു.
- Comment[nb]=Nepomuks register for fulltekst-søk er ferdig bygget på nytt.
-@@ -403,6 +408,7 @@
- Comment[km]=ទិន្នន័យ Nepomuk ទាំងអស់ត្រូវបានបម្លែងទៅកម្មវិធីផ្នែកខាងក្រោយផ្នុកថ្មី
- Comment[ko]=새 저장소 백엔드를 사용하도록 Nepomuk 데이터를 변환하였습니다
- Comment[ku]=Hemû dane yên Nepomuk ji paş-dawî ya hîser kirina nû re hatin veguherandin
-+Comment[lt]=Visi Nepomuk duomenys buvo konvertuoti į naujos saugojimo programinės sąsajos formatą
- Comment[lv]=Visi Nepomuk dati ir konvertēti uz jaunu glabāšanas aizmuguri
- Comment[ml]=പുതിയ സൂക്ഷിപ്പു് സംവിധാനത്തിലേയ്ക്കു് എല്ലാ നെപോമുക് ഡാറ്റയും മാറ്റിക്കഴിഞ്ഞു
- Comment[nb]=Alle Nepomuk-data er konvertert til et nytt lagringsbakstykke
-@@ -505,6 +511,7 @@
- Comment[km]=បានបរាជ័យក្នុងការបម្លែងទិន្នន័យ Nepomuk ទៅជាកម្មវិធីផ្នែកខាងក្រោយថ្មី
- Comment[ko]=Nepomuk 데이터를 새로운 백엔드로 변환하는 데 실패하였습니다
- Comment[ku]=Veguherandina dane yên Nepomuk ji paş-dawî ya nû re têk çû
-+Comment[lt]=Nepomuk duomenų konvertavimas į naudojimui su nauja programine sąsaja nepavyko
- Comment[lv]=Neizdevās konvertēt Nepomuk datus uz jaunu aizmuguri
- Comment[ml]=പുതിയ സൂക്ഷിപ്പു് സംവിധാനത്തിലേയ്ക്കു് നെപോമുക് ഡാറ്റ മാറ്റുന്നതു് പരാജയപ്പെട്ടു
- Comment[nb]=Konvertering av Nepomuk-data til et nytt bakstykke lyktes ikke
-@@ -607,6 +614,7 @@
- Comment[km]=បានបម្លែងទិន្នន័យ Nepomuk ដោយជោគជ័យទៅកម្មវិធីផ្នែកខាងក្រោយថ្មី
- Comment[ko]=새 저장소 백엔드를 사용하도록 Nepomuk 데이터를 변환하였습니다
- Comment[ku]=Bi serfiraz dane yên Nepomuk ji paş-dawî ya nû re veguherand
-+Comment[lt]=Sėkmingai konvertuoti Nepomuk duomenys naudojimui su nauja programine sąsaja
- Comment[lv]=Nepomuk dati veiksmīgi konvertēti uz jaunu aizmuguri
- Comment[ml]=പുതിയ സൂക്ഷിപ്പു് സംവിധാനത്തിലേയ്ക്കു് എല്ലാ നെപോമുക് ഡാറ്റയും വിജയകരമായി മാറ്റിക്കഴിഞ്ഞു
- Comment[nb]=Fullført konvertering av Nepomuk-data til et nytt bakstykke
---- runtime/nepomuk/services/storage/nepomukstorage.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/nepomuk/services/storage/nepomukstorage.desktop (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -97,6 +97,7 @@
- Comment[kn]=ಮೂಲ (ಕೋರ್) ನೆಪೋಮುಕ್ ದತ್ತ ಸಂಗ್ರಹ ಸೇವೆ
- Comment[ko]=코어 Nepomuk 데이터 저장소 서비스
- Comment[ku]=Nepomuk servîsa hîser kirina dane yên Bingeh
-+Comment[lt]=Esminė Nepomuk duomenų saugojimo tarnyba
- Comment[lv]=Pamata Nepomuk datu glabāšanas serviss
- Comment[ml]=Core Nepomuk ഡേറ്റാ സംഭരണ സേവനം
- Comment[mr]=कोर Nepomuk माहीती संचयन सेवा
---- runtime/nepomuk/services/queryservice/nepomukqueryservice.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/nepomuk/services/queryservice/nepomukqueryservice.desktop (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -20,6 +20,7 @@
- Name[kn]=ನೆಪೋಮುಕ್ ವಿಚಾರಣಾ ಸೇವೆ
- Name[ko]=Nepomuk 쿼리 서비스
- Name[ku]=NepomukRêzaPêşkêşkerê
-+Name[lt]=NepomukUžklausųTarnyba
- Name[ml]=Nepomuk ക്വെറി സേവനം
- Name[nb]=Nepomuk spørretjeneste
- Name[nds]=Nepomuk-Affraagdeenst
-@@ -58,6 +59,7 @@
- Comment[kn]=ಅವಿಚ್ಛಿನ್ನ ವಿಚಾರಣಾ (ಪರ್ಸಿಸ್ಟೆಂಟ್ ಕ್ವೆರಿ) ಕಡತಕೋಶಗಳಿಗೆ ನೆಪೋಮುಕ್ ವಿಚಾರಣಾ ಸೇವೆ ಒಂದು ಸಂಪರ್ಕತಟವನ್ನು (ಇಂಟರ್ಫೇಸ್) ನೀಡುತ್ತದೆ
- Comment[ko]=Nepomuk 쿼리 서비스는 쿼리 폴더의 인터페이스를 제공합니다
- Comment[ku]=Nepomuk Servîsa Lêpirsînê navrû yekê ji bo peldankên lêpirsîna payîdar peyde dike
-+Comment[lt]=Nepomuk užklausų tarnyba suteikia nuolatinių užklausų aplankų sąsają
- Comment[lv]=Nepomuk vaicājumu serviss nodrošina saskarni pastāvīgu vaicājumu mapēm
- Comment[ml]=Nepomuk ക്വെറി സേവനം ഇടയ്ക്കിടെ വരുന്ന ക്വെറി അറകള്ക്കായി ഒരു വിനിമയതലം നല്കുന്നു
- Comment[nb]=Nepomuk spørretjeneste tilbyr en brukerflate for varige spørremapper
---- runtime/nepomuk/kcm/nepomukserverkcm.cpp (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/nepomuk/kcm/nepomukserverkcm.cpp (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -90,7 +90,6 @@
- SLOT( slotUpdateStrigiStatus() ) );
-
- recreateStrigiInterface();
-- load();
- }
-
-
---- runtime/kstyles/oxygen/oxygen.cpp (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/kstyles/oxygen/oxygen.cpp (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -2409,22 +2409,18 @@
- void OxygenStyle::renderScrollBarHole(QPainter *p, const QRect &r, const QColor &color,
- Qt::Orientation orientation, TileSet::Tiles tiles) const
+ PopupAppletInterface::PopupAppletInterface(AbstractJsAppletScript *parent)
+- : AppletInterface(parent)
++ : POPUPAPPLETSUPERCLASS(parent)
{
-- _helper.scrollHole(
-- color,
-- orientation)->render(r, p, tiles);
-+ if (r.isValid()) { // TODO and check that it's big enough?
-+ _helper.scrollHole(
-+ color,
-+ orientation)->render(r, p, tiles);
-+ }
}
--void OxygenStyle::renderScrollBarHandle(QPainter *p, const QRect &_r, const QPalette &pal,
-+void OxygenStyle::renderScrollBarHandle(QPainter *p, const QRect &r, const QPalette &pal,
- Qt::Orientation orientation, bool hover) const
- {
-- QRect r(_r);
-- if (r.height() == 0) {
-- // Temporary fix for an infinite loop in kmail. The call to drawRoundedRect()
-- // at the end of this function produces an infinite loop in Qt's drawing code
-- // if the rect's height is zero.
-- qDebug("OxygenStyle::renderScrollBarHandle: trying to paint scrollbar handle with zero height!");
-- r.setHeight(1);
-- }
-+ if (!r.isValid())
-+ return;
- p->setRenderHints(QPainter::Antialiasing);
- QColor color = pal.color(QPalette::Button);
- QColor light = _helper.calcLightColor(color);
-@@ -2434,13 +2430,16 @@
- bool horizontal = orientation == Qt::Horizontal;
+--- runtime/plasma/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -55,6 +55,8 @@
+ #include <Plasma/Svg>
+ #include <Plasma/VideoWidget>
- // draw the hole as background
-- renderScrollBarHole(p, (orientation == Qt::Horizontal) ? r.adjusted(-4,0,4,0) : r.adjusted(0,-3,0,4),
-+ const QRect holeRect = horizontal ? r.adjusted(-4,0,4,0) : r.adjusted(0,-3,0,4);
-+ renderScrollBarHole(p, holeRect,
- pal.color(QPalette::Window), orientation,
- horizontal ? TileSet::Top | TileSet::Bottom | TileSet::Center
- : TileSet::Left | TileSet::Right | TileSet::Center);
++#define USE_JS_SCRIPTENGINE
++
+ #include "appletauthorization.h"
+ #include "appletinterface.h"
+ #include "scriptenv.h"
+@@ -511,8 +513,8 @@
+
+ // Expose applet interface
+ const bool isPopupApplet = qobject_cast<Plasma::PopupApplet *>(applet());
+- m_interface = isPopupApplet ? new PopupAppletInterface(this) : new AppletInterface(this);
+- m_self = m_engine->newQObject(m_interface);
++ m_interface = isPopupApplet ? new PopupAppletInterface(this) : new JsAppletInterface(this);
++ m_self = m_engine->newQObject(m_interface, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater);
+ m_env->addMainObjectProperties(m_self);
+ m_self.setScope(global);
+ global.setProperty("plasmoid", m_self);
+--- runtime/plasma/scriptengines/javascript/plasmoid/appletinterface.h (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/scriptengines/javascript/plasmoid/appletinterface.h (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -76,10 +76,6 @@
+ Q_PROPERTY(int apiVersion READ apiVersion CONSTANT)
+ Q_PROPERTY(QRectF rect READ rect)
+ Q_PROPERTY(QSizeF size READ size)
+-#ifdef USE_JS_SCRIPTENGINE
+- Q_PROPERTY(QGraphicsLayout *layout WRITE setLayout READ layout)
+- Q_PROPERTY(QObject *sender READ sender)
+-#endif
+
+ public:
+ AppletInterface(AbstractJsAppletScript *parent);
+@@ -276,12 +272,6 @@
+
+ Q_INVOKABLE Plasma::Extender *extender() const;
+
+-#ifdef USE_JS_SCRIPTENGINE
+- Q_INVOKABLE void update(const QRectF &rect = QRectF());
+- QGraphicsLayout *layout() const;
+- void setLayout(QGraphicsLayout *);
+-#endif
+-
+ Plasma::DataEngine *dataEngine(const QString &name);
- // draw the slider itself
- QRectF rect = r.adjusted(3, horizontal ? 2 : 4, -3, -3);
-+ if (!rect.isValid()) // e.g. not enough height
-+ return;
+ QList<QAction*> contextualActions() const;
+@@ -311,9 +301,31 @@
+ QMap<QString, Plasma::ConfigLoader*> m_configs;
+ };
- // gradients
- QLinearGradient sliderGradient( rect.topLeft(), horizontal ? rect.bottomLeft() : rect.topRight());
-@@ -3034,6 +3033,16 @@
+-class PopupAppletInterface : public AppletInterface
++class JsAppletInterface : public AppletInterface
{
- switch(type)
- {
-+ case CT_GroupBox:
-+ {
-+ // adjust groupbox width to bold label font
-+ if (const QStyleOptionGroupBox* gbOpt = qstyleoption_cast<const QStyleOptionGroupBox*>(option)) {
-+ QSize size = KStyle::sizeFromContents(type, option, contentsSize, widget);
-+ int labelWidth = subControlRect(CC_GroupBox, gbOpt, SC_GroupBoxLabel, widget).width();
-+ size.setWidth(qMax(size.width(), labelWidth));
-+ return size;
-+ }
-+ }
- case CT_ToolButton:
- {
- QSize size = contentsSize;
-@@ -3154,12 +3163,12 @@
- cr = subElementRect(SE_CheckBoxIndicator, option, widget);
- QRect gcr((gbOpt->rect.width() - tw -cr.width())/2 , (h-cr.height())/2+r.y(), cr.width(), cr.height());
- if(subControl == SC_GroupBoxCheckBox)
-- {
-- if (!isFlat)
-- return visualRect(option->direction, option->rect, gcr);
-- else
-- return visualRect(option->direction, option->rect, QRect(0,0,cr.width(),cr.height()));
-- }
-+ {
-+ if (!isFlat)
-+ return visualRect(option->direction, option->rect, gcr);
-+ else
-+ return visualRect(option->direction, option->rect, QRect(0,0,cr.width(),cr.height()));
-+ }
- }
-
- // left align labels in flat group boxes, center align labels in framed group boxes
---- runtime/kurifilter-plugins/ikws/searchproviders/bugft.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/bugft.desktop (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -76,8 +76,6 @@
- Name[xh]=Uphendlo lwesiseko sedata ye KDE Bug Olubhaliweyo ngokupheleleyo
- Name[zh_CN]=KDE Bug 数据库全文检索
- Name[zh_TW]=KDE 臭蟲資料庫全文檢索
--Query=http://bugs.kde.org/simple_search.cgi?id=\\{1}+\\{2}+\\{3}+\\{4}+\\{5}+\\{6}+\\{7}+\\{8}+\\{9}
--Query[bg]=Query=http://bugs.kde.org/simple_search.cgi?id=\\{1}+\\{2}+\\{3}+\\{4}+\\{5}+\\{6}+\\{7}+\\{8}+\\{9}
--Query[x-test]=xxhttp://bugs.kde.org/simple_search.cgi?id=\\{1}+\\{2}+\\{3}+\\{4}+\\{5}+\\{6}+\\{7}+\\{8}+\\{9}xx
-+Query=http://bugs.kde.org/buglist.cgi?quicksearch=\\{1}+\\{2}+\\{3}+\\{4}+\\{5}+\\{6}+\\{7}+\\{8}+\\{9}
- X-KDE-ServiceTypes=SearchProvider
- Type=Service
---- runtime/l10n/ae/entry.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/l10n/ae/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -60,7 +60,7 @@
- Name[pt]=Emiratos Árabes Unidos
- Name[pt_BR]=Emirados Árabes Unidos
- Name[ro]=Emiratele Arabe Unite
--Name[ru]=Объединенные Арабские Эмираты
-+Name[ru]=Объединённые Арабские Эмираты
- Name[se]=Ovttastuvvon arábalaš emiráhtat
- Name[si]=එක්සත් අරාඹි එමීර් රාජ්ය
- Name[sk]=Spojené arabské emiráty
---- runtime/l10n/au/entry.desktop (.../tags/KDE/4.2.1/kdebase) (wersja 942072)
-+++ runtime/l10n/au/entry.desktop (.../branches/KDE/4.2/kdebase) (wersja 942072)
-@@ -25,7 +25,7 @@
- Name[gu]=ઓસ્ટ્રેલિઆ
- Name[he]=אוסטרליה
- Name[hi]=आस्ट्रेलिया
--Name[hne]=आस्ट्रेले
-+Name[hne]=आस्ट्रेलिया
- Name[hr]=Australija
- Name[hsb]=Awstralska
- Name[hu]=Ausztrália
+ Q_OBJECT
++ Q_PROPERTY(QGraphicsLayout *layout WRITE setLayout READ layout)
++ Q_PROPERTY(QObject *sender READ sender)
++
++public:
++ JsAppletInterface(AbstractJsAppletScript *parent)
++ : AppletInterface(parent)
++ {
++ }
++
++ Q_INVOKABLE void update(const QRectF &rect = QRectF());
++ QGraphicsLayout *layout() const;
++ void setLayout(QGraphicsLayout *);
++};
++
++#ifdef USE_JS_SCRIPTENGINE
++#define POPUPAPPLETSUPERCLASS JsAppletInterface
++#else
++#define POPUPAPPLETSUPERCLASS AppletInterface
++#endif
++class PopupAppletInterface : public POPUPAPPLETSUPERCLASS
++{
++ Q_OBJECT
+ Q_PROPERTY(QIcon popupIcon READ popupIcon WRITE setPopupIcon)
+ Q_PROPERTY(bool passivePopup READ isPassivePopup WRITE setPassivePopup)
+ Q_PROPERTY(QGraphicsWidget *popupWidget READ popupWidget WRITE setPopupWidget)
+--- runtime/plasma/scriptengines/javascript/data/plasma-scriptengine-dataengine-javascript.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/scriptengines/javascript/data/plasma-scriptengine-dataengine-javascript.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -15,7 +15,7 @@
+ Name[et]=JavaScripti andmemootor
+ Name[eu]=JavaScript datu-motorea
+ Name[fi]=JavaScript-datakone
+-Name[fr]=Moteur de donnée JavaScript
++Name[fr]=Moteur de données JavaScript
+ Name[fy]=JavaSkript gegevens motor
+ Name[ga]=Inneall Sonraí JavaScript
+ Name[gl]=Motor de datos de JavaScript
projects / packages / kde4-kdebase-runtime.git / blobdiff