---- 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)
+--- runtime/knotify/Info.plist.template (.../tags/KDE/4.4.1/kdebase) (wersja 0)
++++ runtime/knotify/Info.plist.template (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -0,0 +1,36 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++ <key>CFBundleDevelopmentRegion</key>
++ <string>English</string>
++ <key>CFBundleExecutable</key>
++ <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
++ <key>CFBundleGetInfoString</key>
++ <string>${MACOSX_BUNDLE_INFO_STRING}</string>
++ <key>CFBundleIconFile</key>
++ <string>${MACOSX_BUNDLE_ICON_FILE}</string>
++ <key>CFBundleIdentifier</key>
++ <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
++ <key>CFBundleInfoDictionaryVersion</key>
++ <string>6.0</string>
++ <key>CFBundleLongVersionString</key>
++ <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
++ <key>CFBundleName</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
++ <key>CFBundlePackageType</key>
++ <string>APPL</string>
++ <key>CFBundleShortVersionString</key>
++ <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
++ <key>CFBundleVersion</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
++ <key>CSResourcesFileMapped</key>
++ <true/>
++ <key>LSRequiresCarbon</key>
++ <true/>
++ <key>LSUIElement</key>
++ <string>1</string>
++ <key>NSHumanReadableCopyright</key>
++ <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
++</dict>
++</plist>
+--- runtime/knotify/CMakeLists.txt (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/knotify/CMakeLists.txt (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -22,6 +22,12 @@
+ set (knotify_OUTPUT_NAME knotify4)
+ kde4_add_executable( knotify ${knotify_SRCS})
+
++if (Q_WS_MAC)
++ set_target_properties(knotify PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
++ set_target_properties(knotify PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.knotify4")
++ set_target_properties(knotify PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Notify")
++endif (Q_WS_MAC)
++
+ target_link_libraries( knotify ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS})
+
+ set_target_properties(knotify PROPERTIES OUTPUT_NAME knotify4 )
+--- runtime/solid-device-automounter/kded/device_automounter.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/solid-device-automounter/kded/device_automounter.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -29,6 +29,7 @@
+ Name[kk]=Ауыстырмалы құрылғының автоттіркегіші
+ Name[km]=កម្មវិធីម៉ោនឧបករណ៍ចល័តដោយស្វ័យប្រវត្តិ
+ Name[ko]=이동식 장치 자동 마운터
++Name[lt]=Prijungiamų įrenginių automatinis montavimas
+ Name[lv]=Noņemamo iekārtu automontētājs
+ Name[mk]=Автом. монтирање на подвижните уреди
+ Name[ml]=നീക്കം ചെയ്യാവുന്ന ഉപകരണങ്ങളുടെ ഔട്ടോമൌണ്ടര്
+@@ -75,6 +76,7 @@
+ Comment[kk]=Құрылғыны қосқан кезде не кірген кезде автоматты түрде тіркеу
+ Comment[km]=ម៉ោនឧបករណ៍ដោយស្វ័យប្រវត្តិ នៅពេលពួកវាត្រូវបានដោត ឬចូល
+ Comment[ko]=로그인하거나 연결할 때 자동으로 장치 마운트하기
++Comment[lt]=Automatiškai primontuoja įrenginius kai jie yra prijungiami, arba – prisiregistravimo metu
+ Comment[lv]=Automātiski piemontē pieslēgtās ierīces, piesakoties datorā vai iespraužot
+ Comment[mk]=Автоматски ги монтира уредите кога ќе бидат вклучени, или при најава
+ Comment[ml]=ഉപകരണള് കുത്തുമ്പോഴോ അകത്തുകയറുമ്പോഴോ അവ മൌണ്ട് ചെയ്യുന്നതാണ്
+--- runtime/solid-device-automounter/kcm/device_automounter_kcm.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/solid-device-automounter/kcm/device_automounter_kcm.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
@@ -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>
+ Name[km]=ឧបករណ៍ចល័ត
+ Name[kn]=ತೆಗೆದೆಹಾಕಬಹುದಾದ ಸಾಧನಗಳು
+ Name[ko]=이동식 장치
++Name[lt]=Atjungiami įrenginiai
+ Name[lv]=Noņemamās iekārtas
+ Name[mk]=Подвижни уреди
+ Name[ml]=നീക്കം ചെയ്യാവുന്ന ഉപകരണങ്ങള്
+@@ -83,6 +84,7 @@
+ Comment[kk]=Ауыстырмалы сақтағыш тасушылармен автоматты түрде айналысуды баптау
+ Comment[km]=កំណត់រចនាសម្ព័ន្ធការគ្រប់គ្រងដោយស្វ័យប្រវត្តិរបស់មេឌៀផ្ទុកចល័ត
+ Comment[ko]=이동식 저장소 미디어 자동 처리 설정
++Comment[lt]=Atjungiamų įrenginių automatinio tvarkymo konfigūravimas
+ Comment[lv]=Konfifurēt noņemamo datu nesēju automātisku apstrādi
+ Comment[mk]=Го конфигурира автоматското ракување со подвижните носачи
+ Comment[ml]=നീക്കം ചെയ്യാവുന്ന സംഭരണ മാധ്യമത്തിനെ സ്വയം കൈകാര്യം ചെയ്യുന്നതു് ക്രമീകരിയ്ക്കുക.
+--- runtime/localization/currency/all.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/all.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=អាល់បានី ឡិក
+ Name[kn]=ಅಲ್ಬೇನಿಯಾದ ಲೇಕ್
+ Name[ko]=알바니아 레크
++Name[lt]=Albanijos lekas
+ Name[lv]=Albāņu Lekas
+ Name[mai]=अलबानिया लेक
+ Name[mk]=Албански лек
+--- runtime/localization/currency/etb.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/etb.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -28,6 +28,7 @@
+ Name[km]=ប៊ែរអេត្យូពី
+ Name[kn]=ಇಥಿಯೋಪಿಯಾದ ಬಿರ್
+ Name[ko]=에티오피아 비르
++Name[lt]=Etiopijos bira
+ Name[ml]=എത്യോപിയയിലെ ബിര്
+ Name[nb]=Etiopiske birr
+ Name[nds]=Äthioopsch Birr
+--- runtime/localization/currency/frf.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/frf.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=French Franc
+ Name[kn]=ಫ್ರೆಂಚ್ ಫ್ರಾಂಕ್
+ Name[ko]=프랑스 프랑
++Name[lt]=Prancūzijos frankas
+ Name[lv]=Francijas franks
+ Name[mai]=फ्रेन्च फ्रान्क
+ Name[mk]=Француски франк
+--- runtime/localization/currency/idr.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/idr.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=រ៉ូពីឥណ្ឌូនេស៊ី
+ Name[kn]=ಇಂಡೋನೇಶಿಯಾದ ರುಪೈಯಾ
+ Name[ko]=인도네시아 루피아
++Name[lt]=Indonezijos rupija
+ Name[lv]=Indonēzijas rūpija
+ Name[ml]=ഇന്ഡോനേഷ്യയിലെ റുപയ്യ
+ Name[nb]=Indonesiske rupier
+--- runtime/localization/currency/brl.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/brl.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=រៀលប្រេហ្ស៊ីល
+ Name[kn]=ಬ್ರಝಿಲಿಯಾದ ರೀಲ್
+ Name[ko]=브라질 레알
++Name[lt]=Brazilijos realas
+ Name[lv]=Brazīlijas reāls
+ Name[mai]=ब्राजील रीयाल
+ Name[mk]=Бразилски реал
+--- runtime/localization/currency/bzd.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/bzd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -29,6 +29,7 @@
+ Name[km]=ដុល្លារបេលីហ្ស
+ Name[kn]=ಬೆಲಿಝ್ ಡಾಲರ್
+ Name[ko]=벨리즈 달러
++Name[lt]=Belizo doleris
+ Name[lv]=Belizas dolārs
+ Name[mai]=बेलाइज डालर
+ Name[ml]=ബെലിസിലെ ഡോളര്
+--- runtime/localization/currency/ghs.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/ghs.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -27,6 +27,7 @@
+ Name[km]=សេឌីហ្កាណា
+ Name[kn]=ಘಾನಾ ಸೆಡಿ
+ Name[ko]=가나 세디
++Name[lt]=Ganos cedis
+ Name[ml]=ഘാന സെഡി
+ Name[nb]=Ghana Cedi
+ Name[nds]=Ghana-Cedi
+--- runtime/localization/currency/ils.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/ils.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -27,6 +27,7 @@
+ Name[kk]=Израильдің жаңа шекелі
+ Name[km]=Israeli New Sheqel
+ Name[ko]=이스라엘 신 셰켈
++Name[lt]=Izraelio naujasis šekelis
+ Name[lv]=Izraēlas jaunais šekelis
+ Name[mk]=Израелски Нов шекел
+ Name[ml]=ഇസ്രായേലിലെ പുതിയ ഷേകേല്
+--- runtime/localization/currency/ats.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/ats.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=Austrian Schilling
+ Name[kn]=ಆಸ್ಟ್ರಿಯಾದ ಶಿಲಿಂಗ್
+ Name[ko]=오스트리아 실링
++Name[lt]=Austrijos šilingas
+ Name[lv]=Austrijas šiliņš
+ Name[mai]=आस्ट्रियन शिल्लिंग
+ Name[mk]=Австриски шилинг
+--- runtime/localization/currency/cad.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/cad.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=Canadian Dollar
+ Name[kn]=ಕೆನಡಾದ ಡಾಲರ್
+ Name[ko]=캐나다 달러
++Name[lt]=Kanados doleris
+ Name[lv]=Kanādas dolārs
+ Name[mai]=कनाडा डालर
+ Name[mk]=Канадски долар
+--- runtime/localization/currency/itl.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/itl.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=Italian Lira
+ Name[kn]=ಇಟಿಲಿಯಾದ ಲಿರಾ
+ Name[ko]=이탈리아 리라
++Name[lt]=Italijos lira
+ Name[lv]=Itālijas lira
+ Name[mai]=इटालियन लीरा
+ Name[mk]=Италијанска лира
+--- runtime/localization/currency/aed.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/aed.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -29,6 +29,7 @@
+ Name[km]=អារ៉ាប់រួម ឌឺហែម
+ Name[kn]=ಯುನೈಟೆಡ್ ಅರಬ್ ಎಮಿರೈಟ್ಸಿನ ದಿರ್ಹಾಮ್
+ Name[ko]=아랍에미리트 디르함
++Name[lt]=Jungtinių arabų emyratų dirhamas
+ Name[lv]=Apvienoto Arābu Emerātu dinārs
+ Name[mai]=संयुक्त अरब अमीरात दिरहम
+ Name[mk]=Дирхам од Обединети Арапски Емирати
+--- runtime/localization/currency/shp.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/shp.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -23,6 +23,7 @@
+ Name[hr]=Funta Svete Helene
+ Name[hu]=Szent Heléna-i font
+ Name[id]=Pound Saint Helena
++Name[is]=Sankti Helenu pund
+ Name[it]=Sterlina di Sant'Elena
+ Name[ja]=セントヘレナ・ポンド
+ Name[kk]=Әулие Елена фунты
+--- runtime/localization/currency/lvl.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/lvl.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -28,6 +28,7 @@
+ Name[km]=ឡាតឡាតវីយ៉ា
+ Name[kn]=ಲಾಟ್ವಿಯಾದ ಲ್ಯಾಟ್ಸ್
+ Name[ko]=라트비아 라트
++Name[lt]=Latvijos latas
+ Name[lv]=Latvijas lats
+ Name[ml]=ലാത്വിയയിലെ ലാത്സ്
+ Name[nb]=Latviske lats
+--- runtime/localization/currency/amd.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/amd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=អារមេនី ដ្រាម
+ Name[kn]=ಅರ್ಮೇನಿಯಾದ ದ್ರಾಮ್
+ Name[ko]=아르메니아 드람
++Name[lt]=Armėnijos dramas
+ Name[lv]=Armēņu Dramas
+ Name[mai]=आर्मेनिया ड्रैम
+ Name[mk]=Ерменски драм
+--- runtime/localization/currency/eek.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/eek.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=គ្រូនអេស្តូនី
+ Name[kn]=ಎಸ್ಟೋನಿಯಾದ ಕ್ರೂನ್
+ Name[ko]=에스토니아 크룬
++Name[lt]=Estijos krona
+ Name[lv]=Igaunijas krona
+ Name[ml]=എസ്റ്റോണിയയിലെ ക്രൂണ്
+ Name[nb]=Estiske kroon
+--- runtime/localization/currency/bsd.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/bsd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=Bahamian Dollar
+ Name[kn]=ಬಹಮಿಯಾದ ಡಾಲರ್
+ Name[ko]=바하마 달러
++Name[lt]=Bahamų doleris
+ Name[lv]=Bahamu dolārs
+ Name[mai]=बहामा डालर
+ Name[mk]=Бахамски долар
+--- runtime/localization/currency/aud.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/aud.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=ដុល្លារអូស្ត្រាលី
+ Name[kn]=ಆಸ್ಟ್ರೇಲಿಯಾದ ಡಾಲರ್
+ Name[ko]=오스트레일리아 달러
++Name[lt]=Australijos doleris
+ Name[lv]=Austrālijas dolārs
+ Name[mai]=आस्ट्रेलिया डालर
+ Name[mk]=Австралиски долар
+--- runtime/localization/currency/iep.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/iep.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=ផោនអៀឡង់
+ Name[kn]=ಐರಿಶ್ ಪೌಂಡ್
+ Name[ko]=아일랜드 파운드
++Name[lt]=Airijos svaras
+ Name[lv]=Īru mārciņa
+ Name[mk]=Ирска фунта
+ Name[ml]=ഐറിഷ് പൌണ്ട്
+--- runtime/localization/currency/gip.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/gip.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=ផោន ហ្គីប្រាតា
+ Name[kn]=ಜಿಬ್ರಾಲ್ಟರ್ ಪೌಂಡ್
+ Name[ko]=지브롤터 파운드
++Name[lt]=Gibraltaro svaras
+ Name[lv]=Gibraltāra mārciņa
+ Name[mk]=Гибралтарска фунта
+ Name[ml]=ജിബ്രാല്ട്ടറിലെ പൌണ്ട്
+--- runtime/localization/currency/fkp.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/fkp.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -29,6 +29,7 @@
+ Name[km]=ផោនកោះហ្វ៉កឡង់
+ Name[kn]=ಫಾಕ್ಲ್ಯಾಂಡ್ ಐಲ್ಯಾಂಡುಗಳ ಪೌಂಡ್
+ Name[ko]=포클랜드 제도 파운드
++Name[lt]=Falklando salų svaras
+ Name[lv]=Folklendu salu mārciņa
+ Name[mk]=Фунта од Фокландски Острови
+ Name[ml]=ഫാക്ലാന്റ് ദ്വീപുകളിലെ പൌണ്ട്
+--- runtime/localization/currency/dop.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/dop.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=ប៉េសូដូមីនីកា
+ Name[kn]=ಡೊಮಿನಿಕನ್ ಪೆಸೊ
+ Name[ko]=도미니카 페소
++Name[lt]=Dominikos pesas
+ Name[lv]=Dominikas peso
+ Name[mk]=Доминикански пезос
+ Name[ml]=ഡൊമിനിയ്ക്കയിലെ പെസോ
+--- runtime/localization/currency/afa.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/afa.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=អាហ្គានីស្ថាន
+ Name[kn]=ಅಫ್ಘನ್ ಆಫ್ಘಾನಿ
+ Name[ko]=아프가니스탄 아프가니
++Name[lt]=Afganistano afganis
+ Name[lv]=Afgāņu afgāni
+ Name[mai]=अफगान अफगानी
+ Name[ml]=അഫ്ഗാനിലെ അഫ്ഗാനി
+--- runtime/localization/currency/rsd.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/rsd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=ឌីណាស៊ឺប៊ែរ
+ Name[kn]=ಸರ್ಬಿಯಾದ ದಿನಾರ್
+ Name[ko]=세르비아 디나르
++Name[lt]=Serbijos dinaras
+ Name[lv]=Serbijas dinārs
+ Name[mk]=Српски динар
+ Name[ml]=സെര്ബിയയിലെ ദിനാര്
+--- runtime/localization/currency/eur.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/eur.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -32,6 +32,7 @@
+ Name[km]=អឺរ៉ូ
+ Name[kn]=ಯೂರೊ
+ Name[ko]=유로
++Name[lt]=Euras
+ Name[lv]=Eiro
+ Name[mk]=Евро
+ Name[ml]=യൂറോ
+--- runtime/localization/currency/xof.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/xof.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -22,7 +22,7 @@
+ Name[hr]=Zapadno afrički CFA frank
+ Name[id]=CFA Franc Afrika Barat
+ Name[is]=Vestur-afrískur CFA franki
+-Name[it]=Franco CFA dell'africa occidentale
++Name[it]=Franco CFA dell'Africa occidentale
+ Name[ja]=西部アフリカ CFA フラン
+ Name[kk]=Батыс Африка CFA франкі
+ Name[km]=West African CFA Franc
+--- runtime/localization/currency/afn.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/afn.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=អាហ្គានីស្ថាន
+ Name[kn]=ಅಫ್ಘನ್ ಆಫ್ಘಾನಿ
+ Name[ko]=아프가니스탄 아프가니
++Name[lt]=Afganistano afganis
+ Name[lv]=Afgāņu afgāni
+ Name[mai]=अफगान अफगानी
+ Name[ml]=അഫ്ഗാനിലെ അഫ്ഗാനി
+--- runtime/localization/currency/ang.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/ang.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -29,6 +29,7 @@
+ Name[km]=អង់ទីយ៍ហុល្លង់
+ Name[kn]=ನೆದರ್ಲ್ಯಾಂಡ್ಸ್ ಆಂಟಿಲಿಯಾದ ಗಿಲ್ಡರ್
+ Name[ko]=네덜란드령 앤틸리스 길더
++Name[lt]=Nyderlandų Antilų guldenas
+ Name[lv]=Nīderlandes Antiļas guldeņi
+ Name[mai]=नीदरलैंड्स एंटीलेस गिल्डर
+ Name[mk]=Холандски Антилски гилдер
+--- runtime/localization/currency/crc.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/crc.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -28,6 +28,7 @@
+ Name[km]=កូឡុនកូស្តារីកា
+ Name[kn]=ಕೋಸ್ಟ ರಿಕಾದ ಕೊಲೊನ್
+ Name[ko]=코스타리카 콜론
++Name[lt]=Kosta Rikos kolonas
+ Name[mai]=कोस्टा रिका कोलोन
+ Name[ml]=കൊസ്റ്ററിക്കയിലെ കോളന്
+ Name[nb]=Costa Rica-Colon
+--- runtime/localization/currency/gbp.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/gbp.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=British Pound Sterling
+ Name[kn]=ಬ್ರಿಟಿಷ್ ಪೌಂಡ್ ಸ್ಟರ್ಲಿಂಗ್
+ Name[ko]=영국 파운드
++Name[lt]=Britų svaras sterlingų
+ Name[lv]=Britu mārciņa
+ Name[ml]=ബ്രിട്ടീഷ് പൌണ്ട് സ്റ്റര്ലിങ്
+ Name[nb]=Britiske Pund Sterling
+--- runtime/localization/currency/bdt.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/bdt.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=តាកាបង់ក្លាដេស្ហ
+ Name[kn]=ಬಾಂಗ್ಲಾದೇಶದ ಟಾಕಾ
+ Name[ko]=방글라데시 타카
++Name[lt]=Bangladešo taka
+ Name[mai]=बांग्लादेश टका
+ Name[ml]=ബംഗ്ലാദേശിലെ ടാക്ക
+ Name[nb]=Bangladesh Taka
+--- runtime/localization/currency/grd.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/grd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -28,6 +28,7 @@
+ Name[kk]=Грекия драхмасы
+ Name[km]=Greek Drachma
+ Name[ko]=그리스 드라크마
++Name[lt]=Graikijos drachma
+ Name[lv]=Grieķijas drahma
+ Name[mai]=ग्रीक ड्राक्मा
+ Name[mk]=Грчка драхма
+--- runtime/localization/currency/btn.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/btn.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -22,11 +22,13 @@
+ Name[hr]=Bhutanese Ngultrum
+ Name[hu]=Bhutáni ngultrum
+ Name[id]=Ngultrum Bhutan
++Name[is]=Bhútanskur Ngultrum
+ Name[it]=Ngultrum bhutanese
+ Name[ja]=ブータン・ニュルタム
+ Name[kk]=Бутан нгултрумы
+ Name[km]=Bhutanese Ngultrum
+ Name[ko]=부탄 엉굴트럼
++Name[lt]=Butano ngultrumas
+ Name[mai]=भुटानी न्गुलट्रम
+ Name[ml]=ഭൂട്ടാനിലെ ഗള്ട്ടറം
+ Name[nb]=Butanske Ngultrum
+--- runtime/localization/currency/czk.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/czk.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=Czech Koruna
+ Name[kn]=ಜೆಕ್ ಕೊರುನಾ
+ Name[ko]=체코 코루나
++Name[lt]=Čekų krona
+ Name[lv]=Čehu krona
+ Name[ml]=ചെക്ക് കൊറുണാ
+ Name[nb]=Tsjekkiske koruna
+--- runtime/localization/currency/inr.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/inr.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=រ៉ូពីឥណ្ឌា
+ Name[kn]=ಭಾರತದ ರುಪಾಯಿ
+ Name[ko]=인도 루피
++Name[lt]=Indijos rupija
+ Name[lv]=Indijas rūpija
+ Name[ml]=ഇന്ത്യയിലെ രൂപ
+ Name[nb]=Indiske rupier
+--- runtime/localization/currency/xpd.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/xpd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -27,6 +27,7 @@
+ Name[km]=Palladium
+ Name[kn]=ಪೆಲಾಡಿಯಮ್
+ Name[ko]=팔라듐
++Name[lt]=Paladijus
+ Name[lv]=Palādijs
+ Name[mk]=Паладиум
+ Name[ml]=പലാഡിയം
+--- runtime/localization/currency/bef.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/bef.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=Belgian Franc
+ Name[kn]=ಬೆಲ್ಜಿಯನ್ ಫ್ರಾಂಕ್
+ Name[ko]=벨기에 프랑
++Name[lt]=Belgijos frankas
+ Name[lv]=Beļģijas franks
+ Name[mai]=बेल्जियन फ्रान्क
+ Name[mk]=Белгиски франк
+--- runtime/localization/currency/aoa.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/aoa.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -29,6 +29,7 @@
+ Name[km]=អង់ហ្គោឡា ខ្វាន់ហ្សា
+ Name[kn]=ಅಂಗೋಲಾದ ಕ್ವಾಂಝಾ
+ Name[ko]=앙골라 콴자
++Name[lt]=Angolos kvanzas
+ Name[mai]=अंगोला क्वांजा
+ Name[ml]=അംഗോളയിലെ ക്വാന്സ
+ Name[nb]=Angolanske Kwanza
+--- runtime/localization/currency/bmd.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/bmd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -24,12 +24,14 @@
+ Name[hr]=Bermudski dolar
+ Name[hu]=Bermudai dollár
+ Name[id]=Dollar Bermuda
++Name[is]=Bermúdadollari
+ Name[it]=Dollaro della Bermuda
+ Name[ja]=バミューダ・ドル
+ Name[kk]=Бермуд доллары
+ Name[km]=ដុល្លារប៊េរមូដា
+ Name[kn]=ಬರ್ಮುಡಾ ಡಾಲರ್
+ Name[ko]=버뮤다 달러
++Name[lt]=Bermudų doleris
+ Name[lv]=Bermudu dolārs
+ Name[mai]=बरमुडा डालर
+ Name[mk]=Бермудски долар
+--- runtime/localization/currency/jmd.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/jmd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=ដុល្លារហ្សាម៉ាអ៊ិកា
+ Name[kn]=ಜಮೈಕಾದ ಡಾಲರ್
+ Name[ko]=자메이카 달러
++Name[lt]=Jamaikos doleris
+ Name[lv]=Jamaikas dolārs
+ Name[mk]=Јамајкански долар
+ Name[ml]=ജമൈക്കയിലെ ഡോളര്
+--- runtime/localization/currency/egp.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/egp.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=Egyptian Pound
+ Name[kn]=ಈಜಿಪ್ಟಿಯನ್ ಪೌಂಡ್
+ Name[ko]=이집트 파운드
++Name[lt]=Egipto svaras
+ Name[lv]=Ēģiptes mārciņa
+ Name[mk]=Египетска фунта
+ Name[ml]=ഈജിപ്റ്റിലെ പൌണ്ട്
+--- runtime/localization/currency/aon.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/aon.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -28,6 +28,7 @@
+ Name[kk]=Анголаның нова кванзасы
+ Name[km]=Angolan Novo Kwanza
+ Name[ko]=앙골라 노보 콴자
++Name[lt]=Angolos Novo kvanzas
+ Name[mai]=अंगोला नोवा क्वांजा
+ Name[ml]=അന്ഗോളിയന് നോവൊ ക്വാന്സാ
+ Name[nb]=Angolanske Novo Kwanza
+--- runtime/localization/currency/xaf.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/xaf.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -23,7 +23,7 @@
+ Name[hr]=CFA Franak Centralne Afrike
+ Name[id]=Franc CFA Afrika Tengah
+ Name[is]=Mið-Afríkulýðveldis CFA franki
+-Name[it]=Franco CFA dell'africa centrale
++Name[it]=Franco CFA dell'Africa centrale
+ Name[ja]=中部アフリカ CFA フラン
+ Name[kk]=Орталық Африка CFA франкі
+ Name[km]=សាធារណរដ្ឋអាហ្វ្រិកកណ្ដាល CFA
+--- runtime/localization/currency/awg.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/awg.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -27,6 +27,7 @@
+ Name[kk]=Аруби флорині
+ Name[km]=Aruban Florin
+ Name[ko]=아루바 길더
++Name[lt]=Arubos florinas
+ Name[mai]=अरूबन फ्लोरिन
+ Name[ml]=അറുബന് ഫ്ലൊറിന്
+ Name[nb]=Arubisk gylden
+--- runtime/localization/currency/xag.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/xag.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -29,6 +29,7 @@
+ Name[km]=ប្រាក់
+ Name[kn]=ಬೆಳ್ಳಿ
+ Name[ko]=은
++Name[lt]=Sidabras
+ Name[lv]=Sudrabs
+ Name[mk]=Сребро
+ Name[ml]=വെള്ളി
+--- runtime/localization/currency/rub.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/rub.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=រ៉ូប៊លរូស្ស៊ី
+ Name[kn]=ರಷ್ಯಾದ ರೂಬೆಲ್
+ Name[ko]=러시아 루블
++Name[lt]=Rusijos rublis
+ Name[lv]=Krievijas rublis
+ Name[mk]=Руска рубља
+ Name[ml]=റഷ്യയിലെ റൂബിള്
+--- runtime/localization/currency/cdf.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/cdf.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -17,6 +17,7 @@
+ Name[hi]=कोंगोली फ्रांक
+ Name[hr]=Kongoanski franak
+ Name[id]=Franc Kongo
++Name[is]=Kongóskur franki
+ Name[it]=Franco congolese
+ Name[ja]=コンゴ・フラン
+ Name[kk]=Конгоның франкі
+--- runtime/localization/currency/xau.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/xau.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -29,6 +29,7 @@
+ Name[km]=មាស
+ Name[kn]=ಚಿನ್ನ
+ Name[ko]=금
++Name[lt]=Auksas
+ Name[lv]=Zelts
+ Name[mk]=Злато
+ Name[ml]=സ്വര്ണ്ണം
+--- runtime/localization/currency/ugx.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/ugx.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -22,6 +22,7 @@
+ Name[hi]=उगाँडा शिल्लिंग
+ Name[hr]=Ugandski šiling
+ Name[id]=Shilling Uganda
++Name[is]=Úgandískur skildingur
+ Name[it]=Scellino ugandese
+ Name[ja]=ウガンダ・シリング
+ Name[kk]=Уганда шиллингі
+--- runtime/localization/currency/djf.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/djf.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=ហ្វ្រង់ហ្ស៊ីបូទី
+ Name[kn]=ಜಿಬೌಟಿಯ ಫ್ರಾಂಕ್
+ Name[ko]=지부티 프랑
++Name[lt]=Džibučio frankas
+ Name[lv]=Džibutijas franks
+ Name[mk]=Џибутиски франк
+ Name[ml]=ജിബൂട്ടിയിലെ ഫ്രാങ്ക്
+--- runtime/localization/currency/bnd.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/bnd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -24,12 +24,14 @@
+ Name[hr]=Brunejski dolar
+ Name[hu]=Brunei dollár
+ Name[id]=Dollar Brunei
++Name[is]=Brúnei dollari
+ Name[it]=Dollaro del Brunei
+ Name[ja]=ブルネイ・ドル
+ Name[kk]=Бруней доллары
+ Name[km]=ដុល្លារប្រ៊ុយណេ
+ Name[kn]=ಬ್ರೂನೈ ಡಾಲರ್
+ Name[ko]=브루나이 달러
++Name[lt]=Brunėjaus doleris
+ Name[lv]=Brunejas dolārs
+ Name[mai]=ब्रुनेई डालर
+ Name[mk]=Брунејски долар
+--- runtime/localization/currency/rur.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/rur.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=Russian Ruble A/97
+ Name[kn]=ರಶಿಯನ್ ರೂಬಲ್ A/97
+ Name[ko]=러시아 루블 (1997년)
++Name[lt]=Rusijos rublis A/97
+ Name[lv]=Krievijas rublis A/97
+ Name[mk]=Руска рубља A/97
+ Name[ml]=റഷ്യയിലെ റൂബിള് എ/97
+--- runtime/localization/currency/sdd.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/sdd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -23,6 +23,7 @@
+ Name[hr]=Sudanski dinar
+ Name[hu]=Szudáni dínár
+ Name[id]=Dinar Sudan
++Name[is]=Súdanskur dínar
+ Name[it]=Dinaro sudanese
+ Name[ja]=スーダン・ディナール
+ Name[kk]=Судан динары
+--- runtime/localization/currency/sdg.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/sdg.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -24,6 +24,7 @@
+ Name[hr]=Sudanska funta
+ Name[hu]=Szudáni font
+ Name[id]=Pound Sudan
++Name[is]=Súdanskt pund
+ Name[it]=Sterlina sudanese
+ Name[ja]=スーダン・ポンド
+ Name[kk]=Судан фунты
+--- runtime/localization/currency/clp.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/clp.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=Chilean Peso
+ Name[kn]=ಚಿಲಿಯ ಪೆಸೊ
+ Name[ko]=칠레 페소
++Name[lt]=Čilės pesas
+ Name[lv]=Čīles peso
+ Name[mai]=चीलियन पेसो
+ Name[mk]=Чилеански пезос
+--- runtime/localization/currency/dzd.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/dzd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=ឌីណាអាល់ហ្សេរី
+ Name[kn]=ಅಲ್ಜೀರಿಯನ್ ದಿನಾರ್
+ Name[ko]=알제리 디나르
++Name[lt]=Alžyro dinaras
+ Name[lv]=Alžīrijas dinārs
+ Name[mk]=Алжирски динар
+ Name[ml]=അല്ജീരിയയിലെ ദിനാര്
+--- runtime/localization/currency/hrk.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/hrk.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=ឃុណាក្រូអាត
+ Name[kn]=ಕ್ರೊಯೆಶಿಯಾದ ಕುನಾ
+ Name[ko]=크로아티아 쿠나
++Name[lt]=Kroatijos kuna
+ Name[lv]=Horvātijas kuna
+ Name[mk]=Хрватска куна
+ Name[ml]=ക്രൊയേഷ്യയിലെ ക്യൂന
+--- runtime/localization/currency/bob.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/bob.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -22,12 +22,14 @@
+ Name[hr]=Bolivijski boliviano
+ Name[hu]=Bolíviai boliviano
+ Name[id]=Boliviano Bolivia
++Name[is]=Bólivískur Boliviano
+ Name[it]=Boliviano
+ Name[ja]=ボリビア・ボリビアーノ
+ Name[kk]=Боливия боливианосы
+ Name[km]=Bolivian Boliviano
+ Name[kn]=ಬೊಲಿವಿಯಾದ ಬೊಲಿವಿಯಾನೊ
+ Name[ko]=볼리비아 볼리비아노
++Name[lt]=Bolivijos bolivijanas
+ Name[lv]=Bolīvijas boliviano
+ Name[mai]=बोलिबन बोलिबिनो
+ Name[ml]=ബൊളീവിയയിലെ ബൊളിവിയാനോ
+--- runtime/localization/currency/bgl.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/bgl.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -29,6 +29,7 @@
+ Name[km]=ប៊ុលហ្ការី Lev A/99
+ Name[kn]=ಬಲ್ಗೇರಿಯಾದ Lev A/99
+ Name[ko]=불가리아 레프 (1999년)
++Name[lt]=Bulgarijos levas A/99
+ Name[lv]=Bulgārijas leva A/99
+ Name[mai]=बल्गारिया Lev A/99
+ Name[mk]=Бугарски лев A/99
+--- runtime/localization/currency/bgn.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/bgn.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=ប៊ុលហ្ការី Lev
+ Name[kn]=ಬಲ್ಗೇರಿಯಾದ Lev
+ Name[ko]=불가리아 레프
++Name[lt]=Bulgarijos levas
+ Name[lv]=Bulgārijas leva
+ Name[mai]=बल्गारिया लेव
+ Name[mk]=Бугарски лев
+--- runtime/localization/currency/gel.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/gel.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=ឡារីហ្សកហ្ស៊ី
+ Name[kn]=ಜಾರ್ಜಿಯಾದ ಲಾರಿ
+ Name[ko]=그루지야 라리
++Name[lt]=Gruzijos laris
+ Name[lv]=Gruzijas lars
+ Name[ml]=ജോര്ജ്ജിയയിലെ ലാരി
+ Name[nb]=Georgiske Lari
+--- runtime/localization/currency/dkk.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/dkk.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=Danish Krone
+ Name[kn]=ಡ್ಯಾನಿಶ್ ಕ್ರೋನ್
+ Name[ko]=덴마크 크로네
++Name[lt]=Danijos krona
+ Name[lv]=Dāņu krona
+ Name[mk]=Данска круна
+ Name[ml]=ഡെന്മാര്ക്കിലെ ക്രോണ
+--- runtime/localization/currency/cuc.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/cuc.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -27,6 +27,7 @@
+ Name[kk]=Кубаның конвертацияланатын песосы
+ Name[km]=Cuban Convertible Peso
+ Name[ko]=쿠바 유동적 페소
++Name[lt]=Kubos konvertuojamasis pesas
+ Name[lv]=Kubas konverējamais peso
+ Name[mai]=कूबान बदलैबला पेसो
+ Name[mk]=Кубански конвертибилен пезос
+--- runtime/localization/currency/iqd.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/iqd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=Iraqi Dinar
+ Name[kn]=ಇರಾಕಿ ದಿನಾರ್
+ Name[ko]=이라크 디나르
++Name[lt]=Irako dinaras
+ Name[lv]=Irākas dinārs
+ Name[mk]=Ирачки динар
+ Name[ml]=ഇറാക്കിലെ ദിനാര്
+--- runtime/localization/currency/tzs.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/tzs.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -22,6 +22,7 @@
+ Name[hi]=तनजानी शिल्लिंग
+ Name[hr]=Tanzanijski šiling
+ Name[id]=Shilling Tanzania
++Name[is]=Tansanískur skildingur
+ Name[it]=Scellino tanzaniano
+ Name[ja]=タンザニア・シリング
+ Name[kk]=Танзания шиллингі
+--- runtime/localization/currency/sek.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/sek.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=Swedish Krona
+ Name[kn]=ಸ್ವೀಡಿಶ್ ಕ್ರೋನಾ
+ Name[ko]=스웨덴 크로나
++Name[lt]=Švedijos krona
+ Name[lv]=Zviedru krona
+ Name[mk]=Шведска круна
+ Name[ml]=സ്വീഡനിലെ ക്രോണ
+--- runtime/localization/currency/bov.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/bov.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -27,6 +27,7 @@
+ Name[kk]=Боливияның Mvdol-ы
+ Name[km]=បូលីវី Mvdol
+ Name[ko]=볼리비아 MVDOL
++Name[lt]=Bolivijos midolis
+ Name[mai]=बोलिविया म्वडोल
+ Name[ml]=ബൊളീവിയയിലെ മവ്ഡോള്
+ Name[nb]=Bolivianske Mydol
+--- runtime/localization/currency/cup.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/cup.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=Cuban Peso
+ Name[kn]=ಕ್ಯೂಬನ್ ಪೆಸೊ
+ Name[ko]=쿠바 페소
++Name[lt]=Kubos pesas
+ Name[lv]=Kubas peso
+ Name[mai]=क्यूबान पेसो
+ Name[mk]=Кубански пезос
+--- runtime/localization/currency/nok.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/nok.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=Norwegian Krone
+ Name[kn]=ನಾರ್ವೆಯ ಕ್ರೋನ್
+ Name[ko]=노르웨이 크로네
++Name[lt]=Norvegijos krona
+ Name[lv]=Norvēģu krona
+ Name[mk]=Норвешка круна
+ Name[ml]=നോര്വെയിലെ ക്രോണ
+--- runtime/localization/currency/bwp.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/bwp.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -29,6 +29,7 @@
+ Name[km]=ពូឡាបុតស្វាណា
+ Name[kn]=ಬೋಟ್ಸ್ವಾನದ ಪುಲಾ
+ Name[ko]=보츠와나 풀라
++Name[lt]=Botsvanos pula
+ Name[mai]=बोत्सवाना पुला
+ Name[ml]=ബോട്സ്വാനയിലെ പുല
+ Name[nb]=Botswana Pula
+--- runtime/localization/currency/bhd.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/bhd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -24,12 +24,14 @@
+ Name[hr]=Bahreinski dinar
+ Name[hu]=Bahreini dínár
+ Name[id]=Dinar Bahrain
++Name[is]=Bareinskur dínar
+ Name[it]=Dinaro del Bahrain
+ Name[ja]=バーレーン・ディナール
+ Name[kk]=Бахрейн динары
+ Name[km]=ឌីណាបារ៉ែន
+ Name[kn]=ಬಹರೈನಿ ದಿನಾರ್
+ Name[ko]=바레인 디나르
++Name[lt]=Bahreino dinaras
+ Name[lv]=Bahreinas dinārs
+ Name[mai]=बहरीन दिनार
+ Name[mk]=Бахреински динар
+--- runtime/localization/currency/omr.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/omr.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -22,6 +22,7 @@
+ Name[hr]=Omanski rial
+ Name[hu]=Ománi riál
+ Name[id]=Rial Oman
++Name[is]=Ómanskur ríal
+ Name[it]=Riyal dell'Oman
+ Name[ja]=オーマン・リヤル
+ Name[kk]=Оман риалы
+--- runtime/localization/currency/ern.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/ern.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -27,6 +27,7 @@
+ Name[kk]=Эритрея накфасы
+ Name[km]=ណាកហ្វាអេរីទ្រា
+ Name[ko]=에리트리아 나크파
++Name[lt]=Eritrėjos nakfa
+ Name[ml]=എറിട്രിയയിലെ നകഫ
+ Name[nb]=Eritreiske Nakfa
+ Name[nds]=Eritreesch Nakfa
+--- runtime/localization/currency/ars.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/ars.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=អាហ្សង់ទីន ប៉េស្សូ
+ Name[kn]=ಅರ್ಜಂಟೀನಾದ ಪೆಸೊ
+ Name[ko]=아르헨티나 페소
++Name[lt]=Argentinos pesas
+ Name[lv]=Argentīnas peso
+ Name[mai]=अर्जेन्टिना पेसो
+ Name[mk]=Аргентинско пезо
+--- runtime/localization/currency/azm.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/azm.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -29,6 +29,7 @@
+ Name[km]=អាហ្ស៊ែរបែហ្សង់ ម៉ាណាត
+ Name[kn]=ಅಝರ್ಬೈಜಾನಿಯಾದ ಮನಾಟ್
+ Name[ko]=아제르바이잔 마나트
++Name[lt]=Azerbaidžano manatas
+ Name[mai]=अजरबैजान मनात
+ Name[ml]=അസര്ബൈജാനിലെ മാനറ്റ്
+ Name[nb]=Aserbajdsjanske Manat
+--- runtime/localization/currency/azn.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/azn.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -29,6 +29,7 @@
+ Name[km]=អាហ្ស៊ែរបែហ្សង់ ម៉ាណាត
+ Name[kn]=ಅಝರ್ಬೈಜಾನಿಯಾದ ಮನಾಟ್
+ Name[ko]=아제르바이잔 마나트
++Name[lt]=Azerbaidžano manatas
+ Name[mai]=अजरबैजान मनात
+ Name[ml]=അസര്ബൈജാനിലെ മാനറ്റ്
+ Name[nb]=Aserbajdsjanske Manat
+--- runtime/localization/currency/cny.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/cny.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=យ័ន ចិន
+ Name[kn]=ಚೈನಾದ ಯುವಾನ್
+ Name[ko]=중국 위안
++Name[lt]=Kinijos juanis
+ Name[lv]=Ķīnas juaņa
+ Name[mai]=चीनी यूआन
+ Name[mk]=Кинески јуан
+--- runtime/localization/currency/pln.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/pln.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -29,6 +29,7 @@
+ Name[kk]=Польша злотыйы
+ Name[km]=Polish Zloty
+ Name[ko]=폴란드 즈워티
++Name[lt]=Lenkijos zlotas
+ Name[lv]=Polijas zlots
+ Name[mk]=Полска злота
+ Name[ml]=പോളണ്ടിലെ സ്ലോട്ടി
+--- runtime/localization/currency/ltl.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/ltl.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -28,6 +28,7 @@
+ Name[km]=លីតាសលីទុយអានី
+ Name[kn]=ಲಿಥುವೇನಿಯಾದ ಲಿಟಾಸ್
+ Name[ko]=리투아니아 리타스
++Name[lt]=Lietuvos litas
+ Name[lv]=Lietuvas lits
+ Name[ml]=ലിത്വാനിയയിലെ ലിതാസ്
+ Name[nb]=Litauiske litas
+--- runtime/localization/currency/bam.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/bam.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -28,6 +28,7 @@
+ Name[kk]=Босния және Герцоговинаның конвертацияланатын маркасы
+ Name[km]=Bosnia and Herzegovina Convertible Mark
+ Name[ko]=보스니아 헤르체고비나 유동적 마르크
++Name[lt]=Bosnijos ir Hercegovinos konvertuojama markė
+ Name[lv]=Bosnijas un Hercogovinas konvertējamā marka
+ Name[mai]=बोस्निया आओर हर्जेगोविना बदलेबला मार्क
+ Name[mk]=Конвертибилна марка од Босна и Херцеговина
+--- runtime/localization/currency/bif.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/bif.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -24,12 +24,14 @@
+ Name[hr]=Burundijski franak
+ Name[hu]=Burundi frank
+ Name[id]=Franc Burundi
++Name[is]=Búrúndískur franki
+ Name[it]=Franco del Burundi
+ Name[ja]=ブルンジ・フラン
+ Name[kk]=Бурунди франкі
+ Name[km]=ហ្វ្រង់ប៊ូរុនឌី
+ Name[kn]=ಬುರುಂಡಿಯಾದ ಫ್ರಾಂಕ್
+ Name[ko]=부룬디 프랑
++Name[lt]=Burundijos frankas
+ Name[lv]=Burundijas franks
+ Name[mai]=बुरूंडी फ्रैंक
+ Name[mk]=Бурундиски франк
+--- runtime/localization/currency/dem.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/dem.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=ម៉ាកអាល្លឺម៉ង់
+ Name[kn]=ಜರ್ಮನಿಯ ಮಾರ್ಕ್
+ Name[ko]=독일 마르크
++Name[lt]=Vokietijos markė
+ Name[lv]=Vācijas marka
+ Name[mk]=Германска марка
+ Name[ml]=ജര്മനിയിലെ മാര്ക്ക്
+--- runtime/localization/currency/fim.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/fim.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -29,6 +29,7 @@
+ Name[kk]=Финн маркасы
+ Name[km]=Finnish Markka
+ Name[ko]=핀란드 마르카
++Name[lt]=Suomijos markė
+ Name[lv]=Somu marka
+ Name[ml]=ഫിന്ലന്റിലെ മാര്ക്ക
+ Name[nb]=Finske mark
+--- runtime/localization/currency/sgd.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/sgd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -24,6 +24,7 @@
+ Name[hr]=Singapurški dolar
+ Name[hu]=Szingapúri dollár
+ Name[id]=Dollar Singapura
++Name[is]=Singapúrskur dollari
+ Name[it]=Dollaro di Singapore
+ Name[ja]=シンガポール・ドル
+ Name[kk]=Сингапур доллары
+--- runtime/localization/currency/cop.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/cop.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=ប៉ូសូកូឡុំប៊ី
+ Name[kn]=ಕೊಲಂಬಿಯಾದ ಪೆಸೊ
+ Name[ko]=콜롬비아 페소
++Name[lt]=Kolumbijos pesas
+ Name[lv]=Kolumbijas peso
+ Name[mai]=कोलंबिया पेसो
+ Name[mk]=Колумбиски пезос
+--- runtime/localization/currency/huf.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/huf.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -29,6 +29,7 @@
+ Name[kk]=Венгрия форинті
+ Name[km]=Hungarian Forint
+ Name[ko]=헝가리 포린트
++Name[lt]=Vengrijos forintas
+ Name[lv]=Ungārijas forints
+ Name[mk]=Унгарска форинта
+ Name[ml]=ഹംഗറിയിലെ ഫൊറിന്റ്
+--- runtime/localization/currency/isk.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/isk.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=ក្រូណាអ៊ីស្លង់
+ Name[kn]=ಐಸ್ಲ್ಯಾಂಡಿನ ಕ್ರೋನ
+ Name[ko]=아이슬란드 크로나
++Name[lt]=Islandijos krona
+ Name[lv]=Īslandes krona
+ Name[mk]=Исландска круна
+ Name[ml]=ഐസ്ലാന്ഡിലെ ക്രോണ
+--- runtime/localization/currency/bbd.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/bbd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=ដុល្លារបារបាដូស
+ Name[kn]=ಬಾರ್ಬಡೋಸ್ ಡಾಲರ್
+ Name[ko]=바베이도스 달러
++Name[lt]=Barbadoso doleris
+ Name[lv]=Barbadosas dolārs
+ Name[mai]=बारबोडस डालर
+ Name[mk]=Барбадоски долар
+--- runtime/localization/currency/esp.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/esp.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=Spanish Peseta
+ Name[kn]=ಸ್ಪಾನಿಶ್ ಪೆಸೆಟಾ
+ Name[ko]=스페인 페세타
++Name[lt]=Ispanijos peseatas
+ Name[lv]=Spānijas peseta
+ Name[mai]=स्पानिश पेसेटा
+ Name[mk]=Шпанска пезета
+--- runtime/localization/currency/adf.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/adf.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=Andorran Franc
+ Name[kn]=ಅಂಡೋರಾದ ಫ್ರಾಂಕ್
+ Name[ko]=안도라 프랑
++Name[lt]=Andoros frankas
+ Name[lv]=Andoras franki
+ Name[mai]=अंडोरा फ्रैंक
+ Name[mk]=Андорски франк
+--- runtime/localization/currency/byr.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/byr.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=រ៉ូប៊ល បេឡារុស្ស
+ Name[kn]=ಬೆಲಾರುಸಿಯ ರೂಬಲ್
+ Name[ko]=벨라루스 루블
++Name[lt]=Baltarusijos rublis
+ Name[lv]=Baltkrievijas rublis
+ Name[mai]=बेलारूस रूबल
+ Name[mk]=Белоруска рубља
+--- runtime/localization/currency/chf.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/chf.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=Swiss Franc
+ Name[kn]=ಸ್ವಿಸ್ ಫ್ರಾಂಕ್
+ Name[ko]=스위스 프랑
++Name[lt]=Šveicarijos frankas
+ Name[lv]=Šveices franks
+ Name[mai]=स्विस फ्रैंक
+ Name[mk]=Швајцарски франк
+--- runtime/localization/currency/ghc.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/ghc.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -27,6 +27,7 @@
+ Name[kk]=Гананың седиі
+ Name[km]=Ghanaian Cedi
+ Name[ko]=가나 세디
++Name[lt]=Ganos cedis
+ Name[ml]=ഘാനൈയന് സെഡി
+ Name[nb]=Ghanesiske Cedi
+ Name[nds]=Ghanaasch Cedi
+--- runtime/localization/currency/fjd.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/fjd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -30,6 +30,7 @@
+ Name[km]=Fijian Dollar
+ Name[kn]=ಫಿಜಿಯನ್ ಡಾಲರ್
+ Name[ko]=피지 달러
++Name[lt]=Fidži doleris
+ Name[lv]=Fidži dolārs
+ Name[ml]=ഫിജിയിലെ ഡോളര്
+ Name[nb]=Fiji-dollar
+--- runtime/localization/currency/adp.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/adp.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -31,6 +31,7 @@
+ Name[km]=Andorran Peseta
+ Name[kn]=ಅಂಡೋರಾದ ಪೆಸೆಟಾ
+ Name[ko]=안도라 페소
++Name[lt]=Andoros pesetas
+ Name[lv]=Andoras pesetas
+ Name[mai]=अंडोरा पेसेटा
+ Name[mk]=Андорска пезета
+--- runtime/localization/currency/sos.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/localization/currency/sos.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -23,6 +23,7 @@
+ Name[hr]=Somalijski šiling
+ Name[hu]=Szomáliai schilling
+ Name[id]=Shilling Somalia
++Name[is]=Sómalskur skildingur
+ Name[it]=Scellino somalo
+ Name[ja]=ソマリア・シリング
+ Name[kk]=Сомали шиллингі
+--- runtime/kcontrol/componentchooser/CMakeLists.txt (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kcontrol/componentchooser/CMakeLists.txt (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -19,10 +19,10 @@
+ componentchooserterminal.cpp ktimerdialog.cpp)
+ endif(NOT WIN32)
+
+-if(NOT APPLE AND NOT WIN32)
++if(Q_WS_X11)
+ set(kcm_componentchooser_SRCS ${kcm_componentchooser_SRCS}
+ componentchooserwm.cpp )
+-endif(NOT APPLE AND NOT WIN32)
++endif(Q_WS_X11)
+
+
+ kde4_add_ui_files(kcm_componentchooser_SRCS
+--- runtime/phonon/platform_kde/phonon.notifyrc (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/phonon/platform_kde/phonon.notifyrc (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -266,7 +266,7 @@
+ Comment[lv]=Paziņojums par automātisku atkāpšanos, ja vēlamā iekārta nav pieejama
+ Comment[ml]=ഇഷ്ടപ്പെട്ട ഉപകരണം ലഭ്യമല്ലാതിരിയ്ക്കുമ്പോള് പകരമുള്ള ഉപകരണത്തിലേയ്ക്ക് സ്വയമുള്ള മാറ്റം അറിയിയ്ക്കുക
+ Comment[mr]=सूचीत केलेले साधन अनुपलब्ध असल्यास स्वयंरूपी फॉलबॅक करीता सूचना पुरविली जाते
+-Comment[nb]=Gi varsel dersom enehenten det skal falles tilbake til ikke er tilgjengelig
++Comment[nb]=Gi varsel dersom enheten det skal falles tilbake til ikke er tilgjengelig
+ Comment[nds]=Bescheed, wenn de vörtrocken Reedschap nich verföögbor is un ansteed de Opbackreedschap bruukt warrt
+ Comment[nl]=Melding voor automatische terugval als het gewenste apparaat niet beschikbaar is
+ Comment[nn]=Varsling om automatisk reserveeining om den føretrekte eininga ikkje er tilgjengeleg
+--- runtime/khelpcenter/plugins/plasma.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/khelpcenter/plugins/plasma.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-X-DocPath=help:/plasma/index.html
++X-DocPath=help:/plasma-desktop/index.html
+ Icon=plasma
+ Name=Plasma Manual
+ Name[ar]=دليل بلازما
+--- runtime/doc/kdebugdialog/index.docbook (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/doc/kdebugdialog/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
++<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
+ "dtd/kdex.dtd" [
+ <!ENTITY kdebugdialog "<application>KDebugDialog</application>">
+ <!ENTITY kappname "&kdebugdialog;">
+@@ -9,57 +9,56 @@
+
+ ]>
---- 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 @@
+-<book lang="&language;">
+-<bookinfo>
+-<title>The &kdebugdialog; Handbook</title>
+-
++<article lang="&language;">
++<title>KDebugDialog</title>
++<articleinfo>
+ <authorgroup>
+ <author>&David.Faure; &David.Faure.mail;</author>
<!-- 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>
+-<date>2001-02-13</date>
+-<releaseinfo>0.03.00</releaseinfo>
++<date>2010-02-11</date>
++<releaseinfo>1.0 &kde; 4.4</releaseinfo>
+-<abstract>
+-<para>This document describes &kdebugdialog;.</para>
+-</abstract>
+-
<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>
+ <keyword>KDebugdialog</keyword>
++<keyword>Debug</keyword>
+ </keywordset>
+-</bookinfo>
++</articleinfo>
+
+-<chapter id="Introduction">
+-<title>What is &kdebugdialog;?</title>
+
+-<para>It is a dialog box for managing diagnostic messages at runtime.
+-</para>
++<para>&kdebugdialog; is a dialog box for managing diagnostic messages at runtime.
++It features a simple and a full mode.</para>
++<para>In order to be able to make changes
++<guilabel>Disable all debug output</guilabel> has to be unchecked.</para>
+
++<variablelist>
++<varlistentry>
++<term>Simple mode</term>
++<listitem>
+ <para>If you simply start <command>kdebugdialog</command>, you will
+ see a list of <quote>areas</quote>, that can be disabled or enabled. A
+ <function>kDebug(area)</function> call in the code will show
+ something in the debug output only if the area is enabled.</para>
+
+ <note><para>Note that kWarning, kError and kFatal always appear,
+-they are NOT controlled by this setting. </para></note>
++they are <emphasis>NOT</emphasis> controlled by this setting. </para></note>
+
+-<variablelist>
+-<varlistentry>
+-<term><guilabel>Area</guilabel></term>
+-<listitem>
+-<para>The areas which should only be output. Every message
+-that is not mentioned here will simply not be output (unless
+-this field remains empty, which is the default, and means that all
+-messages should be output). You can enter several areas
+-separated by commas here, and you can also use area ranges with
+-the syntax start-end. Thus a valid entry could be:
+-117,214-289,356-359,221. Do not use whitespaces.</para>
++<para>Enter a matching string into the <guilabel>Search</guilabel>
++box at the top of the list, this allows you to filter the areas
++which are displayed in the list view.
++Use the buttons below the list to select or deselect all items in the view
++(the other areas are not effected) or change the debug output for a single
++item using the check box in front of it.
++</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>
+-</variablelist>
+
++<varlistentry>
++<term>Full mode</term>
++<listitem>
+ <para>If you start <command>kdebugdialog</command>
+ <option>--fullmode</option>, then for every severity level you can
+ define separately what should be done with the diagnostic messages of
+@@ -89,7 +88,7 @@
+ Box</quote>, <quote>Shell</quote> (meaning stderr) and
+ <quote>Syslog</quote>. Please do not direct fatal messages to syslog
+ unless you are the system administrator yourself. The default is
+-<quote>Message Box</quote>.</para>
++<quote>Shell</quote>.</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>
--
--<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;
- }
+@@ -109,9 +108,13 @@
+ output, the application aborts with a SIGABRT after outputting the
+ message.</para>
--/** Make sure it builds with NDEBUG */
--kndbgstream& operator<< (kndbgstream& s, sftpFileAttr& ) {
-- return s;
--}
--
- /** 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();
- }
++</listitem>
++</varlistentry>
++</variablelist>
++
+ <para>When you close the dialog by pressing <guibutton>OK</guibutton>,
+ your entries apply immediately and are saved in
+-<filename>kdebugrc</filename>. When you press
++<filename>$<envar>KDEHOME</envar>/share/config/kdebugrc</filename>. When you press
+ <guibutton>Cancel</guibutton>, your entries are discarded and the old
+ ones are restored.</para>
--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 @@
- }
- }
+@@ -122,10 +125,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;
- }
+ &underFDL;
-@@ -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;
+-</chapter>
+-
+-&documentation.index;
+-</book>
++</article>
+ <!--
+ Local Variables:
+ mode: sgml
+--- runtime/doc/kcontrol/index.docbook (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/doc/kcontrol/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -1,639 +0,0 @@
+-<?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
+-"dtd/kdex.dtd" [
+-<!ENTITY % addindex "IGNORE">
+-<!ENTITY % English "INCLUDE" > <!-- change language only here -->
+-]>
+-
+-<book lang="&language;">
+-<bookinfo>
+-<title>The &kcontrolcenter;</title>
+-
+-<authorgroup>
+-<author>&Mike.McBride; &Mike.McBride.mail;</author>
+-<!-- TRANS:ROLES_OF_TRANSLATORS -->
+-</authorgroup>
+-
+-<legalnotice>&FDLNotice;</legalnotice>
+-
+-<date>2005-03-05</date>
+-<releaseinfo>3.4.0</releaseinfo>
+-
+-<abstract>
+-<para>This documentation describes &kde;'s control center.</para>
+-</abstract>
+-
+-<keywordset>
+-<keyword>KDE</keyword>
+-<keyword>kcontrol</keyword>
+-<keyword>configuration</keyword>
+-<keyword>settings</keyword>
+-<keyword>module</keyword>
+-</keywordset>
+-
+-</bookinfo>
+-
+-<chapter id="introduction">
+-<title>The &kcontrolcenter;</title>
+-
+-<para>
+-The &kcontrolcenter; (from now on referred to simply as <quote>the
+-control center</quote>) provides you with a centralized and convenient
+-way to configure all of your &kde; settings.
+-</para>
+-
+-<para>
+-The control center is made up of multiple modules. Each module is a
+-separate application, but the control center organizes all of these
+-programs into a convenient location.
+-</para>
+-
+-<tip>
+-<para>
+-Each control center module can be executed individually
+-</para>
+-
+-<para>
+-See section entitled <link linkend="control-center-run-indiv">Running
+-individual control center modules</link> for more information.
+-</para>
+-</tip>
+-
+-<para>
+-The control center groups the configuration modules into categories, so
+-they are easy to locate. Within each category, the control center shows
+-all the modules in a list, so it is easier to find the right
+-configuration module.
+-</para>
+-</chapter>
+-
+-<chapter id="control-center">
+-<title>Using the &kcontrolcenter;</title>
+-
+-<para>
+-This next section details the use of the control center itself. For
+-information on individual modules, please see <link linkend="module">Control
+-Center Modules</link>
+-</para>
+-
+-<sect1 id="control-center-starting">
+-<title>Starting the &kcontrol;</title>
+-
+-<para>The &kcontrolcenter; can be started in 3 ways:
+-</para>
+-
+-<orderedlist>
+-<listitem>
+-<para>
+-By selecting <menuchoice><guimenu>K Button</guimenu><guimenuitem>Control
+-Center</guimenuitem></menuchoice> from the &kde; Panel.
+-</para>
+-</listitem>
+-<listitem>
+-<para>
+-By pressing <keycombo
+-action="simul">&Alt;<keycap>F2</keycap></keycombo>.
+-</para>
+-
+-<para>
+-This will bring up a dialog box. Type
+-<userinput><command>kcontrol</command></userinput>, and click
+-<guibutton>Run</guibutton>.
+-</para>
+-</listitem>
+-
+-<listitem>
+-<para>
+-You can type <command>kcontrol &</command> at any command prompt.
+-</para>
+-</listitem>
+-</orderedlist>
+-
+-<para>
+-All three of these methods are equivalent, and produce the same result.
+-</para>
+-
+-</sect1>
+-
+-<sect1 id="control-center-screen">
+-<title>The &kcontrolcenter; Screen</title>
+-
+-<para>
+-When you start the control center, you are presented with a window,
+-which can be divided into 3 functional parts.
+-</para>
+-
+-<screenshot>
+-<screeninfo>Screenshot</screeninfo>
+-<mediaobject>
+-<imageobject> <imagedata fileref="screenshot.png" format="PNG"/>
+-</imageobject>
+-<textobject> <phrase>Screenshot</phrase> </textobject>
+-<caption>
+-<para>The &kde; Control Center Screen</para>
+-</caption>
+-</mediaobject>
+-</screenshot>
+-
+-<para>
+-Across the top is a menubar. The menubar will provide you with quick
+-access to most of &kcontrolcenter;'s features. The menus are detailed in
+-<link linkend="control-center-menus">The &kde; Control Center
+-Menus</link>.
+-</para>
+-
+-<para>
+-Along the left hand side, is a icon tree. Here you can choose which
+-module to configure.
+-</para>
+-
+-<para>
+-The main panel shows you some system information.
+-</para>
+-
+-<para>
+-In this example, we are running &kde; 3.4.0, we started &kcontrolcenter;
+-as user <systemitem class="username">newkde</systemitem>, the computer is
+-named <systemitem class="systemname">turtle</systemitem>, it is a
+-&Linux; system running the 2.6 kernel, on a i686 processor.
+-</para>
+-
+-</sect1>
+-
+-<sect1 id="control-center-menus">
+-<title>The &kcontrolcenter; Menus</title>
+-
+-<para>
+-This next section gives you a brief description of what each menu item
+-does.
+-</para>
+-
+-<sect2 id="control-center-menu-file">
+-<title><guimenu>File</guimenu> Menu</title>
+-
+-<para>
+-The <guimenu>File</guimenu> menu has a single entry.
+-</para>
+-
+-<variablelist>
+-
+-<varlistentry>
+-<term><menuchoice>
+-<shortcut>
+-<keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>
+-</shortcut>
+-<guimenu>File</guimenu>
+-<guimenuitem>Quit</guimenuitem>
+-</menuchoice></term>
+-<listitem>
+-<para>
+-<action>Closes the control center.</action>
+-</para>
+-</listitem>
+-</varlistentry>
+-</variablelist>
+-
+-</sect2>
+-
+-<sect2 id="control-center-menu-view">
+-<title><guimenu>View</guimenu> Menu</title>
+-
+-<para>
+-These options determine how the module selection looks and behaves.
+-</para>
+-
+-<variablelist>
+-<varlistentry>
+-<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Mode</guimenuitem>
+-</menuchoice></term>
+-
+-<listitem>
+-<para>
+-Determines whether to use <guimenuitem>Tree</guimenuitem> view,
+-or <guimenuitem>Icon</guimenuitem> view for your modules.
+-</para>
+-
+-<para>
+-With <guimenuitem>Tree</guimenuitem> view, each submenu appears as an
+-indented list.
+-</para>
+-
+-<para>
+-With <guimenuitem>Icon</guimenuitem> view, when you click on a category,
+-the categories disappear and are replaced with the module list. You
+-then use the <guiicon>Back</guiicon> button to return to the categories.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><menuchoice>
+-<guimenu>View</guimenu><guisubmenu>Icon size</guisubmenu>
+-</menuchoice></term>
+-
+-<listitem>
+-<para>
+-Using this option, you can choose
+-<guimenuitem>Small</guimenuitem>, <guimenuitem>Medium</guimenuitem>, or
+-<guimenuitem>Large</guimenuitem> icons to select your modules.
+-</para>
+-
+-<note><para>
+-This menu item only controls the icon size if you are in
+-<guimenuitem>Icon View</guimenuitem>. If you choose
+-<guimenuitem>Tree View</guimenuitem>, the <guimenuitem>Small</guimenuitem>
+-icon size will be used, no matter what size was previously selected in
+-<guimenuitem>Icon View</guimenuitem>.
+-</para>
+-</note>
+-</listitem>
+-
+-</varlistentry>
+-</variablelist>
+-</sect2>
+-
+-<sect2 id="control-center-menu-settings">
+-<title><guimenu>Settings</guimenu> Menu</title>
+-
+-<para>
+- The <guimenu>Settings</guimenu> menu has a single entry,
+-<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts...</guimenuitem></menuchoice>. From here you can map keyboard shortcuts to the
+-other menu options.
+-</para>
+-
+-</sect2>
+-
+-<sect2 id="control-center-menu-help">
+-<title><guimenu>Help</guimenu> Menu</title>
+-
+-&help.menu.documentation;
+-
+-</sect2>
+-
+-</sect1>
+-
+-<sect1 id="control-center-exiting">
+-<title>Exiting The &kde; Control Center</title>
+-
+-<para>
+-You can exit the control center one of three ways:
+-</para>
+-
+-<itemizedlist>
+-<listitem>
+-<para>
+-Select <menuchoice><guimenu>File</guimenu>
+-<guimenuitem>Quit</guimenuitem></menuchoice> from the menu bar.
+-</para>
+-</listitem>
+-
+-<listitem>
+-<para>Type <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>
+-on the keyboard.
+-</para>
+-</listitem>
+-
+-<listitem>
+-<para>
+-Click on the <guiicon>Close</guiicon> button on the frame surrounding
+-the control center.
+-</para>
+-</listitem>
+-</itemizedlist>
+-
+-</sect1>
+-
+-<sect1 id="control-center-run-indiv">
+-<title>Running Individual Modules</title>
+-
+-<para>
+-You can run individual modules without running kcontrol using the command <command>kcmshell4</command> from &konsole;. Type <userinput> <command>kcmshell4</command><option> --list</option></userinput> to see a list of the available &kcontrolcenter; modules. You can also access individual &kcontrolcenter; modules through adding the <guilabel>Preferences</guilabel> button to either &kicker; or the &kmenu; through their respective configuration dialogs.
+-</para>
+-
+-</sect1>
+-
+-</chapter>
+-
+-<!--*****************************************************************-->
+-
+-<chapter id="module">
+-<title>The &kcontrolcenter; Modules</title>
+-
+-<para>
+-In order to make it as easy as possible, the &kcontrolcenter; has organized
+-similar options into groups. Each group is called a module. When you
+-click on the name of a module in the left window, you will be presented
+-with the options of the module on the right.
+-</para>
+-
+-<para>
+-Each module will have some or all of the following buttons:
+-</para>
+-
+-<variablelist>
+-
+-<varlistentry>
+-<term>Help</term>
+-<listitem>
+-<para>
+-This button will give you help specific to the current module. The
+-button will show you a short summary help page in the left window. At
+-the bottom of that window, you can click on a link to get more detailed
+-help.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Defaults</guilabel></term>
+-<listitem>
+-<para>
+-This button will restore this module to its default values. You must
+-click <guibutton>OK</guibutton> to save the options.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guibutton>Apply</guibutton></term>
+-<listitem>
+-<para>
+-Clicking this button will save all changes to &kde;. If you have
+-changed anything, clicking <guibutton>Apply</guibutton> will cause the
+-changes to take effect.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guibutton>Reset</guibutton></term>
+-<listitem>
+-<para>
+-This button will <quote>Reset</quote> the module to the previous settings.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-</variablelist>
+-
+-<note>
+-<para>
+-You must save the options of the current module using
+-<guibutton>Apply</guibutton> before you can change to a different
+-module.
+-</para>
+-<para>
+-If you try to change without saving your options, you will be asked if
+-you want to save your changes, or discard them.
+-</para>
+-</note>
+-</chapter>
+-<!--
+- Commented until fixed arrangement is made
+-<sect1 id="module-intro">
+-<title>Navigating Modules</title>
+-
+-<para>
+-This is a list of the <emphasis>standard</emphasis> configuration
+-modules (sorted by category) provided by the <application
+-role="package">KDE base</application> package. Please note that there
+-may be many more modules on your system if you have installed additional
+-software.
+-</para>
+-
+-<variablelist>
+-<varlistentry>
+-<term>File Browsing</term>
+-<listitem>
+-<para>
+-<link linkend="file-assoc">File Associations</link>,
+-<link linkend="file-manager">File Manager</link>,
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term>Look and Feel</term>
+-<listitem>
+-<para>
+-<link linkend="background">Background</link>,
+-<!- - <link linkend="borders">Borders</link>,- ->
+-<link linkend="color">Colors</link>,
+-<link linkend="desktop">Desktop</link>,
+-<link linkend="fonts">Fonts</link>,
+-<link linkend="icons">Icons</link>,
+-<!- - <link linkend="iconstyle">Icon Style</link>, - ->
+-<link linkend="key-bindings">Key Bindings</link>,
+-<link linkend="launch-feedback">Launch feedback</link>,
+-<link linkend="panel">Panel</link>,
+-<link linkend="screensaver">Screensaver</link>,
+-<link linkend="style">Style</link>,
+-<link linkend="sys-notify">System Notifications</link>,
+-<link linkend="taskbar">Taskbar</link>,
+-<link linkend="theme-manager">Theme Manager</link>,
+-<!- - <link linkend="numbername">Virtual Desktops</link>,- ->
+-<link linkend="window-behavior">Window Behavior</link>,
+-<link linkend="window-deco">Window Decoration</link>.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term>Network</term>
+-<listitem>
+-<para>
+-<link linkend="e-mail">E-Mail</link>,
+-<link linkend="lan-browsing">LAN Browsing</link>,
+-<link linkend="timeouts">Preferences</link>, <!- - FIXME - ->
+-<link linkend="socks">SOCKS</link>,
+-<link linkend="talk">Talk Configuration</link>
+-<link linkend="windows-shares">Windows Shares</link>
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term>Peripherals</term>
+-<listitem>
+-<para>
+-<link linkend="kbd">Keyboard</link>,
+-<link linkend="mouse">Mouse</link>
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term>Personalization</term>
+-<listitem>
+-<para>
+-<link linkend="accessibility">Accessibility</link>,
+-<link linkend="locale">Country & Language</link>,
+-<link linkend="crypto">Crypto</link>,
+-<!- - <link linkend="kblayout">Keyboard Layout</link>, - ->
+-<link linkend="passwords">Passwords</link>
+-<link linkend="spell-checking">Spell Checking</link>.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term>Power Control</term>
+-<listitem>
+-<para>
+-<link linkend="battery-monitor">Battery Monitor</link>,
+-<link linkend="energy">Energy</link>,
+-<link linkend="powerctrl">Laptop Power Control</link>,
+-<link linkend="lowbatcrit">Low Battery Critical</link>,
+-<link linkend="lowbatwarn">Low Battery Warning</link>
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term>Sound</term>
+-<listitem>
+-<para>
+-<link linkend="midi">Midi</link>,
+-<link linkend="mixer">Mixer</link>,
+-<link linkend="sndserver">Sound Server</link>,
+-<link linkend="bell">System Bell</link>
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term>System</term>
+-<listitem>
+-<para>
+-<link linkend="datetime">Date and Time</link>,
+-<link linkend="konsole">&konsole;</link>,
+-<link linkend="login-manager">Login Manager</link>,
+-<link linkend="print-manager">Printing Manager</link>,
+-<link linkend="sessions">Session Manager</link>,
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term>Web Browsing</term>
+-<listitem>
+-<para>
+-<link linkend="cookie">Cookies</link>,
+-<link linkend="ebrowse">Enhanced Browsing</link>,
+-<link linkend="konq-browsing">Konqueror Browser</link>,
+-<link linkend="nsplugins">Netscape Plugins</link>,
+-<link linkend="proxies">Proxies & Cache</link>,
+-<link linkend="stylesheets">Stylesheets</link>,
+-<link linkend="user-agent">User Agent</link>,
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-</variablelist>
+-</sect1>
+-</chapter>
+--->
+-
+-<!-- commenting this section out until I figure out what to do with it :)
+-<chapter id="laptop">
+-<title>Laptop Modules Notes</title>
+-
+-<para>
+-In order to use the laptop modules, you must have the kernel
+-<acronym>APM</acronym> package installed in your kernel. Useful information
+-
+-on
+-how to do this can be found at
+-<ulink url="http://www.cs.utexas.edu/users/kharker/linux-laptop/apm.html">
+-http://www.cs.utexas.edu/users/kharker/linux-laptop/apm.html</ulink> and
+-in the Battery Powered Linux mini-HOWTO at <ulink
+-url="http://metalab.unc.edu/LDP/HOWTO/mini/Battery-Powered.html">
+-http://metalab.unc.edu/LDP/HOWTO/mini/Battery-Powered.html</ulink>.
+-</para>
+-
+-<para>
+-If you want the <guimenuitem>suspend</guimenuitem> and
+-<guimenuitem>standby</guimenuitem> menu commands to work then you should
+-install the &Linux; <application>apmd</application> package (version 2.4
+-or later). If you want to use them from non-root accounts you must mark
+-the <application>apm</application> command <quote>set uid root</quote>.
+-</para>
+-
+-<para>
+-To do this, log on as <systemitem class="username">root</systemitem> and
+-enter:
+-</para>
+-
+-<screen>
+-<prompt>%</prompt><userinput><command>chown</command> <option>root
+-/usr/bin/apm</option>;<command>chmod</command> <option>+s
+-/usr/bin/apm</option></userinput>
+-</screen>
+-
+-<warning>
+-<para>
+-By doing this you will allow any user of your system to put it into suspend
+-or
+-standby states - if you are the only user, this should not be a problem.
+-</para>
+-
+-<para>
+-Also note that any program which has <systemitem
+-class="username">root</systemitem> access, can be a potential security
+-problem. You should carefully determine if there are any security
+-concerns <emphasis>before</emphasis> giving any program <systemitem
+-class="username">root</systemitem> permissions.
+-</para>
+-</warning>
+-</chapter>
+--->
+-
+-<chapter id="credits">
+-<title>Credits and License</title>
+-
+-<para>&kcontrol;</para>
+-<para>Program copyright 1997-2001 The &kcontrolcenter; Developers</para>
+-<para>Contributors:</para>
+-
+-<itemizedlist>
+-<listitem><para>Matthias Hoelzer-Kluepfel
+-&Matthias.Hoelzer-Kluepfel.mail;</para></listitem>
+-<listitem><para>&Matthias.Elter;
+-&Matthias.Elter.mail;</para></listitem>
+-</itemizedlist>
+-
+-<para>Documentation <trademark class="copyright">copyright 2000 Michael
+-McBride</trademark> &Mike.McBride.mail;</para>
+-
+-<para>Contributors:</para>
+-
+-<itemizedlist>
+-<listitem><para>&Paul.Campbell; &Paul.Campbell.mail;</para></listitem>
+-<listitem><para>&Helge.Deller; &Helge.Deller.mail;</para></listitem>
+-<listitem><para>&Mark.Donohoe; </para></listitem>
+-<listitem><para>&Patrick.Dowler; </para></listitem>
+-<listitem><para>&Duncan.Haldane; <email>duncan@kde.org</email></para></listitem>
+-<listitem><para>&Steffen.Hansen; <email>stefh@mip.ou.dk</email>.</para></listitem>
+-<listitem><para>Matthias Hoelzer-Kluepfel &Matthias.Hoelzer-Kluepfel.mail;</para></listitem>
+-<listitem><para>Martin Jones &Martin.R.Jones.mail;</para></listitem>
+-<listitem><para>&Jost.Schenck; &Jost.Schenck.mail;</para></listitem>
+-<listitem><para>&Jonathan.Singer; &Jonathan.Singer.mail;</para></listitem>
+-<listitem><para>&Thomas.Tanghus; &Thomas.Tanghus.mail;</para></listitem>
+-<listitem><para>&Krishna.Tateneni; &Krishna.Tateneni.mail;</para></listitem>
+-<listitem><para>Ellis Whitehead <email>ewhitehe@uni-freiburg.de</email></para></listitem>
+-
+-</itemizedlist>
+-<!-- TRANS:CREDIT_FOR_TRANSLATORS -->
+-
+-&underFDL;
+-&underGPL;
+-</chapter>
+-
+-</book>
+-
+-<!--
+-Local Variables:
+-mode: sgml
+-End:
+--->
+-
+--- runtime/doc/kcontrol/language/index.docbook (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/doc/kcontrol/language/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -77,6 +77,10 @@
+ <note><para>
+ Note that some applications may not be translated to your languages; in
+ this case, they will automatically fall back to US English.</para></note>
++<note><para>
++Language and Country/Region are independent settings. Changing a language
++does <emphasis>not</emphasis> automatically change the settings for numbers,
++currency &etc; to the corresponding country or region.</para></note>
+ </sect2>
-+ 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 @@
+ <sect2 id="locale-numbers">
+--- runtime/doc/kcontrol/CMakeLists.txt (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/doc/kcontrol/CMakeLists.txt (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -37,9 +37,3 @@
+ add_subdirectory(solid-device-automounter)
+ add_subdirectory(phonon)
+ endif ( Q_WS_X11 )
+-
+-########### install files ###############
+-#
+-#
+-#
+-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+--- runtime/kwalletd/backend/kwalletbackend.cc (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kwalletd/backend/kwalletbackend.cc (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -325,7 +325,8 @@
+ }
+
+ // check the password hash for correct size (currently fixed)
+- if (passwordHash.size() != 20) {
++ if (passwordHash.size() != 20 && passwordHash.size() != passwordHash.size() != 40 &&
++ passwordHash.size() != 56) {
+ return -42; // unsupported encryption scheme
+ }
+
+--- runtime/kwalletd/kwalletd.notifyrc (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kwalletd/kwalletd.notifyrc (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -86,7 +86,7 @@
+ Name[gu]=kwalletd
+ Name[he]=kwalletd
+ Name[hi]=kwalletd
+-Name[hr]=kwalletd – KNovčanik daemon
++Name[hr]=kwalletd
+ Name[hu]=kwalletd
+ Name[id]=kwalletd
+ Name[is]=kwalletd
+--- runtime/kioslave/trash/trashimpl.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kioslave/trash/trashimpl.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -1099,8 +1099,6 @@
+ if ( info.deletionDate.daysTo( currentDate ) > maxDays )
+ del( info.trashId, info.fileId );
}
+-
+- return true;
}
-- 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 @@
- */
-
- bool KSshProcess::setOptions(const SshOptList& opts) {
-- kDebug(KSSHPROC) << "KSshProcess::setOptions()";
--
- if( mVersion == UNKNOWN_VER ) {
- // we don't know the ssh version yet, so find out
- version();
-@@ -448,14 +439,12 @@
- break;
+ if ( useSizeLimit ) { // check if size limit exceeded
+--- runtime/kioslave/thumbnail/jpegthumbnail.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kioslave/thumbnail/jpegthumbnail.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -28,6 +28,7 @@
+ Name[km]=រូបភាព JPEG
+ Name[kn]=JPEG ಚಿತ್ರಗಳು
+ Name[ko]=JPEG 그림
++Name[lt]=JPEG paveikslėliai
+ Name[lv]=JPEG attēli
+ Name[mk]=JPEG-слики
+ Name[ml]=ജെപെഗ് ചിത്രങ്ങള്
+--- runtime/kioslave/thumbnail/svgthumbnail.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kioslave/thumbnail/svgthumbnail.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -28,6 +28,7 @@
+ Name[km]=រូបភាព SVG
+ Name[kn]=SVG ಚಿತ್ರಗಳು
+ Name[ko]=SVG 그림
++Name[lt]=SVG paveikslėliai
+ Name[lv]=SVG attēli
+ Name[mk]=SVG-слики
+ Name[ml]=എസ്വിജി ചിത്രങ്ങള്
+--- runtime/kioslave/thumbnail/comicbookthumbnail.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kioslave/thumbnail/comicbookthumbnail.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -27,6 +27,7 @@
+ Name[km]=សៀវភៅកំប្លែង
+ Name[kn]=ಕಾಮಿಕ್ ಪುಸ್ತಕಗಳು
+ Name[ko]=만화책
++Name[lt]=Komiksų knygos
+ Name[lv]=Komiksu grāmatas
+ Name[mai]=कॉमिक पुस्तक
+ Name[mk]=Стрипови
+--- runtime/kioslave/network/kded/networkwatcher.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kioslave/network/kded/networkwatcher.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -40,7 +40,7 @@
+ Name[mai]=नेटवर्क वाचर
+ Name[mk]=Анализатор на мрежи
+ Name[ml]=ശൃംഖല നിരീക്ഷകന്
+-Name[nb]=Nettversksovervåker
++Name[nb]=Nettverksovervåker
+ Name[nds]=Nettwark-Kieker
+ Name[nl]=Netwerkbewaker
+ Name[nn]=Nettverksovervakar
+--- runtime/kioslave/sftp/kio_sftp.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kioslave/sftp/kio_sftp.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -449,11 +449,6 @@
+
+ mUsername = user;
+ mPassword = pass;
+-
+- if (user.isEmpty()) {
+- KUser u;
+- mUsername = u.loginName();
+- }
+ }
- default:
-- kDebug(KSSHPROC) << "KSshProcess::setOptions(): "
-- "unrecognized ssh opt " << (*it).opt << endl;
-+ kDebug(KSSHPROC) << "unrecognized ssh opt " << (*it).opt;
+ void sftpProtocol::openConnection() {
+--- runtime/nepomuk/kioslaves/search/CMakeLists.txt (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/nepomuk/kioslaves/search/CMakeLists.txt (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -8,6 +8,7 @@
+ ${QT_INCLUDES}
+ ${KDE4_INCLUDES}
+ ${KDE4_KIO_INCLUDES}
++ ${SOPRANO_INCLUDE_DIR}
+ ${NEPOMUK_INCLUDE_DIR}
+ ${nepomuk_kio_slaves_SOURCE_DIR}/common
+ )
+--- runtime/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -18,10 +18,12 @@
+ Name[hi]=नेपोमक खोज मोड्यूल
+ Name[hr]=Nepomukov modul za pretraživanje
+ Name[id]=Modul Pencarian Nepomuk
++Name[is]=Nepomuk leitareining
+ Name[it]=Modulo di ricerca di Nepomuk
+ Name[ja]=Nepomuk 検索モジュール
+ Name[kk]=Nepomuk іздеу модулі
+ Name[km]=ម៉ូឌុលស្វែងរករបស់ Nepomuk
++Name[lt]=Nepomuk paieškos modulis
+ Name[mk]=Модул на Непомук за пребарување
+ Name[nb]=Nepomuk søkemodul
+ Name[nds]=Nepomuk-Söökmoduul
+@@ -58,6 +60,7 @@
+ Comment[it]=Modulo ausiliare per KIO per assicurare gli aggiornamenti automatici delle liste di ricerca di Nepomuk.
+ Comment[kk]=nepomuksearch тізімдерін автоматты түрде жаңартуға арналған KIO-нің көмекші модулі
+ Comment[km]=ម៉ឌុលកម្មវិធីជំនួយសម្រាប់ KIO ដើម្បីប្រាកដថាមានភាពធ្វើឲ្យទាន់សម័យរបស់ nepomuksearch ។
++Comment[lt]=Pagalbos modulis, skirtas KIO, užtikrinantis automatinius atnaujinimus nepomuk paieškos sąrašuose.
+ Comment[nb]=Hjelpemodul for KIO – for å sikre automatiske oppdateringer av nepomuksearch-resultater.
+ Comment[nds]=Hülpmoduul för de KDE-In-/Utgaav för automaatsch Opfrischen vun Nepomuk-Sööklisten
+ Comment[nl]=Helper-module voor KIO om automatisch bijwerken van nepomukzoeklijsten.
+--- runtime/nepomuk/kioslaves/timeline/kio_timeline.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/nepomuk/kioslaves/timeline/kio_timeline.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -68,7 +68,7 @@
+ " ?de ntao:dataObject ?r . "
+ "} "
+ #endif
+- "FILTER(?date > '%3'^^%5 && ?date < '%4'^^%5) . "
++ "FILTER(?date > '%1'^^%3 && ?date < '%2'^^%3) . "
+ "OPTIONAL { ?r2 a nfo:Folder . FILTER(?r=?r2) . } . FILTER(!BOUND(?r2)) . "
+ "}")
+ .arg(dateFrom)
+--- runtime/nepomuk/services/removablestorage/nepomukremovablestorageservice.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/nepomuk/services/removablestorage/nepomukremovablestorageservice.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -27,6 +27,7 @@
+ Name[km]=សេវាផ្ទុកចល័ររបស់ Nepomuk
+ Name[kn]=ನೆಪೋಮುಕ್ ತೆಗೆದು ಹಾಕಬಹುದಾದ ಶೇಖರಣಾ ಸೇವೆ
+ Name[ko]=Nepomuk 이동식 저장소 서비스
++Name[lt]=Nepomuk atjungiamų kaupiklių tarnyba
+ Name[lv]=Nepomuk noņemamo glabāšanas ierīču serviss
+ Name[mk]=Сервис на Непомук за подвижни медиуми
+ Name[ml]=നെപ്പോമുക്ക് സൂക്ഷിപ്പു് സേവനം
+@@ -72,6 +73,7 @@
+ Comment[kk]=Ауыстырмалы Nepomuk құрылғыда метадеректеріне қатынауды қамтамасыз етіп сақтау қызметі.
+ Comment[km]=សេវាឧបករណ៍ផ្ទុកចល័តរបស់ Nepomuk ដោយផ្ដល់ការចូលដំណើរការទៅកាន់ទិន្នន័យមេតារបស់ Nepomuk នៅលើឧបករណ៍ផ្ទុកចល័ត ។
+ Comment[ko]=Nepomuk 이동식 저장소 서비스는 이동식 저장소에 있는 Nepomuk 메타데이터를 사용합니다.
++Comment[lt]=Nepomuk atjungiamų kaupiklių tarnba, leidžianti pasiekti Nepomuk metaduomenis atjungiamuose kaupikliuose.
+ Comment[lv]=Nepomuk noņemamo ierīču serviss, nodrošina piekļuvi pie Nepomuk medatatiem failiem uz noņemamajām ierīcēm.
+ Comment[ml]=നീക്കം ചെയ്യാവുന്ന സംഭരണോപകരണങ്ങള്ക്കു് നെപ്പോമുക്ക് മെറ്റാഡാറ്റ ഉപയോഗിയ്ക്കാന് അനുവദിയ്ക്കുന്ന നെപ്പോമുക്കിന്റെ നീക്കം ചെയ്യാവുന്ന സംഭരണ സേവനം.
+ Comment[nb]=Nepomuk flyttbar lagringstjeneste som gir tilgang til Nepomuk metadata på flyttbare lagringsenheter.
+--- runtime/nepomuk/services/strigi/indexscheduler.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/nepomuk/services/strigi/indexscheduler.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -533,10 +533,27 @@
+
+
+ namespace {
++ /**
++ * Returns true if the specified folder f would already be included or excluded using the list
++ * folders
++ */
++ bool alreadyInList( const QList<QPair<QString, bool> >& folders, const QString& f, bool include )
++ {
++ bool included = false;
++ for ( int i = 0; i < folders.count(); ++i ) {
++ if ( f != folders[i].first &&
++ f.startsWith( folders[i].first ) )
++ included = folders[i].second;
++ }
++ return included == include;
++ }
++
++ /**
++ * Simple insertion sort
++ */
+ void insertSortFolders( const QStringList& folders, bool include, QList<QPair<QString, bool> >& result )
+ {
+ foreach( const QString& f, folders ) {
+- // insertion sort
+ int pos = 0;
+ while ( result.count() > pos &&
+ result[pos].first < f )
+@@ -545,9 +562,28 @@
}
}
- 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 @@
- }
+- QString constructFolderFilter( const QList<QPair<QString, bool> > folders, int& index )
++ /**
++ * Remove useless entries which would confuse the algo below.
++ * This makes sure all top-level items are include folders.
++ * This runs in O(n^2) and could be optimized but what for.
++ */
++ void cleanupList( QList<QPair<QString, bool> >& result )
+ {
+- const QString path = folders[index].first;
++ int i = 0;
++ while ( i < result.count() ) {
++ if ( result[i].first.isEmpty() ||
++ alreadyInList( result, result[i].first, result[i].second ) )
++ result.removeAt( i );
++ else
++ ++i;
++ }
++ }
++
++ QString constructFolderSubFilter( const QList<QPair<QString, bool> > folders, int& index )
++ {
++ QString path = folders[index].first;
++ if ( !path.endsWith( '/' ) )
++ path += '/';
+ const bool include = folders[index].second;
+
+ ++index;
+@@ -555,7 +591,7 @@
+ QStringList subFilters;
+ while ( index < folders.count() &&
+ folders[index].first.startsWith( path ) ) {
+- subFilters << constructFolderFilter( folders, index );
++ subFilters << constructFolderSubFilter( folders, index );
+ }
- if( mHost.isEmpty() ) {
-- kDebug(KSSHPROC) << "KSshProcess::setOptions(): "
-- "a host name must be supplied" << endl;
-+ kDebug(KSSHPROC) << "a host name must be supplied";
- return false;
+ QString thisFilter = QString::fromLatin1( "REGEX(STR(?url),'^file://%1')" ).arg( path );
+@@ -573,6 +609,20 @@
+ return subFilters.first();
+ }
}
- 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";
++
++ QString constructFolderFilter()
++ {
++ QList<QPair<QString, bool> > folders;
++ insertSortFolders( Nepomuk::StrigiServiceConfig::self()->folders(), true, folders );
++ insertSortFolders( Nepomuk::StrigiServiceConfig::self()->excludeFolders(), false, folders );
++ cleanupList( folders );
++ int index = 0;
++ QStringList subFilters;
++ while ( index < folders.count() ) {
++ subFilters << constructFolderSubFilter( folders, index );
+ }
-+ else
-+ kDebug(KSSHPROC) << "kill failed";
- }
- else
-- kDebug(KSSHPROC) << "KSshProcess::kill(): "
-- "Refusing to kill ssh process" << endl;
-+ kDebug(KSSHPROC) << "refusing to kill ssh process";
++ return subFilters.join(" && ");
++ }
}
-
-@@ -588,13 +569,12 @@
+ void Nepomuk::IndexScheduler::removeOldAndUnwantedEntries()
+@@ -581,11 +631,7 @@
+ // We now query all indexed files that are in folders that should not
+ // be indexed at once.
+ //
+- QList<QPair<QString, bool> > folders;
+- insertSortFolders( StrigiServiceConfig::self()->folders(), true, folders );
+- insertSortFolders( StrigiServiceConfig::self()->excludeFolders(), false, folders );
+- int i = 0;
+- QString folderFilter = constructFolderFilter( folders, i );
++ QString folderFilter = constructFolderFilter();
+
+ //
+ // We query all files that should not be in the store
+--- runtime/nepomuk/services/strigi/strigiserviceconfig.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/nepomuk/services/strigi/strigiserviceconfig.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -36,6 +36,8 @@
+ connect( dirWatch, SIGNAL( created( const QString& ) ),
+ this, SLOT( slotConfigDirty() ) );
+ dirWatch->addFile( KStandardDirs::locateLocal( "config", m_config.name() ) );
++
++ buildExcludeFilterRegExpCache();
+ }
- void KSshProcess::acceptHostKey(bool accept) {
-- kDebug(KSSHPROC) << "KSshProcess::acceptHostKey(accept:"
-- << accept << ")" << endl;
-+ kDebug(KSSHPROC) << "accept host key ? " << accept;
- mAcceptHostKey = accept;
+@@ -92,6 +94,7 @@
+ void Nepomuk::StrigiServiceConfig::slotConfigDirty()
+ {
+ m_config.reparseConfiguration();
++ buildExcludeFilterRegExpCache();
+ emit configChanged();
}
--void KSshProcess::setPassword(QString password) {
-- kDebug(KSSHPROC) << "KSshProcess::setPassword(password:xxxxxxxx)";
-+void KSshProcess::setPassword(const QString& password) {
-+ kDebug(KSSHPROC) << "setPassword(password:xxxxxxxx)";
- mPassword = password;
+@@ -102,11 +105,47 @@
}
-@@ -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( 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.";
- }
-
- }
-@@ -712,11 +686,8 @@
- buffer.pop_back();
++namespace {
++ /// recursively check if a folder is hidden
++ bool isDirHidden( QDir& dir ) {
++ if ( QFileInfo( dir.path() ).isHidden() )
++ return true;
++ else if ( dir.cdUp() )
++ return isDirHidden( dir );
++ else
++ return false;
++ }
++}
++
+ bool Nepomuk::StrigiServiceConfig::shouldFolderBeIndexed( const QString& path )
+ {
+- QStringList inDirs = folders();
+- QStringList exDirs = excludeFolders();
++ if ( folderInFolderList( path, folders(), excludeFolders() ) ) {
++ // check for hidden folders
++ QDir dir( path );
++ if ( !indexHiddenFolders() && isDirHidden( dir ) )
++ return false;
+
++ // reset dir
++ dir = path;
++
++ // check the filters
++ const QString dirName = dir.dirName();
++ foreach( const QRegExp& filter, m_excludeFilterRegExpCache ) {
++ if ( filter.exactMatch( dirName ) ) {
++ return false;
++ }
++ }
++
++ return true;
++ }
++ else {
++ return false;
++ }
++}
++
++
++bool Nepomuk::StrigiServiceConfig::folderInFolderList( const QString& path, const QStringList& inDirs, const QStringList& exDirs ) const
++{
+ if( inDirs.contains( path ) ) {
+ return true;
}
-
--// 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;
-
- 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;
- }
-
- 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 @@
+@@ -119,9 +158,21 @@
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;
+ }
+ else {
+- return shouldFolderBeIndexed( parent );
++ return folderInFolderList( parent, inDirs, exDirs );
}
}
-
- // 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 );
+
-+ 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
++void Nepomuk::StrigiServiceConfig::buildExcludeFilterRegExpCache()
++{
++ m_excludeFilterRegExpCache.clear();
++ foreach( const QString& filter, excludeFilters() ) {
++ QString filterRxStr = QRegExp::escape( filter );
++ filterRxStr.replace( "\\*", QLatin1String( ".*" ) );
++ filterRxStr.replace( "\\?", QLatin1String( "." ) );
++ m_excludeFilterRegExpCache << QRegExp( filterRxStr );
++ }
++}
++
+ #include "strigiserviceconfig.moc"
+--- runtime/nepomuk/services/strigi/strigiserviceconfig.h (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/nepomuk/services/strigi/strigiserviceconfig.h (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -20,6 +20,8 @@
+ #define _NEPOMUK_STRIGI_SERVICE_CONFIG_H_
+
+ #include <QtCore/QObject>
++#include <QtCore/QList>
++#include <QtCore/QRegExp>
+
+ #include <kconfig.h>
+ #include <kio/global.h>
+@@ -67,7 +69,7 @@
+ bool isInitialRun() const;
+
+ /**
+- * Check if the folder should be indexed based on
++ * Check if the folder should be indexed based on
+ * folders() and excludeFolders()
+ */
+ bool shouldFolderBeIndexed( const QString& );
+@@ -81,7 +83,14 @@
+ private:
+ StrigiServiceConfig();
+
++ bool folderInFolderList( const QString& path, const QStringList& include, const QStringList& exclude ) const;
++ void buildExcludeFilterRegExpCache();
++
+ KConfig m_config;
++
++ /// cache of regexp objects for all exclude filters
++ /// to prevent regexp parsing over and over
++ QList<QRegExp> m_excludeFilterRegExpCache;
+ };
}
-
- sftpProtocol::~sftpProtocol() {
- #ifndef Q_WS_WIN
-- kDebug(KIO_SFTP_DB) << "~sftpProtocol(): pid = " << getpid();
-+ kDebug(KIO_SFTP_DB) << "pid = " << getpid();
+--- runtime/nepomuk/services/storage/nepomukstorage.notifyrc (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/nepomuk/services/storage/nepomukstorage.notifyrc (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -172,6 +172,7 @@
+ Name[km]=បានបរាជ័យក្នុងការចាប់ផ្ដើម Nepomuk
+ Name[kn]=ನೆಪೋಮುಕ್ ಅನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ
+ Name[ko]=Nepomuk을 시작할 수 없음
++Name[lt]=Nepavyko paleisti Nepomuk
+ Name[lv]=Neizdevās palaist Nepomuk
+ Name[mk]=Не успеа стартувањето на Непомук
+ Name[ml]=നെപ്പോമുക്ക് ആരംഭിയ്ക്കുന്നതില് പരാജയപ്പെട്ടു
+@@ -216,6 +217,7 @@
+ Comment[kk]=Nepomuk семантикалық үстел жүйесі жұмысын бастай алмады
+ Comment[km]=ប្រព័ន្ធផ្ទៃតុ Nepomuk Semantic មិនអាចត្រូវបានចាប់ផ្ដើមបានទេ
+ Comment[ko]=Nepomuk 시맨틱 데스크톱을 시작할 수 없음
++Comment[lt]=Nepomuk semantinio darbastalio sistemos paleisti nepavyko
+ Comment[lv]=Nebija iespējams palaist Nepomuk semantisko darbvirsmas sistēmu
+ Comment[mk]=Системот „Непомук семантички десктоп“ не можеше да биде стартуван
+ Comment[ml]=നെപ്പോമുക്ക് സിമാന്റിക്ക് പണിയിട സിസ്റ്റം തുടങ്ങുവാന് കഴിഞ്ഞില്ല
+--- runtime/nepomuk/services/queryservice/CMakeLists.txt (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/nepomuk/services/queryservice/CMakeLists.txt (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -7,6 +7,7 @@
+ include_directories(
+ ${QT_INCLUDES}
+ ${KDE4_INCLUDES}
++ ${SOPRANO_INCLUDE_DIR}
+ ${NEPOMUK_INCLUDES}
+ )
+
+--- runtime/kstyles/themes/qtgtk.themerc (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kstyles/themes/qtgtk.themerc (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -28,6 +28,7 @@
+ Name[km]=GTK+ Style
+ Name[kn]=GTK+ ವೈಖರಿ
+ Name[ko]=GTK+ 스타일
++Name[lt]=GTK+ stilius
+ Name[lv]=GTK+ stils
+ Name[mai]=GTK+ शैली
+ Name[mk]=Стил GTK+
+@@ -83,6 +84,7 @@
+ Comment[kk]=GTK+ нақыштар тетігін қолданатын стилі
+ Comment[km]=រចនាប័ទ្មដែលប្រើម៉ាស៊ីន GTK+ theming
+ Comment[ko]=GTK+ 테마 엔진을 사용하는 스타일
++Comment[lt]=Stilius, naudojantis GTK+ temų variklį
+ Comment[lv]=Stils, kas izmanto GTK+ tēmošanas dzinēju
+ Comment[mk]=Стил што ја користи машината на теми од GTK+
+ Comment[ml]=ജിടികെ+ പ്രമേയ എഞ്ചിന് ഉപയോഗിയ്ക്കുന്ന ശൈലി
+--- runtime/kstyles/themes/qtmacintosh.themerc (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kstyles/themes/qtmacintosh.themerc (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -29,6 +29,7 @@
+ Name[km]=Mac OS X
+ Name[kn]=Max OS X
+ Name[ko]=Mac OS X
++Name[lt]=Mac OS X
+ Name[lv]=Mac OS X
+ Name[mai]=Mac OS X
+ Name[mk]=Mac OS X
+@@ -83,6 +84,7 @@
+ Comment[kk]=Apple Appearance Manager-ін қолданатын стилі
+ Comment[km]=រចនាប័ទ្មដែលប្រើកម្មវិធីគ្រប់គ្រងរូបរាងរបស់ Apple
+ Comment[ko]=Apple 모양 관리자를 사용하는 스타일
++Comment[lt]=Stilius, naudojantis Apple išvaizdos tvarkyklę
+ Comment[lv]=Stils, kas izmanto Apple Apperance Manager
+ Comment[mk]=Стил што го користи „Apple Appearance Manager“
+ Comment[ml]=ആപ്പിള് ചമയം നടത്തിപ്പുകാരനെ ഉപയോഗിയ്ക്കുന്ന രീതി
+--- runtime/kstyles/themes/qtcleanlooks.themerc (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kstyles/themes/qtcleanlooks.themerc (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -26,6 +26,7 @@
+ Name[km]=រូបរាងច្បាស់
+ Name[kn]=Cleanlooks
+ Name[ko]=Cleanlooks
++Name[lt]=Cleanlooks
+ Name[lv]=Cleanlooks
+ Name[mk]=Чист изглед
+ Name[ml]=ക്ലീന്ലുക്സ്
+@@ -74,6 +75,7 @@
+ Comment[kk]=Құрамындағы GNOME Clearlooks тәрізді нақышы өзгертілмейтін стилі
+ Comment[km]=រចនាប័ទ្ម unthemed ជាប់ដូចគ្នាទៅនឹងរូបរាងច្បាស់ពី GNOME
+ Comment[ko]=그놈의 Clearlooks와 닮은 내장 스타일
++Comment[lt]=Stilius nesusietas su tema, primenantis GNOME Clearlooks
+ Comment[lv]=Iebūvēts netēmots stils, līdzīgs Clearlooks no GNOME
+ Comment[mk]=Вграден стил без тема сличен на „Clearlooks“ од GNOME
+ Comment[ml]=ഗ്നോമിലെ ക്ലിയര്ലുക്സുമായി സാദൃശ്യമുള്ള പ്രമേയമില്ലാത്ത ഒപ്പം വരുന്ന ശൈലി
+--- runtime/kstyles/themes/qtwindowsvista.themerc (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kstyles/themes/qtwindowsvista.themerc (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -28,6 +28,7 @@
+ Name[km]=MS Windows 9x
+ Name[kn]=ಎಮ್ ಎಸ್ ವಿಂಡೋಸ್ ವಿಸ್ತಾ
+ Name[ko]=MS 윈도 비스타
++Name[lt]=MS Windows Vista
+ Name[lv]=MS Windows Vista
+ Name[mai]=MS Windows Vista
+ Name[mk]=MS Windows Vista
+@@ -81,6 +82,7 @@
+ Comment[kk]=Windows Vista стиль тетігін қолданатын стилі
+ Comment[km]=រចនាប័ទ្មដែលប្រើម៉ាស៊ីនរចនាប័ទ្ម Windows Vista
+ Comment[ko]=윈도 비스타 스타일 엔진을 사용하는 스타일
++Comment[lt]=Stilius, naudojantis Windows Vista stilių variklį
+ Comment[lv]=Stils, kas izmanto Windows Vista stila dzinēju
+ Comment[mk]=Стил што ја користи машината за стилови од Windows Vista
+ Comment[ml]=വിന്ഡോസ് വിസ്റ്റാ ശൈലി എഞ്ചിന് ഉപയോഗിയ്ക്കുന്ന ശൈലി
+--- runtime/kstyles/themes/qtwindowsxp.themerc (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kstyles/themes/qtwindowsxp.themerc (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -28,6 +28,7 @@
+ Name[km]=MS Windows 9x
+ Name[kn]=ಎಮ್ ಎಸ್ ವಿಂಡೋಸ್ ಎಕ್ಸ್ಪಿ
+ Name[ko]=MS 윈도 XP
++Name[lt]=MS Windows XP
+ Name[lv]=MS Windows XP
+ Name[mai]=MS Windows XP
+ Name[mk]=MS Windows XP
+@@ -81,6 +82,7 @@
+ Comment[kk]=Windows XP стиль тетігін қолданатын стилі
+ Comment[km]=រចនាប័ទ្មដែលប្រើម៉ាស៊ីនរចនាប័ទ្ម Windows XP
+ Comment[ko]=윈도 XP 스타일 엔진을 사용하는 스타일
++Comment[lt]=Stilius, naudojantis Windows XP stilių variklį
+ Comment[lv]=Stils, kas izmanto Windows XP stila dzinēju
+ Comment[mk]=Стил што ја користи машината за стилови од Windows XP
+ Comment[ml]=വിന്ഡോസ് എക്സ്പി ശൈലി എഞ്ചിന് ഉപയോഗിയ്ക്കുന്ന ശൈലി
+--- runtime/kstyles/themes/qtplastique.themerc (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kstyles/themes/qtplastique.themerc (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -28,6 +28,7 @@
+ Name[km]=ប្ល៉ាស្ទិក
+ Name[kn]=Plastique
+ Name[ko]=Plastique
++Name[lt]=Plastikinis
+ Name[lv]=Plastique
+ Name[mai]=प्लास्टिक
+ Name[mk]=Plastique
+@@ -79,6 +80,7 @@
+ Comment[kk]=Құрамындағы KDE3 Plastik-қа ұқсас нақыштарсыз стилі
+ Comment[km]=រចនាប័ទ្ម unthemed ដែលជាប់ដូចគ្នាទៅនឹងប្លាស្ទីកពី KDE3
+ Comment[ko]=KDE 3의 Plastik과 닮은 내장 스타일
++Comment[lt]=Nesusietas su tema stilius, panašu į KDE3 Plastik stilių
+ Comment[lv]=Iebūvēts netēmots stils, līdzīgs Plastik no KDE3
+ Comment[mk]=Вграден стил без тема сличен на „Пластик“ од KDE3
+ Comment[ml]=കെഡിഇ3യിലെ പ്ലാസ്റ്റിക്കിനോടു് സദൃശ്യമായ പ്രമേയമില്ലാത്ത ഒപ്പം വരുന്ന ശൈലി
+--- runtime/kstyles/oxygen/oxygen.themerc (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kstyles/oxygen/oxygen.themerc (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -126,7 +126,7 @@
+ Comment[mai]=अगिला पीढ़ीक डेस्कटापक शैली
+ Comment[mk]=Стил за следната генерација десктопи
+ Comment[ml]=ഭാവിതലമുറയിലെ പണിയിടത്തിനുള്ള രീതികള്
+-Comment[nb]=Stil for neste skrivebord av neste generasjon
++Comment[nb]=Stil for skrivebord av neste generasjon
+ Comment[nds]=Stil för den kamen Schriefdisch
+ Comment[ne]=पछिल्लो युगको डेस्कटपको शैली
+ Comment[nl]=De stijl voor de volgende generatie desktops
+--- runtime/kstyles/oxygen/helper.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kstyles/oxygen/helper.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -46,6 +46,7 @@
+ m_holeCache.clear();
+ m_holeFlatCache.clear();
+ m_slopeCache.clear();
++ m_grooveCache.clear();
+ m_slitCache.clear();
+ m_dockFrameCache.clear();
+ m_scrollHoleCache.clear();
+--- runtime/kurifilter-plugins/ikws/searchproviders/imdb.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kurifilter-plugins/ikws/searchproviders/imdb.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -89,3 +89,22 @@
+ X-KDE-ServiceTypes=SearchProvider
+ Keys=imdb
+ Query=http://imdb.com/find?s=all&q=\\{@}
++Query[ca]=http://imdb.com/find?s=all&q=\\{@}
++Query[ca@valencia]=http://imdb.com/find?s=all&q=\\{@}
++Query[de]=http://imdb.com/find?s=all&q=\\{@}
++Query[es]=http://imdb.com/find?s=all&q=\\{@}
++Query[et]=http://imdb.com/find?s=all&q=\\{@}
++Query[fr]=http://imdb.com/find?s=all&q=\\{@}
++Query[hr]=http://imdb.com/find?s=all&q=\\{@}
++Query[is]=http://imdb.com/find?s=all&q=\\{@}
++Query[it]=http://italian.imdb.com/find?s=all&q=\\{@}
++Query[lt]=http://imdb.com/find?s=all&q=\\{@}
++Query[nb]=http://imdb.com/find?s=all&q=\\{@}
++Query[nds]=http://imdb.com/find?s=all&q=\\{@}
++Query[nl]=http://imdb.com/find?s=all&q=\\{@}
++Query[pt]=http://imdb.com/find?s=all&q=\\{@}
++Query[pt_BR]=http://imdb.com/find?s=all&q=\\{@}
++Query[sv]=http://imdb.com/find?s=all&q=\\{@}
++Query[uk]=http://imdb.com/find?s=all&q=\\{@}
++Query[x-test]=xxhttp://imdb.com/find?s=all&q=\\{@}xx
++Query[zh_TW]=http://imdb.com/find?s=all&q=\\{@}
+--- runtime/kurifilter-plugins/ikws/searchproviders/wolfram_alpha.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kurifilter-plugins/ikws/searchproviders/wolfram_alpha.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -27,6 +27,7 @@
+ Name[km]=Wolfram Alpha
+ Name[kn]=ವೂಲ್ಫ್ರಾಮ್ ಆಲ್ಫಾ
+ Name[ko]=울프람 알파
++Name[lt]=Wolfram Alpha
+ Name[lv]=Wolfram Alpha
+ Name[mai]=वोल्फॉर्म अल्फा
+ Name[mk]=Волфрам Алфа
+--- runtime/kurifilter-plugins/ikws/searchproviders/ethicle.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kurifilter-plugins/ikws/searchproviders/ethicle.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -32,6 +32,7 @@
+ Name[km]=Ethicle
+ Name[kn]=ಎತಿಕಲ್
+ Name[ko]=Ethicle
++Name[lt]=Ethicle
+ Name[lv]=Ethicle
+ Name[mai]=एथिकल
+ Name[ml]=ഇത്തിക്കിള്
+--- runtime/kurifilter-plugins/ikws/searchproviders/php.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kurifilter-plugins/ikws/searchproviders/php.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -89,5 +89,24 @@
+ Name[zh_CN]=PHP 搜索
+ Name[zh_TW]=PHP 搜尋
+ Query=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[ca]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[ca@valencia]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[de]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[es]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[et]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[fr]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[hr]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[is]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[it]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[lt]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[nb]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[nds]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[nl]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[pt]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[pt_BR]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[sv]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[uk]=http://www.php.net/manual-lookup.php?pattern=\\{@}
++Query[x-test]=xxhttp://www.php.net/manual-lookup.php?pattern=\\{@}xx
++Query[zh_TW]=http://www.php.net/manual-lookup.php?pattern=\\{@}
+ X-KDE-ServiceTypes=SearchProvider
+ Type=Service
+--- runtime/attica/kcm/kcm_attica.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/attica/kcm/kcm_attica.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -32,6 +32,7 @@
+ Name[kk]=Open Collaboration қызмет етушісі
+ Name[km]=ការគ្រប់គ្រងអ្នកផ្ដល់សេវាសហការណ៍ចំហ
+ Name[ko]=열린 협업 서비스 공급자 관리
++Name[lt]=Open Collaboration tarnybų tvarkymas
+ Name[lv]=Open Collaboration pakalpojumu piegādātāju pārvaldība
+ Name[ml]=തുറന്ന കൊളാബൊറേഷന് സേവന ധാതാവിന്റെ കൈകാര്യം
+ Name[nb]=Åpne samarbeidstjenester – tilbyderstyring
+@@ -76,6 +77,7 @@
+ Comment[kk]=Open Collaboration қызмет етушілікті басқару
+ Comment[km]=គ្រប់គ្រងអ្នកផ្ដល់សសេវាសហការណ៍បើកចំហ
+ Comment[ko]=열린 협업 서비스 공급자 관리
++Comment[lt]=Tvarkyti Open Collaboration tarnybas
+ Comment[lv]=Pārvaldīt Open Collaboration piegādātājus
+ Comment[ml]=തുറന്ന കൊളാബൊറേഷന് സേവന ധാതാവിനെ കൈകാര്യം ചെയ്യുക
+ Comment[nb]=Styr leverandører av åpne samarbeidstjenester (OCS)
+--- runtime/drkonqi/crashedapplication.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/drkonqi/crashedapplication.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -89,7 +89,7 @@
+ std::free(savedLocale);
+ return QString::fromLocal8Bit(name != NULL ? name : "Unknown");
+ #else
+- switch (m_signalnum) {
++ switch (m_signalNumber) {
+ case 4: return QString("SIGILL");
+ case 6: return QString("SIGABRT");
+ case 8: return QString("SIGFPE");
+--- runtime/drkonqi/ui/assistantpage_bugzilla_duplicates.ui (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/drkonqi/ui/assistantpage_bugzilla_duplicates.ui (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -26,7 +26,7 @@
+ <item>
+ <widget class="StatusWidget" name="m_statusWidget" native="true">
+ <property name="sizePolicy">
+- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
++ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+--- runtime/l10n/yt/entry.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/l10n/yt/entry.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -23,6 +23,7 @@
+ Name[km]=Mayotte
+ Name[kn]=ಮೆಯೋಟ್
+ Name[ko]=마요트
++Name[lt]=Majotas
+ Name[lv]=Majota
+ Name[mai]=मयोटे
+ Name[mk]=Мајоте
+--- runtime/l10n/re/entry.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/l10n/re/entry.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -22,6 +22,7 @@
+ Name[km]=Réunion
+ Name[kn]=ರೆಯೂನಿಯನ್
+ Name[ko]=레위니옹
++Name[lt]=Reunonas
+ Name[lv]=Reunjona
+ Name[mai]=रियूनियन
+ Name[mk]=Реунион
+--- runtime/l10n/gf/entry.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/l10n/gf/entry.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -23,6 +23,7 @@
+ Name[km]=ហ្គូអ៊ីយ៉ាណា បារាំង
+ Name[kn]=ಫ್ರೆಂಚ್ ಗಯಾನ
+ Name[ko]=프랑스령 기아나
++Name[lt]=Prancūzijos Gviana
+ Name[lv]=Francijas Gviāna
+ Name[mai]=फ्रेंच गायना
+ Name[mk]=Француска Гвајана
+--- runtime/kdesu/kdesu/kdesu.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/kdesu/kdesu/kdesu.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -408,7 +408,7 @@
+ #ifdef Q_WS_X11
+ KStartupInfo::sendFinish( id );
#endif
- closeConnection();
+- exit(0);
++ exit(1);
+ }
+ if (ret == KDEsuDialog::AsUser)
+ change_uid = false;
+--- runtime/plasma/scriptengines/javascript/simplebindings/qscriptbookkeeping.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/plasma/scriptengines/javascript/simplebindings/qscriptbookkeeping.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -42,6 +42,7 @@
+ Q_DECLARE_METATYPE(Plasma::Applet*)
+ Q_DECLARE_METATYPE(Plasma::Extender*)
+ Q_DECLARE_METATYPE(Plasma::VideoWidget::Controls)
++Q_DECLARE_METATYPE(Plasma::Svg*)
+
+ Q_DECLARE_METATYPE(AppletInterface*)
+
+@@ -167,12 +168,24 @@
+ return engine->newQObject(const_cast<QGraphicsWidget *>(anim), QScriptEngine::AutoOwnership, QScriptEngine::PreferExistingWrapperObject);
}
-@@ -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 qGraphicsWidgetFromQScriptValue(const QScriptValue &scriptValue, QGraphicsWidgetPtr &anim)
++void graphicsWidgetFromQScriptValue(const QScriptValue &scriptValue, QGraphicsWidgetPtr &anim)
{
-- kDebug(KIO_SFTP_DB) << "copy(): " << src << " -> " << dest;
-+ kDebug(KIO_SFTP_DB) << src << " -> " << dest;
+ QObject *obj = scriptValue.toQObject();
+ anim = static_cast<QGraphicsWidget *>(obj);
+ }
- bool srcLocal = src.isLocalFile();
- bool destLocal = dest.isLocalFile();
-@@ -210,7 +210,7 @@
++typedef Plasma::Svg * SvgPtr;
++QScriptValue qScriptValueFromSvg(QScriptEngine *engine, const SvgPtr &anim)
++{
++ return engine->newQObject(const_cast<Plasma::Svg *>(anim), QScriptEngine::AutoOwnership, QScriptEngine::PreferExistingWrapperObject);
++}
++
++void svgFromQScriptValue(const QScriptValue &scriptValue, SvgPtr &anim)
++{
++ QObject *obj = scriptValue.toQObject();
++ anim = static_cast<Plasma::Svg *>(obj);
++}
++
+ typedef Plasma::Extender *ExtenderPtr;
+ QScriptValue qScriptValueFromExtender(QScriptEngine *engine, const ExtenderPtr &extender)
+ {
+@@ -223,7 +236,8 @@
- void sftpProtocol::sftpCopyGet(const KUrl& dest, const KUrl& src, int mode, KIO::JobFlags flags)
+ void registerSimpleAppletMetaTypes(QScriptEngine *engine)
{
-- kDebug(KIO_SFTP_DB) << "sftpCopyGet(): " << src << " -> " << dest;
-+ kDebug(KIO_SFTP_DB) << src << " -> " << dest;
+- qScriptRegisterMetaType<QGraphicsWidget*>(engine, qScriptValueFromQGraphicsWidget, qGraphicsWidgetFromQScriptValue);
++ qScriptRegisterMetaType<QGraphicsWidget*>(engine, qScriptValueFromQGraphicsWidget, graphicsWidgetFromQScriptValue);
++ qScriptRegisterMetaType<Plasma::Svg*>(engine, qScriptValueFromSvg, svgFromQScriptValue);
+
+ qScriptRegisterMetaType<KConfigGroup>(engine, qScriptValueFromKConfigGroup, kConfigGroupFromScriptValue, QScriptValue());
+ qScriptRegisterMetaType<KJob *>(engine, qScriptValueFromKJob, qKJobFromQScriptValue);
+--- runtime/plasma/scriptengines/javascript/simplebindings/appletinterface.h (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/plasma/scriptengines/javascript/simplebindings/appletinterface.h (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -58,6 +58,7 @@
+ Q_ENUMS(QtAlignment)
+ Q_ENUMS(QtMouseButton)
+ Q_ENUMS(AnimationDirection)
++ Q_ENUMS(IntervalAlignment)
+ Q_PROPERTY(AspectRatioMode aspectRatioMode READ aspectRatioMode WRITE setAspectRatioMode)
+ Q_PROPERTY(FormFactor formFactor READ formFactor)
+ Q_PROPERTY(Location location READ location)
+@@ -190,6 +191,12 @@
+ AnimationForward = QAbstractAnimation::Forward,
+ AnimationBackward = QAbstractAnimation::Backward
+ };
++
++enum IntervalAlignment {
++ NoAlignment = 0,
++ AlignToMinute,
++ AlignToHour
++};
+ //-------------------------------------------------------------------
+
+ Q_INVOKABLE void gc();
+--- runtime/plasma/scriptengines/javascript/simplebindings/easingcurve.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/plasma/scriptengines/javascript/simplebindings/easingcurve.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -17,6 +17,7 @@
+ */
+
+ #include <QEasingCurve>
++#include <QMetaEnum>
+ #include <QScriptValue>
+ #include <QScriptEngine>
+ #include <QScriptContext>
+@@ -55,13 +56,20 @@
- // 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;
+ if (ctx->argumentCount()) {
+ QScriptValue arg = ctx->argument(0);
++
++ qint32 type = -1;
+ if (arg.isNumber()) {
+- qint32 type = arg.toInt32();
++ type = arg.toInt32();
++ } else if (arg.isString()) {
++ QMetaObject meta = QEasingCurve::staticMetaObject;
++ QMetaEnum easingCurveEnum = meta.enumerator(meta.indexOfEnumerator("Type"));
++
++ type = easingCurveEnum.keyToValue(arg.toString().toAscii().data());
++ }
+ if (type > -1 && type < QEasingCurve::Custom) {
+ self->setType(static_cast<QEasingCurve::Type>(type));
}
}
+- }
-@@ -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();
+ return QScriptValue(eng, self->type());
}
-
-@@ -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()
- {
- 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";
- }
-
- 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();
- }
-
- void sftpProtocol::slave_status() {
-- kDebug(KIO_SFTP_DB) << "slave_status(): connected to "
-- << mHost << "? " << mConnected << endl;
--
-+ kDebug(KIO_SFTP_DB) << "connected to " << mHost << "? " << mConnected;
- slaveStatus ((mConnected ? mHost : QString()), mConnected);
- }
-
-@@ -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;
- }
-
-@@ -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;
- }
-
- /** 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);
--
-- 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)
- {
-- // 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;
- }
-
-@@ -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
- {
-- _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;
-
- // 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);
-
- // draw the slider itself
- QRectF rect = r.adjusted(3, horizontal ? 2 : 4, -3, -3);
-+ if (!rect.isValid()) // e.g. not enough height
-+ return;
-
- // gradients
- QLinearGradient sliderGradient( rect.topLeft(), horizontal ? rect.bottomLeft() : rect.topRight());
-@@ -3034,6 +3033,16 @@
- {
- 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
+--- runtime/plasma/scriptengines/javascript/simplebindings/icon.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104126)
++++ runtime/plasma/scriptengines/javascript/simplebindings/icon.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104126)
+@@ -34,7 +34,8 @@
+ if (ctx->argumentCount() > 0) {
+ QScriptValue v = ctx->argument(0);
+ if (v.isString()) {
+- return qScriptValueFromValue(eng, KIcon(v.toString()));
++ QIcon icon = KIcon(v.toString());
++ return qScriptValueFromValue(eng, icon);
+ } else if (v.isVariant()) {
+ QVariant variant = v.toVariant();
+ QPixmap p = variant.value<QPixmap>();
projects / packages / kde4-kdebase-runtime.git / blobdiff