---- runtime/knotify/notifybyktts.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/knotify/notifybyktts.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -61,7 +61,7 @@
- QString error;
- if (KToolInvocation::startServiceByDesktopName("kttsd", QStringList(), &error))
- {
-- KMessageBox::error(0, i18n( "Starting KTTSD Failed"), error );
-+ KMessageBox::error(0, i18n( "Starting Jovie Text-to-Speech Service Failed"), error );
- tryToStartKttsd = true;
- return;
- }
---- runtime/knotify/kde.notifyrc (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/knotify/kde.notifyrc (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -89,7 +89,7 @@
- Name[hne]=घुरवा: खाली होगे
- Name[hr]=Otpad: Ispražnjeno
- Name[hsb]=Papjernik: wuprózdnjeny
--Name[hu]=Szemétkosár: kiürítve
-+Name[hu]=Kuka: kiürítve
- Name[ia]=Corbe: vacuate
- Name[id]=Tempat Sampah: Dikosongkan
- Name[is]=Ruslið: tæmt
-@@ -166,7 +166,7 @@
- Comment[hne]=घुरवा ल खाली करे गे
- Comment[hr]=Otpad je ispražnjen
- Comment[hsb]=Papjernik je wuprózdnjeny
--Comment[hu]=A szemétkosár kiürült
-+Comment[hu]=A kuka kiürült
- Comment[ia]=Le corbe ha essite vacuate
- Comment[id]=Tempat sampah telah dikosongkan
- Comment[is]=Ruslatunnan hefur verið tæmd
---- runtime/knotify/notifybypopup.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/knotify/notifybypopup.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -28,6 +28,7 @@
- #include <kdialog.h>
- #include <khbox.h>
- #include <kvbox.h>
-+#include <kcharsets.h>
-
- #include <QBuffer>
- #include <QImage>
-@@ -503,6 +504,8 @@
- QString NotifyByPopup::stripHtml( const QString &text )
- {
- QXmlStreamReader r( "<elem>" + text + "</elem>" );
-+ HtmlEntityResolver resolver;
-+ r.setEntityResolver( &resolver );
- QString result;
- while( !r.atEnd() ) {
- r.readNext();
-@@ -530,4 +533,22 @@
- return result;
+--- runtime/knotify/knotify4.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/knotify/knotify4.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -99,7 +99,7 @@
+ Comment[el]=Δαίμονας ειδοποιήσεων του KDE
+ Comment[en_GB]=KDE Notification Dæmon
+ Comment[eo]=KDE atentigo-demono
+-Comment[es]=Servicio de notificaciones de KDE
++Comment[es]=Demonio de notificaciones de KDE
+ Comment[et]=KDE märguannete deemon
+ Comment[eu]=KDE jakinarazpen deabrua
+ Comment[fa]=شبح اخطار KDE
+--- runtime/solid-device-automounter/kded/device_automounter.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/solid-device-automounter/kded/device_automounter.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -46,6 +46,7 @@
+ Name[pt]=Montagem Automática dos Dispositivos Removíveis
+ Name[pt_BR]=Auto-montador de Dispositivo Removível
+ Name[ro]=Montator automat de dispozitive amovibile
++Name[ru]=Подключение внешних носителей
+ Name[sk]=Automatické pripájanie vymeniteľných zariadení
+ Name[sl]=Samodejno priklapljanje odstranljivih naprav
+ Name[sr]=Аутомонтер уклоњивих уређаја
+@@ -96,6 +97,7 @@
+ Comment[pl]=Automatycznie montuje urządzenia
+ Comment[pt]=Monta automaticamente os dispositivos à medida das necessidades
+ Comment[pt_BR]=Monta automaticamente dispositivos quando necessário
++Comment[ru]=Автоматически подключает внешние носители информации
+ Comment[sk]=Automaticky pripojí zariadenia podľa potreby
+ Comment[sl]=Samodejno po potrebi priklopi naprave
+ Comment[sr]=Аутоматско монтирање уређаја по потреби
+--- runtime/kcontrol/componentchooser/componentchooser.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/kcontrol/componentchooser/componentchooser.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -27,7 +27,7 @@
+ Name[el]=Προκαθορισμένες εφαρμογές
+ Name[en_GB]=Default Applications
+ Name[eo]=Defaŭltaj aplikaĵoj
+-Name[es]=Aplicaciones predefinidas
++Name[es]=Aplicaciones predeterminadas
+ Name[et]=Vaikimisi rakendused
+ Name[eu]=Aplikazio lehenetsiak
+ Name[fa]=کاربردهای پیشفرض
+--- runtime/kcontrol/componentchooser/componentservices/kcm_kemail.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_kemail.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -84,7 +84,7 @@
+ Comment[el]=Αυτή η υπηρεσία σας επιτρέπει να ρυθμίσετε τον προκαθορισμένο πελάτη email σας. Όλες οι εφαρμογές του KDE που χρειάζονται πρόσβαση σε μια εφαρμογή πελάτη email θα πρέπει να χρησιμοποιούν αυτή τη ρύθμιση.
+ Comment[en_GB]=This service allows you to configure your default email client. All KDE applications which need access to an email client application should honour this setting.
+ Comment[eo]=Tiu servo ebligas, ke vi elektas vian defaŭltan retpoŝtilon. Ĉiuj KDEaj aplikoj, kiuj bezonas retpoŝtilon, uzos tiun agordon.
+-Comment[es]=Este servicio le permite configurar su cliente de correo predefinido. Todas las aplicaciones KDE que precisan acceso a una aplicación de cliente de correo deberían reconocer esta opción.
++Comment[es]=Este servicio le permite configurar su cliente de correo predeterminado. Todas las aplicaciones KDE que precisen acceso a una aplicación de cliente de correo deberían reconocer esta opción.
+ Comment[et]=See teenus võimaldab sul määrata kindlaks vaikimisi kasutatava e-posti kliendi. Kõik KDE rakendused, mis vajavad mingil moel e-posti klienti, peaksid arvestama selle seadega.
+ Comment[eu]=Zerbitzu honen bidez zure posta eletronikoko bezero lehenetsia konfigura dezakezu. Posta elektroniko bezeroa behar duten KDE aplikazio guztiek ezarpen hau errespetatu egin beharko lukete.
+ Comment[fa]=این خدمت به شما اجازۀ پیکربندی کارخواه رایانامۀ پیشفرضتان را میدهد. همۀ کاربردهای KDE که نیاز به دستیابی به کاربردهای کارخواه رایانامه دارند، باید این تنظیم را قبول کنند.
+--- runtime/kcontrol/componentchooser/componentservices/kcm_browser.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_browser.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -84,7 +84,7 @@
+ Comment[el]=Εδώ μπορείτε να ρυθμίσετε τον προκαθορισμένο περιηγητή ιστού σας. Όλες οι εφαρμογές του KDE στις οποίες μπορείτε να επιλέξετε υπερσυνδέσεις θα πρέπει να χρησιμοποιούν αυτή τη ρύθμιση.
+ Comment[en_GB]=Here you can configure your default web browser. All KDE applications in which you can select hyperlinks should honour this setting.
+ Comment[eo]=Tiu servo ebligas, ke vi elektas vian defaŭltan retumilon. Ĉiuj KDE-aplikaĵoj, en kiuj vi povas elekti retligilojn, uzos tiun agordon.
+-Comment[es]=Este servicio le permite configurar su navegador de Internet predeterminado. Todas las aplicaciones KDE que precisan acceso a hiperenlaces deberían reconocer esta opción.
++Comment[es]=Este servicio le permite configurar su navegador web predeterminado. Todas las aplicaciones KDE que le permitan seleccionar hiperenlaces deberían reconocer esta opción.
+ Comment[et]=Siin saab seadistada vaikimisi kasutatavat brauserit. Kõik KDE rakendused, kus saab valida hüperlinke, peaksid siinsete seadistustega arvestama.
+ Comment[eu]=Hemen zure web arakatzaile lehenetsia konfigura dezakezu. Aukera honek estekak darabiltzaten KDEren aplikazio guztiei eragin behar die.
+ Comment[fa]=در اینجا میتوانید مرورگر وب پیشفرض خود را پیکربندی کنید. همۀ کاربردهای KDE که میتوانید ابرپیوندها را در آن گزینش کنید، باید این تنظیمات را قبول کنند.
+--- runtime/kcontrol/componentchooser/componentservices/kcm_terminal.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_terminal.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -84,7 +84,7 @@
+ Comment[el]=Αυτή η υπηρεσία σας επιτρέπει να ρυθμίσετε τον προκαθορισμένο προσομοιωτή τερματικού σας. Όλες οι εφαρμογές του KDE που καλούν μια εφαρμογή προσομοιωτή τερματικού θα πρέπει να τηρούν αυτήν τη ρύθμιση.
+ Comment[en_GB]=This service allows you to configure your default terminal emulator. All KDE applications which invoke a terminal emulator application should honour this setting.
+ Comment[eo]=Tiu servo ebligas, ke vi elektas vian defaŭltan terminalon. Ĉiuj KDEaj aplikoj, kiuj bezonas terminalon, uzos tiun agordon.
+-Comment[es]=Este servicio le permite configurar su emulador de terminal predefinido. Todas las aplicaciones KDE que invoquen un emulador de terminal deberían reconocer esta opción.
++Comment[es]=Este servicio le permite configurar su emulador de terminal predeterminado. Todas las aplicaciones KDE que invoquen un emulador de terminal deberían reconocer esta opción.
+ Comment[et]=See teenus võimaldab sul määrata kindlaks vaikimisi kasutatava terminaliemulaatori. Kõik KDE rakendused, mis vajavad mingil moel terminaliemulaatorit, peaksid arvestama selle seadega.
+ Comment[eu]=Zerbitzu honen bidez zure terminal emuladore lehenetsia konfiguradezakezu. Terminal emuladore bati deitzen dioten KDEren aplikazio guztiek ezarpen hau onartu egin beharko lukete.
+ Comment[fa]=این خدمت به شما اجازۀ پیکربندی مقلد پایانۀ پیشفرضتان را میدهد. همۀ کاربردهای KDE که نیاز به دستیابی به کاربردهای کارخواه رایانامه دارند، باید این تنظیم را قبول کنند.
+--- runtime/phonon/platform_kde/phononbackend.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/phonon/platform_kde/phononbackend.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -16,7 +16,7 @@
+ Name[el]=Σύστημα υποστήριξης πολυμέσων του KDE
+ Name[en_GB]=KDE Multimedia Backend
+ Name[eo]=KDE Interna Interfaco de Aŭdvida legilo
+-Name[es]=Reproductor multimedia
++Name[es]=Motor multimedia de KDE
+ Name[et]=KDE multimeedia taustaprogramm
+ Name[eu]=KDE multimedia interfazea
+ Name[fi]=KDE-multimediataustaosa
+--- runtime/phonon/kded-module/phononserver.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/phonon/kded-module/phononserver.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -70,7 +70,7 @@
+ Comment[et]=Helisüsteemi reeglite edastamine rakendustele
+ Comment[eu]=Aplikazioei soinu sistemaren politika hornitzen die
+ Comment[fi]=Tarjoaa äänijärjestelmäkäytännön sovelluksille
+-Comment[fr]=Fournis une politique de système sonore aux applications
++Comment[fr]=Fournit une politique de système sonore aux applications
+ Comment[fy]=Jout lûd systeem belied oan applikaasjes
+ Comment[ga]=Soláthraíonn sé polasaí fuaime d'fheidhmchláir
+ Comment[he]=מספק נהלי מערכת השמע עבור יישומים
+--- runtime/khelpcenter/glossary.cpp (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/khelpcenter/glossary.cpp (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -322,8 +322,7 @@
+ .arg( i18n( "KDE Glossary" ) )
+ .arg( entry.term() )
+ .arg( entry.definition() )
+- .arg( seeAlso)
+- .arg( View::langLookup( QLatin1String("khelpcenter/kdelogo2.png") ) );
++ .arg( seeAlso );
}
-+QString NotifyByPopup::HtmlEntityResolver::resolveUndeclaredEntity(
-+ const QString &name )
-+{
-+ QString result =
-+ QXmlStreamEntityResolver::resolveUndeclaredEntity(name);
-+ if( !result.isEmpty() )
-+ return result;
-+
-+ QChar ent = KCharsets::fromEntity( '&' + name );
-+ if( ent.isNull() ) {
-+ kWarning(300) << "Notification to send to backend which does "
-+ "not support HTML, contains invalid entity: "
-+ << name;
-+ ent = ' ';
-+ }
-+ return QString(ent);
-+}
-+
- #include "notifybypopup.moc"
---- runtime/knotify/hardwarenotifications.notifyrc (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/knotify/hardwarenotifications.notifyrc (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -101,6 +101,7 @@
- Comment[sr@latin]=Obaveštenja koja okida Solid
- Comment[sv]=Underrättelser utlösta av Solid
- Comment[th]=การแจ้งให้ทราบต่าง ๆ ที่ถูกกระตุ้นจาก Solid
-+Comment[tr]=Solid tarafından tetiklenen bildirimler
- Comment[uk]=Сповіщення, спричинені solid
- Comment[x-test]=xxNotifications triggered by solidxx
- Comment[zh_CN]=Solid 触发的通知
-@@ -158,6 +159,7 @@
- Name[sr@latin]=Greška u montiranju ili demontiranju
- Name[sv]=Monterings- eller avmonteringsfel
- Name[th]=เมานท์หรือเลิกเมานท์ผิดพลาด
-+Name[tr]=Bağlama veya ayırma hatası
- Name[uk]=Помилка монтування або демонтування
- Name[x-test]=xxMount or unmount errorxx
- Name[zh_CN]=挂载或卸载错误
-@@ -209,6 +211,7 @@
- Comment[sr@latin]=Problem pri montiranju ili demontiranju uređaja
- Comment[sv]=Ett problem har uppstått vid montering eller avmontering av en enhet
- Comment[th]=เกิดปัญหาขึ้นในระหว่างทำการเมานท์หรือเลิกเมานท์อุปกรณ์
-+Comment[tr]=Bir aygıtı bağlama veya ayırma sırasında bir sorun oluştu
- Comment[uk]=Під час спроби монтування або демонтування пристрою сталася помилка
- Comment[x-test]=xxThere has been a problem mounting or unmounting a devicexx
- Comment[zh_CN]=挂载或卸载设备时出现问题
---- runtime/knotify/notifybypopup.h (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/knotify/notifybypopup.h (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -26,6 +26,7 @@
- #include <QMap>
- #include <QHash>
- #include <QStringList>
-+#include <QXmlStreamEntityResolver>
-
- class KPassivePopup;
-
-@@ -113,6 +114,15 @@
- * Maps knotify notification IDs to DBus notifications IDs
- */
- QHash<int,uint> m_idMap;
-+
-+ /**
-+ * A class for resolving HTML entities in XML documents (used
-+ * during HTML stripping)
-+ */
-+ class HtmlEntityResolver : public QXmlStreamEntityResolver
-+ {
-+ QString resolveUndeclaredEntity( const QString &name );
-+ };
- };
-
- #endif
---- runtime/solid-device-automounter/kded/device_automounter.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/solid-device-automounter/kded/device_automounter.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -27,6 +27,7 @@
- Name[hr]=Automatski monter uklonjivih uređaja
- Name[ia]=Automounter de Dispositivo Removibile
- Name[id]=Pengait Otomatis Divais Dapat Dilepas
-+Name[is]=Sjálfvirk tenging fjarlægjanlegra geymslumiðla
- Name[it]=Montaggio automatico dei dispositivi rimovibili
- Name[ja]=リムーバブルデバイスの自動マウント
- Name[kk]=Ауыстырмалы құрылғының автоттіркегіші
-@@ -78,6 +79,7 @@
- Comment[hr]=Automatski montira uređaje po potrebi
- Comment[ia]=Il monta automaticamente le dispositivos como il necessita
- Comment[id]=Secara otomatis mengaitkan divais ketika diperlukan
-+Comment[is]=Tengir tæki sjálfvirkt eftir þörfum inn í skráakerfi
- Comment[it]=Monta automaticamente i dispositivi secondo necessità
- Comment[ja]=必要に応じて自動的にデバイスをマウントします
- Comment[kk]=Құрылғыны керек кезде автоматты түрде тіркеу
-@@ -103,6 +105,7 @@
- Comment[sv]=Monterar automatiskt enheter efter behov
- Comment[tg]=Дастгоҳҳоро ба худкор васл мекунад
- Comment[th]=ต้องการอุปกรณ์ต่าง ๆ ที่จะให้ทำการเมานท์อัตโนมัติ
-+Comment[tr]=Aygıtları gerektiğinde otomatik olarak bağlar
- Comment[uk]=Автоматичне монтування пристроїв за вимогою
- Comment[x-test]=xxAutomatically mounts devices as neededxx
- Comment[zh_CN]=按需自动挂载设备
---- runtime/solid-device-automounter/kcm/device_automounter_kcm.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/solid-device-automounter/kcm/device_automounter_kcm.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -30,6 +30,7 @@
- Name[he]=התקנים נשלפים
- Name[hi]=हटाने लायक औज़ार
- Name[hr]=Uklonjivi uređaji
-+Name[hu]=Cserélhető eszközök
- Name[ia]=Dispositivos removibile
- Name[id]=Divais Dapat Dilepaskan
- Name[is]=Útskiptanleg tæki
-@@ -89,6 +90,7 @@
- Comment[hr]=Podesi automatsko korištenje uklonjivih medija za pohranu
- Comment[ia]=Il configura le tractamento automatic de media de storage removibile
- Comment[id]=Mengatur penanganan otomatis dari media penyimpanan dapat dilepas
-+Comment[is]=Stilla sjálfvirka meðhöndlun á fjarlægjanlegum geymslumiðlum
- Comment[it]=Configura la gestione automatica dei supporti rimovibili
- Comment[ja]=リムーバブルストレージメディアの自動処理を設定
- Comment[kk]=Ауыстырмалы сақтағыш тасушылармен автоматты түрде айналысуды баптау
---- runtime/localization/currency/aed.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/aed.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -7,6 +7,7 @@
- Name[bn]=সংযুক্ত আরব আমিরশাহি ডারহাম
- Name[ca]=Dírham de la Unió dels Emirats Àrabs
- Name[ca@valencia]=Dírham de la Unió dels Emirats Àrabs
-+Name[cs]=Dirham Spojených arabských emirátů
- Name[csb]=Dirma ze Zjednónych Abrabsczich Emiratów
- Name[da]=Forenende Arabiske Emirater dirham
- Name[de]=VAE-Dirham
---- runtime/localization/currency/pgk.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/pgk.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -25,6 +25,7 @@
- Name[hu]=Pápua új-guineai kina
- Name[ia]=Papua Nove Guinean Kina
- Name[id]=Kina Papua Nugini
-+Name[is]=Papúa Nýju-gíneskt kina
- Name[it]=Kina papuana
- Name[ja]=パプアニューギニア・キナ
- Name[kk]=Папуа - Жаңа Гвинея кинасы
---- runtime/localization/currency/xof.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/xof.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -23,6 +23,7 @@
- Name[gu]=પશ્ચિમ આફ્રિકન CFA ફ્રાન્ક
- Name[he]=West African CFA Franc
- Name[hr]=Zapadno afrički CFA frank
-+Name[hu]=Nyugat-Afrikai CFA frank
- Name[ia]=CFA Franc de Africa Occidental
- Name[id]=CFA Franc Afrika Barat
- Name[is]=Vestur-afrískur CFA franki
---- runtime/localization/currency/top.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/top.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -22,6 +22,7 @@
- Name[hu]=Tongai pa'anga
- Name[ia]=Tongan Pa'anga
- Name[id]=Pa'anga Tonga
-+Name[is]=Tongóskt pa'anga
- Name[it]=Paʻanga tongano
- Name[ja]=トンガ・パ・アンガ
- Name[kk]=Тонго паангасы
---- runtime/localization/currency/ang.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/ang.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -7,6 +7,7 @@
- Name[bn]=নেদারল্যাণ্ডস অ্যান্টিলেস গিল্ডার
- Name[ca]=Florí de les Antilles Holandeses
- Name[ca@valencia]=Florí de les Antilles Holandeses
-+Name[cs]=Holandsko-antilský gulden
- Name[csb]=Gùlider z Hòlandzczich Antilów
- Name[da]=Gylden, Hollandske Antiller
- Name[de]=Niederländische-Antillen-Gulden
---- runtime/localization/currency/srd.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/srd.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -8,6 +8,7 @@
- Name[bn]=সুরিনাম ডলার
- Name[ca]=Dòlar de Surinam
- Name[ca@valencia]=Dòlar de Surinam
-+Name[cs]=Surinamský dolar
- Name[csb]=Surinamsczi Dolar
- Name[da]=Surinamsk dollar
- Name[de]=Suriname-Dollar
---- runtime/localization/currency/tpe.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/tpe.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -22,6 +22,7 @@
- Name[hu]=Portugál-timori escudo
- Name[ia]=Portugese Timorese Escudo
- Name[id]=Escudo Timor Portugis
-+Name[is]=Portúgalska Tímorskt Eskúdó
- Name[it]=Escudo del Timor portoghese
- Name[ja]=ポルトガル領ティモール・エスクード
- Name[kk]=Португал Тимордың эскудосы
---- runtime/localization/currency/srg.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/srg.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -7,6 +7,7 @@
- Name[bn]=সুরিনাম গিল্ডার
- Name[ca]=Florí de Surinam
- Name[ca@valencia]=Florí de Surinam
-+Name[cs]=Surinamský gulden
- Name[csb]=Surinamsczi Gùlden
- Name[da]=Surinamsk gylden
- Name[de]=Suriname-Gulden
---- runtime/localization/currency/pab.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/pab.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -26,6 +26,7 @@
- Name[hu]=Panamai balboa
- Name[ia]=Panamanian Balboa
- Name[id]=Balboa Panama
-+Name[is]=Panamaskt balboa
- Name[it]=Balboa panamense
- Name[ja]=パナマ・ボルボア
- Name[kk]=Панама балбоасы
---- runtime/localization/currency/mvr.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/mvr.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -26,6 +26,7 @@
- Name[hu]=Maldív-szigeteki rúfia
- Name[ia]=Maldivian Rufiyaa
- Name[id]=Rufiyaa Maladewa
-+Name[is]=Maldivísk rufiyaa
- Name[it]=Rupia maldiviana
- Name[ja]=モルディブ・ルフィヤ
- Name[kk]=Мальдивия руфиясы
---- runtime/localization/currency/szl.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/szl.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -24,6 +24,7 @@
- Name[hu]=Szváziföldi lilangeni
- Name[ia]=Swazi Lilangeni
- Name[id]=Lilangeni Swaziland
-+Name[is]=Svasílenskt lilagreni
- Name[it]=Lilangeni dello Swaziland
- Name[ja]=スワジランド・リランゲニ
- Name[kk]=Свазиленд лилангениі
---- runtime/localization/currency/xaf.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/xaf.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -24,6 +24,7 @@
- Name[he]=Central African CFA Franc
- Name[hi]=सेंट्रल अफ्रीकन CFA फ्रांक
- Name[hr]=CFA Franak Centralne Afrike
-+Name[hu]=Közép-Afrikai CFA frank
- Name[ia]=CFA Franc de Africa Central
- Name[id]=Franc CFA Afrika Tengah
- Name[is]=Mið-Afríkulýðveldis CFA franki
---- runtime/localization/currency/mop.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/mop.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -25,6 +25,7 @@
- Name[hu]=Makaói pataca
- Name[ia]=Macanese Pataca
- Name[id]=Pataca Macau
-+Name[is]=Makaneskt pataka
- Name[it]=Pataca di Macao
- Name[ja]=マカオ・パタカ
- Name[kk]=Аомынь (Макао) патакасы
---- runtime/localization/currency/std.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/std.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -25,6 +25,7 @@
- Name[hu]=Sao Tome és Principe-i dobra
- Name[ia]=San Tomé and Príncipe Dobra
- Name[id]=Dobra São Tomé dan Príncipe
-+Name[is]=Saó Tóme og Prinsípeskt dobra
- Name[it]=Dobra di São Tomé e Príncipe
- Name[ja]=サントメ・プリンシペ・ドブラ
- Name[kk]=Сан-Томе және Принсипи добрасы
---- runtime/localization/currency/sll.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/sll.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -25,6 +25,7 @@
- Name[hu]=Sierra Leone-i leone
- Name[ia]=Sierra Leonean Leone
- Name[id]=Leone Sierra Leone
-+Name[is]=Síerra Leóneskt león
- Name[it]=Leone della Sierra Leone
- Name[ja]=シエラレオネ・レオン
- Name[kk]=Съера-Леоне леонесі
---- runtime/localization/currency/tjs.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/tjs.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -25,6 +25,7 @@
- Name[hu]=Tádzsik szomoni
- Name[ia]=Tajikistani Somoni
- Name[id]=Somoni Tajikistan
-+Name[is]=Tadsjikiskut somoni
- Name[it]=Somoni tagico
- Name[ja]=タジキスタン・ソモニ
- Name[kk]=Тәжікстан сомониі
---- runtime/localization/currency/tzs.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/tzs.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -28,6 +28,7 @@
- Name[hu]=Tanzániai shilling
- Name[ia]=Tanzanian Shilling
- Name[id]=Shilling Tanzania
-+Name[is]=Tansanískur skildingur
- Name[it]=Scellino tanzaniano
- Name[ja]=タンザニア・シリング
- Name[kk]=Танзания шиллингі
---- runtime/localization/currency/bov.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/bov.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -7,6 +7,7 @@
- Name[bn]=বলিভিয়ার Mvdol
- Name[ca]=Mvdol de Bolívia
- Name[ca@valencia]=Mvdol de Bolívia
-+Name[cs]=Bolívijský mvdol
- Name[csb]=Bòliwijsczé Mvdole
- Name[da]=Boliviansk mvdol
- Name[de]=Bolivianischer Mvdol
---- runtime/localization/currency/svc.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/svc.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -23,6 +23,7 @@
- Name[hu]=Salvadori colon
- Name[ia]=Salvadoran Colon
- Name[id]=Colon Salvador
-+Name[is]=Salvadorskur kólon
- Name[it]=Colón salvadoregno
- Name[ja]=エルサルバドル・コロン
- Name[kk]=Сальвадор колоны
---- runtime/localization/currency/bif.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/bif.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -8,6 +8,7 @@
- Name[bn]=বুরুন্ডির ফ্রাঙ্ক
- Name[ca]=Franc de Burundi
- Name[ca@valencia]=Franc de Burundi
-+Name[cs]=Burundský frank
- Name[csb]=Burundzczi Frank
- Name[da]=Burundisk franc
- Name[de]=Burundi-Franc
---- runtime/localization/currency/mzm.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/mzm.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -24,6 +24,7 @@
- Name[hu]=Mozambiki metical
- Name[ia]=Mozambican Metical
- Name[id]=Metical Mozambik
-+Name[is]=Mósambískt metical
- Name[it]=Metical mozambicano
- Name[ja]=モザンビーク・メティカル
- Name[kk]=Мозамбик метикалы
---- runtime/localization/currency/mzn.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/mzn.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -24,6 +24,7 @@
- Name[hu]=Mozambiki metical
- Name[ia]=Mozambican Metical
- Name[id]=Metical Mozambik
-+Name[is]=Mósambískt metical
- Name[it]=Metical mozambicano
- Name[ja]=モザンビーク・メティカル
- Name[kk]=Мозамбик метикалы
---- runtime/localization/currency/nio.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/nio.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -24,6 +24,7 @@
- Name[hu]=Nicaraguai córdoba
- Name[ia]=Nicaraguan Cordoba Oro
- Name[id]=Cordoba Oro Nikaragua
-+Name[is]=Níkaragvaskt Cordoba Oro
- Name[it]=Córdoba nicaraguense
- Name[ja]=コルドバ・オロ
- Name[kk]=Никарагуа кордоба оросы
---- runtime/localization/currency/tmm.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/tmm.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -25,6 +25,7 @@
- Name[hu]=Régi türkmén manat
- Name[ia]=Turkmenistani vetule Manat
- Name[id]=Manat Lama Turkmenistan
-+Name[is]=Túrkmenískt gamla-manat
- Name[it]=Vecchio manat turkmeno
- Name[ja]=旧トルクメニスタン・マナト
- Name[kk]=Түрікменстан бұрыңғы манаты
---- runtime/localization/currency/tmt.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/localization/currency/tmt.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -25,7 +25,7 @@
- Name[hu]=Türkmén manat
- Name[ia]=Turkmenistani Manat
- Name[id]=Manat Turkmenistan
--Name[is]=Túrkmenistanskt manat
-+Name[is]=Túrkmenískt manat
- Name[it]=Manat turkmeno
- Name[ja]=トルクメニスタン・マナト
- Name[kk]=Түрікменстан манаты
---- runtime/kcontrol/componentchooser/componentservices/kcm_wm.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kcontrol/componentchooser/componentservices/kcm_wm.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -74,7 +74,7 @@
- Comment[bn]=আপনার কে.ডি.ই. সেশন-এ যে উইণ্ডো ম্যানেজার ব্যবহার করা হবে সেটি আপনি এখানে পছন্দ করতে পারেন।
- Comment[ca]=Aquí podeu seleccionar el gestor de finestres que s'executarà en la sessió del KDE.
- Comment[ca@valencia]=Ací podeu seleccionar el gestor de finestres que s'executarà en la sessió del KDE.
--Comment[cs]=Zde si můžete zvolit správce oken pro svou relaci KDE.
-+Comment[cs]=Zde si můžete zvolit správce oken pro své sezení KDE.
- Comment[csb]=Tuwò mòżesz wëbrac menadżerã òknów jakô mô bëc zrëszonô w twòji sesëji KDE.
- Comment[da]=Her kan du vælge, den vindueshåndtering der skal køre i din KDE-session.
- Comment[de]=Hier können Sie den Fenstermanager wählen, der für Ihre KDE-Sitzung verwendet werden soll.
---- runtime/desktoptheme/air/metadata.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/desktoptheme/air/metadata.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -30,7 +30,6 @@
- Name[id]=Udara
- Name[is]=Loft
- Name[it]=Aria
--Name[ja]=大気
- Name[kk]=Air
- Name[km]=ខ្យល់
- Name[kn]=ಗಾಳಿ
---- runtime/phonon/platform_kde/phonon.notifyrc (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/phonon/platform_kde/phonon.notifyrc (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -19,6 +19,7 @@
- Comment[ga]=Córas Ilmheán
- Comment[hi]=मल्टीमीडिया तंत्र
- Comment[hr]=Multimedijalni sustav
-+Comment[hu]=Multimédiarendszer
- Comment[ia]=Systema de Multimedia
- Comment[id]=Sistem Multimedia
- Comment[is]=Margmiðlunarkerfi
-@@ -49,6 +50,7 @@
- Comment[sv]=Multimediasystem
- Comment[tg]=Системаи мултимедиавӣ
- Comment[th]=ระบบสื่อประสม
-+Comment[tr]=Çoklu Ortam Sistemi
- Comment[uk]=Мультимедійна система
- Comment[x-test]=xxMultimedia Systemxx
- Comment[zh_CN]=多媒体系统
---- runtime/phonon/kcm/kcm_phonon.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/phonon/kcm/kcm_phonon.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -29,6 +29,7 @@
- Name[ga]=Phonon
- Name[hi]=फोनोन
- Name[hr]=Phonon
-+Name[hu]=Phonon
- Name[ia]=Phonon
- Name[id]=Phonon
- Name[is]=Phonon
-@@ -58,6 +59,7 @@
- Name[sr@latin]=Phonon
- Name[sv]=Phonon
- Name[th]=โฟนอน
-+Name[tr]=Phonon
- Name[uk]=Phonon
- Name[x-test]=xxPhononxx
- Name[zh_CN]=Phonon
---- runtime/phonon/kded-module/phononserver.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/phonon/kded-module/phononserver.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -53,6 +53,7 @@
- Name[sv]=Ljudpolicy
- Name[tg]=Идоракунии овозҳо
- Name[th]=ข้อกำหนดระบบเสียง
-+Name[tr]=Ses Politikası
- Name[uk]=Правила доступу до звуку
- Name[x-test]=xxSound Policyxx
- Name[zh_CN]=声音策略
---- runtime/doc/kcontrol/language/index.docbook (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/doc/kcontrol/language/index.docbook (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -6,18 +6,16 @@
- ]>
+ void Glossary::slotSelectGlossEntry( const QString &id )
+--- runtime/doc/glossary/kdeprintingglossary.docbook (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/doc/glossary/kdeprintingglossary.docbook (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -16,8 +16,8 @@
+
+ <glossentry id="gloss-acl">
+ <glossterm><acronym>ACLs</acronym></glossterm>
+- <glossdef><para>Abbreviation for <emphasis>A</emphasis>ccess
+- <emphasis>C</emphasis>ontrol <emphasis>L</emphasis>ists;
++ <glossdef><para>Abbreviation for &emstart;A&emend;ccess
++ &emstart;C&emend;ontrol &emstart;L&emend;ists;
+ ACLs are used to check for the access by a given
+ (authenticated) user. A first rough support for ACLs
+ for printing is available from &CUPS;; this will be refined
+@@ -46,21 +46,13 @@
+ APSfilter calls "real filters" to do the jobs needed. It sends
+ printjobs automatically through these other filters, based on an
+ initial file-type analysis of the printfile.
+- It is written and maintained by Andreas Klemm.
+-<!--
+- </para>
+- <para>
+--->
++ It is written and maintained by Andreas Klemm.&newpara;
+ It is
+ similar to Magicfilter and mostly uses Ghostscript for file conversions.
+ Some Linux Distributions (like &SuSE;) use APSfilter, others
+ Magicfilter (like &RedHat;), some have both for preference selection
+- (like *BSD).
+-<!--
+- </para>
+- <para>
+--->
+- &CUPS; has <emphasis>no</emphasis> need for APSfilter,
++ (like *BSD).&newpara;
++ &CUPS; has &emstart;no&emend; need for APSfilter,
+ as it runs its own file type recognition (based on &MIME; types)
+ and applies its own filtering logic.</para>
+ <glossseealso otherterm="gloss-ghostscript">Ghostscript</glossseealso>
+@@ -100,12 +92,8 @@
+ <glossterm>BSD-style Printing</glossterm>
+ <glossdef><para>Generic term for different variants of the traditional &UNIX;
+ printing method. Its first version appeared in the early 70s on
+- BSD &UNIX; and was formally described in <ulink url="http://www.rfc.net/rfc1179.html">RFC 1179</ulink> only as late
+- as 1990.
+-<!--
+- </para>
+- <para>
+--->
++ BSD &UNIX; and was formally described in &linkstart;"http://www.rfc.net/rfc1179.html"&linkmid;RFC 1179&linkend; only as late
++ as 1990.&newpara;
+ At the time when BSD "remote" printing was first designed, printers
+ were serially or otherwise directly connected devices to a host
+ (with the Internet hardly consisting of more than 100 nodes!); printers
+@@ -114,26 +102,17 @@
+ the medium, drawn from a cardboard box beneath the table. It came out
+ like a zig-zag folded paper "snake". Remote printing consisted of a
+ neighboring host in the next room sending a file
+- asking for printout.
+-<!--
+- </para>
+- <para>
+--->
++ asking for printout.&newpara;
+ How technology has changed! Printers generally use cut-sheet media, they have
+ built-in intelligence to compute the raster images of pages after pages
+ that are sent to them using one of the powerful page description
+ languages (PDL). Many are network nodes in their own right,
+ with CPU, RAM, a hard disk and their own Operation System, and
+- are hooked to a net with potentially millions of users...
+-<!--
+- </para>
+- <para>
+--->
++ are hooked to a net with potentially millions of users...&newpara;
+ It is a vast proof of the flexible &UNIX; concept for doing things,
+ that it made "Line Printing" reliably work even under these modern
+ conditions. But time has finally come now to go for something new
+ -- the IPP.
+-
+ </para>
+ <glossseealso otherterm="gloss-ipp">IPP</glossseealso>
+ <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso>
+@@ -143,30 +122,27 @@
+
+ <glossentry id="gloss-cups">
+ <glossterm>&CUPS;</glossterm>
+- <glossdef><para>Abbreviation for <emphasis>C</emphasis>ommon
+- <emphasis>U</emphasis>NIX <emphasis>P</emphasis>rinting
+- <emphasis>S</emphasis>ystem; &CUPS; is the most modern &UNIX; and Linux
++ <glossdef><para>Abbreviation for &emstart;C&emend;ommon
++ &emstart;U&emend;NIX &emstart;P&emend;rinting
++ &emstart;S&emend;ystem; &CUPS; is the most modern &UNIX; and Linux
+ printing system, also providing cross-platform print services
+ to &Microsoft; &Windows; and Apple &MacOS; clients. Based on IPP, it does
+ away with all the pitfalls of old-style BSD printing,
+ providing authentication, encryption and ACLs, plus many more
+ features. At the same time it is backward-compatible enough
+ to serve all legacy clients that are not yet up to IPP, via
+- LPR/LPD (BSD-style).
+-<!--
+- </para>
+- <para>
+--->
++ LPR/LPD (BSD-style).&newpara;
+ &CUPS; is able to control any &PostScript; printer by
+ utilizing the vendor-supplied PPD (PostScript Printer
+ Description file), targeted originally for &Microsoft; Windows NT
+ printing only. &kde; Printing is most powerful if based on
+- &CUPS;.</para>
++ &CUPS;.&newpara;
++ More info:&newpara;
++ &linkstart;"http://www.cups.org"&linkmid;&CUPS; Homepage&linkend;</para>
+ <glossseealso otherterm="gloss-acl">ACLs</glossseealso>
+ <glossseealso otherterm="gloss-authentication">Authentication</glossseealso>
+ <glossseealso otherterm="gloss-bsdstyleprinting">BSD-style printing</glossseealso>
+ <glossseealso otherterm="gloss-ipp">IPP</glossseealso>
+- <glossseealso otherterm="gloss-kdeprint">KDEPrint</glossseealso>
+ <glossseealso otherterm="gloss-lprlpd">LPR/LPD</glossseealso>
+ <glossseealso otherterm="gloss-ppd">PPD</glossseealso>
+ </glossdef>
+@@ -175,75 +151,22 @@
+
+ <glossentry id="gloss-cupsfaq">
+ <glossterm><acronym>&CUPS;-FAQ</acronym></glossterm>
+- <glossdef><para>Currently only available in German (translation is on the way),
+- the <ulink url="http://www.danka.de/printpro/faq.html">&CUPS;-FAQ</ulink>
++ <glossdef><para>&linkstart;"http://www.cups.org/articles.php?L+TFAQ"&linkmid;&CUPS;-FAQ&linkend;
+ is a valuable resource to answer many questions that anyone new to
+ &CUPS; printing might have at first.
+ </para>
+- <glossseealso otherterm="gloss-kdeprinthandbook">KDEPrint Handbook</glossseealso>
+ </glossdef>
+ </glossentry>
- <article lang="&language;">
-+<articleinfo>
- <title>Country/Region & Language</title>
--<sect1 id="locale">
-
--<sect1info>
- <authorgroup>
- <author>&Mike.McBride; &Mike.McBride.mail;</author>
- <author>&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
- <!-- TRANS:ROLES_OF_TRANSLATORS -->
- </authorgroup>
-
-- <date>2009-11-23</date>
-- <releaseinfo>4.4</releaseinfo>
-+ <date>2010-08-19</date>
-+ <releaseinfo>4.5</releaseinfo>
-
- <keywordset>
- <keyword>KDE</keyword>
-@@ -26,15 +24,14 @@
- <keyword>country</keyword>
- <keyword>language</keyword>
- </keywordset>
-+</articleinfo>
-
-- </sect1info>
+- <glossentry id="gloss-cups-o-matic">
+- <glossterm>&CUPS;-O-Matic</glossterm>
+- <glossdef><para>&CUPS;-O-Matic was the first "Third Party" plugin for
+- the &CUPS; printing software. It is available on the <ulink
+- url="http://www.linuxprinting.org/cups-doc.html">Linuxprinting.org
+- website</ulink> to provide an online PPD-generating service.
+-<!--
+- </para>
+- <para>
+--->
+-
+- Together with the companion <application>cupsomatic</application> Perl-Script,
+- that needs to be installed as an additional &CUPS; backend,
+- it redirects output from the native <application>pstops</application> filter into
+- a chain of suitable Ghostscript filters. Upon completion, it
+- passes the resulting data back to a &CUPS; "backend" for sending
+- to the printer.
+-<!--
+- </para>
+- <para>
+--->
+- In this way, &CUPS;-O-Matic enables support for any printer known to
+- have worked previously in a "classical" Ghostscript environment.
+- If no native &CUPS; support for that printer is in sight... &CUPS;-O-Matic
+- is now replaced by the more capable PPD-O-Matic.</para>
+- <glossseealso otherterm="gloss-cupsomatic">cupsomatic</glossseealso>
+- <glossseealso otherterm="gloss-PPD-O-Matic">PPD-O-Matic</glossseealso>
+- <glossseealso otherterm="gloss-foomatic">Foomatic</glossseealso>
+- </glossdef>
+- </glossentry>
-
-
-+<sect1 id="locale">
- <title>Country/Region & Language</title>
+- <glossentry id="gloss-cupsomatic">
+- <glossterm>cupsomatic</glossterm>
+- <glossdef><para>The Perl script <application>cupsomatic</application> (plus a working Perl installation
+- on your system) is needed to make any &CUPS;-O-Matic (or PPD-O-Matic)
+- generated PPD work with &CUPS;. It was written by Grant Taylor, author of
+- the Linux Printing HOWTO and Maintainer of the <ulink
+- url="http://www.linuxprinting.org/printer_list.cgi">printer
+- database</ulink> at the Linuxprinting.org website.</para>
+- <glossseealso otherterm="gloss-cups-o-matic">&CUPS;-O-Matic</glossseealso>
+- <glossseealso otherterm="gloss-foomatic">Foomatic</glossseealso>
+- <glossseealso otherterm="gloss-cupsomatic">cupsomatic</glossseealso>
+- </glossdef>
+- </glossentry>
+-
+ <glossentry id="gloss-daemon">
+ <glossterm><acronym>Daemon</acronym></glossterm>
+- <glossdef><para>Abbreviation for <emphasis>D</emphasis>isk
+- <emphasis>a</emphasis>nd <emphasis>e</emphasis>xecution
+- <emphasis>mon</emphasis>itor; <acronym>Daemons</acronym> are present
++ <glossdef><para>Abbreviation for &emstart;D&emend;isk
++ &emstart;a&emend;nd &emstart;e&emend;xecution
++ &emstart;mon&emend;itor; <acronym>Daemons</acronym> are present
+ on all &UNIX; systems to perform tasks independent of user
+ intervention. Readers more familiar with &Microsoft; &Windows; might
+ want to compare daemons and the tasks they are responsible
+- with "services".
+-<!--
+- </para>
+- <para>
+--->
++ with "services".&newpara;
+ One example of a daemon present on most
+ legacy &UNIX; systems is the LPD (Line Printer Daemon); &CUPS; is
+ widely seen as the successor to LPD in the &UNIX; world and
+@@ -258,11 +181,7 @@
+ (only command line printing was known to most Linux users, no device
+ specific print options were available for doing the jobs), Grant Taylor,
+ author of the "Linux Printing HOWTO", collected most of the available
+- information about printers, drivers and filters in his database.
+-<!--
+- </para>
+- <para>
+--->
++ information about printers, drivers and filters in his database.&newpara;
+ With the emerging
+ &CUPS; concept, extending the use of PPDs even to non-PostScript printers,
+ he realized the potential of this database: if one puts the different
+@@ -270,11 +189,7 @@
+ "Which device prints with which Ghostscript or other
+ filter?", "How well?", and "What command line switches are available?") into
+ PPD-compatible files, he could have all the power of &CUPS; on top of
+- the traditional printer "drivers".
+-<!--
+- </para>
+- <para>
+--->
++ the traditional printer "drivers".&newpara;
+ This has now developed into a broader
+ concept, known as "Foomatic". Foomatic extends the capabilities
+ of spoolers other than &CUPS; (LPR/LPD, LPRng, PDQ, PPR) to a certain
+@@ -323,24 +238,20 @@
+ <glossterm>Easy Software Products</glossterm>
+ <glossdef><para>Mike Sweet's company, which has contributed a few substantial
+ software products towards the Free Software community; amongst
+- them the initial version of <ulink
+- url="http://gimp-print.sf.net/">Gimp-Print,</ulink> the <ulink
+- url="http://www.easysw.com/epm/">EPM software packaging</ulink> tool
+- and <ulink url="http://www.easysw.com/htmldoc/">HTMLDOC</ulink>
++ them the initial version of &linkstart;
++ "http://gimp-print.sf.net/"&linkmid;Gimp-Print,&linkend; the &linkstart;
++ "http://www.easysw.com/epm/"&linkmid;EPM software packaging&linkend; tool
++ and &linkstart;"http://www.easysw.com/htmldoc/"&linkmid;HTMLDOC&linkend;
+ (used by the "Linux Documentation Project" to build the PDF versions
+- of the HOWTOs) -- but most importantly: <ulink
+- url="http://www.cups.org/">&CUPS;</ulink> (the 'Common &UNIX; Printing
+- System').
+-<!--
+- </para>
+- <para>
+--->
+- ESP finance themselves by selling a commercial version
+- of &CUPS;, called <ulink url="http://www.easysw.com/">ESP PrintPro,</ulink>
++ of the HOWTOs) -- but most importantly: &linkstart;
++ "http://www.cups.org/"&linkmid;&CUPS;&linkend; (the 'Common &UNIX; Printing
++ System').&newpara;
++ ESP financed themselves by selling a commercial version
++ of &CUPS;, called ESP PrintPro,
+ that includes some professional enhancements.
++ ESP Print Pro was purchased by Apple Inc. in February of 2007. ESP Print Pro software and support are no longer available from Easy Software Products. ESP Print Pro users were given non-expiring, floating licenses which may be accessed from the MyESP pages.
+ </para>
+ <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso>
+- <glossseealso otherterm="gloss-espprintpro">ESP PrintPro</glossseealso>
+ <glossseealso otherterm="gloss-esp">ESP</glossseealso>
+ <glossseealso otherterm="gloss-gimpprint">Gimp-Print</glossseealso>
+ </glossdef>
+@@ -349,19 +260,11 @@
+ <glossentry id="gloss-encryption">
+ <glossterm>Encryption</glossterm>
+ <glossdef><para>Encryption of confidential data is an all-important issue if
+- you transfer it over the Internet or even within intranets.
+-<!--
+- </para>
+- <para>
+--->
++ you transfer it over the Internet or even within intranets.&newpara;
+ Printing
+ via traditional protocols is not encrypted at all -- it is very easy
+- to tap and eavesdrop ⪚ into &PostScript; or PCL data transfered
+- over the wire.
+-<!--
+- </para>
+- <para>
+--->
++ to tap and eavesdrop ⪚ into &PostScript; or PCL data transferred
++ over the wire.&newpara;
+ Therefore, in the design of IPP, provision was made for the easy
+ plugin of encryption mechanisms (which can be provided by the same
+ means as the encryption standards for HTTP traffic: SSL and TLS).</para>
+@@ -381,16 +284,7 @@
+ devices and handed technical specification documents to developers.
+ The excellent print quality achieved by Gimp-Print on the Stylus
+ series of printers can be attributed to this openness.
+-<!--
+ </para>
+- <para>
+--->
+- They have also
+- contracted Easy Software Products to maintain an enhanced version
+- of Ghostscript ("ESP GhostScript") for improved support of their
+- printer portfolio.
+- </para>
+- <glossseealso otherterm="gloss-ghostscript">ESP Ghostscript</glossseealso>
+ </glossdef>
+ </glossentry>
- <para>This module of the &kde; &systemsettings; allows you select
- customization options that depend on the region of the world that you
--happen to live in. There are five different pages in this module, each
-+happen to live in. There are five different tabs in this module, each
- of which is described in detail in the following sections.</para>
+@@ -411,9 +305,9 @@
- <para>In most cases, you can simply select the country and the language, and
-@@ -76,7 +73,7 @@
- </para>
+ <glossentry id="gloss-escp">
+ <glossterm><acronym>ESC/P</acronym></glossterm>
+- <glossdef><para>Abbreviation for <emphasis>E</emphasis>pson
+- <emphasis>S</emphasis>tandard <emphasis>C</emphasis>odes for
+- <emphasis>P</emphasis>rinters. Besides &PostScript; and PCL, Epson's ESC/P
++ <glossdef><para>Abbreviation for &emstart;E&emend;pson
++ &emstart;S&emend;tandard &emstart;C&emend;odes for
++ &emstart;P&emend;rinters. Besides &PostScript; and PCL, Epson's ESC/P
+ printer language is one of the best known.</para>
+ <glossseealso otherterm="gloss-pcl">PCL</glossseealso>
+ <glossseealso otherterm="gloss-postscript">&PostScript;</glossseealso>
+@@ -423,55 +317,21 @@
- <note><para>
--Note that some applications and documentations may not be translated to your languages; in
-+Note that some applications and documentations may not be translated to your language; 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
-@@ -106,6 +103,10 @@
- For example, the default for English is not to have any prefix for
- positive numbers, and a <userinput>-</userinput> for negative numbers.</para>
-
-+<para>In the spinbox <guilabel>Decimal places</guilabel>
-+you can set the number of decimal places displayed for numeric values,
-+&ie; the number of digits <emphasis>after</emphasis> the decimal separator.</para>
-+
- <para>The <guilabel>Digit set</guilabel> drop down box presents digit sets
- which may be used instead of basic Arabic when displaying numbers.
- If you select a digit set other than Arabic, it will be applied only to
-@@ -113,6 +114,9 @@
- (e.g. Arabic-Indic digits in application translated to Arabic language),
- while Arabic digits are still going to be used elsewhere.</para>
-
-+<para>Note that decimal symbol, thousands separator, decimal places and
-+the set of digits used to display monetary values has to be set
-+separately on the <guilabel>Money</guilabel> tab.</para>
- </sect2>
-
- <sect2 id="locale-money">
-@@ -125,11 +129,8 @@
-
- <para>The character or characters representing the currency symbol
- are based on the country that is currently selected.
--The decimal symbol, thousands separator, and digit set work
--as they do for numbers.
--The text box labeled <guilabel>Fract digits</guilabel> allows you
--to specify the number of fractional digits used in displaying
--currency values.</para>
-+The decimal symbol, thousands separator, decimal places, and digit set
-+for money work as they do for numbers.</para>
-
- <para>For both positive and negative currency values, you can
- control whether the currency symbol appears before or after the
-@@ -171,6 +172,9 @@
- <para>If you use a different calendar system than Gregorian, you can
- choose this from the first drop down box.</para>
-
-+<para>The next option determines if the Common Era (CE/BCE) should be
-+used instead of the Christian Era (AD/BC)</para>
-+
- <para>Likewise, if numbers in date and time strings should use
- digits other than basic Arabic, another set of digits can be selected
- from the second drop down box.</para>
---- runtime/platforms/win/kwinstartmenu/kwinstartmenurc (.../tags/KDE/4.5.1/kdebase) (wersja 0)
-+++ runtime/platforms/win/kwinstartmenu/kwinstartmenurc (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -0,0 +1,3 @@
-+[General]
-+Enabled=true
-+useCategories=true
---- runtime/platforms/win/kwinstartmenu/misc.h (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/platforms/win/kwinstartmenu/misc.h (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -27,6 +27,18 @@
-
- #include <KUrl>
-
-+/**
-+ contains global options
-+*/
-+class GlobalOptions {
-+public:
-+ GlobalOptions() : useCategories(true) {}
-+
-+ bool useCategories;
-+};
-+
-+extern GlobalOptions globalOptions;
-+
- bool removeDirectory(const QString& aDir);
- QString getStartMenuPath(bool bAllUsers=false);
- QString getKDEStartMenuPath();
---- runtime/platforms/win/kwinstartmenu/winstartmenu.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/platforms/win/kwinstartmenu/winstartmenu.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -58,6 +58,8 @@
-
- if (group.readEntry("Enabled", true))
- connect(KSycoca::self(), SIGNAL(databaseChanged()), this, SLOT(databaseChanged()));
-+
-+ globalOptions.useCategories = group.readEntry("useCategories", true);
-
- new WinStartMenuAdaptor( this );
- }
---- runtime/platforms/win/kwinstartmenu/main.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/platforms/win/kwinstartmenu/main.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -47,6 +47,7 @@
- options.add("remove", ki18n("Remove installed Start Menu entries"));
- options.add("install", ki18n("Install Start Menu entries (this is also the default when this option is not used)"));
- options.add("query-path", ki18n("query root path of Start Menu entries"));
-+ options.add("nocategories", ki18n("don't use categories for start menu entries"));
- KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
-
- KComponentData a(&about);
-@@ -56,6 +57,8 @@
-
- KApplication app(false);
-
-+ globalOptions.useCategories = args->isSet("categories");
-+
- if (args->isSet("query-path"))
- fprintf(stdout,"%s",qPrintable(QDir::toNativeSeparators(getKDEStartMenuPath())));
- else if (args->isSet("remove"))
---- runtime/platforms/win/kwinstartmenu/misc.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/platforms/win/kwinstartmenu/misc.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -42,6 +42,8 @@
- #include <kdesktopfile.h>
- #include <kdeversion.h>
-
-+GlobalOptions globalOptions;
-+
- bool removeDirectory(const QString& aDir)
- {
- QDir dir( aDir );
-@@ -225,7 +227,12 @@
- continue;
- }
-
-- QString linkPath = getKDEStartMenuPath() + relPathTranslated + '/';
-+ QString linkPath = getKDEStartMenuPath();
-+
-+ if (globalOptions.useCategories)
-+ linkPath += relPathTranslated;
-+ linkPath += '/';
-+
- QString linkName = s->name();
- if (!s->genericName().isEmpty() && s->genericName() != s->name())
- linkName += " (" + s->genericName().replace('/','-') + ')';
---- runtime/platforms/win/kwinstartmenu/CMakeLists.txt (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/platforms/win/kwinstartmenu/CMakeLists.txt (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -24,6 +24,7 @@
- install(TARGETS kded_winstartmenu DESTINATION ${PLUGIN_INSTALL_DIR} )
- install( FILES winstartmenu.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
- install( FILES org.kde.WinStartMenu.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
-+install( FILES kwinstartmenurc DESTINATION ${CONFIG_INSTALL_DIR} )
-
- ########### next target ###############
-
---- runtime/kwalletd/kwalletd.notifyrc (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kwalletd/kwalletd.notifyrc (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -53,6 +53,7 @@
- Comment[sv]=Plånbok
- Comment[tg]=Wallet
- Comment[th]=กระเป๋าคุมข้อมูล
-+Comment[tr]=Cüzdan
- Comment[uk]=Торбинка
- Comment[x-test]=xxWalletxx
- Comment[zh_CN]=钱包
---- runtime/kioslave/trash/kcmtrash.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kioslave/trash/kcmtrash.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -28,7 +28,7 @@
- Name[hne]=घुरुवा
- Name[hr]=Otpad
- Name[hsb]=Papjernik
--Name[hu]=Szemétkosár
-+Name[hu]=Kuka
- Name[ia]=Corbe
- Name[id]=Tempat Sampah
- Name[is]=Rusl
-@@ -189,7 +189,7 @@
- Name[hne]=घुरुवा
- Name[hr]=Otpad
- Name[hsb]=Papjernik
--Name[hu]=Szemétkosár
-+Name[hu]=Kuka
- Name[ia]=Corbe
- Name[id]=Tempat Sampah
- Name[is]=Rusl
---- runtime/kioslave/thumbnail/imagethumbnail.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kioslave/thumbnail/imagethumbnail.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -3,7 +3,7 @@
- Name=Images (GIF, PNG, BMP, ...)
- Name[ar]=الصور (GIF, PNG, BMP, ...)
- Name[bn]=ছবি (GIF, PNG, BMP, ...)
--Name[ca]=Imatges (GIF, PNG, BMP, ...)
-+Name[ca]=Imatges (GIF, PNG, BMP...)
- Name[ca@valencia]=Imatges (GIF, PNG, BMP, ...)
- Name[cs]=Obrázky (GIF, PNG, BMP, ...)
- Name[da]=Billeder (GIF, PNG, BMP, ...)
---- runtime/kioslave/thumbnail/textthumbnail.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kioslave/thumbnail/textthumbnail.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -63,7 +63,7 @@
- Name[pa]=ਟੈਕਸਟ ਫਾਇਲਾਂ
- Name[pl]=Pliki tekstowe
- Name[pt]=Ficheiros de Texto
--Name[pt_BR]=Arquivos texto
-+Name[pt_BR]=Arquivos de texto
- Name[ro]=Fișiere textuale
- Name[ru]=Текстовые файлы
- Name[se]=Teakstafiilat
---- runtime/kioslave/remote/kdedmodule/remotedirnotify.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kioslave/remote/kdedmodule/remotedirnotify.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -47,6 +47,7 @@
- Name[sv]=Underrättelse om ändring av fjärrwebbadresser
- Name[tg]=Тафтиши файлҳои шабакавӣ
- Name[th]=ตัวแจ้งการเปลี่ยนแปลงบนที่อยู่ URL ทางไกล
-+Name[tr]=Uzak Adres Değişimi Bildirici
- Name[uk]=Сповіщення про зміну віддаленої адреси (URL)
- Name[x-test]=xxRemote URL Change Notifierxx
- Name[zh_CN]=远程 URL 更改通知器
-@@ -98,6 +99,7 @@
- Comment[sv]=Tillhandahåller ändringsunderrättelser för nätverkskataloger
- Comment[tg]=Огоҳиҳои тағйиротро дар феҳрастҳои шабака нишон медиҳад
- Comment[th]=ทำการแจ้งให้ทราบถึงความเปลี่ยนแปลงที่มีบนโฟลเดอร์บนเครือข่าย
-+Comment[tr]=Ağ dizinleri için değişim bildirimi sağlar.
- Comment[uk]=Сповіщення про зміну стану мережевих тек
- Comment[x-test]=xxProvides change notification for network foldersxx
- Comment[zh_CN]=为网络文件夹提供更改通知
---- runtime/kioslave/desktop/directory.trash (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kioslave/desktop/directory.trash (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -30,7 +30,7 @@
- Name[hne]=घुरुवा
- Name[hr]=Otpad
- Name[hsb]=Papjernik
--Name[hu]=Szemétkosár
-+Name[hu]=Kuka
- Name[ia]=Corbe
- Name[id]=Tempat Sampah
- Name[is]=Rusl
-@@ -119,7 +119,7 @@
- Comment[kn]=ತೆಗೆದು ಹಾಕಲಾದ ಕಡತಗಳನ್ನು ಹೊಂದಿದೆ
- Comment[ko]=삭제된 파일 및 폴더가 있습니다
- Comment[ku]=Di de pelên hatine rakirin jî hene
--Comment[lt]=Čia yra ištrintos bylos
-+Comment[lt]=Čia yra ištrinti failai
- Comment[lv]=Satur izmestos failus
- Comment[mai]=मेटाएल गेल फ़ाइलसभक राखैत अछि
- Comment[mk]=Содржи избришани датотеки
---- runtime/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -25,6 +25,7 @@
- Name[he]=מודול החיפוש של Nepomuk
- Name[hi]=नेपोमक खोज मोड्यूल
- Name[hr]=Nepomukov modul za pretraživanje
-+Name[hu]=Nepomuk keresőmodul
- Name[ia]=Modulo de cerca de Nepomuk
- Name[id]=Modul Pencarian Nepomuk
- Name[is]=Nepomuk leitareining
---- runtime/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -60,10 +60,9 @@
- // connect to serviceOwnerChanged to catch crashed clients that never unregistered
- // themselves
- //
-- m_watcher = new QDBusServiceWatcher( QString(),
-- QDBusConnection::sessionBus(),
-- QDBusServiceWatcher::WatchForUnregistration,
-- this );
-+ m_watcher = new QDBusServiceWatcher( this );
-+ m_watcher->setConnection( QDBusConnection::sessionBus() );
-+ m_watcher->setWatchMode( QDBusServiceWatcher::WatchForUnregistration );
- connect( m_watcher, SIGNAL( serviceUnregistered( const QString& ) ),
- this, SLOT( slotServiceUnregistered( const QString& ) ) );
-
---- runtime/nepomuk/services/strigi/priority.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/services/strigi/priority.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -1,105 +0,0 @@
--/* This file is part of the KDE Project
-- Copyright (c) 2008 Sebastian Trueg <trueg@kde.org>
--
-- Parts of this file are based on code from Strigi
-- Copyright (C) 2006-2007 Jos van den Oever <jos@vandenoever.info>
+ <glossentry id="gloss-esp">
+ <glossterm><acronym>ESP</acronym></glossterm>
+- <glossdef><para>Abbreviation for <emphasis>E</emphasis>asy
+- <emphasis>S</emphasis>oftware <emphasis>P</emphasis>roducts;
++ <glossdef><para>Abbreviation for &emstart;E&emend;asy
++ &emstart;S&emend;oftware &emstart;P&emend;roducts;
+ the company that developed &CUPS; (the "Common &UNIX; Printing System").
+ </para>
+ <glossseealso otherterm="gloss-easysoftwareproducts">Easy Software Products</glossseealso>
+ <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso>
+- <glossseealso otherterm="gloss-espprintpro">ESP PrintPro</glossseealso>
+ </glossdef>
+ </glossentry>
+
+
+- <glossentry id="gloss-espghostscript">
+- <glossterm><acronym>ESP</acronym> Ghostscript</glossterm>
+- <glossdef><para>A Ghostscript version that is maintained by Easy Software
+- Products. It includes pre-compiled Gimp-Print drivers for
+- many inkjets (plus some other goodies). ESP Ghostscript
+- will produce photographic quality prints in many cases, especially
+- with the Epson Stylus model series. ESP Ghostscript is GPL-software.
+- </para>
+- <glossseealso otherterm="gloss-easysoftwareproducts">Easy Software Products</glossseealso>
+- <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso>
+- <glossseealso otherterm="gloss-espprintpro">ESP PrintPro</glossseealso>
+- </glossdef>
+- </glossentry>
-
-- This library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Library General Public
-- License version 2 as published by the Free Software Foundation.
+- <glossentry id="gloss-espprintpro">
+- <glossterm><acronym>ESP</acronym> PrintPro</glossterm>
+- <glossdef><para> This professional enhancement to &CUPS; (the "Common &UNIX;
+- Printing System") is sold by the developers
+- of &CUPS; complete with more than 2,300 printer drivers for several commercial
+- &UNIX; platforms. <ulink url="http://www.easysw.com/printpro/">ESP PrintPro</ulink>
+- is supposed to work "out of the box" with little or no configuration
+- for users or admins. ESP also sell support contracts for
+- &CUPS; and PrintPro. These sales help to feed the programmers who
+- develop the Free version of &CUPS;.
+- </para>
+- <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso>
+- </glossdef>
+- </glossentry>
-
-- This library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Library General Public License for more details.
+- <glossentry id="gloss-filter">
++ <glossentry id="gloss-filter">
+ <glossterm>Filter</glossterm>
+ <glossdef><para>Filters, in general, are programs that take some input
+ data, work on it and pass it on as their output data. Filters
+- may or may not change the data.
+-<!--
+- </para>
+- <para>
+--->
++ may or may not change the data.&newpara;
+ Filters in the context of printing, are programs that convert
+ a given file (destined for printing, but not suitable in the
+ format it is presently) into a printable format. Sometimes
+@@ -486,51 +346,28 @@
+ <glossentry id="gloss-foomatic">
+ <glossterm>Foomatic</glossterm>
+ <glossdef><para>Foomatic started out as the wrapper name for a set of
+- different tools available from <ulink
+- url="http://www.linuxprinting.org/">Linuxprinting.org</ulink>
++ different tools available from &linkstart;"http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic"&linkmid;Linuxprinting.org&linkend;
+ These tools aimed to make the usage of traditional
+ Ghostscript and other print filters easier for users and
+ extend the filters' capabilities by adding more command line
+- switches or explain the driver's execution data.
+-<!--
+- </para>
+- <para>
+--->
+- Foomatic's different incarnations are &CUPS;-O-Matic, PPD-O-Matic,
+- PDQ-O-Matic, LPD-O-Matic, PPR-O-Matic, MF-O-Matic and
+- Direct-O-Matic. All of these allow the generation
+- of appropriate printer configuration files online, by simply
+- selection the suitable model and suggested (or alternate) driver
+- for that machine.
+-<!--
+- </para>
+- <para>
+--->
++ switches or explain the driver's execution data.&newpara;
+ More recently, Foomatic gravitated towards becoming a "meta-spooling"
+ system, that allows configuration of the underlying print subsystem
+ through a unified set of commands (however, this is much more
+- complicated than KDEPrint's &GUI; interface, which performs a similar
++ complicated than &kde; printing &GUI; interface, which performs a similar
+ task with regards to different print subsystems). </para>
+- <glossseealso otherterm="gloss-cups-o-matic">&CUPS;-O-Matic</glossseealso>
+- <glossseealso otherterm="gloss-PPD-O-Matic">PPD-O-Matic</glossseealso>
+- <glossseealso otherterm="gloss-cupsomatic">cupsomatic</glossseealso>
+ </glossdef>
+ </glossentry>
+
+ <glossentry id="gloss-ghostscript">
+ <glossterm>Ghostscript</glossterm>
+- <glossdef><para>Ghostscript is a &PostScript; Raster Image Processor (RIP) in software, originally
+- developed by L. Peter Deutsch. There is always a <acronym>GPL</acronym> version
+- of Ghostscript available for free usage and distribution
+- (mostly 1 year old) while
+- the current version is commercially sold under another license.
+-<!--
+- </para>
+- <para>
+--->
++ <glossdef><para>Ghostscript is a an interpreter for the &PostScript; language and for PDF or Raster Image Processor (RIP) in software, originally developed by L. Peter Deutsch. There is always a <acronym>GPL</acronym> version
++ of Ghostscript available for free usage and distribution.
+ Ghostscript is widely used inside the Linux and &UNIX; world
+ for transforming &PostScript; into raster data suitable
+- for sending to non-&PostScript; devices.</para>
++ for sending to non-&PostScript; devices.
++ More info:
++ &linkstart;"http://www.ghostscript.com/"&linkmid;Ghostscript Homepage&linkend;</para>
+ <glossseealso otherterm="gloss-postscript">&PostScript;</glossseealso>
+ <glossseealso otherterm="gloss-rip">RIP</glossseealso>
+ </glossdef>
+@@ -541,49 +378,14 @@
+ <glossdef><para>Contrary to its name, Gimp-Print is no longer
+ just the plugin to be used for printing from the popular
+ Gimp program -- its codebase can also serve to be compiled
+- into...
+- <!--
+- </para>
+- <para>
+--->
+- *...a set of PPDs and associated filters that integrate seamlessly
++ into...&newpara;
++ ...a set of PPDs and associated filters that integrate seamlessly
+ into &CUPS;, supporting around 130 different printer models, providing
+- photographic output quality in many cases;
+-<!--
+- </para>
+- <para>
+--->
-
-- You should have received a copy of the GNU Library General Public License
-- along with this library; see the file COPYING.LIB. If not, write to
-- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-- Boston, MA 02110-1301, USA.
--*/
+- *...a Ghostscript filter that can be used with any other
+- program that needs a software-RIP;
+-<!--
+- </para>
+- <para>
+--->
-
--#include "priority.h"
+- *...a library that can be used by other software applications
+- in need of rasterization functions.
-
--#ifndef _GNU_SOURCE
--#define _GNU_SOURCE
--#endif
-
--#include <QtCore/QDebug>
+-<!--
+-after 4 hours fiddling, I
+-could not get those s!@*#?
+-<itemizedlist> to pass
+-through the meinproc checks.
+-For the time being I gave up
+-on it and handle it differently
+-now.
+- <itemizedlist>
+- <listitem>...a set of PPDs and associated filters that integrate seamlessly
+- into &CUPS;, supporting around 130 different printer models, providing
+- photografic output quality in many cases;</listitem>
+- <listitem>...a Ghostscript filter that can be used with any other
+- program that needs a software-RIP;</listitem>
+- <listitem>...a library that can be used by other software applications
+- in need of rasterization functions.</listitem>
+- </itemizedlist>
+--->
+- </para>
++ photographic output quality in many cases;&newpara;
++ ...a Ghostscript filter that can be used with any other
++ program that needs a software-RIP;&newpara;
++ ...a library that can be used by other software applications
++ in need of rasterization functions.</para>
+ <glossseealso otherterm="gloss-lexmark">Lexmark Drivers</glossseealso>
+ <glossseealso otherterm="gloss-rip">RIP</glossseealso>
+ <glossseealso otherterm="gloss-ghostscript">Ghostscript</glossseealso>
+@@ -592,7 +394,7 @@
+
+ <glossentry id="gloss-hp">
+ <glossterm><acronym>&HP;</acronym></glossterm>
+- <glossdef><para>Abbreviation for <emphasis>H</emphasis>ewlett-<emphasis>Packard</emphasis>;
++ <glossdef><para>Abbreviation for &emstart;H&emend;ewlett-&emstart;Packard&emend;;
+ one of the first companies to distribute their own Linux printer
+ drivers. -- More recently, the Company has released their
+ "HPIJS" package of drivers, including source code and a Free license.
+@@ -605,8 +407,8 @@
+
+ <glossentry id="gloss-hpgl">
+ <glossterm><acronym>&HP;/GL</acronym></glossterm>
+- <glossdef><para>Abbreviation for <emphasis>&HP;</emphasis>
+- <emphasis>G</emphasis>raphical <emphasis>L</emphasis>anguage;
++ <glossdef><para>Abbreviation for &emstart;&HP;&emend;
++ &emstart;G&emend;raphical &emstart;L&emend;anguage;
+ a &HP; printer language mainly used for plotters; many CAD
+ (Computer Aided Design) software programs output &HP;/GL files for
+ printing.</para>
+@@ -628,18 +430,13 @@
+
+ <glossentry id="gloss-ietf">
+ <glossterm><acronym>IETF</acronym></glossterm>
+- <glossdef><para>Abbreviation for <emphasis>I</emphasis>nternet
+- <emphasis>E</emphasis>ngineering <emphasis>T</emphasis>ask
+- <emphasis>F</emphasis>orce; an assembly of Internet, software
++ <glossdef><para>Abbreviation for &emstart;I&emend;nternet
++ &emstart;E&emend;ngineering &emstart;T&emend;ask
++ &emstart;F&emend;orce; an assembly of Internet, software
+ and hardware experts that discuss
+ new networking technologies and very often arrive at
+ conclusions that are regarded by many as standards. "TCP/IP"
+- is the most famous example.
+-<!--
+- </para>
+- <para>
+--->
-
--#include <sys/time.h>
--#include <sys/resource.h>
++ is the most famous example.&newpara;
+ IETF standards, as well as
+ drafts, discussions, ideas and useful tutorials, are
+ put in writing in the famous series of "RFCs", which
+@@ -653,8 +450,8 @@
+
+ <glossentry id="gloss-ipp">
+ <glossterm><acronym>IPP</acronym></glossterm>
+- <glossdef><para>Abbreviation for <emphasis>I</emphasis>nternet
+- <emphasis>P</emphasis>rinting <emphasis>P</emphasis>rotocol;
++ <glossdef><para>Abbreviation for &emstart;I&emend;nternet
++ &emstart;P&emend;rinting &emstart;P&emend;rotocol;
+ defined in a series of RFCs accepted by the IETF with
+ status "proposed standard"; was designed
+ by the PWG. -- IPP is a completely new design for network printing,
+@@ -662,47 +459,16 @@
+ actual data transfer: HTTP 1.1! By not "re-inventing the wheel",
+ and basing itself on an existing and robust Internet standard,
+ IPP is able to relatively easily bolt other HTTP-compatible standard
+- mechanisms into its framework:
+-<!--
+- </para>
+- <para>
+--->
+- * Basic, Digest or Certificate authentication
+- mechanisms;
+-<!--
+- </para>
+- <para>
+--->
+- * SSL or TLS for encryption of transferred
+- data;
+-<!--
+- </para>
+- <para>
+--->
+- * LDAP for directory services (to publish
++ mechanisms into its framework:&newpara;
++
++ Basic, Digest or Certificate authentication mechanisms&newpara;
++ SSL or TLS for encryption of transferred data&newpara;
++ LDAP for directory services (to publish
+ data on printers, device-options, drivers, costs or
+ also to the network; or to check for passwords while
+- performing authentication).
+-<!--
++ conducting authentication)
+ </para>
+- <para>
+--->
+
+-<!--
+- </para>
+- <itemizedlist>
+- <listitem>Basic, Digest or Certificate authentication
+- mechanisms</listitem>
+- <listitem>SSL or TLS for encryption of transferred
+- data</listitem>
+- <listitem>LDAP for directory services (to publish
+- data on printers, device-options, drivers, costs or
+- elso to the network; or to check for passwords while
+- conducting authentication)</listitem>
+- </itemizedlist>
+--->
+- </para>
-
--#include <unistd.h>
--#ifndef _WIN32
--#include <sys/syscall.h>
--#include <errno.h>
+ <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso>
+ <glossseealso otherterm="gloss-pwg">PWG</glossseealso>
+ <glossseealso otherterm="gloss-ietf">IETF</glossseealso>
+@@ -711,93 +477,7 @@
+ </glossdef>
+ </glossentry>
+
+- <glossentry id="gloss-kdeprint">
+- <glossterm><acronym>KDEPrint</acronym></glossterm>
+- <glossdef><para>The new printing functionality of &kde; since version 2.2
+- consists of several modules that translate the features and settings
+- of different available print subsystems (&CUPS;, BSD-style LPR/LPD, RLPR...)
+- into nice &kde; desktop &GUI; windows and dialogs to ease their
+- usage.
+-<!--
+- </para>
+- <para>
+--->
+- Most important for day-to-day usage is "kprinter", the new
+- &GUI; print command. -- Note: KDEPrint does <emphasis>not</emphasis> implement its own
+- spooling mechanism or its own &PostScript; processing; for this it
+- relies on the selected <emphasis>print subsystem</emphasis>
+- -- however it does add some functionality of its own on top of this
+- foundation...
+- </para>
+- <glossseealso otherterm="gloss-bsdstyleprinting">BSD-style printing</glossseealso>
+- <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso>
+- <glossseealso otherterm="gloss-kprinter">kprinter</glossseealso>
+- <glossseealso otherterm="gloss-kdeprinthandbook">KDEPrint Handbook</glossseealso>
+- </glossdef>
+- </glossentry>
+
-
--#include <sched.h>
--#endif
+- <glossentry id="gloss-kdeprinthandbook">
+- <glossterm><acronym>KDEPrint Handbook...</acronym></glossterm>
+- <glossdef><para>...is the name of the reference document that describes KDEPrint
+- functions to users and administrators. You can load it into Konqueror by
+- typing "help:/kdeprint" into the address field. The <ulink
+- url="http://printing.kde.org/">KDEPrint website</ulink>
+- is the resource for updates to this documentation, as well as PDF
+- versions suitable for printing it. It is authored and maintained by Kurt
+- Pfeifle.
+- </para>
+- <glossseealso otherterm="gloss-cupsfaq">&CUPS;-FAQ</glossseealso>
+- </glossdef>
+- </glossentry>
-
--#ifdef SYS_ioprio_set
--namespace {
--#ifndef IOPRIO_CLASS_IDLE
-- enum {
-- IOPRIO_CLASS_NONE,
-- IOPRIO_CLASS_RT,
-- IOPRIO_CLASS_BE,
-- IOPRIO_CLASS_IDLE
-- };
--#endif
+- <glossentry id="gloss-kprinter">
+- <glossterm>kprinter</glossterm>
+- <glossdef><para><emphasis>kprinter</emphasis> is the new powerful
+- print utility that is natively used by all &kde; applications.
+-<!--
+- </para>
+- <para>
+--->
+- Contrary to some common misconceptions,
+- <emphasis>kprinter</emphasis> is <emphasis>not</emphasis> a &CUPS;-only tool,
+- but supports different print subsystems. You can even switch
+- to a different print subsystem "on the fly", in between two jobs,
+- without re-configuration. Of course, due to the powerful
+- features of &CUPS;, <emphasis>kprinter</emphasis> is
+- best suited for use with a &CUPS; frontend.
+-<!--
+- </para>
+- <para>
+--->
+- <emphasis>kprinter</emphasis> is the successor
+- to "qtcups", which is no longer being actively maintained. It has
+- inherited all the best features of qtcups and added several new ones.
+-<!--
+- </para>
+- <para>
+--->
-
--#ifndef IOPRIO_WHO_PROCESS
-- enum {
-- IOPRIO_WHO_PROCESS = 1,
-- IOPRIO_WHO_PGRP,
-- IOPRIO_WHO_USER
-- };
--#endif
+- MOST IMPORTANT: you can use <emphasis>kprinter</emphasis>
+- with all its features in all non-&kde; applications that allow
+- a customized print command, like gv, Acrobat Reader, Netscape,
+- Mozilla, Galeon, StarOffice, OpenOffice and all GNOME programs.
+-<!--
+- </para>
+- <para>
+--->
+- <emphasis>kprinter</emphasis> can act as a "standalone"
+- utility, started from an X-Terminal or a "Mini-CLI" to
+- print many different files, from different folders, with different
+- formats, in one job and simultaneously, without the need to first open the
+- files in the applications! (File formats supported this way are &PostScript;,
+- PDF, International and ASCII Text, as well as many different popular graphic
+- formats, such as PNG, TIFF, JPEG, PNM, Sun RASTER, &etc;)
+- </para>
+- <glossseealso otherterm="gloss-qtcups">QtCUPS</glossseealso>
+- </glossdef>
+- </glossentry>
-
--#ifndef IOPRIO_CLASS_SHIFT
-- const int IOPRIO_CLASS_SHIFT = 13;
--#endif
--}
--#endif
+ <glossentry id="gloss-lexmark">
+ <glossterm><acronym>Lexmark</acronym></glossterm>
+ <glossdef><para>was one of the first companies to distribute their own Linux printer
+@@ -831,24 +511,19 @@
+
+ <glossentry id="gloss-linuxprintingdatabase">
+ <glossterm><acronym>Linuxprinting.org Database</acronym></glossterm>
+- <glossdef><para>....Database containing printers and drivers that are suitable
+- for them... ...a lot of information and documentation to be found... ...it
+- is now also providing some tools and utilities for easing the integration
+- of those drivers into a given system... ...the "Foomatic" family
+- of utilities; being the toolset to make use of the database
+- for most of the commonly used print subsystems, for generating "on the fly"
+- working configurations for your printer model.
+- </para>
++ <glossdef><para>&linkstart;"http://www.openprinting.org/printers"&linkmid;Database&linkend; containing printers and drivers that are suitable for them.
++ More info:
++ &linkstart;"http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/indexfaq"&linkmid;Linuxprinting.org FAQ&linkend;</para>
+ <glossseealso otherterm="gloss-foomatic">Foomatic</glossseealso>
+ </glossdef>
+ </glossentry>
+
+ <glossentry id="gloss-lprlpd">
+ <glossterm><acronym>LPR/LPD</acronym> printing</glossterm>
+- <glossdef><para>LPR == some people translate <emphasis>L</emphasis>ine
+- <emphasis>P</emphasis>rinting <emphasis>R</emphasis>equest, others:
+- <emphasis>L</emphasis>ine <emphasis>P</emphasis>rinter
+- <emphasis>R</emphasis>emote.</para>
++ <glossdef><para>LPR == some people translate &emstart;L&emend;ine
++ &emstart;P&emend;rinting &emstart;R&emend;equest, others:
++ &emstart;L&emend;ine &emstart;P&emend;rinter
++ &emstart;R&emend;emote.</para>
+ <glossseealso otherterm="gloss-bsdstyleprinting">BSD-style printing</glossseealso>
+ </glossdef>
+ </glossentry>
+@@ -865,52 +540,38 @@
+
+ <glossentry id="gloss-mimetypes">
+ <glossterm>&MIME;-Types</glossterm>
+- <glossdef><para>Abbreviation for <emphasis>M</emphasis>ultipurpose (or
+- Multimedia) <emphasis>I</emphasis>nternet <emphasis>M</emphasis>ail
+- <emphasis>E</emphasis>xtensions; &MIME;-Types were first used to allow
++ <glossdef><para>Abbreviation for &emstart;M&emend;ultipurpose (or
++ Multimedia) &emstart;I&emend;nternet &emstart;M&emend;ail
++ &emstart;E&emend;xtensions; &MIME;-Types were first used to allow
+ the transport of binary data (like mail attachments containing
+ graphics) over mail connections that were normally only transmitting
+- ASCII characters: the data had to be encoded into an ASCII representation.
+-<!--
+- </para>
+- <para>
+--->
++ ASCII characters: the data had to be encoded into an ASCII representation.&newpara;
+ Later this concept was extended to describe a data format in
+ a platform independent, but at the same time non-ambiguous, way.
+ From &Windows; everybody knows the .doc extensions for &Microsoft; Word files.
+ This is handled ambiguously on the &Windows; platform: .doc extensions are also
+ used for simple text files or for Adobe Framemaker files. And if a real
+ Word file is renamed with a different extension, it can no longer be
+- opened by the program.
+-<!--
+- </para>
+- <para>
+--->
++ opened by the program.&newpara;
+ &MIME; typed files carry a recognition string with them, describing
+- their file format based on <emphasis>main_category/sub_category</emphasis>.
++ their file format based on &emstart;main_category/sub_category&emend;.
+ Inside IPP, print files are also described using the &MIME; type scheme.
+ &MIME; types are registered with the IANA (Internet Assigning Numbers
+- <emphasis>Association</emphasis>) to keep them unambiguous.
+-<!--
+- </para>
+- <para>
+--->
++ &emstart;Association&emend;) to keep them unambiguous.&newpara;
+ &CUPS; has some &MIME; types of its own registered, like
+- <emphasis>application/vnd.cups-raster</emphasis> (for the &CUPS;-internal
++ &emstart;application/vnd.cups-raster&emend; (for the &CUPS;-internal
+ raster image format).
-
+ </para>
+ <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso>
+ <glossseealso otherterm="gloss-easysoftwareproducts">Easy Software Products</glossseealso>
+- <glossseealso otherterm="gloss-espprintpro">ESP PrintPro</glossseealso>
+ <glossseealso otherterm="gloss-gimpprint">Gimp-Print</glossseealso>
+ </glossdef>
+ </glossentry>
+
+ <glossentry id="gloss-pcl">
+ <glossterm><acronym>PCL</acronym></glossterm>
+- <glossdef><para>Abbreviation for <emphasis>P</emphasis>rinter
+- <emphasis>C</emphasis>ontrol <emphasis>L</emphasis>anguage;
++ <glossdef><para>Abbreviation for &emstart;P&emend;rinter
++ &emstart;C&emend;ontrol &emstart;L&emend;anguage;
+ developed by &HP;. PCL started off in version 1 as a simple
+ command set for ASCII printing; now,
+ in its versions PCL6 and PCL-X, it is capable of printing graphics
+@@ -925,8 +586,8 @@
+
+ <glossentry id="gloss-pdl">
+ <glossterm><acronym>PDL</acronym></glossterm>
+- <glossdef><para>Abbreviation for <emphasis>P</emphasis>age
+- <emphasis>D</emphasis>escription <emphasis>L</emphasis>anguage;
++ <glossdef><para>Abbreviation for &emstart;P&emend;age
++ &emstart;D&emend;escription &emstart;L&emend;anguage;
+ PDLs describe, in an abstract way, the graphical representation
+ of a page. - Before it is actually transferred into
+ toner or ink laid down on to paper, a PDL needs to be
+@@ -942,8 +603,8 @@
+
+ <glossentry id="gloss-pixel">
+ <glossterm>Pixel</glossterm>
+- <glossdef><para>Abbreviation for <emphasis>Pic</emphasis>ture
+- <emphasis>El</emphasis>ement; this term describes the smallest
++ <glossdef><para>Abbreviation for &emstart;Pic&emend;ture
++ &emstart;El&emend;ement; this term describes the smallest
+ part of a raster picture (either as printed on paper
+ or as displayed on a monitor by cathode rays or LCD elements). As
+ any graphical or image representation on those types of output
+@@ -959,8 +620,8 @@
+
+ <glossentry id="gloss-pjl">
+ <glossterm><acronym>PJL</acronym></glossterm>
+- <glossdef><para>Abbreviation for <emphasis>P</emphasis>rint
+- <emphasis>J</emphasis>ob <emphasis>L</emphasis>anguage;
++ <glossdef><para>Abbreviation for &emstart;P&emend;rint
++ &emstart;J&emend;ob &emstart;L&emend;anguage;
+ developed by &HP; to control and influence default and per-job
+ settings of a printer. It may not only be used
+ for &HP;'s own (PCL-)printers; also many &PostScript;
+@@ -975,11 +636,7 @@
+ <glossdef><para>&PostScript; (often shortened to "PS") is the de-facto
+ standard in the &UNIX; world for printing files. It was
+ developed by Adobe and licensed to printer manufacturers
+- and software companies.
+-<!--
+- </para>
+- <para>
+--->
++ and software companies.&newpara;
+ As the &PostScript; specifications were
+ published by Adobe, there are also "Third Party" implementations
+ of &PostScript; generating and &PostScript; interpreting software
+@@ -995,36 +652,21 @@
+
+ <glossentry id="gloss-ppd">
+ <glossterm><acronym>PPD</acronym></glossterm>
+- <glossdef><para>Abbreviation for <emphasis>P</emphasis>ostScript
+- <emphasis>P</emphasis>rinter <emphasis>D</emphasis>escription;
++ <glossdef><para>Abbreviation for &emstart;P&emend;ostScript
++ &emstart;P&emend;rinter &emstart;D&emend;escription;
+ PPDs are ASCII files storing all information about the special
+ capabilities of a printer, plus definitions of the (PostScript-
+ or PJL-) commands to call on a certain capability (like print
+- duplexing).
+-<!--
+- </para>
+- <para>
+--->
-
--bool lowerIOPriority()
--{
--#ifdef SYS_ioprio_set
-- if ( syscall( SYS_ioprio_set, IOPRIO_WHO_PROCESS, 0, IOPRIO_CLASS_IDLE<<IOPRIO_CLASS_SHIFT ) < 0 ) {
-- qDebug( "cannot set io scheduling to idle (%s). Trying best effort.\n", strerror( errno ));
-- if ( syscall( SYS_ioprio_set, IOPRIO_WHO_PROCESS, 0, 7|IOPRIO_CLASS_BE<<IOPRIO_CLASS_SHIFT ) < 0 ) {
-- qDebug( "cannot set io scheduling to best effort.\n");
-- return false;
-- }
-- }
-- return true;
--#else
-- return false;
--#endif
--}
++ duplexing).&newpara;
+ As the explanation of the acronym reveals, PPDs were originally
+ only used for &PostScript; printers. &CUPS; has extended the
+- PPD concept to all types of printers.
+-<!--
+- </para>
+- <para>
+--->
-
++ PPD concept to all types of printers.&newpara;
+ PPDs for &PostScript; printers are provided by the printer
+- vendors. They can be used with &CUPS; and KDEPrint to have access
+- to the full features of any &PostScript; printer. The KDEPrint Team
++ vendors. They can be used with &CUPS; and &kde; printing subsystem to have access
++ to the full features of any &PostScript; printer. The &kde; Team
+ recommends using a PPD originally intended for use with
+- &Microsoft; Windows NT.
+-<!--
+- </para>
+- <para>
+--->
-
--bool lowerPriority()
--{
--#ifndef Q_OS_WIN
-- return !setpriority( PRIO_PROCESS, 0, 19 );
--#else
-- return false;
--#endif
--}
+- PPDs for non-PostScript printers <emphasis>need</emphasis> a
++ &Microsoft; Windows NT.&newpara;
++ PPDs for non-PostScript printers &emstart;need&emend; a
+ companion "filter" to process the &PostScript; print files into
+ a format digestible for the non-PostScript target device. Those
+ PPD/filter combos are not (yet) available from the vendors. After
+@@ -1043,41 +685,6 @@
+ </glossdef>
+ </glossentry>
+
+- <glossentry id="gloss-PPD-O-Matic">
+- <glossterm>PPD-O-Matic</glossterm>
+- <glossdef><para>PPD-O-Matic is a set of Perl scripts that run on the Linuxprinting.org
+- web server and can be used online to generate PPDs for any printer that is known
+- to print with Ghostscript.
+-<!--
+- </para>
+- <para>
+--->
-
+- These PPDs can be hooked up to &CUPS;/KDEPrint, as well as
+- used inside PPD-aware applications like StarOffice to determine all different
+- parameters of your printjobs. It is now recommended, in most cases, to
+- use "PPD-O-Matic" instead of the older &CUPS;-O-Matic.
+-<!--
+- </para>
+- <para>
+--->
-
--// FIXME: is this really useful? Should we better use SCHED_IDLE?
--bool lowerSchedulingPriority()
--{
--#ifdef SCHED_BATCH
-- struct sched_param param;
-- memset( ¶m, 0, sizeof(param) );
-- param.sched_priority = 0;
-- return !sched_setscheduler( 0, SCHED_BATCH, ¶m );
--#else
-- return false;
--#endif
--}
---- runtime/nepomuk/services/strigi/priority.h (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/services/strigi/priority.h (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -1,26 +0,0 @@
--/* This file is part of the KDE Project
-- Copyright (c) 2008 Sebastian Trueg <trueg@kde.org>
+- To generate a PPD, go to the <ulink
+- url="http://www.linuxprinting.org/printer_list.cgi">printer
+- database</ulink>, select your printer model, follow
+- the link to show the available Ghostscript filters for that printer, select
+- one, click "generate" and finally save the file to your local system.
+- Be sure to read the instructions. Make sure that your local system
+- does indeed have Ghostscript and the filter, which you chose
+- before generating the PPD, installed.
+- </para>
+- <glossseealso otherterm="gloss-postscript">&PostScript;</glossseealso>
+- <glossseealso otherterm="gloss-cups-o-matic">&CUPS;-O-Matic</glossseealso>
+- <glossseealso otherterm="gloss-linuxprintingorg">Linuxprinting.org</glossseealso>
+- <glossseealso otherterm="gloss-foomatic">Foomatic</glossseealso>
+- </glossdef>
+- </glossentry>
-
-- This library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Library General Public
-- License version 2 as published by the Free Software Foundation.
+ <glossentry id="gloss-printcap">
+ <glossterm>printcap</glossterm>
+ <glossdef><para>In BSD-style print systems, the "printcap" file holds
+@@ -1095,8 +702,8 @@
+ <glossentry id="gloss-printermib">
+ <glossterm>Printer-<acronym>MIB</acronym></glossterm>
+ <glossdef><para>Abbreviation for
+- <emphasis>Printer</emphasis>-<emphasis>M</emphasis>anagement
+- <emphasis>I</emphasis>nformation <emphasis>B</emphasis>ase; the
++ &emstart;Printer&emend;-&emstart;M&emend;anagement
++ &emstart;I&emend;nformation &emstart;B&emend;ase; the
+ Printer-MIB defines a set of parameters that are to be
+ stored inside the printer for access
+ through the network. This is useful if many (in some cases, literally
+@@ -1110,8 +717,8 @@
+ <glossentry id="gloss-pwg">
+ <glossterm><acronym>PWG</acronym></glossterm>
+ <glossdef><para>Abbreviation for
+- <emphasis>P</emphasis>rinter <emphasis>W</emphasis>orking
+- <emphasis>G</emphasis>roup; the PWG is a loose grouping of
++ &emstart;P&emend;rinter &emstart;W&emend;orking
++ &emstart;G&emend;roup; the PWG is a loose grouping of
+ representatives of the printer industry that has, in the past
+ years, developed different standards
+ in relation to network printing. These were later accepted by the
+@@ -1123,62 +730,38 @@
+ </glossdef>
+ </glossentry>
+
++<!--
+ <glossentry id="gloss-printkioslave">
+ <glossterm>print:/ KIO Slave</glossterm>
+ <glossdef><para>You can use a syntax of "print:/..." to get quick access
+- to KDEPrint resources. Typing "print:/manager" as a Konqueror URL
++ to &kde; printing subsystem resources. Typing "print:/manager" as a Konqueror URL
+ address gives administrative access to KDEPrint. Konqueror uses &kde;'s
+ famous "KParts" technology to achieve that. </para>
+ <glossseealso otherterm="gloss-ioslave">IO Slave</glossseealso>
+ <glossseealso otherterm="gloss-kparts">KParts</glossseealso>
+ </glossdef>
+ </glossentry>
++-->
+
-
-- This library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Library General Public License for more details.
+ <glossentry id="gloss-printerdatabase">
+ <glossterm>Printer Database</glossterm>
+- <glossdef><para>.</para>
++ <glossdef><para>Good database of printer drivers can be found at &linkstart;"http://www.openprinting.org/printers"&linkmid;http://www.openprinting.org/printers&linkend;.</para>
+ <glossseealso otherterm="gloss-linuxprintingdatabase">Linuxprinting Database</glossseealso>
+ </glossdef>
+ </glossentry>
+
+- <glossentry id="gloss-qtcups">
+- <glossterm><acronym>Qt&CUPS;</acronym></glossterm>
+- <glossdef><para>Qt&CUPS; and KUPS were the predecessors of KDEPrint; they are now
+- deprecated and no longer maintained. What was good in qtcups is all inherited
+- by "kprinter", the new KDE print dialog (which is much improved over qtcups);
+- what you liked about kups is now all in the KDEPrint Manager (accessible
+- via the KDE Control Center or via the URL "print:/manager" from Konqueror) --
+- with more functionality and less bugs... Its former developer, Michael Goffioul, is now
+- the developer of KDEPrint -- a very nice and productive guy and quick bug fixer...
+- </para>
+- <glossseealso otherterm="gloss-kprinter">kprinter</glossseealso>
+- </glossdef>
+- </glossentry>
-
-- You should have received a copy of the GNU Library General Public License
-- along with this library; see the file COPYING.LIB. If not, write to
-- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-- Boston, MA 02110-1301, USA.
--*/
+ <glossentry id="gloss-raster">
+ <glossterm>Raster Image</glossterm>
+ <glossdef><para>Every picture on a physical medium
+ is composed of a pattern of discrete dots in different colors and (maybe)
+- sizes. This is called a "raster image".
+-<!--
+- </para>
+- <para>
+--->
-
--#ifndef _NEPOMUK_LINUX_PRIORITY_H_
--#define _NEPOMUK_LINUX_PRIORITY_H_
++ sizes. This is called a "raster image".&newpara;
+ This is as opposed to a "vector image"
+ where the graphic is described in terms of continuous curves, shades,
+ forms and filled areas, represented by mathematical formula. Vector images
+ normally have a smaller file size and may be scaled in size
+ without any loss of information and quality --- but they cannot be
+ output directly, but always have to be "rendered" or "rasterized"
+- first to the given resolution that the output device is capable of...
+-<!--
+- </para>
+- <para>
+--->
-
--bool lowerIOPriority();
--bool lowerSchedulingPriority();
--bool lowerPriority();
-
--#endif // _NEPOMUK_LINUX_PRIORITY_H_
---- runtime/nepomuk/services/strigi/strigiservice.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/services/strigi/strigiservice.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -18,7 +18,6 @@
-
- #include "strigiservice.h"
- #include "strigiserviceadaptor.h"
--#include "priority.h"
- #include "indexscheduler.h"
- #include "eventmonitor.h"
- #include "systray.h"
-@@ -42,16 +41,6 @@
- : Service( parent, true ),
- m_indexManager( 0 )
- {
-- // lower process priority - we do not want to spoil KDE usage
-- // ==============================================================
-- if ( !lowerPriority() )
-- kDebug() << "Failed to lower priority.";
-- if ( !lowerSchedulingPriority() )
-- kDebug() << "Failed to lower scheduling priority.";
-- if ( !lowerIOPriority() )
-- kDebug() << "Failed to lower io priority.";
++ first to the given resolution that the output device is capable of...&newpara;
+ The rasterization is done by a Raster Image Processor (RIP,
+ often the Ghostscript software) or some other filtering
+ instance.</para>
+@@ -1193,26 +776,16 @@
+ <glossentry id="gloss-rip">
+ <glossterm><acronym>RIP</acronym></glossterm>
+ <glossdef><para>Abbreviation for
+- <emphasis>R</emphasis>aster <emphasis>I</emphasis>mage
+- <emphasis>P</emphasis>rocess(or); if used in the context of
++ &emstart;R&emend;aster &emstart;I&emend;mage
++ &emstart;P&emend;rocess(or); if used in the context of
+ printing, "RIP" means a hardware or software
+ instance that converts &PostScript; (or other print formats
+ that are represented in one of the non-Raster PDLs) into a
+ raster image format in such a way that it is acceptable
+- for the "marking engine" of the printer.
+-<!--
+- </para>
+- <para>
+--->
-
++ for the "marking engine" of the printer.&newpara;
+ &PostScript; printers
+ contain their own PostScript-RIPs. A RIP may or may not be located
+- inside a printer.
+-<!--
+- </para>
+- <para>
+--->
-
- // setup the actual index scheduler including strigi stuff
- // ==============================================================
- if ( ( m_indexManager = Strigi::IndexPluginLoader::createIndexManager( "nepomukbackend", 0 ) ) ) {
---- runtime/nepomuk/services/strigi/nepomukstrigiservice.notifyrc (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/services/strigi/nepomukstrigiservice.notifyrc (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -19,6 +19,7 @@
- Comment[ga]=Cuardach Deisce
- Comment[hi]=डेस्कटॉप खोज
- Comment[hr]=Pretraživanje računala
-+Comment[hu]=Asztali keresés
- Comment[ia]=Cerca de Scriptorio
- Comment[id]=Pencarian Desktop
- Comment[is]=Skjáborðsleit
-@@ -49,6 +50,7 @@
- Comment[sv]=Skrivbordssökning
- Comment[tg]=Ҷустуҷӯи мизи корӣ
- Comment[th]=ค้นหาผ่านพื้นที่ทำงาน
-+Comment[tr]=Masaüstü Araması
- Comment[uk]=Стільничний пошук
- Comment[x-test]=xxDesktop Searchxx
- Comment[zh_CN]=桌面搜索
---- runtime/nepomuk/services/strigi/CMakeLists.txt (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/services/strigi/CMakeLists.txt (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -28,7 +28,6 @@
- strigiservice.cpp
- strigiserviceadaptor.cpp
- indexscheduler.cpp
-- priority.cpp
- strigiserviceconfig.cpp
- eventmonitor.cpp
- systray.cpp
---- runtime/nepomuk/services/activities/nepomukactivitiesservice.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/services/activities/nepomukactivitiesservice.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -48,6 +48,7 @@
- Name[sr@latin]=Nepomukov servis aktivnosti
- Name[sv]=Nepomuk aktivitetstjänst
- Name[th]=บริการ Nepomuk Activities
-+Name[tr]=Nepomuk Eylemler Servisi
- Name[uk]=Служба просторів дій Nepomuk
- Name[x-test]=xxNepomuk Activities Servicexx
- Name[zh_CN]=Nepomuk 活动服务
---- runtime/nepomuk/services/storage/nepomukstorage.notifyrc (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/services/storage/nepomukstorage.notifyrc (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -49,6 +49,7 @@
- Name[sv]=Semantisk datalagring
- Name[tg]=Захирагоҳи маъноии маълумот
- Name[th]=ที่จัดเก็บข้อมูลของระบบค้นหา
-+Name[tr]=Anlamsal Veri Depolama
- Name[uk]=Сховище семантичних даних
- Name[x-test]=xxSemantic Data Storagexx
- Name[zh_CN]=语义学数据存储
-@@ -101,6 +102,7 @@
- Comment[sv]=Semantiskt skrivbord
- Comment[tg]=Мизи кории маъноӣ
- Comment[th]=ระบบค้นหาผ่านพื้นที่ทำงาน
-+Comment[tr]=Anlamsal Masaüstü
- Comment[uk]=Семантична стільниця
- Comment[x-test]=xxSemantic Desktopxx
- Comment[zh_CN]=语义学桌面
---- runtime/nepomuk/services/storage/repository.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/services/storage/repository.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -336,6 +336,10 @@
- // Always force the start, ie. kill previously started Virtuoso instances
- settings << Soprano::BackendSetting( "forcedstart", true );
-
-+ // 100 server threads is hopefully enough - at some point the problem of maximum server threads == max client
-+ // needs to be addressed as well
-+ settings << Soprano::BackendSetting( "thread", 100 );
-+
- return settings;
- }
++ inside a printer.&newpara;
+ For many &UNIX; systems, Ghostscript is the package that provides
+ a "RIP in software", running on the host computer, and pre-digesting
+ the &PostScript; or other data to become ready to be sent to the
+@@ -1231,33 +804,18 @@
---- runtime/nepomuk/services/filewatch/nepomukfilewatch.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/services/filewatch/nepomukfilewatch.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -19,7 +19,6 @@
- #include "nepomukfilewatch.h"
- #include "metadatamover.h"
- #include "strigiserviceinterface.h"
--#include "../strigi/priority.h"
- #include "nie.h"
-
- #ifdef BUILD_KINOTIFY
-@@ -120,10 +119,6 @@
- m_metadataMover->start();
-
- #ifdef BUILD_KINOTIFY
-- // listing all folders in watchFolder below will be IO-intensive. Do not grab it all
-- if ( !lowerIOPriority() )
-- kDebug() << "Failed to lower io priority.";
+ <glossentry id="gloss-rlpr">
+ <glossterm><acronym>RLPR</acronym> (Remote LPR)</glossterm>
+- <glossdef><para>Abbreviation for <emphasis>R</emphasis>emote
+- <emphasis>L</emphasis>ine <emphasis>P</emphasis>rinting
+- <emphasis>R</emphasis>equest; this is a BSD-style printing system,
++ <glossdef><para>Abbreviation for &emstart;R&emend;emote
++ &emstart;L&emend;ine &emstart;P&emend;rinting
++ &emstart;R&emend;equest; this is a BSD-style printing system,
+ that needs no root privileges to be installed, and no "printcap" to
+ work: all parameters may be specified on the command
+- line.
+-<!--
+- </para>
+- <para>
+--->
-
- // monitor the file system for changes (restricted by the inotify limit)
- m_dirWatch = new KInotify( this );
-
---- runtime/nepomuk/services/filewatch/CMakeLists.txt (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/services/filewatch/CMakeLists.txt (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -16,7 +16,6 @@
- nepomukfilewatch.cpp
- metadatamover.cpp
- updaterequest.cpp
-- ../strigi/priority.cpp
- )
-
- qt4_add_dbus_interface(SRCS ../../interfaces/org.kde.nepomuk.Strigi.xml strigiserviceinterface)
---- runtime/nepomuk/services/filewatch/kinotify.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/services/filewatch/kinotify.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -299,36 +299,31 @@
-
- QByteArray encodedPath = QByteArray::fromRawData( event->name, event->len );
-
-- kDebug() << encodedPath;
++ line.&newpara;
+ RLPR comes in handy for many laptop users who are
+ working in frequently changing environments. This is because it
+ may be installed concurrently with every other printing
+ sub system, and allows a very flexible and quick
+ way to install a printer for direct access via LPR/LPD.
+-<!--
+ </para>
+- <para>
+--->
-
- if ( encodedPath[0] != '/' ) {
- encodedPath = d->pathHash.value( event->wd ) + '/' + encodedPath;
- }
+- KDEPrint
+- has an "Add Printer Wizard" to make RLPR usage even easier.
+- The kprinter command allows switching to RLPR "on
+- the fly" at any time.</para>
+- <glossseealso otherterm="gloss-kdeprint">KDEPrint</glossseealso>
+- <glossseealso otherterm="gloss-kprinter">kprinter</glossseealso>
+ <glossseealso otherterm="gloss-printcap">printcap</glossseealso>
+ </glossdef>
+ </glossentry>
+@@ -1265,9 +823,9 @@
+
+ <glossentry id="gloss-snmp">
+ <glossterm><acronym>SNMP</acronym></glossterm>
+- <glossdef><para>Abbreviation for <emphasis>S</emphasis>imple
+- <emphasis>N</emphasis>etwork <emphasis>M</emphasis>anagement
+- <emphasis>P</emphasis>rotocol; SNMP is widely used to control
++ <glossdef><para>Abbreviation for &emstart;S&emend;imple
++ &emstart;N&emend;etwork &emstart;M&emend;anagement
++ &emstart;P&emend;rotocol; SNMP is widely used to control
+ all types of network node (Hosts, Routers, Switches, Gateways,
+ Printers...) remotely.</para>
+ <glossseealso otherterm="gloss-pwg">PWG</glossseealso>
+@@ -1277,8 +835,8 @@
- QString path = QFile::decodeName( encodedPath );
+ <glossentry id="gloss-ssl">
+ <glossterm><acronym>SSL(3)</acronym> encryption</glossterm>
+- <glossdef><para>Abbreviation for <emphasis>S</emphasis>ecure
+- <emphasis>S</emphasis>ocket <emphasis>L</emphasis>ayer;
++ <glossdef><para>Abbreviation for &emstart;S&emend;ecure
++ &emstart;S&emend;ocket &emstart;L&emend;ayer;
+ <acronym>SSL</acronym> is a proprietary encryption method for data
+ transfer over HTTP that was developed by Netscape. It is now being
+ replaced by an IETF standard named TLS.
+@@ -1290,9 +848,9 @@
+
+ <glossentry id="gloss-spooling">
+ <glossterm><acronym>SPOOL</acronym>ing</glossterm>
+- <glossdef><para>Abbreviation for <emphasis>S</emphasis>ynchronous
+- <emphasis>P</emphasis>eripheral <emphasis>O</emphasis>perations
+- <emphasis>O</emphasis>n<emphasis>L</emphasis>ine;
++ <glossdef><para>Abbreviation for &emstart;S&emend;ynchronous
++ &emstart;P&emend;eripheral &emstart;O&emend;perations
++ &emstart;O&emend;n&emstart;L&emend;ine;
+ <acronym>SPOOL</acronym>ing enables printing applications
+ (and users) to continue their work
+ as the job is being taken care of by a system <acronym>daemon</acronym>,
+@@ -1305,10 +863,10 @@
+
+ <glossentry id="gloss-tls">
+ <glossterm><acronym>TLS</acronym> encryption</glossterm>
+- <glossdef><para>Abbreviation for <emphasis>T</emphasis>ransport
+- <emphasis>L</emphasis>ayer <emphasis>S</emphasis>ecurity;
++ <glossdef><para>Abbreviation for &emstart;T&emend;ransport
++ &emstart;L&emend;ayer &emstart;S&emend;ecurity;
+ <acronym>TLS</acronym> is an encryption standard for
+- data transfered over HTTP 1.1; it is defined in RFC 2246;
++ data transferred over HTTP 1.1; it is defined in RFC 2246;
+ although based on the former SSL development
+ (from Netscape) it is not fully compatible with it.
+ </para>
+@@ -1346,11 +904,11 @@
+
+ <glossentry id="gloss-xpp">
+ <glossterm><acronym>XPP</acronym></glossterm>
+- <glossdef><para>Abbreviation for <emphasis>X</emphasis>
+- <emphasis>P</emphasis>rinting <emphasis>P</emphasis>anel;
++ <glossdef><para>Abbreviation for &emstart;X&emend;
++ &emstart;P&emend;rinting &emstart;P&emend;anel;
+ <acronym>XPP</acronym> was the first Free
+ graphical print command for &CUPS;, written by Till Kamppeter,
+- and in some ways a model for the "kprinter" utility in &kde;.</para>
++ and in some ways a model for the "kprinter" utility in &kde; 3.</para>
+ </glossdef>
+ </glossentry>
+ <!--
+--- runtime/doc/glossary/checkxrefs (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/doc/glossary/checkxrefs (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ DEFINED_ENTRIES=`sed -ne "s^.*<glossentry id=\"\(.*\)\">.*^\1^p" *.docbook`
+-REFERENCED_ENTRIES=`sed -ne "s^.*<glossseealso otherterm=\"\(.*\)\">.*^\1^p" *.docbook | unique`
++REFERENCED_ENTRIES=`sed -ne "s^.*<glossseealso otherterm=\"\(.*\)\">.*^\1^p" *.docbook | uniq`
+
+ # Check for entries which are referenced but not defined.
+ for ENTRY in $REFERENCED_ENTRIES; do
+--- runtime/doc/glossary/index.docbook (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/doc/glossary/index.docbook (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -3,17 +3,95 @@
+ <!ENTITY % addindex "IGNORE">
+ <!ENTITY % English "INCLUDE">
+ <!ENTITY glossary-kdeprinting SYSTEM "kdeprintingglossary.docbook">
++<!ENTITY newpara "</p><p>">
++<!ENTITY linkstart "<a href=">
++<!ENTITY linkmid ' target="_top">'>
++<!ENTITY linkend "</a>">
-- kDebug() << path;
-
++<!ENTITY emstart '<span class="emphasis"><em>' >
++<!ENTITY emend '</em></span>'>
++<!-- acronym, systemitem unchanged
++itemizedlist+listitem changed to simple para -->
+ ]>
+
+
+-<glossary id="glossary">
++<glossary lang="&language;" id="glossary">
+
+-&glossary-kdeprinting;
-
- // now signal the event
- if ( event->mask & EventAccess) {
-- kDebug() << path << "EventAccess";
-+// kDebug() << path << "EventAccess";
- emit accessed( path );
- }
- if ( event->mask & EventAttributeChange ) {
-- kDebug() << path << "EventAttributeChange";
-+// kDebug() << path << "EventAttributeChange";
- emit attributeChanged( path );
- }
- if ( event->mask & EventCloseWrite ) {
-- kDebug() << path << "EventCloseWrite";
-+// kDebug() << path << "EventCloseWrite";
- emit closedWrite( path );
- }
- if ( event->mask & EventCloseRead ) {
-- kDebug() << path << "EventCloseRead";
-+// kDebug() << path << "EventCloseRead";
- emit closedRead( path );
- }
- if ( event->mask & EventCreate ) {
-- kDebug() << path << "EventCreate";
-+// kDebug() << path << "EventCreate";
- if ( event->mask & IN_ISDIR ) {
- // FIXME: store the mode and flags somewhere
- addWatch( encodedPath, d->mode, d->flags );
-@@ -336,28 +331,28 @@
- emit created( path );
- }
- if ( event->mask & EventDelete ) {
-- kDebug() << path << "EventDelete";
-+// kDebug() << path << "EventDelete";
- if ( event->mask & IN_ISDIR ) {
- d->removeWatch( event->wd );
- }
- emit deleted( path );
- }
- if ( event->mask & EventDeleteSelf ) {
-- kDebug() << path << "EventDeleteSelf";
-+// kDebug() << path << "EventDeleteSelf";
- if ( event->mask & IN_ISDIR ) {
- d->removeWatch( event->wd );
- }
- emit deleted( path );
- }
- if ( event->mask & EventModify ) {
-- kDebug() << path << "EventModify";
-+// kDebug() << path << "EventModify";
- emit modified( path );
- }
- if ( event->mask & EventMoveSelf ) {
-- kDebug() << path << "EventMoveSelf";
-+// kDebug() << path << "EventMoveSelf";
- }
- if ( event->mask & EventMoveFrom ) {
-- kDebug() << path << "EventMoveFrom";
-+// kDebug() << path << "EventMoveFrom";
- d->cookies[event->cookie] = path;
- }
- if ( event->mask & EventMoveTo ) {
-@@ -365,7 +360,7 @@
- if ( d->cookies.contains( event->cookie ) ) {
- QString oldPath = d->cookies[event->cookie];
- d->cookies.remove( event->cookie );
-- kDebug() << oldPath << "EventMoveTo" << path;
-+// kDebug() << oldPath << "EventMoveTo" << path;
- emit moved( oldPath, path );
- }
- else {
-@@ -373,11 +368,11 @@
- }
- }
- if ( event->mask & EventOpen ) {
-- kDebug() << path << "EventOpen";
-+// kDebug() << path << "EventOpen";
- emit opened( path );
- }
- if ( event->mask & EventUnmount ) {
-- kDebug() << path << "EventUnmount. removing from path hash";
-+// kDebug() << path << "EventUnmount. removing from path hash";
- if ( event->mask & IN_ISDIR ) {
- d->removeWatch( event->wd );
- }
---- runtime/nepomuk/services/queryservice/queryservice.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/services/queryservice/queryservice.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -51,9 +51,8 @@
-
- s_instance = this;
-
-- m_serviceWatcher = new QDBusServiceWatcher( QString(),
-- QDBusConnection::sessionBus(),
-- QDBusServiceWatcher::WatchForUnregistration, this);
-+ m_serviceWatcher = new QDBusServiceWatcher( this );
-+ m_serviceWatcher->setWatchMode( QDBusServiceWatcher::WatchForUnregistration );
-
- connect( m_serviceWatcher, SIGNAL( serviceUnregistered(const QString& ) ),
- this, SLOT( slotServiceUnregistered( const QString& ) ) );
-@@ -62,6 +61,9 @@
-
- Nepomuk::Query::QueryService::~QueryService()
- {
-+ // cannot use qDeleteAll since deleting a folder changes m_openQueryFolders
-+ while ( !m_openConnections.isEmpty() )
-+ delete m_openConnections.begin().value();
- }
+ <glossdiv id="glossdiv-technologies">
+ <title>Technologies</title>
++ <glossentry id="gloss-akonadi">
++ <glossterm>Akonadi</glossterm>
++ <glossdef><para>The data storage access mechanism for all PIM (Personal Information Manager) data in &kde; SC 4. One single
++ storage and retrieval system allows efficiency and extensibility not possible under &kde; 3, where each PIM component had
++ its own system. Note that use of Akonadi does not change data storage formats (vcard, iCalendar, mbox, maildir etc.) - it
++ just provides a new way of accessing and updating the data.&newpara;
++ The main reasons for design and development of Akonadi are of technical nature, ⪚ having a unique way to access PIM-data (contacts, calendars, emails..) from different applications (⪚ &kmail;, &kword; &etc;), thus eliminating the need to write similar code here and there.&newpara;
++ Another goal is to de-couple GUI applications like &kmail; from the direct access to external resources like mail-servers - which was a major reason for bug-reports/wishes with regard to performance/responsiveness in the past.&newpara;
++ More info:&newpara;
++ &linkstart;"http://pim.kde.org/akonadi/"&linkmid;Akonadi for KDE's PIM&linkend;&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/Akonadi"&linkmid;Wikipedia: Akonadi&linkend;&newpara;
++ &linkstart;"http://techbase.kde.org/Projects/PIM/Akonadi"&linkmid;Techbase - Akonadi&linkend;</para>
++ <glossseealso otherterm="gloss-gui">&GUI;</glossseealso>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-arts">
++ <glossterm>ARts</glossterm>
++ <glossdef><para>The sound framework in &kde; 2 and 3. Its single-tasking nature caused problems when two sources of sound were encountered. In the &plasma; desktop it is replaced by Phonon.&newpara;
++ More info:&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/ARts"&linkmid; Wikipedia: ARts&linkend;&newpara;
++ &linkstart;"http://www.arts-project.org"&linkmid;ARts home page&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-phonon">Phonon</glossseealso>
++ <glossseealso otherterm="gloss-plasma">&plasma;</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-dbus">
++ <glossterm>D-Bus</glossterm>
++ <glossdef><para>D-Bus or Desktop Bus is an inter-service messaging system. Developed by &RedHat;, it was heavily influenced by &kde; 3 DCOP, which it supersedes. Most POSIX operating systems support D-Bus, and a port for Windows exists. It is used by Qt 4 and GNOME.&newpara;
++ More info:&newpara;
++ &linkstart;"http://freedesktop.org/wiki/Software/dbus/"&linkmid;FreeDesktop.org: What is D-Bus?&linkend;&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/D-Bus"&linkmid;Wikipedia: D-Bus&linkend;</para>
++ <glossseealso otherterm="gloss-dcop">&DCOP;</glossseealso>
++ <glossseealso otherterm="gloss-gnome">GNOME</glossseealso>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-qt">&Qt;</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-dcop">
++ <glossterm>DCOP</glossterm>
++ <glossdef><para><acronym>DCOP</acronym>, which stands for Desktop COmmunication Protocol, is a light-weight interprocess and software componentry communication system used in &kde; 3. Replaced with &DBus; in &kde; SC 4.&newpara;
++ More info:&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/DCOP"&linkmid;Wikipedia: DCOP&linkend;</para>
++ <glossseealso otherterm="gloss-dbus">D-Bus</glossseealso>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-flake">
++ <glossterm>Flake</glossterm>
++ <glossdef><para>Flake is a programming library to be used in &koffice; 2. Functionally, it provides Shapes to display content and Tools to manipulate content. Shapes can be zoomed or rotated and can be grouped to work as a single Shape, around which text flow is possible.&newpara;
++ More info:&newpara;
++ &linkstart;"http://wiki.koffice.org/index.php?title=Flake"&linkmid;KOffice Wiki: Flake&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-kparts">KParts</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-ghns">
++ <glossterm>Get Hot New Stuff</glossterm>
++ <glossdef><para>&emstart;G&emend;et &emstart;H&emend;ot &emstart;N&emend;ew &emstart;S&emend;tuff (GHNS) is an open standard that makes it easy for users to download and install various extensions for their applications. Our implementation of GHNS is used by &plasma; (for example to get new desktop themes), and by many applications and widgets.&newpara;
++ More info:&newpara;
++ &linkstart;"http://ghns.freedesktop.org"&linkmid;Home of GHNS&linkend;&newpara;
++ &linkstart;"http://lwn.net/Articles/227855/"&linkmid;An article on GHNS in &kde; SC 4&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-plasma">&plasma;</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-ghnsaccr">
++ <glossterm>GHNS</glossterm>
++ <glossdef><para><acronym>GHNS</acronym> is the acronym of Get Hot New Stuff.</para>
++ <glossseealso otherterm="gloss-ghns">Get Hot New Stuff</glossseealso>
++ </glossdef>
++ </glossentry>
+ <glossentry id="gloss-ioslave">
+ <glossterm><acronym>IO</acronym> Slave</glossterm>
+ <glossdef><para><acronym>IO</acronym> Slaves enable &kde; applications to
+@@ -24,6 +102,16 @@
+ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
+ </glossdef>
+ </glossentry>
++ <glossentry id="gloss-khtml">
++ <glossterm>KHTML</glossterm>
++ <glossdef><para>KHTML is the &HTML; rendering engine for the &kde; &plasma; desktop, as used by the &konqueror; browser. It also provides a KPart that enables all &kde; applications to display web content. A new introduction, &Qt; WebKit is also for Plasma and other application development.</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-konqueror">&konqueror;</glossseealso>
++ <glossseealso otherterm="gloss-kparts">KParts</glossseealso>
++ <glossseealso otherterm="gloss-plasma">&plasma;</glossseealso>
++ <glossseealso otherterm="gloss-webkit">WebKit</glossseealso>
++ </glossdef>
++ </glossentry>
+ <glossentry id="gloss-kio">
+ <glossterm><acronym>KIO</acronym></glossterm>
+ <glossdef><para>The &kde; Input/Output system which makes use of so-called
+@@ -33,6 +121,12 @@
+ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
+ </glossdef>
+ </glossentry>
++ <glossentry id="gloss-kiosk">
++ <glossterm>Kiosk</glossterm>
++ <glossdef><para>Kiosk is a framework for restricting user capabilities on a &kde; platform system, ideal for use in locked-down environments such as Internet cafés. It is present in &kde; 3 and &kde; 4, but the administration tool, <application>Kiosktool</application> is &kde; 3 only. It can be used to configure &kde; 4 applications, or kiosk configurations can be maintained by editing config files manually.</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ </glossdef>
++ </glossentry>
+ <glossentry id="gloss-kparts">
+ <glossterm>KParts</glossterm>
+ <glossdef><para>KParts is an embedding technology which allows &kde;
+@@ -43,23 +137,71 @@
+ </glossentry>
+ <glossentry id="gloss-ksycoca">
+ <glossterm><acronym>KSycoca</acronym></glossterm>
+- <glossdef><para><acronym>KSycoca</acronym> (&kde; <emphasis>Sy</emphasis>stem
+- <emphasis>Co</emphasis>nfiguration <emphasis>Ca</emphasis>che) is a
++ <glossdef><para><acronym>KSycoca</acronym> (&kde; &emstart;Sy&emend;stem
++ &emstart;Co&emend;nfiguration &emstart;Ca&emend;che) is a
+ configuration cache which, for example, guarantees fast access to the menu
+ entries.</para>
+ <glossseealso
+ otherterm="gloss-kbuildsycoca"><application>KBuildSycoca</application></glossseealso>
+ </glossdef>
+ </glossentry>
++ <glossentry id="gloss-nepomuk">
++ <glossterm>Nepomuk</glossterm>
++ <glossdef><para>Nepomuk is the acronym of &emstart;N&emend;etworked &emstart;E&emend;nvironment for &emstart;P&emend;ersonalized, &emstart;O&emend;ntology-based &emstart;M&emend;anagement of &emstart;U&emend;nified &emstart;K&emend;nowledge. Nepomuk aims to remove artificial barriers between information to allow dynamic classification, organization and presentation of data to the user. Whether downloaded from the Internet, received in an email or scribbled in a note, information is globally searchable and tagged with intelligent data.&newpara;
++ More info:&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/Semantic_desktop"&linkmid;Wikipedia: Semantic Desktop&linkend;&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/NEPOMUK_(framework)"&linkmid;Wikipedia: NEPOMUK framework&linkend;&newpara;
++ &linkstart;"http://nepomuk.semanticdesktop.org/xwiki/bin/view/Main1/"&linkmid;NEPOMUK website&linkend;&newpara;
++ &linkstart;"http://nepomuk.kde.org/discover/user"&linkmid;NEPOMUK KDE&linkend;&newpara;
++ &linkstart;"http://userbase.kde.org/Nepomuk"&linkmid;Userbase Nepomuk page&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-phonon">
++ <glossterm>Phonon</glossterm>
++ <glossdef><para>A cross-platform multimedia API, interfacing with existing frameworks, such as gstreamer and xine engines. &kde; 2 and 3 depended on aRts for sound. Phonon replaces it.&newpara;
++ More info:&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/Phonon_(KDE)"&linkmid; Wikipedia: Phonon (KDE)&linkend;&newpara;
++ &linkstart;"http://phonon.kde.org"&linkmid;Phonon website&linkend;</para>
++ <glossseealso otherterm="gloss-arts">&arts;</glossseealso>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-solid">
++ <glossterm>Solid</glossterm>
++ <glossdef><para>Solid provides a single API for hardware management. Hardware is grouped into 'domains'. Since the backends for Solid are pluggable, Solid helps application developers write less code, and have it platform independent.&newpara;
++ More info:&newpara;
++ &linkstart;"http://solid.kde.org"&linkmid;Discover Solid&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-threadweaver">
++ <glossterm>Threadweaver</glossterm>
++ <glossdef><para>This thread programming library spreads work among multiple-core processors where available, prioritizing them before queuing them for execution. ThreadWeaver provides a high-level job interface for multithreaded programming.&newpara;
++ More info:&newpara;
++ &linkstart;"http://www.englishbreakfastnetwork.org/apidocs/apidox-kde-4.0/kdelibs-apidocs/threadweaver/html/Why.html"&linkmid;Why Multithreading?&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-webkit">
++ <glossterm>WebKit</glossterm>
++ <glossdef><para>HTML rendering engine, originating from a fork of KHTML. Adopted by <trademark>Apple</trademark> and developed for <trademark>Safari</trademark>. Webkit brings the whole functionality back to &kde; SC 4, where it is available through &Qt;.&newpara;
++ More info:&newpara;
++ &linkstart;"http://webkit.org/"&linkmid;WebKit home page&linkend;&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/Webkit"&linkmid;Wikipedia: WebKit&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-kde">KHTML</glossseealso>
++ </glossdef>
++ </glossentry>
+ </glossdiv>
+
+- <glossdiv id="glossdiv-xfree86">
+- <title>XFree86</title>
++ <glossdiv id="glossdiv-xorg">
++ <title>X.Org</title>
+ <glossentry id="gloss-antialiasing">
+ <glossterm>Antialiasing</glossterm>
+ <glossdef><para>If mentioned in context with &kde;, anti-aliasing often means
+- the smoothing of the fonts visible on the screen. &Qt; version 2.3.0
+- or higher used together with XFree86 4.x makes this possible under &kde;
++ the smoothing of the fonts visible on the screen. &Qt; version 3.3
++ or higher used together with X.Org server makes this possible under &kde;
+ as well.</para>
+ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
+ <glossseealso otherterm="gloss-qt">&Qt;</glossseealso>
+@@ -80,6 +222,17 @@
+
+ <glossdiv id="glossdiv-applications">
+ <title>Applications</title>
++ <glossentry id="gloss-dolphin">
++ <glossterm>Dolphin</glossterm>
++ <glossdef><para>The default file manager in &kde; SC 4. It has a side panel (Places), but navigation is mainly by the 'breadcrumb' trail above the main window. Split windows are possible, and views can be applied to individual windows. Mounting and unmounting <acronym>USB</acronym> devices can be done in the side panel. Other directories can be added to the Places panel. A Tree view is also possible.&newpara;
++ More info:&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/Dolphin_(software)"&linkmid;Wikipedia: Dolphin&linkend;&newpara;
++ &linkstart;"http://introducingkde4.blogspot.com/2007/12/dolphin.html"&linkmid;Introducing KDE 4 Blog - Dolphin&linkend;&newpara;
++ &linkstart;"http://userbase.kde.org/Tutorials/File_Management"&linkmid;Userbase: File Management Tutorial&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-konqueror">&konqueror;</glossseealso>
++ </glossdef>
++ </glossentry>
+ <glossentry id="gloss-kbuildsycoca">
+ <glossterm><application>KBuildSycoca</application></glossterm>
+ <glossdef><para><application>KBuildSycoca4</application> is a command line
+@@ -91,27 +244,94 @@
+ <glossseealso otherterm="gloss-systemsettings">&systemsettings;</glossseealso>
+ </glossdef>
+ </glossentry>
+- <glossentry id="gloss-systemsettings">
+- <glossterm>&systemsettings;</glossterm>
+- <glossdef><para>This is the project and filename of the &kde; control
+- center. &systemsettings; allows you to customize virtually
+- every configuration option of &kde;.</para>
++ <glossentry id="gloss-kinfocenter">
++ <glossterm>KInfoCenter</glossterm>
++ <glossdef><para>Kinfocenter originated as part of Kcontrol standing alone from KDE 3.1. In KDE SC 4 it is replaced by modules configured in System Settings, notably Solid, and is being reintroduced as an application in &kde; SC 4.5.&newpara;
++ More info:&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/Kinfocenter"&linkmid;Wikipedia: KInfoCenter&linkend;</para>
+ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-solid">Solid</glossseealso>
++ <glossseealso otherterm="gloss-systemsettings">&systemsettings;</glossseealso>
+ </glossdef>
+ </glossentry>
+ <glossentry id="gloss-konqueror">
+ <glossterm>&konqueror;</glossterm>
+ <glossdef><para>&konqueror; is a web browser, picture viewer, file manager
+ and more, and a core part of the &kde; project. You can
+- find more information about &konqueror; at <ulink
+- url="http://www.konqueror.org">www.konqueror.org</ulink>.</para>
++ find more information about &konqueror; at &linkstart;"http://www.konqueror.org"&linkmid;www.konqueror.org&linkend;.</para>
+ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
+ </glossdef>
+ </glossentry>
++ <glossentry id="gloss-krunner">
++ <glossterm>KRunner</glossterm>
++ <glossdef><para>The mini-command-line that is accessed from the Classic menu, the keyboard shortcut &Alt;+<keycap>F2</keycap>, or a right-click on the desktop. In &kde; SC 4 a partial name will display all possible matches.&newpara;
++ More info:&newpara;
++ &linkstart;"http://userbase.kde.org/Tutorials/Krunner"&linkmid;UserBase: KRunner Usage&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-plasma">&plasma;</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-kwin">
++ <glossterm>KWin</glossterm>
++ <glossdef><para>KWin is the window manager. This is where window decorations can be changed and themes applied. &kde; SC 4 extends KWin to provide support for 3D Compositing effects on the desktop.&newpara;
++ More info:&newpara;
++ &linkstart;"http://userbase.kde.org/KWin"&linkmid;UserBase: KWin&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-xserver">&X-Server;</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-minicli">
++ <glossterm>Mini-CLI</glossterm>
++ <glossdef><para>Mini &emstart;C&emend;ommand &emstart;L&emend;ine &emstart;I&emend;nterface. Synonym to KRunner.</para>
++ <glossseealso otherterm="gloss-krunner">KRunner</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-pager">
++ <glossterm>Pager</glossterm>
++ <glossdef><para>A pager is a small program or panel applet which shows the position of windows on your desktop and usually if you have several Virtual Desktops gives an overview over all.</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-kickoff">Kickoff</glossseealso>
++ <glossseealso otherterm="gloss-kicker">Kicker</glossseealso>
++ <glossseealso otherterm="gloss-panel">Panel</glossseealso>
++ <glossseealso otherterm="gloss-plasma">&plasma;</glossseealso>
++ <glossseealso otherterm="gloss-virtualdesktops">Virtual Desktops</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-systemsettings">
++ <glossterm>&systemsettings;</glossterm>
++ <glossdef><para>This is the project and filename of the &kde; control
++ center. &systemsettings; allows you to customize virtually
++ every configuration option of &kde;.</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-kinfocenter">KInfoCenter</glossseealso>
++ </glossdef>
++ </glossentry>
+ </glossdiv>
+
+ <glossdiv id="glossdiv-desktop-terminology">
+ <title>Desktop Terminology</title>
++ <glossentry id="gloss-activities">
++ <glossterm>Activities</glossterm>
++ <glossdef><para>Activities are sets of &plasma; widgets that have their own wallpaper&newpara;
++ A bit like Virtual Desktops, but not quite. For example you have a "work activity" with commit rss feeds, a note with your TODO, a Folder View with your work related files, and a subtle wallpaper.&newpara;
++ Next to it, you have your freetime activity, with previews of family photos and dogs, rss feeds from your favorite blogs, a Folder View showing your movie collection, a twitter applet and of course that Iron Maiden wallpaper you have been loving since the early 80s.&newpara;
++ At 17:00 hours sharp you switch from the work activity to your freetime activity.&newpara;
++ More info:&newpara;
++ &linkstart;"http://userbase.kde.org/Plasma"&linkmid;Plasma FAQ&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-virtualdesktops">Virtual Desktops</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-containment">
++ <glossterm>Containment</glossterm>
++ <glossdef><para>A Containment is a top level grouping of widgets. Each Containment manages the layout and configuration data of its set of widgets independently from other Containments.&newpara;
++ The end result is that you can group widgets within a Containment according to the significance to your working pattern, rather than by directory grouping.&newpara;
++ More info:&newpara;
++ &linkstart;"http://userbase.kde.org/Plasma"&linkmid;Plasma FAQ&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-widget">Widget</glossseealso>
++ </glossdef>
++ </glossentry>
+ <glossentry id="gloss-draganddrop">
+ <glossterm>Drag and Drop</glossterm>
+ <glossdef><para>This concept tries to replace many actions like copying
+@@ -122,47 +342,133 @@
+ <glossseealso otherterm="gloss-konqueror">&konqueror;</glossseealso>
+ </glossdef>
+ </glossentry>
++ <glossentry id="gloss-extender">
++ <glossterm>Extender</glossterm>
++ <glossdef><para>Extenders are a special kind of popup that can grow out of a &plasma; panel for example. Extenders have detachable parts. Extenders are a new concept that arrived in &plasma; for &kde; 4.2. The Kuiserver (the interface that collects all long running jobs and puts them into one window) will make use of extenders so you can detach various jobs and monitor their progress separately.&newpara;
++ More info:&newpara;
++ &linkstart;"http://userbase.kde.org/Plasma"&linkmid;Plasma FAQ&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-plasma">&plasma;</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-gnome">
++ <glossterm><acronym>GNOME</acronym></glossterm>
++ <glossdef>
++ <para>&emstart;G&emend;NU &emstart;N&emend;etwork &emstart;O&emend;bject
++ &emstart;M&emend;odel &emstart;E&emend;nvironment, one of the
++ leading &UNIX; &GUI;s.</para>
++ <glossseealso otherterm="gloss-gui">&GUI;</glossseealso>
++ </glossdef>
++ </glossentry>
+ <glossentry id="gloss-gui">
+ <glossterm>&GUI;</glossterm>
+- <glossdef><para>Abbreviation for <emphasis>G</emphasis>raphical
+- <emphasis>U</emphasis>ser <emphasis>I</emphasis>nterface. Every desktop
++ <glossdef><para>Abbreviation for &emstart;G&emend;raphical
++ &emstart;U&emend;ser &emstart;I&emend;nterface. Every desktop
+ environment (like &kde;) is a &GUI;. Most
+ &GUI;s feature mouse support and/or windows to manage
+ the programs.</para>
+ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
+ </glossdef>
+ </glossentry>
++ <glossentry id="gloss-homedirectory">
++ <glossterm>Home Directory</glossterm>
++ <glossdef><para>That's the place in system, where all your files are kept. You can write your files outside of this folder, but all applications are configured to propose this folder as place to write your files to. And this is easier, when you are keeping your things here.&newpara;
++ More info:&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/Home_directory"&linkmid;Wikipedia: Home Directory&linkend;</para>
++ <glossseealso otherterm="gloss-dolphin">&dolphin;</glossseealso>
++ </glossdef>
++ </glossentry>
+ <glossentry id="gloss-kde">
+ <glossterm>&kde;</glossterm>
+ <glossdef><para>Abbreviation for <quote>K Desktop Environment</quote>, a
+ leading &GUI; for &UNIX;-based systems. You can find more
+- detailed information at <ulink
+- url="http://www.kde.org">www.kde.org</ulink>.</para>
++ detailed information at &linkstart;
++ "http://www.kde.org"&linkmid;www.kde.org&linkend;.&newpara;
++ &kde; is more than just software. It is a community made up of programmers, translators, contributors, artists, writers, distributors, and users from all over the world. Our international technology team is committed to creating the best free software for the desktop. And not only contributors, but users and fans of &kde; software can be found throughout the entire globe, giving help to other users, spreading the news, or just simply enjoying the experience.</para>
+ <glossseealso otherterm="gloss-gui">&GUI;</glossseealso>
+ </glossdef>
+ </glossentry>
+- <glossentry id="gloss-gnome">
+- <glossterm><acronym>GNOME</acronym></glossterm>
++ <glossentry id="gloss-kicker">
++ <glossterm><acronym>&kicker;</acronym></glossterm>
+ <glossdef>
+- <para><emphasis>G</emphasis>NU <emphasis>N</emphasis>etwork <emphasis>O</emphasis>bject
+- <emphasis>M</emphasis>odel <emphasis>E</emphasis>nvironment, one of the
+- leading &UNIX; &GUI;s.</para>
+- <glossseealso otherterm="gloss-gui">&GUI;</glossseealso>
++ <para>In &kde; 3, the relocatable bar, usually at the bottom of the screen (sometimes called the Panel), on which application launchers, the Pager, and buttons for running applications reside.</para>
++ <glossseealso otherterm="gloss-panel">Panel</glossseealso>
++ <glossseealso otherterm="gloss-plasma">&plasma;</glossseealso>
+ </glossdef>
+ </glossentry>
++ <glossentry id="gloss-kickoff">
++ <glossterm><acronym>&kickoff;</acronym></glossterm>
++ <glossdef>
++ <para>In &kde; SC 4 (and some late versions of &kde; 3), a launch menu in which apps are sorted by functional group. 'Favorites' replaces the 'Most used applications' in Classic Menu, and applications can be added to it. Right-click also offers the possibility of adding applications to the desktop or panel. Rapid access to a less-used application can be by the search box. Other menus are being worked on, since &kde; SC 4 can be used with more than one launcher, should that be required.&newpara;
++ More info:&newpara;
++ &linkstart;"http://home.kde.org/~binner/kickoff/sneak_preview.html"&linkmid;Kickoff Sneak Preview&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-pager">Pager</glossseealso>
++ <glossseealso otherterm="gloss-panel">Panel</glossseealso>
++ <glossseealso otherterm="gloss-plasma">&plasma;</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-oxygen">
++ <glossterm><acronym>Oxygen</acronym></glossterm>
++ <glossdef>
++ <para>Oxygen is the default theme of &kde; SC 4. Designed to bring 'a breath of fresh air' to the desktop by removing the simplistic, cartoonish icons, and replacing them with a clean theme and photo-realistic icons. Oxygen uses a desaturated palette to avoid the icons becoming a distraction and uses detailed scalable graphics (SVG).&newpara;
++ More info:&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/Oxygen_Project"&linkmid;Wikipedia: Oxygen Project&linkend;&newpara;
++ &linkstart;"http://www.oxygen-icons.org/?cat=3"&linkmid;Oxygen Icons&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-ksvg">KSVG</glossseealso>
++ <glossseealso otherterm="gloss-plasma">&plasma;</glossseealso>
++ </glossdef>
++ </glossentry>
+ <glossentry id="gloss-panel">
+ <glossterm>Panel</glossterm>
+ <glossdef><para>Refers to the panel which often resides at the bottom of the
+ screen.</para>
+ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-kicker">&kicker;</glossseealso>
++ <glossseealso otherterm="gloss-kickoff">&kickoff;</glossseealso>
++ <glossseealso otherterm="gloss-plasma">&plasma;</glossseealso>
+ </glossdef>
+ </glossentry>
++ <glossentry id="gloss-plasma">
++ <glossterm>Plasma</glossterm>
++ <glossdef><para>In &kde; SC 4 the &plasma; Desktop replaces KDesktop, &kicker; and the SuperKaramba widget engine. The applets are called Plasmoids, and range from informational widgets to mini-apps such as a calculator or dictionary. Widgets from other sources, such as SuperKaramba widgets or <trademark>Google</trademark> Gadgets are also supported.&newpara;
++ More info:&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/Plasma_(KDE)"&linkmid;Wikipedia: Plasma&linkend;&newpara;
++ &linkstart;"http://plasma.kde.org/cms/1107/"&linkmid;Plasma website&linkend;&newpara;
++ &linkstart;"http://userbase.kde.org/Plasma"&linkmid;Plasma FAQ&linkend;&newpara;
++ &linkstart;"http://userbase.kde.org/Tutorials/TweakingPlasma"&linkmid;Tweaking Plasma&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-kicker">&kicker;</glossseealso>
++ <glossseealso otherterm="gloss-widget">Widget</glossseealso>
++ </glossdef>
++ </glossentry>
+ <glossentry id="gloss-ripping">
+- <glossterm>ripping</glossterm>
++ <glossterm>Ripping</glossterm>
+ <glossdef><para>The process of reading audio data from a &cdrom; and
+ storing it on the hard disk.</para>
+ </glossdef>
+ </glossentry>
++ <glossentry id="gloss-virtualdesktops">
++ <glossterm>Virtual Desktops</glossterm>
++ <glossdef><para>A popular concept of &UNIX; based window managers is the one of virtual desktops. This means you have not only one screen where you can place your windows on but several. When you switch to a different desktop (usually with a pager) you will only see the windows which you started on your new desktop or moved to it. A window can also be made "sticky" which means it appears on all virtual desktops.&newpara;
++ More info:&newpara;
++ &linkstart;"http://userbase.kde.org/Plasma"&linkmid;Plasma FAQ&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-kickoff">&kickoff;</glossseealso>
++ <glossseealso otherterm="gloss-pager">Pager</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-zui">
++ <glossterm><acronym>ZUI</acronym></glossterm>
++ <glossdef><para>The Zooming User Interface. &emstart;By zooming out, users can get an overview of all the object groupings that they have made. These groupings may reflect the projects they are working on, be ways to keep different sets of files organized, etc. By hovering or clicking on one of these groups when zoomed out, users can either get a preview/snapshot of what is in the grouping, or zoom in on that grouping so that it is displayed full size on the physical screen.&emend; --Aaron Seigo&newpara;
++ More info:&newpara;
++ &linkstart;"http://userbase.kde.org/Plasma"&linkmid;Plasma FAQ&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-ksvg">KSVG</glossseealso>
++ <glossseealso otherterm="gloss-plasma">&plasma;</glossseealso>
++ </glossdef>
++ </glossentry>
+ </glossdiv>
+
+ <glossdiv id="kde-development">
+@@ -172,25 +478,68 @@
+ <glossdef><para>The &GUI; of &kde; is built on top of
+ the &Qt; toolkit, which provides many graphical elements (so-called
+ <quote>Widgets</quote>) which are used to construct the desktop. You
+- can find more information about &Qt; at <ulink
+- url="http://www.trolltech.com">www.trolltech.com</ulink>.</para>
++ can find more information about &Qt; at &linkstart;
++ "http://qt.nokia.com/"&linkmid;http://qt.nokia.com/&linkend;.</para>
+ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
+ <glossseealso otherterm="gloss-gui">&GUI;</glossseealso>
+ <glossseealso otherterm="gloss-widget">Widget</glossseealso>
+ </glossdef>
+ </glossentry>
++ <glossentry id="gloss-git">
++ <glossterm>Git</glossterm>
++ <glossdef><para>Git is a free and open source, distributed version control system designed to handle everything from small to very large projects with speed and efficiency.&newpara;
++ Every Git clone is a full-fledged repository with complete history and full revision tracking capabilities, not dependent on network access or a central server. Branching and merging are fast and easy to do.&newpara;
++ Git is used for version control of files, much like tools such as Mercurial, Bazaar, Subversion, CVS, Perforce, and Visual SourceSafe.&newpara;
++ It was decided that Git will be the main version control system of &kde;, replacement of SVN. It has been already used for some &kde; projects like Konversation and Amarok.&newpara;
++ More info:&newpara;
++ &linkstart;"http://git-scm.com/"&linkmid;Git Homepage&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-svn">SVN</glossseealso>
++ </glossdef>
++ </glossentry>
+ <glossentry id="gloss-i18n">
+ <glossterm>i18n</glossterm>
+ <glossdef><para>Abbreviation for <quote>internationalization</quote>. &kde;
+ supports many different languages, and several i18n techniques make it
+ easy to translate the &GUI; as well as the accompanying
+ documents of &kde; into all these languages. More information about the
+- i18n process is available at <ulink
+- url="http://l10n.kde.org">l10n.kde.org</ulink>.</para>
++ i18n process is available at &linkstart;
++ "http://l10n.kde.org"&linkmid;l10n.kde.org&linkend;.</para>
+ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
+ <glossseealso otherterm="gloss-gui">&GUI;</glossseealso>
+ </glossdef>
+ </glossentry>
++ <glossentry id="gloss-kross">
++ <glossterm>Kross</glossterm>
++ <glossdef><para>Kross is a scripting framework, enabling support for multiple scripting languages. A plugin system allows for the support of further languages in the future.</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-kdom">
++ <glossterm>KDOM</glossterm>
++ <glossdef><para>A KPart module making KHTML <acronym>DOM</acronym> (&emstart;D&emend;ocument &emstart;O&emend;bject &emstart;M&emend;odel) rendering capabilities available to all applications. KSVG2 is built on KDOM for &kde; SC 4.</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-khtml">KHTML</glossseealso>
++ <glossseealso otherterm="gloss-kparts">KParts</glossseealso>
++ <glossseealso otherterm="gloss-khtml">KSVG</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-kjs">
++ <glossterm>KJS</glossterm>
++ <glossdef><para>&kde; platform's JavaScript engine.</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-kparts">KParts</glossseealso>
++ <glossseealso otherterm="gloss-plasma">&plasma;</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-ksvg">
++ <glossterm>KSVG</glossterm>
++ <glossdef><para>KSVG enables support for scalable vector graphics in a KHTML browser. KSVG2 extends this for &kde; SC 4.</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-khtml">KHTML</glossseealso>
++ <glossseealso otherterm="gloss-kparts">KParts</glossseealso>
++ </glossdef>
++ </glossentry>
+ <glossentry id="gloss-l10n">
+ <glossterm>l10n</glossterm>
+ <glossdef><para>Abbreviation for <quote>localization</quote>, the process
+@@ -199,6 +548,26 @@
+ <glossseealso otherterm="gloss-i18n">i18n</glossseealso>
+ </glossdef>
+ </glossentry>
++ <glossentry id="gloss-soprano">
++ <glossterm>Soprano</glossterm>
++ <glossdef><para>Soprano is a sub-project of Nepomuk, providing a repository for gathered information such as tags, ratings, &etc; This makes the information available to Strigi.&newpara;
++ More info:&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/Soprano_(KDE)"&linkmid;Wikipedia: Soprano&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-nepomuk">Nepomuk</glossseealso>
++ <glossseealso otherterm="gloss-strigi">Strigi</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-strigi">
++ <glossterm>Strigi</glossterm>
++ <glossdef><para>A deep-indexed search daemon, Strigi aims to be fast and light-weight. It also uses SHA-1 hash which will help in the identification of duplicate files.&newpara;
++ More info:&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/Strigi"&linkmid;Wikipedia: Strigi&linkend;</para>
++ <glossseealso otherterm="gloss-kde">&kde;</glossseealso>
++ <glossseealso otherterm="gloss-nepomuk">Nepomuk</glossseealso>
++ <glossseealso otherterm="gloss-soprano">Soprano</glossseealso>
++ </glossdef>
++ </glossentry>
+ <glossentry id="gloss-widget">
+ <glossterm>Widget</glossterm>
+ <glossdef><para>Graphical elements like scrollbars, buttons or input
+@@ -208,36 +577,36 @@
+ <glossseealso otherterm="gloss-gui">&GUI;</glossseealso>
+ </glossdef>
+ </glossentry>
+- <glossentry id="gloss-svn">
+- <glossterm><acronym>SVN</acronym></glossterm>
+- <glossdef>
+- <para>Abbreviation for <emphasis>Subversion</emphasis>, a version control system.
+- The <acronym>SVN</acronym> is a very elegant way of managing file
+-versions that allow more than one developer
+- to easily work on the same project. You can find a description of how to
+-get the latest (developer) version of the
+- &kde; sources via anonymous <acronym>SVN</acronym> on
+- <ulink
+-url="http://developer.kde.org/source/anonsvn.html">http://developer.kde.org/source/anonsvn.html</ulink>.
+- More about <acronym>SVN</acronym> is available at <ulink
+-url="http://subversion.tigris.org/">http://subversion.tigris.org/</ulink>.
+-
+- </para>
+- </glossdef>
+- </glossentry>
++ <glossentry id="gloss-svn">
++ <glossterm><acronym>SVN</acronym></glossterm>
++ <glossdef><para>Abbreviation for &emstart;Subversion&emend;, a version control system. The <acronym>SVN</acronym> is a very elegant way of managing file versions that allow more than one developer to easily work on the same project. You can find a description of how to get the latest (developer) version of the &kde; sources via anonymous <acronym>SVN</acronym> on &linkstart;"http://developer.kde.org/source/anonsvn.html"&linkmid;http://developer.kde.org/source/anonsvn.html&linkend;.&newpara; More about <acronym>SVN</acronym> is available at &linkstart;"http://subversion.tigris.org/"&linkmid;http://subversion.tigris.org/&linkend;.</para>
++ <glossseealso otherterm="gloss-git">Git</glossseealso>
++ </glossdef>
++ </glossentry>
++ <glossentry id="gloss-xmlgui">
++ <glossterm>XMLGUI</glossterm>
++ <glossdef><para>A programmers' framework for designing the user interface. It is extensively used by KParts.&newpara;
++ More info:&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/XMLGUI"&linkmid;Wikipedia: XMLGUI&linkend;&newpara;
++ &linkstart;"http://en.wikipedia.org/wiki/Qt_Style_Sheets"&linkmid;Wikipedia: Qt Style Sheets&linkend;</para>
++ <glossseealso otherterm="gloss-gui">&GUI;</glossseealso>
++ <glossseealso otherterm="gloss-kparts">Kparts</glossseealso>
++ <glossseealso otherterm="gloss-qt">&Qt;</glossseealso>
++ </glossdef>
++ </glossentry>
+ </glossdiv>
+
+ <glossdiv id="glossdiv-misc">
+ <title>Miscellaneous</title>
+ <glossentry id="gloss-rfc">
+ <glossterm><acronym>RFC</acronym></glossterm>
+- <glossdef><para><emphasis>R</emphasis>equest <emphasis>F</emphasis>or
+- <emphasis>C</emphasis>omment. A common way to publish new protocol
++ <glossdef><para>&emstart;R&emend;equest &emstart;F&emend;or
++ &emstart;C&emend;omment. A common way to publish new protocol
+ ideas or procedures for evaluation of the Internet community. Though
+ <acronym>RFC</acronym>s are not mandatory, many applications try to
+- adhere to them, once they have been approved by the community. More
+- information about <acronym>RFC</acronym>s can be found at the
+- <ulink url="http://www.rfc-editor.org">RFC Homepage</ulink>.</para>
++ adhere to them, once they have been approved by the community.&newpara;
++ More information about <acronym>RFC</acronym>s can be found at the
++ &linkstart;"http://www.rfc-editor.org"&linkmid;RFC Homepage&linkend;.</para>
+ </glossdef>
+ </glossentry>
+ </glossdiv>
+@@ -246,31 +615,31 @@
+ <title>Various protocols</title>
+ <glossentry id="gloss-smb">
+ <glossterm><acronym>SMB</acronym></glossterm>
+- <glossdef><para><emphasis>S</emphasis>erver <emphasis>M</emphasis>essage
+- <emphasis>B</emphasis>lock. A network protocol used in &Microsoft; &Windows;
++ <glossdef><para>&emstart;S&emend;erver &emstart;M&emend;essage
++ &emstart;B&emend;lock. A network protocol used in &Microsoft; &Windows;
+ networks to access the file systems of other computers.</para>
+- <glossseealso otherterm="gloss-ioslave"><acronym>IO</acronym>
+-Slave</glossseealso>
++ <glossseealso otherterm="gloss-ioslave"><acronym>IO</acronym> Slave</glossseealso>
+ </glossdef>
+ </glossentry>
+ <glossentry id="gloss-irc">
+ <glossterm><acronym>IRC</acronym></glossterm>
+- <glossdef><para><emphasis>I</emphasis>nternet <emphasis>R</emphasis>elay
+- <emphasis>C</emphasis>hat. A protocol defined in <acronym>RFC</acronym>
++ <glossdef><para>&emstart;I&emend;nternet &emstart;R&emend;elay
++ &emstart;C&emend;hat. A protocol defined in <acronym>RFC</acronym>
+ 1459, which handles the specification to enable real-time text chat.</para>
+ <glossseealso otherterm="gloss-rfc"><acronym>RFC</acronym></glossseealso>
+ </glossdef>
+ </glossentry>
+ <glossentry id="gloss-host">
+- <glossterm>host</glossterm>
++ <glossterm>Host</glossterm>
+ <glossdef><para>This can either be a name from your
+ <filename>/etc/hosts</filename> file
+ (<systemitem class="systemname">mycomputer</systemitem>),
+- an Internet name (<systemitem
+-class="systemname">www.kde.org</systemitem>) or an IP-Address
++ an Internet name (<systemitem class="systemname">www.kde.org</systemitem>) or an IP-Address
+ (<systemitem>192.168.0.10</systemitem>).
+ </para>
+ </glossdef>
+ </glossentry>
+ </glossdiv>
++
++ &glossary-kdeprinting;
+ </glossary>
+--- runtime/doc/kcontrol/bookmarks/index.docbook (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/doc/kcontrol/bookmarks/index.docbook (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -8,7 +8,7 @@
+ <article lang="&language;">
+ <articleinfo>
+-<title>Bookmarks home page</title>
++<title>Bookmarks</title>
+ <authorgroup>
+ <author>
+ <personname><firstname>Xavier</firstname><surname>Vello</surname></personname>
+@@ -17,8 +17,8 @@
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
---- runtime/nepomuk/services/queryservice/nepomukqueryservice.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/services/queryservice/nepomukqueryservice.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -81,7 +81,7 @@
- Comment=The Nepomuk Query Service provides an interface for persistent query folders
- Comment[ar]=تقدم خدمة استعلام نبومك واجهة لمجلدات الاستعلام الموجودة مسبقا.
- Comment[be@latin]=Słužba zapytaŭ „Nepomuk” absłuhoŭvaje interfejs dla stałych katalohaŭ, jakija biaruć źviestki ad zapytaŭ.
--Comment[ca]=El servei de consultes del Nepomuk proporciona una interfície per a carpetes persistents de consultes
-+Comment[ca]=El servei de consultes del Nepomuk proporciona una interfície per a carpetes persistents de consultes
- Comment[ca@valencia]=El servei de consultes del Nepomuk proporciona una interfície per a carpetes persistents de consultes
- Comment[cs]=Dotazovací služba Nepomuku poskytuje rozhraní pro složky trvalých dotazů
- Comment[csb]=Ùsłëżnota Query Nepomuka dôwô interfejs do persistentnegò òdwòłëwaniô kataloga
---- runtime/nepomuk/servicestub/priority.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 0)
-+++ runtime/nepomuk/servicestub/priority.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -0,0 +1,105 @@
-+/* This file is part of the KDE Project
-+ Copyright (c) 2008 Sebastian Trueg <trueg@kde.org>
-+
-+ Parts of this file are based on code from Strigi
-+ Copyright (C) 2006-2007 Jos van den Oever <jos@vandenoever.info>
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public
-+ License version 2 as published by the Free Software Foundation.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public License
-+ along with this library; see the file COPYING.LIB. If not, write to
-+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ Boston, MA 02110-1301, USA.
-+*/
-+
-+#include "priority.h"
-+
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE
-+#endif
-+
-+#include <QtCore/QDebug>
-+
-+#include <sys/time.h>
-+#include <sys/resource.h>
-+
-+#include <unistd.h>
-+#ifndef _WIN32
-+#include <sys/syscall.h>
-+#include <errno.h>
-+
-+#include <sched.h>
-+#endif
-+
-+#ifdef SYS_ioprio_set
-+namespace {
-+#ifndef IOPRIO_CLASS_IDLE
-+ enum {
-+ IOPRIO_CLASS_NONE,
-+ IOPRIO_CLASS_RT,
-+ IOPRIO_CLASS_BE,
-+ IOPRIO_CLASS_IDLE
-+ };
-+#endif
-+
-+#ifndef IOPRIO_WHO_PROCESS
-+ enum {
-+ IOPRIO_WHO_PROCESS = 1,
-+ IOPRIO_WHO_PGRP,
-+ IOPRIO_WHO_USER
-+ };
-+#endif
-+
-+#ifndef IOPRIO_CLASS_SHIFT
-+ const int IOPRIO_CLASS_SHIFT = 13;
-+#endif
-+}
-+#endif
+-<date>2008-08-31</date>
+-<releaseinfo>0.2</releaseinfo>
++<date>2010-09-24</date>
++<releaseinfo>0.2 (&kde; 4.5)</releaseinfo>
+
+ <keywordset>
+ <keyword>KDE</keyword>
+@@ -28,7 +28,12 @@
+ </keywordset>
+ </articleinfo>
+ <sect1 id="conf">
+-<title>Configuration options</title>
++<title>Bookmarks home page</title>
++<para>This module lets you configure the bookmarks home page.</para>
++<para>To view the bookmarks home page enter <userinput>bookmarks:/</userinput> in
++the location bar.</para>
++<para>The settings in this module are also accessible by entering
++<userinput>bookmarks:/config</userinput> in the location bar.</para>
+ <sect2 id="conf-general">
+ <title>General settings</title>
+ <variablelist>
+--- runtime/doc/kcontrol/emoticons/index.docbook (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/doc/kcontrol/emoticons/index.docbook (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -12,8 +12,8 @@
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+
+-<date>2008-09-12</date>
+-<releaseinfo>&kde; 4.1.2</releaseinfo>
++<date>2010-09-25</date>
++<releaseinfo>&kde; 4.5</releaseinfo>
+
+ <keywordset>
+ <keyword>KDE</keyword>
+@@ -110,7 +110,7 @@
+ <varlistentry><term><guilabel>Remove Theme</guilabel></term>
+ <listitem>
+ <para>
+-This action will remove the theme from your disk. Select the theme you want to remove in the list. Click the <guibutton>Remove Theme</guibutton> button. A dialog appears to ask you confirmation.
++This action will remove the theme from your disk. Select the theme you want to remove in the list. Click the <guibutton>Remove Theme</guibutton> button. The Design will be removed from the disk if you click <guibutton>Apply</guibutton> or leave this module confirming to apply your change.
+ </para>
+ </listitem>
+ </varlistentry>
+--- runtime/doc/kcontrol/kcmnotify/index.docbook (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/doc/kcontrol/kcmnotify/index.docbook (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -117,7 +117,7 @@
+
+ <varlistentry>
+ <term><guilabel>Speech</guilabel></term>
+-<listitem><para>If a mark is in this checkbox, &kde; will use KTTS to speak the event
++<listitem><para>If a mark is in this checkbox, &kde; will use Jovie to speak the event
+ message, event name or custom text.</para>
+ <para>If you select <guilabel>Speak Custom Text</guilabel>, enter the text in the box.
+ You may use the following
+--- runtime/doc/kcontrol/attica/index.docbook (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/doc/kcontrol/attica/index.docbook (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -8,7 +8,7 @@
+ <article lang="&language;">
+ <articleinfo>
+
+-<title>Social Desktop Configuration</title>
++<title>Social Desktop</title>
+ <authorgroup>
+ <author><personname><firstname>Frederik</firstname><surname>Gladhorn</surname></personname>
+ <email>gladhorn@kde.org</email>
+@@ -17,8 +17,8 @@
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+
+-<date>2009-12-16</date>
+-<releaseinfo>&kde; 4.4</releaseinfo>
++<date>2010-09-26</date>
++<releaseinfo>&kde; 4.5</releaseinfo>
+
+ <keywordset>
+ <keyword>KDE</keyword>
+@@ -37,7 +37,8 @@
+
+ <para>The benefit is that you can do more things in <quote>Get Hot New Stuff</quote>:
+ vote for items, become a fan of them and upload new content. A configured
+-account also allows you to use the social Plasma widgets to their full extent.
++account also allows you to use the social Plasma widgets (<guilabel>Community</guilabel>,
++<guilabel>Social News</guilabel> &etc;)to their full extent.
+ </para>
+
+ <para>Using the &systemsettings; module:</para>
+@@ -46,6 +47,11 @@
+ Either enter your existing user name and password to let &kde; use them.
+ You can verify that these work by using the <guibutton>Test Login</guibutton> button</para>
+
++<!--
++missing:
++Enable
++Add/Remove Providers-->
+
+ <para>If you do not have an account yet, use the <guilabel>Register</guilabel> tab.
+ Here you need to fill out all fields.
+ After clicking <guibutton>Register...</guibutton> you will receive an email from the
+--- runtime/doc/kcontrol/icons/index.docbook (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/doc/kcontrol/icons/index.docbook (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -15,8 +15,8 @@
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+
+-<date>2008-05-28</date>
+-<releaseinfo>3.2</releaseinfo>
++<date>2010-08-25</date>
++<releaseinfo>&kde; 4.5</releaseinfo>
+
+ <keywordset>
+ <keyword>KDE</keyword>
+@@ -207,9 +207,8 @@
+ </screenshot>
+ </para>
+
+-<para>You have two options relating to icon sizes. First, you can choose
+-from a list of icon sizes. Second, you can tell &kde; to draw all icons
+-using double sized pixels. The largest icon sizes are especially useful
++<para>You can choose
++from a list of icon sizes. The largest icon sizes are especially useful
+ for visually impaired people.</para>
+
+ <para>Which sizes will be offered by the icon size listbox depends on
+@@ -220,7 +219,7 @@
+ However, as &kde; can not have all these icon sizes in store, icons
+ using size 64 to 128 will be automatically generated which may result in
+ a loss of quality.</para>
+-
++<!-- not in 4.5
+ <para>If the icon sizes offered by your chosen icon theme are not enough
+ for you, there is still the option <guilabel>Double-sized
+ pixels</guilabel>. If this option is selected, all icons will have
+@@ -231,6 +230,7 @@
+ an option for you, using the large sizes offered by &kde;'s HiColor
+ icon theme will always result in a much better quality than using the
+ low color icon theme with double sized pixels.</para>
++-->
+ <!--
+ <para>You can also choose to have smoothed icons, an effect similar to
+ anti-aliasing of fonts. Enable the checkbox <guilabel>Blend alpha
+--- runtime/doc/kcontrol/spellchecking/index.docbook (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/doc/kcontrol/spellchecking/index.docbook (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -16,8 +16,8 @@
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+
+-<date>2009-11-18</date>
+-<releaseinfo>&kde; 4.4</releaseinfo>
++<date>2010-09-02</date>
++<releaseinfo>&kde; 4.5</releaseinfo>
+
+ <keywordset>
+ <keyword>KDE</keyword>
+@@ -36,20 +36,19 @@
+ <para>The configuration options available here are used as default by all &kde;
+ applications that use &sonnet;, which is a frontend to various free spell checkers.</para>
+
++<para>To use &sonnet; you need to install spell checkers like ⪚
++<ulink url="http://aspell.net/">GNU Aspell</ulink>,
++<ulink url="http://www.abisource.com/projects/enchant/">Enchant</ulink>,
++<ulink url="http://hspell.ivrix.org.il/">Hspell</ulink>,
++<ulink url="http://fmg-www.cs.ucla.edu/geoff/ispell.html">ISpell</ulink> or
++<ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>
++and additionally the corresponding dictionaries for your language.</para>
+
-+bool lowerIOPriority()
-+{
-+#ifdef SYS_ioprio_set
-+ if ( syscall( SYS_ioprio_set, IOPRIO_WHO_PROCESS, 0, IOPRIO_CLASS_IDLE<<IOPRIO_CLASS_SHIFT ) < 0 ) {
-+ qDebug( "cannot set io scheduling to idle (%s). Trying best effort.\n", strerror( errno ));
-+ if ( syscall( SYS_ioprio_set, IOPRIO_WHO_PROCESS, 0, 7|IOPRIO_CLASS_BE<<IOPRIO_CLASS_SHIFT ) < 0 ) {
-+ qDebug( "cannot set io scheduling to best effort.\n");
-+ return false;
-+ }
-+ }
-+ return true;
-+#else
-+ return false;
-+#endif
-+}
+ <para>The configuration options selected here can be overridden by each application.</para>
+
+ <para>In the drop down box <guilabel>Default language</guilabel> choose from the
+ available dictionaries, which one to use for &sonnet;. </para>
+
+-<!-- in case of missing language in the list which apps to install?
+-sonnet has pluins HSpell enchant hspell hunspell ??
+-<para>(If you do not have <application>Ispell</application> installed
+-you can obtain it from the <ulink
+-url="http://fmg-www.cs.ucla.edu/geoff/ispell.html">International
+-ISpell home page</ulink>. <application>ASpell</application> is available from the <ulink
+-url="http://aspell.sourceforge.net/">ASpell home page</ulink>.)
+-</para>
+--->
+ <sect2 id="spell-options">
+ <title>Spell Options</title>
+
+--- runtime/doc/kdesu/man-kdesu.1.docbook (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/doc/kdesu/man-kdesu.1.docbook (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -7,7 +7,7 @@
+ <refentryinfo>
+ <title>KDE User's Manual</title>
+ <author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+-<date>Jun 7, 2005</date>
++<date>2010-09-18</date>
+ <productname>K Desktop Environment</productname>
+ </refentryinfo>
+
+@@ -25,7 +25,7 @@
+ <cmdsynopsis>
+ <command>kdesu</command>
+
+-<group choice="opt"><option>-c</option></group>
++<group choice="opt"><option>-c</option> <replaceable> command</replaceable></group>
+ <group choice="opt"><option>-d</option></group>
+ <group choice="opt"><option>-f</option> <replaceable> file</replaceable></group>
+ <group choice="opt"><option>-i</option> <replaceable> icon name</replaceable></group>
+@@ -34,13 +34,14 @@
+ <group choice="opt"><option>-r</option></group>
+ <group choice="opt"><option>-s</option></group>
+ <group choice="opt"><option>-t</option></group>
+-<group choice="opt"><option>-u</option> <replaceable>
+-user</replaceable></group>
+-<group choice="opt"><option>--nonewdcop</option></group>
++<group choice="opt"><option>-u</option> <replaceable> user</replaceable></group>
++<group choice="opt"><option>--noignorebutton</option></group>
++<group choice="opt"><option>--attach</option> <replaceable> winid</replaceable></group>
++<!--group choice="opt"><option>- -nonewdcop</option></group>
+
+ <group><arg choice="req"><replaceable>command</replaceable> <arg><replaceable>arg1</replaceable></arg>
+ <arg><replaceable>arg2</replaceable></arg>
+- <arg rep="repeat"><replaceable></replaceable></arg></arg></group>
++ <arg rep="repeat"><replaceable></replaceable></arg></arg></group-->
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <command>kdesu</command>
+@@ -63,6 +64,11 @@
+
+ <para>This program is meant to be started from the command line or
+ from <filename>.desktop</filename> files.</para>
+
++<para>Since <command>kdesu</command> is no longer installed in <userinput>
++$(kde4-config --prefix)</userinput>/bin but in <userinput>kde4-config --path libexec</userinput>
++and therefore not in your <envar>Path</envar>, you have to use <userinput>$(kde4-config
++--path libexec)<command>kdesu</command></userinput> to launch <command>kdesu</command>.</para>
+ </refsect1>
+
+ <refsect1>
+@@ -70,11 +76,11 @@
+
+ <variablelist>
+ <varlistentry>
+-<term><option>-c <replaceable>program</replaceable></option></term>
+-<listitem><para>This specifies the program to run as root. It has to be passed
++<term><option>-c <replaceable>command</replaceable></option></term>
++<listitem><para>This specifies the command to run as root. It has to be passed
+ in one argument. So if, for example, you want to start a new file manager, you
+-would enter at the prompt: <userinput><command>kdesu <option>-c <replaceable>kfm
+--sw</replaceable></option></command></userinput></para></listitem>
++would enter at the prompt: <userinput>$(kde4-config --path libexec)<command>kdesu <option>-c <replaceable>
++&dolphin;</replaceable></option></command></userinput></para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-d</option></term>
+@@ -91,10 +97,7 @@
+ <para><parameter>file</parameter> is evaluated like this: if
+ <parameter>file</parameter> starts with a <literal>/</literal>, it is
+ taken as an absolute filename. Otherwise, it is taken as the name of a
+-global &kde; configuration file. For example: to configure the K display
+-manager, <application>kdm</application>, you could issue
+-<command>kdesu <option>-c kdmconfig -f
+-kdmrc</option></command></para></listitem>
++global &kde; configuration file.</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-i</option> <replaceable>icon name</replaceable></term>
+@@ -142,6 +145,18 @@
+ </listitem>
+ </varlistentry>
+
++<varlistentry>
++<term><option>--noignorebutton</option></term>
++<listitem><para>Do not display an ignore button.</para>
++</listitem>
++</varlistentry>
+
-+bool lowerPriority()
-+{
-+#ifndef Q_OS_WIN
-+ return !setpriority( PRIO_PROCESS, 0, 19 );
-+#else
-+ return false;
-+#endif
-+}
++<varlistentry>
++<term><option>--attach</option> <replaceable> winid</replaceable></term>
++<listitem><para>Makes the dialog transient for an X app specified by winid.</para>
++</listitem>
++</varlistentry>
+
+ </variablelist>
+
+ </refsect1>
+@@ -163,7 +178,7 @@
+ <para>Run <command>kfmclient</command> as user <systemitem
+ class="username">jim</systemitem>, and show the &konqueror; icon in the
+ password dialog:</para>
+-<screen><userinput><command>kdesu</command> <option>-u jim</option> <option>-i konqueror</option> <command>kfmclient</command></userinput></screen>
++<screen><userinput>$(kde4-config --path libexec)<command>kdesu</command> <option>-u jim</option> <option>-i konqueror</option> <command>kfmclient</command></userinput></screen>
+
+ </refsect1>
+
+--- runtime/doc/kdesu/index.docbook (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/doc/kdesu/index.docbook (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -24,8 +24,8 @@
+
+ <legalnotice>&FDLNotice;</legalnotice>
+
+-<date>2005-06-07</date>
+-<releaseinfo>1.00.00</releaseinfo>
++<date>2010-09-21</date>
++<releaseinfo>&kde; 4.5</releaseinfo>
+
+
+ <abstract><para>&kdesu; is a graphical front end for the &UNIX;
+@@ -46,7 +46,16 @@
+ <!-- from kdebase/runtime/kdesu/FAQ since rev 855297
+ kdesu is a libexec program, so does not normally reside in your PATH.
+ Use something like:
+-<command>$(kde4-config - -path libexec)kdesu - - program_to_run-->
++<command>$(kde4-config - -path libexec)kdesu - - program_to_run
++
++https://bugs.kde.org/show_bug.cgi?id=194267
++"one needs to create a
++~/.kde/share/config/kdesurc file to tell KDE to use sudo instead of su."
++~/.kde/share/config/kdesurc
++[super-user-command]
++super-user-command=sudo
++does this really work?
++-->
+
+ <para>Welcome to &kdesu;! &kdesu; is a graphical front end for the
+ &UNIX; <command>su</command> command for the K Desktop Environment.
+@@ -66,6 +75,10 @@
+ dialog, I consider it to be more of a command line <-> &GUI;
+ glue instead of a pure &GUI; program.</para>
+
++<para>Since <command>kdesu</command> is no longer installed in <userinput>
++$(kde4-config --prefix)</userinput>/bin but in <userinput>kde4-config --path libexec</userinput>
++and therefore not in your <envar>Path</envar>, you have to use <userinput>$(kde4-config
++--path libexec)<command>kdesu</command></userinput> to launch <command>kdesu</command>.</para>
+ </chapter>
+
+ <chapter id="using-kdesu">
+@@ -76,7 +89,7 @@
+ <cmdsynopsis>
+ <command>kdesu</command>
+
+-<group choice="opt"><option>-c</option></group>
++<group choice="opt"><option>-c</option> <replaceable> command</replaceable></group>
+ <group choice="opt"><option>-d</option></group>
+ <group choice="opt"><option>-f</option> <replaceable> file</replaceable></group>
+ <group choice="opt"><option>-i</option> <replaceable> icon name</replaceable></group>
+@@ -85,13 +98,14 @@
+ <group choice="opt"><option>-r</option></group>
+ <group choice="opt"><option>-s</option></group>
+ <group choice="opt"><option>-t</option></group>
+-<group choice="opt"><option>-u</option> <replaceable>
+-user</replaceable></group>
+-<group choice="opt"><option>--nonewdcop</option></group>
++<group choice="opt"><option>-u</option> <replaceable> user</replaceable></group>
++<group choice="opt"><option>--noignorebutton</option></group>
++<group choice="opt"><option>--attach</option> <replaceable> winid</replaceable></group>
++<!--group choice="opt"><option>- -nonewdcop</option></group>
+
+ <group><arg choice="req"><replaceable>command</replaceable> <arg><replaceable>arg1</replaceable></arg>
+ <arg><replaceable>arg2</replaceable></arg>
+- <arg rep="repeat"><replaceable></replaceable></arg></arg></group>
++ <arg rep="repeat"><replaceable></replaceable></arg></arg></group-->
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <command>kdesu</command>
+@@ -103,15 +117,15 @@
+
+ <variablelist>
+ <varlistentry>
+-<term><option>-c <replaceable>program</replaceable></option></term>
+-<listitem><para>This specifies the program to run as root. It has to be passed
++<term><option>-c <replaceable>command</replaceable></option></term>
++<listitem><para>This specifies the command to run as root. It has to be passed
+ in one argument. So if, for example, you want to start a new file manager, you
+-would enter at the prompt: <userinput><command>kdesu <option>-c <replaceable>kfm
+--sw</replaceable></option></command></userinput></para></listitem>
++would enter at the prompt: <userinput>$(kde4-config --path libexec)<command>kdesu <option>-c <replaceable>
++&dolphin;</replaceable></option></command></userinput></para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-d</option></term>
+-<listitem><para>Do not show the command to be run in the dialog.</para></listitem>
++<listitem><para>Show debug information.</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-f <replaceable>file</replaceable></option></term>
+@@ -122,27 +136,25 @@
+ current user. If it is not writable, the command is executed as user
+ <parameter>user</parameter> (defaults to root).</para>
+ <para><parameter>file</parameter> is evaluated like this: if
+-<parameter>FILE</parameter> starts with a <literal>/</literal>, it is
++<parameter>file</parameter> starts with a <literal>/</literal>, it is
+ taken as an absolute filename. Otherwise, it is taken as the name of a
+-global &kde; configuration file. For example: to configure the K display
+-manager, &kdm;, you could issue
+-<command>kdesu <option>-c kdmconfig -f
+-kdmrc</option></command></para></listitem>
++global &kde; configuration file.</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-i</option> <replaceable>icon name</replaceable></term>
+ <listitem><para>Specify icon to use in the password dialog. You may specify
+ just the name, without any extension.</para>
+-<para>For instance to run <command>kfmclient</command> and show the
++<para>For instance to run &konqueror; in filemanager mode and show the
+ &konqueror; icon in the password dialog:</para>
+-<screen><userinput><command>kdesu</command> <option>-i konqueror</option> <command>kfmclient</command></userinput></screen>
++<screen><userinput>$(kde4-config --path libexec)<command>kdesu</command> <option>-i konqueror</option>
++<option>-c "konqueror --profile filemanagement"</option></userinput></screen>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-n</option></term>
+ <listitem><para>Do not keep the password. This disables the <guilabel>keep
+-password</guilabel> check box in the password dialog.</para></listitem>
++password</guilabel> checkbox in the password dialog.</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-p</option> <replaceable>priority</replaceable></term>
+@@ -154,7 +166,7 @@
+ </varlistentry>
+ <varlistentry>
+ <term><option>-r</option></term>
+-<listitem><para>Use real-time scheduling.</para>
++<listitem><para>Use realtime scheduling.</para>
+ </listitem>
+ </varlistentry>
+
+--- runtime/doc/kioslave/nepomuksearch/index.docbook (.../tags/KDE/4.5.2/kdebase) (wersja 0)
++++ runtime/doc/kioslave/nepomuksearch/index.docbook (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -0,0 +1,110 @@
++<?xml version="1.0" ?>
++<!DOCTYPE article 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 -->
++]>
+
-+// FIXME: is this really useful? Should we better use SCHED_IDLE?
-+bool lowerSchedulingPriority()
-+{
-+#ifdef SCHED_BATCH
-+ struct sched_param param;
-+ memset( ¶m, 0, sizeof(param) );
-+ param.sched_priority = 0;
-+ return !sched_setscheduler( 0, SCHED_BATCH, ¶m );
-+#else
-+ return false;
-+#endif
-+}
---- runtime/nepomuk/servicestub/main.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/servicestub/main.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -35,6 +35,7 @@
- #include <stdio.h>
-
- #include "servicecontrol.h"
-+#include "priority.h"
-
- namespace {
- #ifndef Q_OS_WIN
-@@ -140,6 +141,18 @@
- }
-
-
-+ // Lower our priority by default which makes sense for most services since Nepomuk
-+ // does not want to get in the way of the user
-+ // TODO: make it configurable
-+ // ====================================
-+ if ( !lowerPriority() )
-+ kDebug() << "Failed to lower priority.";
-+ if ( !lowerSchedulingPriority() )
-+ kDebug() << "Failed to lower scheduling priority.";
-+ if ( !lowerIOPriority() )
-+ kDebug() << "Failed to lower io priority.";
++<article lang="&language;" id="nepomuksearch">
++ <title>nepomuksearch</title>
++ <articleinfo>
++ <authorgroup>
++ <author>
++ <personname>
++ <firstname>Sebastian</firstname>
++ <surname>Trüg</surname>
++ </personname>
++ <email>trueg@kde.org</email>
++ </author>
++ <!-- TRANS:ROLES_OF_TRANSLATORS -->
++ </authorgroup>
+
++ <date>2010-09-10</date>
++ <releaseinfo>1.0.0</releaseinfo>
++ </articleinfo>
+
- // register the service control
- // ====================================
- Nepomuk::ServiceControl* control = new Nepomuk::ServiceControl( serviceName, service, &app );
---- runtime/nepomuk/servicestub/priority.h (.../tags/KDE/4.5.1/kdebase) (wersja 0)
-+++ runtime/nepomuk/servicestub/priority.h (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -0,0 +1,26 @@
-+/* This file is part of the KDE Project
-+ Copyright (c) 2008 Sebastian Trueg <trueg@kde.org>
++ <sect1>
++ <title>Overview</title>
+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public
-+ License version 2 as published by the Free Software Foundation.
++ <para>The <acronym>nepomuksearch</acronym> protocol allows to search the Nepomuk meta data store for files or any other type of resource (although files is the most important use case since we are talking about virtual file systems here).</para>
++ <note>
++ <para>For it to work the Nepomuk system needs to be activated. Activating the Strigi file indexer provides better results and way more search possibilities.</para>
++ </note>
+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Library General Public License for more details.
++ <para>Typically <acronym>nepomuksearch</acronym> is used transparently to the user through an application like <application>Dolphin</application> which provide GUI elements to construct the necessary query and the corresponding URL. However, it is also possible to write a query URL manually. There are two different possibilities which might be of interest to the user (be aware that queries created as presented below are not restricted to files):</para>
++ <variablelist>
++ <varlistentry>
++ <term>
++ <userinput>nepomuksearch:/?query=Nepomuk</userinput>
++ </term>
++ <listitem>
++ <para>will look for anything containing the word "Nepomuk". "Nepomuk" can be replaced with anything the simple <xref linkend="query_syntax" /> allows.</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term>
++ <userinput>nepomuksearch:/?sparql=select ?r where { ?r nao:hasTag ?tag . ?tag nao:prefLabel 'Nepomuk'^^xsd:string . }</userinput>
++ </term>
++ <listitem>
++ <para>will execute the <acronym>SPARQL</acronym> query which in this case looks for all resources that are tagged with a tag that has the label "Nepomuk". Be aware that the query needs to be percent-encoded, &ie; a URI like <userinput><http://www.semanticdesktop.org/ontologies/2007/08/15/nao#Tag></userinput> would have to be written as <userinput>%3chttp:%2f%2fwww.semanticdesktop.org%2fontologies%2f2007%2f08%2f15%2fnao#Tag%3e</userinput>.</para>
++ </listitem>
++ </varlistentry>
++ </variablelist>
+
-+ You should have received a copy of the GNU Library General Public License
-+ along with this library; see the file COPYING.LIB. If not, write to
-+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ Boston, MA 02110-1301, USA.
-+*/
++ </sect1>
+
-+#ifndef _NEPOMUK_LINUX_PRIORITY_H_
-+#define _NEPOMUK_LINUX_PRIORITY_H_
++ <sect1 id="query_syntax">
++ <title>Nepomuk Query Syntax</title>
++ <para>The syntax is fairly simple. Multiple query terms can be combined with the keywords <command>AND</command> or <command>OR</command>, terms can be excluded by prefixing them with a minus, and specific properties can be searched by combining the property name with a comparator and the value.</para>
++ <tip>
++ <para>This syntax can also be used in standard search fields such as the <application>Dolphin</application> one.</para>
++ </tip>
++ <sect2>
++ <title>Examples</title>
++ <variablelist>
++ <varlistentry>
++ <term>
++ <userinput>Nepomuk KDE</userinput> or <userinput>Nepomuk AND KDE</userinput>
++ </term>
++ <listitem>
++ <para>search for everything containing the words "Nepomuk" and "KDE" in any of their properties (this includes the content of files).</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term>
++ <userinput>Nepomuk OR KDE</userinput>
++ </term>
++ <listitem>
++ <para>search for everything containing either the word "Nepomuk" or the word "KDE" in any of their properties.</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term>
++ <userinput>"Nepomuk KDE"</userinput>
++ </term>
++ <listitem>
++ <para>search for everything containing the exact phrase "Nepomuk KDE" in any of their properties.</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term>
++ <userinput>hastag:Nepomuk</userinput>
++ </term>
++ <listitem>
++ <para>search for everything that is tagged with a tag named "Nepomuk".</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term>
++ <userinput>+hastag:nepomuk AND -hastag:scribo</userinput>
++ </term>
++ <listitem>
++ <para>search for everything that has a tag labeled "nepomuk" but not a tag labeled "scribo".</para>
++ </listitem>
++ </varlistentry>
++ </variablelist>
++ </sect2>
++ </sect1>
+
-+bool lowerIOPriority();
-+bool lowerSchedulingPriority();
-+bool lowerPriority();
++</article>
+--- runtime/doc/kioslave/nepomuksearch/CMakeLists.txt (.../tags/KDE/4.5.2/kdebase) (wersja 0)
++++ runtime/doc/kioslave/nepomuksearch/CMakeLists.txt (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -0,0 +1,3 @@
++########### install files ###############
++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/nepomuksearch)
+
-+#endif // _NEPOMUK_LINUX_PRIORITY_H_
---- runtime/nepomuk/servicestub/CMakeLists.txt (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/nepomuk/servicestub/CMakeLists.txt (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -12,6 +12,7 @@
- set(servicestub_SRCS
- main.cpp
- servicecontrol.cpp
-+ priority.cpp
- )
-
- qt4_add_dbus_adaptor(servicestub_SRCS
---- runtime/solidautoeject/solidautoeject.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/solidautoeject/solidautoeject.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -50,6 +50,7 @@
- Name[sv]=Utmatning av enheter
- Name[tg]=Ҷудосозии дастгоҳ
- Name[th]=ตัวดันถาดไดรฟ์
-+Name[tr]=Sürücü Çıkarıcı
- Name[uk]=Вилучення дисків
- Name[x-test]=xxDrive Ejectorxx
- Name[zh_CN]=驱动弹出器
-@@ -99,6 +100,7 @@
- Comment[sr@latin]=Automatsko oslobađanje uređaja kada im se prisne dugme za izbacivanje
- Comment[sv]=Frisläpper automatiskt enheter vid tryck på deras utmatningsknapp
- Comment[th]=เปิดถาดไดรฟ์ให้อัตโนมัติเมื่อมีการกดปุ่มเอาแผ่นสื่อออก
-+Comment[tr]=Çıkarma düğmesine basıldığında sürücüleri otomatik olarak ayırır
- Comment[uk]=Автоматичне вилучення файли пристроїв, після натискання на них кнопки виштовхування
- Comment[x-test]=xxAutomatically releases drives when their eject button is pushedxx
- Comment[zh_CN]=当按下弹出钮时，可自动释放驱动器资源
---- runtime/activitymanager/activitymanager.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/activitymanager/activitymanager.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -60,6 +60,7 @@
- Name[sv]=Aktivitetshanterare
- Name[tg]=Мудири фаъолият
- Name[th]=ตัวจัดการกิจกรรม
-+Name[tr]=Eylem Yöneticisi
- Name[uk]=Керування просторами дій
- Name[x-test]=xxActivity Managerxx
- Name[zh_CN]=活动管理器
-@@ -69,6 +70,7 @@
- Comment[ar]=خلفية إدارة النشاط
- Comment[ca]=Dorsal de gestió d'activitats
- Comment[ca@valencia]=Dorsal de gestió d'activitats
-+Comment[cs]=Backend pro správu aktivit
- Comment[da]=Motor til aktivitetshåndtering
- Comment[de]=Backend zur Aktivitätenverwaltung
- Comment[el]=Σύστημα διαχείρισης δραστηριότητας
-@@ -111,6 +113,7 @@
- Comment[sr@latin]=Pozadina za upravljanje aktivnostima
- Comment[sv]=Gränssnittet för aktivitetshanteringen
- Comment[th]=โปรแกรมเบื้องหลังการจัดการกิจกรรม
-+Comment[tr]=Eylem yönetimi arka ucu
- Comment[uk]=Сервер керування просторами дій
- Comment[x-test]=xxThe activity management backendxx
- Comment[zh_CN]=活动管理后端
---- runtime/kurifilter-plugins/ikws/searchproviders/identica_people.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/identica_people.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -50,6 +50,7 @@
- Name[sr@ijekavianlatin]=identi.ca‑ljudi
- Name[sr@latin]=identi.ca‑ljudi
- Name[sv]=Identi.ca personer
-+Name[tr]=Identi.ca Kişiler
- Name[uk]=Постаті Identi.ca
- Name[x-test]=xxIdenti.ca Peoplexx
- Name[zh_CN]=Identi.ca 人物
---- runtime/kurifilter-plugins/ikws/searchproviders/beolingus.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/beolingus.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -20,6 +20,7 @@
- Name[ga]=Foclóir Ar Líne Beolingus
- Name[hi]=बिओलिंगस ऑनलाइन शब्दकोश
- Name[hr]=Beolingus Online Rječnik
-+Name[hu]=Beolingus online szótár
- Name[ia]=Dictionario in linea Beolingus
- Name[id]=Kamus Daring Beolingus
- Name[is]=Beolingus netorðabókin
-@@ -77,6 +78,7 @@
- Query[ga]=http://dict.tu-chemnitz.de/dings.cgi?lang=de&service=deen&opterrors=0&optpro=0&query=\\{@}&iservice=&comment=&email
- Query[hi]=http://dict.tu-chemnitz.de/dings.cgi?lang=de&service=deen&opterrors=0&optpro=0&query=\\{@}&iservice=&comment=&email
- Query[hr]=http://dict.tu-chemnitz.de/dings.cgi?lang=de&service=deen&opterrors=0&optpro=0&query=\\{@}&iservice=&comment=&email
-+Query[hu]=http://dict.tu-chemnitz.de/dings.cgi?lang=de&service=deen&opterrors=0&optpro=0&query=\\{@}&iservice=&comment=&email
- Query[ia]=http://dict.tu-chemnitz.de/dings.cgi?lang=de&service=deen&opterrors=0&optpro=0&query=\\{@}&iservice=&comment=&email
- Query[id]=http://dict.tu-chemnitz.de/dings.cgi?lang=de&service=deen&opterrors=0&optpro=0&query=\\{@}&iservice=&comment=&email
- Query[is]=http://dict.tu-chemnitz.de/dings.cgi?lang=de&service=deen&opterrors=0&optpro=0&query=\\{@}&iservice=&comment=&email
---- runtime/kurifilter-plugins/ikws/searchproviders/duckduckgo_shopping.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/duckduckgo_shopping.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -6,6 +6,7 @@
- Name[ar]=Duck Duck Go Shopping
- Name[ca]=Duck Duck Go Shopping
- Name[ca@valencia]=Duck Duck Go Shopping
-+Name[cs]=Duck Duck Go Shopping
- Name[da]=Duck Duck Go shopping
- Name[de]=Duck Duck Go Shopping
- Name[el]=Duck Duck Go Shopping
-@@ -18,6 +19,7 @@
- Name[ga]=Siopadóireacht Duck Duck Go
- Name[hi]=बतख़ जा जा खरीदारी
- Name[hr]=Duck Duck Go Shopping
-+Name[hu]=Duck Duck Go Shopping
- Name[ia]=Duck Duck Go Shopping
- Name[id]=Belanja Duck Duck Go
- Name[is]=Duck Duck Go verslun
-@@ -46,6 +48,7 @@
- Name[sr@latin]=Duck Duck Go (kupovina)
- Name[sv]=Duck Duck Go shopping
- Name[th]=ช้อปปิ้งของ Duck Duck Go
-+Name[tr]=Duck Duck Go Alışveriş
- Name[uk]=Duck Duck Go Shopping
- Name[x-test]=xxDuck Duck Go Shoppingxx
- Name[zh_CN]=Duck Duck Go 购物
---- runtime/kurifilter-plugins/ikws/searchproviders/kde_techbase.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/kde_techbase.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -7,6 +7,7 @@
- Name[bn]=KDE টেক-বেস
- Name[ca]=KDE TechBase
- Name[ca@valencia]=KDE TechBase
-+Name[cs]=KDE TechBase
- Name[da]=KDE TechBase
- Name[de]=KDE TechBase
- Name[el]=Τεχνική βάση KDE
---- runtime/kurifilter-plugins/ikws/searchproviders/flickrcc.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/flickrcc.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -21,6 +21,7 @@
- Name[ga]=Flickr Creative Commons
- Name[hi]=फ़्लिकर क्रियेटिव कोमनस
- Name[hr]=Flickr Creative Commons
-+Name[hu]=Flickr Creative Commons
- Name[ia]=Flickr Creative Commons
- Name[id]=Flickr Creative Commons
- Name[is]=Flickr Creative Commons
-@@ -49,6 +50,7 @@
- Name[sr@ijekavianlatin]=Flickr (Creative Commons)
- Name[sr@latin]=Flickr (Creative Commons)
- Name[sv]=Flickr Creative Commons
-+Name[tr]=Flickr Creative Commons
- Name[uk]=Flickr Creative Commons
- Name[x-test]=xxFlickr Creative Commonsxx
- Name[zh_CN]=Flickr 公用创作物
---- runtime/kurifilter-plugins/ikws/searchproviders/yahoo_image.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/yahoo_image.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -53,6 +53,7 @@
- Name[sr@ijekavianlatin]=Yahoo-slike
- Name[sr@latin]=Yahoo-slike
- Name[sv]=Yahoo bilder
-+Name[tr]=Yahoo Resimleri
- Name[uk]=Зображення Yahoo
- Name[x-test]=xxYahoo Imagesxx
- Name[zh_CN]=Yahoo 图像
---- runtime/kurifilter-plugins/ikws/searchproviders/yahoo_local.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/yahoo_local.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -7,6 +7,7 @@
- Name[bn]=ইয়াহু স্থানীয়
- Name[ca]=Yahoo Local
- Name[ca@valencia]=Yahoo Local
-+Name[cs]=Yahoo Local
- Name[da]=Yahoo Local
- Name[de]=Yahoo Local
- Name[el]=Yahoo Τοπικό
---- runtime/kurifilter-plugins/ikws/searchproviders/urbandictionary.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/urbandictionary.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -8,6 +8,7 @@
- Name[bn]=Urban Dictionary
- Name[ca]=Urban Dictionary
- Name[ca@valencia]=Urban Dictionary
-+Name[cs]=Urban Dictionary
- Name[da]=Urban Dictionary
- Name[de]=Urban Dictionary
- Name[el]=Urban Dictionary(Λεξικό)
-@@ -52,6 +53,7 @@
- Name[sr@latin]=Urbani rečnik
- Name[sv]=Slangordlista
- Name[th]=พจนานุกรม Urban
-+Name[tr]=Urban Dictionary
- Name[uk]=Urban Dictionary
- Name[x-test]=xxUrban Dictionaryxx
- Name[zh_CN]=都市词典
---- runtime/kurifilter-plugins/ikws/searchproviders/yahoo_video.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/yahoo_video.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -52,6 +52,7 @@
- Name[sr@ijekavianlatin]=Yahoo Video
- Name[sr@latin]=Yahoo Video
- Name[sv]=Yahoo video
-+Name[tr]=Yahoo Video
- Name[uk]=Відео Yahoo
- Name[x-test]=xxYahoo Videoxx
- Name[zh_CN]=Yahoo 视频
---- runtime/kurifilter-plugins/ikws/searchproviders/duckduckgo.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/duckduckgo.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -7,6 +7,7 @@
- Name[bg]=Duck Duck Go
- Name[ca]=Duck Duck Go
- Name[ca@valencia]=Duck Duck Go
-+Name[cs]=Duck Duck Go
- Name[da]=Duck Duck Go
- Name[de]=Duck Duck Go
- Name[el]=Duck Duck Go
-@@ -49,6 +50,7 @@
- Name[sr@latin]=Duck Duck Go
- Name[sv]=Duck Duck Go
- Name[th]=Duck Duck Go
-+Name[tr]=Duck Duck Go
- Name[uk]=Duck Duck Go
- Name[x-test]=xxDuck Duck Goxx
- Name[zh_CN]=Duck Duck Go
---- runtime/kurifilter-plugins/ikws/searchproviders/opendesktop.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/opendesktop.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -5,6 +5,7 @@
- Name=openDesktop.org
- Name[ca]=openDesktop.org
- Name[ca@valencia]=openDesktop.org
-+Name[cs]=openDesktop.org
- Name[da]=openDesktop.org
- Name[de]=openDesktop.org
- Name[el]=openDesktop.org
-@@ -18,9 +19,12 @@
- Name[hu]=openDesktop.org
- Name[ia]=openDesktop.org
- Name[id]=openDesktop.org
-+Name[is]=openDesktop.org
- Name[it]=openDesktop.org
- Name[km]=openDesktop.org
-+Name[ko]=openDesktop.org
- Name[lt]=openDesktop.org
-+Name[lv]=openDesktop.org
- Name[nb]=openDesktop.org
- Name[nds]=openDesktop.org
+--- runtime/doc/kioslave/CMakeLists.txt (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/doc/kioslave/CMakeLists.txt (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -16,3 +16,4 @@
+ add_subdirectory(tar)
+ add_subdirectory(thumbnail)
+ add_subdirectory(xz)
++add_subdirectory(nepomuksearch)
+--- runtime/platforms/win/kwinstartmenu/misc.h (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/platforms/win/kwinstartmenu/misc.h (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -1,6 +1,6 @@
+ /* This file is part of the KDE Project
+
+- Copyright (C) 2006-2008 Ralf Habacker <ralf.habacker@freenet.de>
++ Copyright (C) 2006-2010 Ralf Habacker <ralf.habacker@freenet.de>
+ All rights reserved.
+
+ This library is free software; you can redistribute it and/or
+--- runtime/platforms/win/kwinstartmenu/winstartmenu.cpp (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/platforms/win/kwinstartmenu/winstartmenu.cpp (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -1,6 +1,6 @@
+ /* This file is part of the KDE project
+
+- Copyright (C) 2008 Ralf Habacker <ralf.habacker@freenet.de>
++ Copyright (C) 2008-2010 Ralf Habacker <ralf.habacker@freenet.de>
+ All rights reserved.
+
+ This library is free software; you can redistribute it and/or
+--- runtime/platforms/win/kwinstartmenu/linkfile.h (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/platforms/win/kwinstartmenu/linkfile.h (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -1,6 +1,6 @@
+ /* This file is part of the KDE Project
+
+- Copyright (C) 2006-2008 Ralf Habacker <ralf.habacker@freenet.de>
++ Copyright (C) 2006-2010 Ralf Habacker <ralf.habacker@freenet.de>
+ All rights reserved.
+
+ This library is free software; you can redistribute it and/or
+--- runtime/platforms/win/kwinstartmenu/main.cpp (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/platforms/win/kwinstartmenu/main.cpp (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -1,6 +1,6 @@
+ /* This file is part of the KDE Project
+
+- Copyright (C) 2006-2009 Ralf Habacker <ralf.habacker@freenet.de>
++ Copyright (C) 2006-2010 Ralf Habacker <ralf.habacker@freenet.de>
+ All rights reserved.
+
+ This library is free software; you can redistribute it and/or
+@@ -37,10 +37,10 @@
+
+ int main(int argc, char **argv)
+ {
+- KAboutData about("winstartmenu", "kdebase-runtime", ki18n("winstartmenu"), "1.0",
++ KAboutData about("kwinstartmenu", "kdebase-runtime", ki18n("kwinstartmenu"), "1.1",
+ ki18n("An application to create/update or remove Windows Start Menu entries"),
+ KAboutData::License_GPL,
+- ki18n("(C) 2008 Ralf Habacker"));
++ ki18n("(C) 2008-2010 Ralf Habacker"));
+ KCmdLineArgs::init( argc, argv, &about);
+
+ KCmdLineOptions options;
+--- runtime/platforms/win/kwinstartmenu/winstartmenu.h (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/platforms/win/kwinstartmenu/winstartmenu.h (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -1,6 +1,6 @@
+ /* This file is part of the KDE Project
+
+- Copyright (C) 2008 Ralf Habacker <ralf.habacker@freenet.de>
++ Copyright (C) 2008-2010 Ralf Habacker <ralf.habacker@freenet.de>
+ All rights reserved.
+
+ This library is free software; you can redistribute it and/or
+--- runtime/platforms/win/kwinstartmenu/misc.cpp (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/platforms/win/kwinstartmenu/misc.cpp (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -1,6 +1,6 @@
+ /* This file is part of the KDE project
+
+- Copyright (C) 2006-2009 Ralf Habacker <ralf.habacker@freenet.de>
++ Copyright (C) 2006-2010 Ralf Habacker <ralf.habacker@freenet.de>
+ All rights reserved.
+
+ This library is free software; you can redistribute it and/or
+--- runtime/platforms/win/kwinstartmenu/linkfile.cpp (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/platforms/win/kwinstartmenu/linkfile.cpp (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -1,6 +1,6 @@
+ /* This file is part of the KDE project
+
+- Copyright (C) 2006-2008 Ralf Habacker <ralf.habacker@freenet.de>
++ Copyright (C) 2006-2010 Ralf Habacker <ralf.habacker@freenet.de>
+ All rights reserved.
+
+ This library is free software; you can redistribute it and/or
+--- runtime/ktimezoned/ktimezoned.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/ktimezoned/ktimezoned.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -79,7 +79,7 @@
+ Comment[et]=Süsteemi ajavööndi edastamine rakendustele
+ Comment[eu]=Aplikazioei sistemaren ordu gunea hornitzen die
+ Comment[fi]=Tarjoaa järjestelmän aikavyöhyketiedon ohjelmille
+-Comment[fr]=Fourni la zone horaire du système aux applications
++Comment[fr]=Fournit la zone horaire du système aux applications
+ Comment[fy]=Jout de tiidsône fan it systeem troch oan applikaasjes
+ Comment[ga]=Soláthraíonn sé crios ama an chórais d'fheidhmchláir
+ Comment[he]=מספק את אזור הזמן של המערכת עבור יישומים
+--- runtime/kioslave/thumbnail/imagethumbnail.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/kioslave/thumbnail/imagethumbnail.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -4,7 +4,7 @@
+ Name[ar]=الصور (GIF, PNG, BMP, ...)
+ Name[bn]=ছবি (GIF, PNG, BMP, ...)
+ Name[ca]=Imatges (GIF, PNG, BMP...)
+-Name[ca@valencia]=Imatges (GIF, PNG, BMP, ...)
++Name[ca@valencia]=Imatges (GIF, PNG, BMP...)
+ Name[cs]=Obrázky (GIF, PNG, BMP, ...)
+ Name[da]=Billeder (GIF, PNG, BMP, ...)
+ Name[de]=Bilder (GIF, PNG, BMP ...)
+--- runtime/kioslave/network/kded/networkwatcher.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/kioslave/network/kded/networkwatcher.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -84,7 +84,7 @@
+ Comment[et]=Hoiab võrgul silma peal ja uuendab protokolli network:/ kataloogide nimekirja
+ Comment[eu]=Sarearen aztarnak jarraitzen ditu eta network:/ protokoloaren direktorio zerrendak eguneratzen ditu
+ Comment[fi]=Pitää kirjaa verkosta ja päivittää network:/-yhteyskäytännön kansioluettelot
+-Comment[fr]=Conserve des enregistrements du réseaux et met à jours les contenus des dossiers pour le protocole « network:/ »
++Comment[fr]=Conserve des enregistrements du réseau et met à jour les contenus des dossiers pour le protocole « network:/ »
+ Comment[fy]=Hâld de netwurk en fernijings triemtafel listen fan it network:/ protocol yn de gaten
+ Comment[ga]=Coimeádann sé cuntas ar an líonra agus nuashonraíonn comhadlanna den phrótacal network:/
+ Comment[gl]=Vixía a rede e actualiza as listaxes de cartafoles do protocolo network:/
+--- runtime/kioslave/remote/kdedmodule/remotedirnotify.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/kioslave/remote/kdedmodule/remotedirnotify.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -66,7 +66,7 @@
+ Comment[et]=Võrgukataloogide muutuste märguanded
+ Comment[eu]=Sareko karpeten aldaketa jakinarazpenak hornitzen ditu
+ Comment[fi]=Tarjoaa huomautuksia verkkokansioiden muutoksista
+-Comment[fr]=Fournis les notifications de modification pour les dossiers réseaux
++Comment[fr]=Fournit les notifications de modification pour les dossiers réseaux
+ Comment[fy]=Ferskaft feroaringsmelding foar netwurkmappen
+ Comment[ga]=Cuireann sé in iúl duit nuair a athraíonn fillteán líonra
+ Comment[he]=מספק שינוי התראות עבור תיקיות רשת
+--- runtime/kioslave/cgi/kcmcgi/kcmcgi.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/kioslave/cgi/kcmcgi/kcmcgi.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -27,7 +27,7 @@
+ Name[el]=Σενάρια CGI
+ Name[en_GB]=CGI Scripts
+ Name[eo]=CGI-skriptoj
+-Name[es]=Procedimientos CGI
++Name[es]=Scripts CGI
+ Name[et]=CGI skriptid
+ Name[eu]=CGI scriptak
+ Name[fa]=دستنوشتههای CGI
+--- runtime/kioslave/desktop/desktopnotifier.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/kioslave/desktop/desktopnotifier.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -77,7 +77,7 @@
+ Comment[et]=Kataloogide muutuste jälgimine
+ Comment[eu]=Direktorioak zelatatzen ditu aldaketa bila
+ Comment[fi]=Tarkkailee muutoksia kansioissa
+-Comment[fr]=Surveilles les modifications des dossiers
++Comment[fr]=Surveille les modifications des dossiers
+ Comment[fy]=Hâld triemtafel feroarings yn de gaten
+ Comment[ga]=Déan monatóireacht ar chomhadlanna le haghaidh athruithe
+ Comment[he]=מנטר תיקיות לשינויים
+--- runtime/kioslave/sftp/kio_sftp.cpp (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/kioslave/sftp/kio_sftp.cpp (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -1002,15 +1002,19 @@
+ return;
+ }
+
+- if (sb->type == SSH_FILEXFER_TYPE_DIRECTORY) {
+- error(KIO::ERR_IS_DIRECTORY, url.prettyUrl());
+- sftp_attributes_free(sb);
+- return;
+- }
+- if (sb->type != SSH_FILEXFER_TYPE_REGULAR) {
++ switch (sb->type) {
++ case SSH_FILEXFER_TYPE_DIRECTORY:
++ error(KIO::ERR_IS_DIRECTORY, url.prettyUrl());
++ sftp_attributes_free(sb);
++ return;
++ case SSH_FILEXFER_TYPE_SPECIAL:
++ case SSH_FILEXFER_TYPE_UNKNOWN:
+ error(KIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyUrl());
+- sftp_attributes_free(sb);
+- return;
++ sftp_attributes_free(sb);
++ return;
++ case SSH_FILEXFER_TYPE_SYMLINK:
++ case SSH_FILEXFER_TYPE_REGULAR:
++ break;
+ }
+
+ // Open file
+--- runtime/nepomuk/kioslaves/search/nepomuksearch.protocol (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/nepomuk/kioslaves/search/nepomuksearch.protocol (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -14,3 +14,4 @@
+ Icon=nepomuk
+ Class=:local
+ maxInstances=20
++X-DocPath=kioslave/nepomuksearch/index.html
+--- runtime/nepomuk/services/removablestorage/nepomukremovablestorageservice.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/nepomuk/services/removablestorage/nepomukremovablestorageservice.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -72,7 +72,7 @@
+ Comment[et]=Nepomuki eemaldatava salvesti teenus, mis võimaldab kasutada Nepomuki metaandmeid eemaldataval salvestusseadmel.
+ Comment[eu]=Nepomuken biltegiratzeko aldagarrien zerbitzua, Nepomuken metadatuei sarbidea ematen die biltegiratzeko gailu aldagarrietan.
+ Comment[fi]=Nepomuk-irrotettavien tallennuslaitteiden palvelu tarjoaa pääsyn Nepomuk-metadataan irrotettavilla tallennuslaitteilla.
+-Comment[fr]=Le service de stockage amovible de Nepomuk, fournissant les méta-données de Mepomuk sur les périphériques de stockage amovibles.
++Comment[fr]=Le service de stockage amovible de Nepomuk, fournissant les méta-données de Nepomuk sur les périphériques de stockage amovibles.
+ Comment[fy]=De Nepomuk útnimber opslach tsjinst, ferskaft troch de Nepomuk metadata op útnimber opslach apparaten.
+ Comment[hr]=Nepomukova usluga uklonjivih uređaja za pohranu omogućuje pristup Nepomukovim metapodacima na uklonjivim uređajima za pohranu.
+ Comment[ia]=Le servicio de storage removibile de Nepomuk forni accesso a metadata de Nepomuk su dispositivos de storage removibile.
+--- runtime/nepomuk/services/queryservice/nepomukqueryservice.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/nepomuk/services/queryservice/nepomukqueryservice.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -82,7 +82,7 @@
+ Comment[ar]=تقدم خدمة استعلام نبومك واجهة لمجلدات الاستعلام الموجودة مسبقا.
+ Comment[be@latin]=Słužba zapytaŭ „Nepomuk” absłuhoŭvaje interfejs dla stałych katalohaŭ, jakija biaruć źviestki ad zapytaŭ.
+ Comment[ca]=El servei de consultes del Nepomuk proporciona una interfície per a carpetes persistents de consultes
+-Comment[ca@valencia]=El servei de consultes del Nepomuk proporciona una interfície per a carpetes persistents de consultes
++Comment[ca@valencia]=El servei de consultes del Nepomuk proporciona una interfície per a carpetes persistents de consultes
+ Comment[cs]=Dotazovací služba Nepomuku poskytuje rozhraní pro složky trvalých dotazů
+ Comment[csb]=Ùsłëżnota Query Nepomuka dôwô interfejs do persistentnegò òdwòłëwaniô kataloga
+ Comment[da]=Nepomuk forespørgselstjeneste giver en grænseflade til ensartet forespørgsel af mapper
+@@ -90,7 +90,7 @@
+ Comment[el]=Η υπηρεσία ερωτήματος Nepomuk προσφέρει μια διασύνδεση για τη συνεχή αναζήτηση σε φακέλους
+ Comment[en_GB]=The Nepomuk Query Service provides an interface for persistent query folders
+ Comment[eo]=La Nepomuk ŝerĉmend-Servo provizas interfacon por daŭraj ŝerĉmend-dosierujoj
+-Comment[es]=El servicio de consultas de Nepomuk proporviona una interfaz para consultas a carpetas persistentes
++Comment[es]=El servicio de consultas de Nepomuk proporciona una interfaz para consultas a carpetas persistentes
+ Comment[et]=Nepomuki päringuteenus tagab püsivate päringukataloogide liidese
+ Comment[eu]=Nepomuk kontsulta zerbitzuak kontsulta iraunkorren karpetentzako interfazea hornitzen du
+ Comment[fi]=Nepomuk-kyselypalvelu tarjoaa liittymän pysyville kyselykansioille
+--- runtime/solidautoeject/solidautoeject.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/solidautoeject/solidautoeject.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -41,6 +41,7 @@
+ Name[pl]=Wysuwanie napędów
+ Name[pt]=Ejecção de Unidades
+ Name[pt_BR]=Ejeção de unidades
++Name[ru]=Извлечение дисков
+ Name[sk]=Vysunutie mechaniky
+ Name[sl]=Izmet pogona
+ Name[sr]=Избацивач јединица
+@@ -68,7 +69,7 @@
+ Comment[et]=Võimaldab plaatidel automaatselt väljuda, kui vajutatakse väljastamisnuppu
+ Comment[eu]=Unitateak automatikoki askatzen ditu beraien egozteko botoia sakatzen denean
+ Comment[fi]=Vapauttaa asemat automaattisesti kun niiden poistopainiketta painetaan
+-Comment[fr]=Libère automatiquement les disques quand leur bouton d'éjection est pressé
++Comment[fr]=Libère automatiquement les disques quand leur bouton d'éjection est appuyé
+ Comment[fy]=Sil automatysk stasjons útsmite as der op de útsmyt knop drukt wurdt
+ Comment[ga]=Ceadaíonn sé seo tiomántán a scaoileadh nuair a bhrúitear a chnaipe díchurtha
+ Comment[hr]=Automatski oslobađa pogone nakon pritiska na njihovu tipku za izbacivanje
+--- runtime/kurifilter-plugins/shorturi/kshorturifilter.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/kurifilter-plugins/shorturi/kshorturifilter.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -20,7 +20,7 @@
+ Name[el]=Φίλτρο σύντομων URI
+ Name[en_GB]=ShortURIFilter
+ Name[eo]=Mallonga URI-filtrilo
+-Name[es]=Filtro de URIs cortas
++Name[es]=Filtro de URI cortas
+ Name[et]=Lühi-URL-ide filter
+ Name[eu]=URL laburren iragazkia
+ Name[fi]=ShortURIFilter
+--- runtime/kurifilter-plugins/ikws/searchproviders/foldoc.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/kurifilter-plugins/ikws/searchproviders/foldoc.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -19,7 +19,7 @@
+ Name[el]=Ελεύθερο διαδικτυακό λεξικό υπολογιστών
+ Name[en_GB]=Free On-Line Dictionary of Computing
+ Name[eo]=Libera reta vortaro de komputado
+-Name[es]=Free On-Line Dictionary Of Computing
++Name[es]=Diccionario de computación en línea y gratuito
+ Name[et]=Vaba arvutialane võrgusõnastik
+ Name[eu]=Konputazioari buruzko lineako hiztegi librea
+ Name[fa]=واژهنامۀ برخط رایگان محاسبات
+--- runtime/kurifilter-plugins/ikws/searchproviders/opendesktop.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/kurifilter-plugins/ikws/searchproviders/opendesktop.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -32,6 +32,7 @@
Name[nl]=openDesktop.org
-@@ -35,6 +39,7 @@
- Name[sr@ijekavianlatin]=Otvorena površ
- Name[sr@latin]=Otvorena površ
- Name[sv]=openDesktop.org
-+Name[tr]=openDesktop.org
- Name[uk]=openDesktop.org
- Name[x-test]=xxopenDesktop.orgxx
- Name[zh_CN]=openDesktop.org
---- runtime/kurifilter-plugins/ikws/searchproviders/kde_userbase.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/kde_userbase.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -7,6 +7,7 @@
- Name[bn]=কে.ডি.ই. ইউসার-বেস
- Name[ca]=KDE UserBase
- Name[ca@valencia]=KDE UserBase
-+Name[cs]=KDE UserBase
- Name[da]=KDE UserBase
- Name[de]=KDE UserBase
- Name[el]=Βάση χρηστών KDE
---- runtime/kurifilter-plugins/ikws/searchproviders/wikia.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/wikia.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -111,6 +111,7 @@
- Query[sr@latin]=http://www.wikia.com/Special:Search?search=\\{@}&wikia_search_submit=Search
- Query[sv]=http://www.wikia.com/Special:Search?search=\\{@}&wikia_search_submit=Search
- Query[th]=http://www.wikia.com/Special:Search?search=\\{@}&wikia_search_submit=Search
-+Query[tr]=http://www.wikia.com/Special:Search?search=\\{@}&wikia_search_submit=Search
- Query[uk]=http://www.wikia.com/Special:Search?search=\\{@}&wikia_search_submit=Search
- Query[x-test]=xxhttp://www.wikia.com/Special:Search?search=\\{@}&wikia_search_submit=Searchxx
- Query[zh_CN]=http://www.wikia.com/Special:Search?search=\\{@}&wikia_search_submit=Search
---- runtime/kurifilter-plugins/ikws/searchproviders/uspto.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/uspto.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -11,7 +11,7 @@
- Name[bg]=База от данни с патенти на САЩ
+ Name[nn]=openDesktop.org
+ Name[pa]=openDesktop.org
++Name[pl]=openDesktop.org
+ Name[pt]=openDesktop.org
+ Name[pt_BR]=openDesktop.org
+ Name[ru]=openDesktop.org
+--- runtime/kurifilter-plugins/ikws/searchproviders/de2en.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/kurifilter-plugins/ikws/searchproviders/de2en.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -20,7 +20,7 @@
+ Name[el]=Μετάφραση dict.cc: Γερμανικά σε Αγγλικά
+ Name[en_GB]=dict.cc Translation: German to English
+ Name[eo]=dict.cc Traduko: germana al angla
+-Name[es]=dict.cc Traducción: alemán a inglés
++Name[es]=Traducciones dict.cc: alemán a inglés
+ Name[et]=dict.cc tõlkimine: saksa->inglise
+ Name[eu]=dict.cc itzulpena: Alemanatik ingelera
+ Name[fa]=ترجمۀ dict.cc: آلمانی به انگلیسی
+--- runtime/kurifilter-plugins/ikws/searchproviders/uspto.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/kurifilter-plugins/ikws/searchproviders/uspto.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -12,7 +12,7 @@
Name[bn]=মার্কিন পেটেন্ট ডেটাবেস
Name[bn_IN]=মার্কিন প্যাটেন্ট ডাটাবেস
--Name[ca]=Base de dades de patents U.S.
-+Name[ca]=Base de dades de patents EUA
- Name[ca@valencia]=Base de dades de patents U.S.
+ Name[ca]=Base de dades de patents EUA
+-Name[ca@valencia]=Base de dades de patents U.S.
++Name[ca@valencia]=Base de dades de patents EUA
Name[cs]=Patentová databáze USA
Name[csb]=Baza patentów USA
---- runtime/kurifilter-plugins/ikws/searchproviders/vimeo.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/vimeo.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -109,6 +109,7 @@
- Query[sr@latin]=http://vimeo.com/videos/search:\\{@}
- Query[sv]=http://vimeo.com/videos/search:\\{@}
- Query[th]=http://vimeo.com/videos/search:\\{@}
-+Query[tr]=http://vimeo.com/videos/search:\\{@}
- Query[uk]=http://vimeo.com/videos/search:\\{@}
- Query[x-test]=xxhttp://vimeo.com/videos/search:\\{@}xx
- Query[zh_CN]=http://vimeo.com/videos/search:\\{@}
---- runtime/kurifilter-plugins/ikws/searchproviders/duckduckgo_info.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/duckduckgo_info.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -6,6 +6,7 @@
- Name[ar]=Duck Duck Go Info
- Name[ca]=Duck Duck Go Info
- Name[ca@valencia]=Duck Duck Go Info
-+Name[cs]=Duck Duck Go Info
- Name[da]=Duck Duck Go info
- Name[de]=Duck Duck Go Info
- Name[el]=Duck Duck Go Info
-@@ -18,6 +19,7 @@
- Name[ga]=Eolas Duck Duck Go
- Name[hi]=बतख़ जा जा जानकारी
- Name[hr]=Duck Duck Go Info
-+Name[hu]=Duck Duck Go Info
- Name[ia]=Duck Duck Go Info
- Name[id]=Info Duck Duck Go
- Name[is]=Duck Duck Go upplýsingar
-@@ -47,6 +49,7 @@
- Name[sr@latin]=Duck Duck Go (informacije)
- Name[sv]=Duck Duck Go information
- Name[th]=ข้อมูลของ Duck Duck Go
-+Name[tr]=Duck Duck Go Bilgileri
- Name[uk]=Duck Duck Go Info
- Name[x-test]=xxDuck Duck Go Infoxx
- Name[zh_CN]=Duck Duck Go 信息
---- runtime/kurifilter-plugins/ikws/searchproviders/identica_notices.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/identica_notices.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -49,6 +49,7 @@
- Name[sr@ijekavianlatin]=identi.ca‑obaveštenja
- Name[sr@latin]=identi.ca‑obaveštenja
- Name[sv]=Identi.ca anslag
-+Name[tr]=Identi.ca Bildirimleri
- Name[uk]=Нотатки Identi.ca
- Name[x-test]=xxIdenti.ca Noticesxx
- Name[zh_CN]=Identi.ca 通知
---- runtime/soliduiserver/soliduiserver.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/soliduiserver/soliduiserver.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -24,6 +24,7 @@
- Name[ga]=Brath Crua-Earraí
- Name[hi]=हार्डवेयर जाँच
- Name[hr]=Detekcija hardvera
-+Name[hu]=Hardverdetektálás
- Name[ia]=Relevamento de Hardware
- Name[id]=Deteksi Peranti Keras
- Name[is]=Vélbúnaðarskynjun
-@@ -53,6 +54,7 @@
- Name[sv]=Hårdvarudetektering
- Name[tg]=Ҷустуҷӯи сахтафзор
- Name[th]=ตรวจจับฮาร์ดแวร์
-+Name[tr]=Donanım Bulma
- Name[uk]=Виявлення обладнання
- Name[x-test]=xxHardware Detectionxx
- Name[zh_CN]=硬件探测
---- runtime/attica/kdeplugin/kdeplatformdependent.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/attica/kdeplugin/kdeplatformdependent.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -26,8 +26,9 @@
-
- #include <QtCore/QDebug>
-
-+#include <KConfigGroup>
-+#include <kcomponentdata.h>
- #include <KDebug>
--#include <KConfigGroup>
- #include <KWallet/Wallet>
- #include <kcmultidialog.h>
- #include <KStringHandler>
-@@ -38,6 +39,11 @@
- KdePlatformDependent::KdePlatformDependent()
- : m_config(KSharedConfig::openConfig("atticarc")), m_accessManager(0), m_wallet(0)
- {
-+ // when a plain Qt application loads this plugin, it needs a valid KGlobal object
-+ if (!KGlobal::hasMainComponent()) {
-+ KComponentData componentData("attica_kde");
-+ }
-+
- KLocale* locale = KGlobal::locale();
- if (locale) {
- locale->insertCatalog("attica_kde");
---- runtime/drkonqi/data/mappings (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/drkonqi/data/mappings (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -91,7 +91,6 @@
- kalarmautostart=kalarm|general
- kpilotDaemon=kpilot|kpilotDaemon
- korgac=korganizer|reminder daemon (korgac)
--kmail=KMail 2|general
-
- #KDE Konqueror
- kjs=konqueror|kjs
---- runtime/plasma/remotewidgetshelper/kcm_remotewidgets.actions (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/plasma/remotewidgetshelper/kcm_remotewidgets.actions (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -41,6 +41,7 @@
- Name[sr@latin]=Sačuvaj smernice za udaljene vidžete
- Name[sv]=Spara policy för grafiska fjärrkomponenter
- Name[th]=บันทึกนโยบายต่าง ๆ ของวิดเจ็ตทางไกล
-+Name[tr]=Uzak gereçler politikalarını kaydet
- Name[uk]=Зберегти правила для віддалених віджетів
- Name[x-test]=xxSave remote widgets' policiesxx
- Name[zh_CN]=保存远程部件的策略
-@@ -64,7 +65,7 @@
- Description[id]=Mencegah sistem dari menyimpan kebijakan widget jarak jauh plasma
- Description[is]=Kemur í veg fyrir að kerfið geti vistað stefnur varðandi fjartengdar græjur
- Description[it]=Impedisce al sistema di salvare le linee guida degli oggetti remoti di Plasma
--Description[ja]=システムがリモート plasma ウィジェットポリシー保存するのを防ぎます
-+Description[ja]=システムがリモート Plasma ウィジェットポリシー保存するのを防ぎます
- Description[kk]=Қашықтағы Plasma виджеттер ережелерін жүйеде сақтауын болдырмау
- Description[km]=ការពារប្រព័ន្ធមិនឲ្យរក្សាទុកគោលនយោបាយរបស់ធាតុក្រាហ្វិកប្លាស្មាពីចម្ងាយ
- Description[ko]=Plasma 원격 위젯 정책을 저장하지 못하도록 합니다
---- runtime/plasma/scriptengines/javascript/simplebindings/dataengine.h (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/plasma/scriptengines/javascript/simplebindings/dataengine.h (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -47,7 +47,13 @@
- typename M::const_iterator end = map.constEnd();
- typename M::const_iterator it;
- for (it = begin; it != end; ++it) {
-- obj.setProperty(it.key(), qScriptValueFromValue(eng, it.value()));
-+ if (it.value().type() == QVariant::Hash) {
-+ obj.setProperty(it.key(), qScriptValueFromMap(eng, it.value().toHash()));
-+ } else if (it.value().type() == QVariant::Map) {
-+ obj.setProperty(it.key(), qScriptValueFromMap(eng, it.value().toMap()));
-+ } else {
-+ obj.setProperty(it.key(), qScriptValueFromValue(eng, it.value()));
-+ }
- }
-
- return obj;
---- runtime/plasma/scriptengines/javascript/plasma-scriptengine-dataengine-javascript.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
-+++ runtime/plasma/scriptengines/javascript/plasma-scriptengine-dataengine-javascript.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
-@@ -21,6 +21,7 @@
- Name[gu]=જાવાસ્ક્રિપ્ટ માહિતીએન્જિન
- Name[he]=מנוע נתונים של JavaScript
- Name[hr]=JavaScript podatkovni mehanizam
-+Name[hu]=JavaScript-adatmodul
- Name[ia]=JavaScript Motor de Datos (Data Engine)
- Name[id]=Mesin Data JavaScript
- Name[is]=JavaScript gagnavél
+ Name[da]=U.S. Patent-database
+--- runtime/kurifilter-plugins/ikws/searchproviders/ruby_application_archive.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/kurifilter-plugins/ikws/searchproviders/ruby_application_archive.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -12,7 +12,7 @@
+ Name[br]=Diell arloadoù Ruby
+ Name[ca]=Arxiu d'aplicacions Ruby
+ Name[ca@valencia]=Arxiu d'aplicacions Ruby
+-Name[cs]=Archív aplikací Ruby
++Name[cs]=Archiv aplikací Ruby
+ Name[csb]=Ruby - archiwa programów
+ Name[cy]=Archif Cymhwysiadau Ruby
+ Name[da]=Ruby programarkiv
+--- runtime/soliduiserver/soliduiserver.desktop (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/soliduiserver/soliduiserver.desktop (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -72,7 +72,7 @@
+ Comment[et]=Riistvarasündmuste kasutajaliides
+ Comment[eu]=Hardware gertakarientzako erabiltzaile interfaze bat hornitzen du
+ Comment[fi]=Tarjoaa käyttöliittymän laitteistotapahtumille
+-Comment[fr]=Fourni un interface utilisateur pour les évènements matériels
++Comment[fr]=Fournit une interface utilisateur pour les évènements matériels
+ Comment[fy]=Ferskaft in brûkersomjouwing foar hurdguod barren
+ Comment[ga]=Soláthraíonn sé comhéadan úsáideora do theagmhais chrua-earraí
+ Comment[he]=מספק ממשק משתמש עבור אירועי חומרה
+--- runtime/plasma/remotewidgetshelper/kcm_remotewidgets.actions (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/plasma/remotewidgetshelper/kcm_remotewidgets.actions (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -54,7 +54,7 @@
+ Description[de]=Hindert das System daran, Regelungen für entfernte Miniprogramme zu speichern.
+ Description[el]=Αποτρέπει το σύστημα από το να σώσει τις πολιτικές απομακρυσμένων μικροεφαρμογών plasma
+ Description[en_GB]=Prevents the system from saving remote plasma widgets' policies
+-Description[es]=Impide que el sistema guarde políticas de componentes Plasma remotos
++Description[es]=Impide que el sistema guarde políticas de elementos gráficos Plasma remotos
+ Description[et]=Takistab süsteemil salvestamast Plasma välisvidinate reegleid
+ Description[eu]=Sistemak urruneko plasma tramankuluen politikak gorde ditzan galarazten du
+ Description[fr]=Empêche le système d'enregistrer la stratégie des gadgets distant
+--- runtime/plasma/scriptengines/javascript/simplebindings/qscriptbookkeeping.cpp (.../tags/KDE/4.5.2/kdebase) (wersja 1188166)
++++ runtime/plasma/scriptengines/javascript/simplebindings/qscriptbookkeeping.cpp (.../branches/KDE/4.5/kdebase) (wersja 1188166)
+@@ -44,6 +44,7 @@
+ Q_DECLARE_METATYPE(Plasma::VideoWidget::Controls)
+ Q_DECLARE_METATYPE(Plasma::Svg*)
+ Q_DECLARE_METATYPE(Qt::MouseButton)
++Q_DECLARE_METATYPE(QList<double>)
+
+ Q_DECLARE_METATYPE(AppletInterface*)
+
+@@ -220,6 +221,7 @@
+ qScriptRegisterMetaType<KJob *>(engine, qScriptValueFromKJob, qKJobFromQScriptValue);
+ qScriptRegisterMetaType<KIO::Job *>(engine, qScriptValueFromKIOJob, qKIOJobFromQScriptValue);
+
++ qScriptRegisterSequenceMetaType<QList<double> >(engine);
+ qScriptRegisterMetaType<Plasma::Animation *>(engine, qScriptValueFromAnimation, abstractAnimationFromQScriptValue);
+ qScriptRegisterMetaType<Plasma::Extender *>(engine, qScriptValueFromExtender, extenderFromQScriptValue);
+ qScriptRegisterMetaType<Plasma::VideoWidget::Controls>(engine, qScriptValueFromControls, controlsFromScriptValue, QScriptValue());
projects / packages / kde4-kdebase-runtime.git / commitdiff