packages: kde4-kdebase/kde4-kdebase-branch.diff, kde4-kdebase/kde4-kdebase....

arekm arekm at pld-linux.org
Thu Oct 21 17:37:39 CEST 2010 

Author: arekm                        Date: Thu Oct 21 15:37:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; add branch diff

---- Files affected:
packages/kde4-kdebase:
   kde4-kdebase-branch.diff (1.20 -> 1.21) , kde4-kdebase.spec (1.136 -> 1.137) 

---- Diffs:

================================================================
Index: packages/kde4-kdebase/kde4-kdebase-branch.diff
diff -u packages/kde4-kdebase/kde4-kdebase-branch.diff:1.20 packages/kde4-kdebase/kde4-kdebase-branch.diff:1.21
--- packages/kde4-kdebase/kde4-kdebase-branch.diff:1.20	Mon Sep 27 09:31:21 2010
+++ packages/kde4-kdebase/kde4-kdebase-branch.diff	Thu Oct 21 17:37:33 2010
@@ -1,1294 +1,867 @@
 Index: apps/konqueror/src/konqmainwindow.cpp
 ===================================================================
---- apps/konqueror/src/konqmainwindow.cpp	(.../tags/KDE/4.5.1/kdebase)	(wersja 1179156)
-+++ apps/konqueror/src/konqmainwindow.cpp	(.../branches/KDE/4.5/kdebase)	(wersja 1179156)
-@@ -1674,7 +1674,10 @@
-       // Reuse current servicetype for local files, but not for remote files (it could have changed, e.g. over HTTP)
-       QString serviceType = reloadView->url().isLocalFile() ? reloadView->serviceType() : QString();
-       // By using locationBarURL instead of url, we preserve name filters (#54687)
--      openUrl( reloadView, reloadView->locationBarURL(), serviceType, req );
-+      KUrl reloadUrl = reloadView->locationBarURL();
-+      if (reloadUrl.isEmpty()) // e.g. initial screen
-+          reloadUrl = reloadView->url();
-+      openUrl(reloadView, reloadUrl, serviceType, req);
-   }
- }
- 
-Index: apps/konqueror/settings/ebrowsing/ebrowsing.desktop
-===================================================================
---- apps/konqueror/settings/ebrowsing/ebrowsing.desktop	(.../tags/KDE/4.5.1/kdebase)	(wersja 1179156)
-+++ apps/konqueror/settings/ebrowsing/ebrowsing.desktop	(.../branches/KDE/4.5/kdebase)	(wersja 1179156)
-@@ -8,6 +8,8 @@
- X-KDE-Library=kcm_kurifilt
- X-KDE-ParentApp=kcontrol
- 
-+X-KDE-System-Settings-Parent-Category=account-details
-+
- Name=Web Shortcuts
- Name[af]=Web Kortpaaie
- Name[ar]=اختصارات الشبكة
-Index: apps/konqueror/settings/kio/kcookiespolicies.cpp
-===================================================================
---- apps/konqueror/settings/kio/kcookiespolicies.cpp	(.../tags/KDE/4.5.1/kdebase)	(wersja 1179156)
-+++ apps/konqueror/settings/kio/kcookiespolicies.cpp	(.../branches/KDE/4.5/kdebase)	(wersja 1179156)
-@@ -270,6 +270,7 @@
-     if (!nextItem)
-       nextItem = dlg->lvDomainPolicy->itemAbove(item);
- 
-+    m_pDomainPolicy.remove(item);
-     delete item;
-   }
- 
-Index: apps/konqueror/settings/kio/uasproviders/safari40.desktop
-===================================================================
---- apps/konqueror/settings/kio/uasproviders/safari40.desktop	(.../tags/KDE/4.5.1/kdebase)	(wersja 1179156)
-+++ apps/konqueror/settings/kio/uasproviders/safari40.desktop	(.../branches/KDE/4.5/kdebase)	(wersja 1179156)
-@@ -52,6 +52,7 @@
- Name[sv]=UAD-beskrivning (Safari 4.0 på MacOS X)
- Name[tg]=UADescription (Safari 4.0 дар MacOS X)
- Name[th]=UADescription (ซาฟารี 4.0 บน MacOS X)
-+Name[tr]=Kullanıcı Uygulaması Tanımı (Safari 4.0 on MacOS X)
- Name[uk]=UADescription (Safari 4.0 на MacOS X)
- Name[x-test]=xxUADescription (Safari 4.0 on MacOS X)xx
- Name[zh_CN]=客户端描述(运行于 MacOS X 的 Safari 4.0)
-Index: apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop
-===================================================================
---- apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop	(.../tags/KDE/4.5.1/kdebase)	(wersja 1179156)
-+++ apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop	(.../branches/KDE/4.5/kdebase)	(wersja 1179156)
-@@ -52,6 +52,7 @@
- Name[sv]=AA-beskrivning (Firefox 3.6 på aktuell)
- Name[tg]=UADescription (Firefox 3.6 версияи ҷорӣ)
- Name[th]=UADescription (ไฟร์ฟอกซ์ 3.6 บนระบบปัจจุบัน)
-+Name[tr]=Kullanıcı Uygulaması Tanımı (geçerli işletim sistemi üzerinde Firefox 3.6)
- Name[uk]=UADescription (Firefox 3.6 на поточній)
- Name[x-test]=xxUADescription (Firefox 3.6 on current)xx
- Name[zh_CN]=客户端描述(运行于本机的 Firefox 3.6)
-Index: apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop
-===================================================================
---- apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop	(.../tags/KDE/4.5.1/kdebase)	(wersja 1179156)
-+++ apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop	(.../branches/KDE/4.5/kdebase)	(wersja 1179156)
-@@ -52,6 +52,7 @@
- Name[sv]=AA-beskrivning (Google Chrome 5.0)
- Name[tg]=UADescription (Google Chrome 5.0)
- Name[th]=UADescription (กูเกิลโครม 5.0)
-+Name[tr]=Kullanıcı Uygulaması Tanımı (Google Chrome 5.0)
- Name[uk]=UADescription (Google Chrome 5.0)
- Name[x-test]=xxUADescription (Google Chrome 5.0)xx
- Name[zh_CN]=客户端描述(Google Chrome 5.0)
-Index: apps/konqueror/settings/konqhtml/khtml_java_js.desktop
-===================================================================
---- apps/konqueror/settings/konqhtml/khtml_java_js.desktop	(.../tags/KDE/4.5.1/kdebase)	(wersja 1179156)
-+++ apps/konqueror/settings/konqhtml/khtml_java_js.desktop	(.../branches/KDE/4.5/kdebase)	(wersja 1179156)
-@@ -139,7 +139,6 @@
- Comment[id]=Atur perilaku Java dan JavaScript
- Comment[is]=Stilla hegðun Java og JavaScript
- Comment[it]=Configura il comportamento di Java e JavaScript
--Comment[ja]=Java と JavaScript の挙動を設定
- Comment[ka]=Java და JavaScript -ის ქცევის კონფიგურაცია
- Comment[kk]=Java және JavaScript қасиеттерін баптау
- Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​ឥរិយាបថ​របស់ Java និង JavaScript
+--- apps/konqueror/src/konqmainwindow.cpp	(.../tags/KDE/4.5.2/kdebase)	(wersja 1188166)
++++ apps/konqueror/src/konqmainwindow.cpp	(.../branches/KDE/4.5/kdebase)	(wersja 1188166)
+@@ -3614,7 +3614,7 @@
+   m_paRemoveView->setIcon( KIcon("view-close") );
+   m_paRemoveView->setText( i18n( "&Close Active View" ) );
+   connect(m_paRemoveView, SIGNAL(triggered()), SLOT( slotRemoveView() ));
+-  m_paRemoveView->setShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_R);
++  m_paRemoveView->setShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_W);
+   m_paRemoveTab = actionCollection()->addAction("removecurrenttab");
+   m_paRemoveTab->setIcon( KIcon("tab-close") );
+   m_paRemoveTab->setText( i18n( "Close Current Tab" ) );
+@@ -5227,10 +5227,10 @@
+ //
+ 
+ // prepend http://www. or http:// if there's no protocol in 's'
+-// used only when there are no completion matches
++// This is used only when there are no completion matches
+ static QString hp_tryPrepend( const QString& s )
+ {
+-    if( s.isEmpty() || s[ 0 ] == '/' )
++    if (s.isEmpty() || s[0] == QLatin1Char('/') || s[0] == QLatin1Char('~'))
+         return QString();
+     for( int pos = 0;
+          pos < s.length() - 2; // 4 = ://x
+Index: apps/konqueror/settings/kio/proxy.desktop
+===================================================================
+--- apps/konqueror/settings/kio/proxy.desktop	(.../tags/KDE/4.5.2/kdebase)	(wersja 1188166)
++++ apps/konqueror/settings/kio/proxy.desktop	(.../branches/KDE/4.5/kdebase)	(wersja 1188166)
+@@ -123,7 +123,7 @@
+ Comment[el]=Ρυθμίστε τους διαμεσολαβητές που χρησιμοποιούνται
+ Comment[en_GB]=Configure the proxy servers used
+ Comment[eo]=Agordi la prokurilon
+-Comment[es]=Configuración de los servidores Proxy usados
++Comment[es]=Configuración de los servidores sroxy usados
+ Comment[et]=Kasutatavate puhverserverite seadistamine
+ Comment[eu]=Konfiguratu erabilitako proxy zerbitzariak
+ Comment[fa]=پیکربندی پیشکارهای استفاده‌شده
+Index: apps/konqueror/settings/kio/bookmarks.desktop
+===================================================================
+--- apps/konqueror/settings/kio/bookmarks.desktop	(.../tags/KDE/4.5.2/kdebase)	(wersja 1188166)
++++ apps/konqueror/settings/kio/bookmarks.desktop	(.../branches/KDE/4.5/kdebase)	(wersja 1188166)
+@@ -114,7 +114,7 @@
+ Comment[el]=Ρύθμιση της αρχικής σελίδας των σελιδοδεικτών
+ Comment[en_GB]=Configure the bookmarks home page
+ Comment[eo]=Agordi la ĉefpaĝon de la legosignoj
+-Comment[es]=Configuración de los marcadores
++Comment[es]=Configuración de la página inicial de los marcadores
+ Comment[et]=Järjehoidjate kodulehekülje seadistamine
+ Comment[eu]=Konfiguratu laster-marken hasierako orria
+ Comment[fi]=Muokkaa kirjanmerkkien kotisivua
+Index: apps/konqueror/settings/kio/cache.desktop
+===================================================================
+--- apps/konqueror/settings/kio/cache.desktop	(.../tags/KDE/4.5.2/kdebase)	(wersja 1188166)
++++ apps/konqueror/settings/kio/cache.desktop	(.../branches/KDE/4.5/kdebase)	(wersja 1188166)
+@@ -120,7 +120,7 @@
+ Comment[el]=Ρυθμίστε τη λανθάνουσα μνήμη ιστοσελίδων
+ Comment[en_GB]=Configure web cache settings
+ Comment[eo]=Agordi la retan tenejon
+-Comment[es]=Configurar las preferencias del caché de web
++Comment[es]=Configuración de las preferencias de la caché web
+ Comment[et]=Veebi vahemälu seadistamine
+ Comment[eu]=Konfiguratu web katxearen ezarpenak
+ Comment[fa]=پیکربندی تنظیمات نهانگاه وب
+Index: apps/konqueror/settings/kio/netpref.desktop
+===================================================================
+--- apps/konqueror/settings/kio/netpref.desktop	(.../tags/KDE/4.5.2/kdebase)	(wersja 1188166)
++++ apps/konqueror/settings/kio/netpref.desktop	(.../branches/KDE/4.5/kdebase)	(wersja 1188166)
+@@ -118,7 +118,7 @@
+ Comment[el]=Ρύθμιση γενικών προτιμήσεων δικτύου, όπως τιμές χρονικών ορίων
+ Comment[en_GB]=Configure generic network preferences, like timeout values
+ Comment[eo]=Agordi la ĝeneralajn retopciojn, kiel tempolimojn ktp.
+-Comment[es]=Configuración de las preferencias genéricas de red, como los tiempos límite
++Comment[es]=Configuración de las preferencias genéricas de red, como los tiempos de espera límite
+ Comment[et]=Üldised võrguseadistused
+ Comment[eu]=Konfiguratu sarerako hobespen orokorrak (denbora-muga balioak, besteak beste)
+ Comment[fa]=پیکربندی تنظیمات شبکۀ محلی، مانند مقادیر اتمام‌ وقت
+Index: apps/konqueror/settings/konqhtml/khtml_behavior.desktop
+===================================================================
+--- apps/konqueror/settings/konqhtml/khtml_behavior.desktop	(.../tags/KDE/4.5.2/kdebase)	(wersja 1188166)
++++ apps/konqueror/settings/konqhtml/khtml_behavior.desktop	(.../branches/KDE/4.5/kdebase)	(wersja 1188166)
+@@ -29,7 +29,7 @@
+ Name[el]=Συμπεριφορά ιστού
+ Name[en_GB]=Web Behaviour
+ Name[eo]=Reta konduto
+-Name[es]=Comportamiento
++Name[es]=Comportamiento web
+ Name[et]=Brauseri käitumine
+ Name[eu]=Web portaera
+ Name[fa]=رفتار وب
 Index: apps/konqueror/settings/konqhtml/khtml_appearance.desktop
 ===================================================================
---- apps/konqueror/settings/konqhtml/khtml_appearance.desktop	(.../tags/KDE/4.5.1/kdebase)	(wersja 1179156)
-+++ apps/konqueror/settings/konqhtml/khtml_appearance.desktop	(.../branches/KDE/4.5/kdebase)	(wersja 1179156)
-@@ -126,7 +126,7 @@
- Comment[gu]=કઇ રીતે વેબ પાનાંઓ જોવા તે રૂપરેખાંકિત કરો
- Comment[he]=הגדר אופן הצגת דפי אינטרנט
- Comment[hi]=वेब पृष्ठ कैसे दिखाने है कॉन्फ़िगर करें
--Comment[hr]=Konfiguriranje prikaza  web-stranica
-+Comment[hr]=Konfiguriranje prikaza web-stranica
- Comment[hu]=A weboldalak megjelenítési jellemzőinek beállítása
- Comment[ia]=Tu configura como monstrar paginas web
- Comment[id]=Atur bagaimana menampilkan halaman web
-Index: apps/konqueror/settings/konqhtml/filteropts.cpp
-===================================================================
---- apps/konqueror/settings/konqhtml/filteropts.cpp	(.../tags/KDE/4.5.1/kdebase)	(wersja 1179156)
-+++ apps/konqueror/settings/konqhtml/filteropts.cpp	(.../branches/KDE/4.5/kdebase)	(wersja 1179156)
-@@ -486,6 +486,7 @@
- 
-         mFilters << filterConfig;
-     }
-+    reset();
- }
- 
- void AutomaticFilterModel::save(KConfigGroup &cg)
-Index: apps/konqueror/kttsplugin/khtmlkttsd.cpp
-===================================================================
---- apps/konqueror/kttsplugin/khtmlkttsd.cpp	(.../tags/KDE/4.5.1/kdebase)	(wersja 1179156)
-+++ apps/konqueror/kttsplugin/khtmlkttsd.cpp	(.../branches/KDE/4.5/kdebase)	(wersja 1179156)
-@@ -66,7 +66,7 @@
-     {
-         QString error;
-         if (KToolInvocation::startServiceByDesktopName("kttsd", QStringList(), &error)) {
--            KMessageBox::error(part->widget(), error, i18n("Starting KTTSD Failed") );
-+            KMessageBox::error(part->widget(), error, i18n("Starting Jovie Text-to-Speech Service Failed") );
- 	    return;
-         }
-     }
-Index: apps/konqueror/sidebar/places_module/konqsidebar_places.desktop
-===================================================================
---- apps/konqueror/sidebar/places_module/konqsidebar_places.desktop	(.../tags/KDE/4.5.1/kdebase)	(wersja 1179156)
-+++ apps/konqueror/sidebar/places_module/konqsidebar_places.desktop	(.../branches/KDE/4.5/kdebase)	(wersja 1179156)
-@@ -53,6 +53,7 @@
- Name[sv]=Sidoradsmodul med platser
- Name[tg]=Модули панели маконҳо
- Name[th]=มอดูลแถบข้างที่หลัก ๆ
-+Name[tr]=Konumlar Yan Çubuk Modülü
- Name[uk]=Модуль місць бічної панелі
- Name[x-test]=xxPlaces SideBar Modulexx
- Name[zh_CN]=位置侧边栏模块
-Index: apps/dolphin/src/dolphinmainwindow.cpp
-===================================================================
---- apps/dolphin/src/dolphinmainwindow.cpp	(.../tags/KDE/4.5.1/kdebase)	(wersja 1179156)
-+++ apps/dolphin/src/dolphinmainwindow.cpp	(.../branches/KDE/4.5/kdebase)	(wersja 1179156)
-@@ -1355,7 +1355,7 @@
- 
-     const KUrl& url = m_activeViewContainer->url();
-     setUrlAsCaption(url);
--    if (m_viewTab.count() > 1 && m_viewTab[m_tabIndex].secondaryView != 0) {
-+    if (m_viewTab.count() > 1) {
-         m_tabBar->setTabText(m_tabIndex, tabName(url));
-         m_tabBar->setTabIcon(m_tabIndex, KIcon(KMimeType::iconNameForUrl(url)));
-     }
-Index: apps/dolphin/src/kcm/kcmdolphinviewmodes.desktop
-===================================================================
---- apps/dolphin/src/kcm/kcmdolphinviewmodes.desktop	(.../tags/KDE/4.5.1/kdebase)	(wersja 1179156)
-+++ apps/dolphin/src/kcm/kcmdolphinviewmodes.desktop	(.../branches/KDE/4.5/kdebase)	(wersja 1179156)
-@@ -48,7 +48,7 @@
- Name[pt]=Modos de Visualização do Dolphin
- Name[pt_BR]=Modos de Visualização do Dolphin
- Name[ro]=Regimuri de vizualizare Dolphin
--Name[ru]=Представление папок в Dolphin
-+Name[ru]=Режимы просмотра папок в Dolphin
- Name[se]=Dolphin čájehanmodusat
- Name[si]=Dolphin දසුන් ආකාර
- Name[sk]=Režimy zobrazenia Dolphinu
-@@ -113,7 +113,7 @@
- Comment[pt]=Este serviço permite-lhe configurar os modos de visualização do Dolphin.
- Comment[pt_BR]=Este serviço permite configurar os modos de visualização do Dolphin.
- Comment[ro]=Acest serviciu permite configurarea regimurilor de vizualizare Dolphin.
--Comment[ru]=Эта служба позволяет настраивать представление папок в Dolphin
-+Comment[ru]=Эта служба позволяет настраивать режимы просмотра папок в Dolphin
- Comment[si]=මෙම සේවාව Dolphin දසුන් ආකාර සැකසීමට ඉඩ දේ. 
- Comment[sk]=Táto služba umožňuje nastavenie režimov zobrazenia Dolphinu.
- Comment[sl]=Ta storitev omogoča nastavitev Dolphinovih načinov prikazov.
-@@ -259,7 +259,7 @@
- Comment[pt]=Configurar os modos de visualização do gestor de ficheiros
- Comment[pt_BR]=Configurar modos de visualização do gerenciador de arquivos
- Comment[ro]=Configurează regimurile de vizualizare ale gestionarului de fișiere
--Comment[ru]=Настройка представления папок в диспетчере файлов
-+Comment[ru]=Настройка режимов просмотра папок в диспетчере файлов
- Comment[se]=Heivet fiilagieđahalli čájehanmodusat
- Comment[si]=ගොනු කළමණාකරුගේ සැසුම් සකසන්න
- Comment[sk]=Nastavenie režimov zobrazenia správcu súborov
-Index: apps/dolphin/src/tooltips/tooltipmanager.cpp
-===================================================================
---- apps/dolphin/src/tooltips/tooltipmanager.cpp	(.../tags/KDE/4.5.1/kdebase)	(wersja 1179156)
-+++ apps/dolphin/src/tooltips/tooltipmanager.cpp	(.../branches/KDE/4.5/kdebase)	(wersja 1179156)
-@@ -155,9 +155,15 @@
- 
-     m_fileMetaDataToolTip->setName(m_item.text());
- 
-+    // Request the retrieval of meta-data. The slot
-+    // slotMetaDataRequestFinished() is invoked after the
-+    // meta-data have been received.
-     m_metaDataRequested = true;
-     m_fileMetaDataToolTip->setItems(KFileItemList() << m_item);
- 
-+    // Request a preview of the item
-+    m_fileMetaDataToolTip->setPreview(QPixmap());
+--- apps/konqueror/settings/konqhtml/khtml_appearance.desktop	(.../tags/KDE/4.5.2/kdebase)	(wersja 1188166)
++++ apps/konqueror/settings/konqhtml/khtml_appearance.desktop	(.../branches/KDE/4.5/kdebase)	(wersja 1188166)
+@@ -115,7 +115,7 @@
+ Comment[el]=Ρύθμιση της εμφάνισης των ιστοσελίδων
+ Comment[en_GB]=Configure how to display web pages
+ Comment[eo]=Agordi la vidigilon de la TTT-paĝoj
+-Comment[es]=Configuración de los tipos de letra usados en páginas web
++Comment[es]=Configuración de los tipos de letra usados para mostrar páginas web
+ Comment[et]=Veebilehtede väljanägemise seadistamine
+ Comment[eu]=Konfiguratu web orriak nola bistaratu
+ Comment[fi]=Muokkaa sitä kuinka verkkosivut näytetään
+Index: apps/konqueror/kttsplugin/khtmlkttsd.desktop
+===================================================================
+--- apps/konqueror/kttsplugin/khtmlkttsd.desktop	(.../tags/KDE/4.5.2/kdebase)	(wersja 1188166)
++++ apps/konqueror/kttsplugin/khtmlkttsd.desktop	(.../branches/KDE/4.5/kdebase)	(wersja 1188166)
+@@ -112,7 +112,7 @@
+ Comment[el]=Εκφωνεί το κείμενο της τρέχουσας σελίδας
+ Comment[en_GB]=Produces audio output for text in the current page
+ Comment[eo]=Generas parolaĵon el la teksto en la nuna paĝo
+-Comment[es]=Produce audio del texto de la página actual
++Comment[es]=Genera una salida de audio a partir del texto de la página actual
+ Comment[et]=Aktiivse lehekülje teksti ettelugemine
+ Comment[eu]=Testurako audio irteera sortzen du uneko orrian
+ Comment[fa]=خروجی صوتی را برای متن در صفحه جاری تولید می‌کند
+Index: apps/konqueror/sidebar/trees/init/remote/ftp/.directory
+===================================================================
+--- apps/konqueror/sidebar/trees/init/remote/ftp/.directory	(.../tags/KDE/4.5.2/kdebase)	(wersja 1188166)
++++ apps/konqueror/sidebar/trees/init/remote/ftp/.directory	(.../branches/KDE/4.5/kdebase)	(wersja 1188166)
+@@ -10,7 +10,7 @@
+ Name[bn_IN]=FTP আর্কাইভ
+ Name[ca]=Arxius FTP
+ Name[ca at valencia]=Arxius FTP
+-Name[cs]=FTP archívy
++Name[cs]=FTP archivy
+ Name[csb]=Archiwa FTP
+ Name[da]=FTP-arkiver
+ Name[de]=FTP-Archive
+Index: apps/konqueror/sidebar/default_entries/history.desktop
+===================================================================
+--- apps/konqueror/sidebar/default_entries/history.desktop	(.../tags/KDE/4.5.2/kdebase)	(wersja 1188166)
++++ apps/konqueror/sidebar/default_entries/history.desktop	(.../branches/KDE/4.5/kdebase)	(wersja 1188166)
+@@ -110,7 +110,7 @@
+ Comment[el]=Αυτό είναι το ιστορικό των URL που επισκεφθήκατε πρόσφατα. Μπορείτε να τα ταξινομήσετε με πολλούς τρόπους.
+ Comment[en_GB]=This is the history of the URLs you have recently visited. You can sort them in many ways.
+ Comment[eo]=Jen la historio de la vizititaj URLoj. Vi povas ordigi ilin diversmaniere.
+-Comment[es]=Este es el historial con las URLs que ha visitado recientemente. Puede ordenarlas de diversos modos.
++Comment[es]=Este es el historial con los URL que ha visitado recientemente. Puede ordenarlos de diversos modos.
+ Comment[et]=Sinu viimati külastatud saitide ajalugu. Ajalugu on võimalik mitmel moel sorteerida.
+ Comment[eu]=Hau bisitatu berri dituzun URLen historia da. Era askotan antola ditzakezu
+ Comment[fa]=این تاریخچۀ نشانیهای وبی است که اخیراً بازدید کرده‌اید. می‌توانید آنها را به روشهای زیادی مرتب کنید.
+Index: apps/dolphin/src/dolphindetailsview.cpp
+===================================================================
+--- apps/dolphin/src/dolphindetailsview.cpp	(.../tags/KDE/4.5.2/kdebase)	(wersja 1188166)
++++ apps/dolphin/src/dolphindetailsview.cpp	(.../branches/KDE/4.5/kdebase)	(wersja 1188166)
+@@ -987,7 +987,19 @@
+     setIconSize(QSize(iconSize, iconSize));
+     m_decorationSize = QSize(iconSize, iconSize);
+ 
++    if (m_extensionsFactory) {
++        // The old maximumSize used by KFileItemDelegate is not valid any more after the icon size change.
++        // It must be discarded before doItemsLayout() is called (see bug 234600).
++        m_extensionsFactory->fileItemDelegate()->setMaximumSize(QSize());
++    }
++
+     doItemsLayout();
 +
-     KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << m_item, 256, 256);
++    // Calculate the new maximumSize for KFileItemDelegate after the icon size change.
++    QModelIndex current = currentIndex();
++    if (current.isValid()) {
++        adjustMaximumSizeForEditing(current);
++    }
+ }
  
-     connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
-Index: apps/doc/kdepasswd/index.docbook
+ KFileItemDelegate::Information DolphinDetailsView::infoForColumn(int columnIndex) const
+Index: apps/doc/konqueror/bookmarks.docbook
 ===================================================================
---- apps/doc/kdepasswd/index.docbook	(.../tags/KDE/4.5.1/kdebase)	(wersja 1179156)
-+++ apps/doc/kdepasswd/index.docbook	(.../branches/KDE/4.5/kdebase)	(wersja 1179156)
-@@ -5,7 +5,7 @@
-   <!ENTITY % English "INCLUDE">
- ]>
- <article lang="&language;">
--<title>User Information</title>
-+<title>Password &amp; User Account</title>
- <articleinfo>
- <authorgroup>
- <author>
-@@ -23,8 +23,8 @@
+--- apps/doc/konqueror/bookmarks.docbook	(.../tags/KDE/4.5.2/kdebase)	(wersja 1188166)
++++ apps/doc/konqueror/bookmarks.docbook	(.../branches/KDE/4.5/kdebase)	(wersja 1188166)
+@@ -5,8 +5,8 @@
  <!-- TRANS:ROLES_OF_TRANSLATORS -->
  </authorgroup>
  
--<date>2010-01-06</date>
+-<date>2010-02-26</date>
 -<releaseinfo>&kde; 4.4</releaseinfo>
-+<date>2010-08-19</date>
++<date>2010-09-24</date>
 +<releaseinfo>&kde; 4.5</releaseinfo>
+ </chapterinfo>
  
- <keywordset>
- <keyword>KDE</keyword>
-@@ -36,7 +36,7 @@
- </articleinfo>
- 
- <sect1 id="kcm_useraccount">
--<title><guilabel>User Information</guilabel></title>
-+<title>User Information</title>
- <sect2 id="intro">
- <title>Introduction</title>
- 
-Index: apps/doc/konqueror/dragdrop.png
-===================================================================
-Nie można wyświetlić: plik binarny.
-svn:mime-type = image/png
-Index: apps/doc/konqueror/konqorg.png
-===================================================================
-Nie można wyświetlić: plik binarny.
-svn:mime-type = image/png
-Index: apps/doc/konqueror/cmndline.png
-===================================================================
-Nie można wyświetlić: plik binarny.
-svn:mime-type = image/png
+ <title>Using Bookmarks</title>
+@@ -15,10 +15,9 @@
+ your own files and folders, they are most useful when you are surfing the
+ Web, letting you build up a list of useful sites.</para>
+ 
+-<para>To open the <guimenu>Bookmarks</guimenu> menu you may either
++<para>To open the <guimenu>Bookmarks</guimenu> menu you may 
+ <mousebutton>left</mousebutton> click on the
+-<guimenu>Bookmarks</guimenu> menu or use the <keycombo
+-action="simul">&Alt;<keycap>B</keycap></keycombo> shortcut. Once
++<guimenu>Bookmarks</guimenu> menu. Once
+ the list is visible, you can navigate through it with the arrow keys or with
+ your mouse, then press &Enter; or
+ <mousebutton>left</mousebutton> click to visit the selected location.</para>
+@@ -27,7 +26,7 @@
+ </guimenu><guimenuitem>Add Bookmark</guimenuitem></menuchoice> or 
+ <keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo> or
+ <mousebutton>right</mousebutton> click on a clear space in the web page or 
+-folder view and select <guimenuitem>Bookmark this Location</guimenuitem> from 
++folder view and select <guimenuitem>Bookmark this Page</guimenuitem> from 
+ the pop up menu.</para>
+ 
+ <para>The <guimenu>Bookmarks</guimenu> list can contain subfolders containing 
+@@ -38,8 +37,11 @@
+ the <guimenuitem>Add Bookmark</guimenuitem> item in that folder.</para>
+ 
+ <para>You can also access your bookmarks from the <link linkend="sidebar">
+-<guilabel>Sidebar</guilabel></link>.</para>
++<guilabel>Sidebar</guilabel></link> or from the <guilabel>Bookmark Toolbar</guilabel>.</para>
+ 
++<para>If you enter <userinput>bookmarks:/</userinput> in the location bar the 
++bookmarks home page with an overview of all bookmarks and folders is shown.</para> 
++
+ <sect1 id="orgbmark">
+ <title>The Bookmark Editor</title>
+ 
+@@ -80,7 +82,7 @@
+ the <guimenu>Edit</guimenu> menu or the pop up menu that appears when you 
+ <mousebutton>right</mousebutton> click on the item. Similarly, you can edit 
+ the &URL; by pressing <keycap>F3</keycap> or choosing the <guimenuitem>
+-Change URL</guimenuitem> menu item.</para>
++Change Location</guimenuitem> menu item.</para>
+ 
+ <para>The <guilabel>Bookmark Editor</guilabel> lets you import bookmarks from 
+ a range of other browsers into &konqueror;'s bookmark list, putting them into 
+@@ -92,7 +94,7 @@
+ 
+ <para>To select which bookmark subfolder is used to hold the Bookmark 
+ Toolbar items select the subfolder then choose <guimenuitem>Set as Toolbar 
+-Folder</guimenuitem> from the <guimenu>Edit</guimenu> menu.</para>
++Folder</guimenuitem> from the <guimenu>Folder</guimenu> menu.</para>
+ 
+ <para>If you are tidying up your bookmarks and have forgotten what a 
+ particular web page is, you can easily open it from within the <guilabel>
 Index: apps/doc/kwrite/index.docbook
 ===================================================================
---- apps/doc/kwrite/index.docbook	(.../tags/KDE/4.5.1/kdebase)	(wersja 1179156)
-+++ apps/doc/kwrite/index.docbook	(.../branches/KDE/4.5/kdebase)	(wersja 1179156)
-@@ -2448,9 +2448,9 @@
+--- apps/doc/kwrite/index.docbook	(.../tags/KDE/4.5.2/kdebase)	(wersja 1188166)
++++ apps/doc/kwrite/index.docbook	(.../branches/KDE/4.5/kdebase)	(wersja 1188166)
+@@ -40,7 +40,7 @@
+ </copyright>
+ <legalnotice>&FDLNotice;</legalnotice>
+ 
+-<date>2010-03-04</date>
++<date>2010-09-16</date>
+ <releaseinfo>4.5</releaseinfo>
+ 
+ <abstract>
+@@ -1373,7 +1373,7 @@
+ <para>You can overwrite the default encoding set in <menuchoice>
+ <guimenu>Settings</guimenu>
+ <guimenuitem>Configure
+-Editor...</guimenuitem></menuchoice> in the <guilabel>Open/Save</guilabel> tab
++Editor...</guimenuitem></menuchoice> in the <guilabel>Open/Save</guilabel> page
+ to set a different encoding for your current document. The encoding you
+ set here will be only valid for your current document.</para>
+  </listitem>
+@@ -1395,7 +1395,7 @@
  <varlistentry>
- <term><guilabel>Auto Completion enabled</guilabel></term>
+ <term><anchor id="tools-add-byte-mark-order"/><menuchoice>
+ <guimenu>Tools</guimenu>
+-<guisubmenu>Add Byte Mark Order</guisubmenu></menuchoice></term>
++<guisubmenu>Add Byte Mark Order (BOM)</guisubmenu></menuchoice></term>
+  <listitem>
+ <para>Checking this action you can explicitly add a byte order mark for unicode
+ encoded documents. The byte order mark (BOM) is a Unicode character used to signal 
+@@ -1423,8 +1423,10 @@
+ <guimenuitem>Word Completion</guimenuitem>
+ </menuchoice> (Power user mode)</term>
+ <listitem>
+-<para><guimenuitem>Reuse Word Below</guimenuitem> and <guimenuitem>Reuse Word
+-Above</guimenuitem> complete the currently typed text by searching for similar
++<para><guimenuitem>Reuse Word Below</guimenuitem> (<keycombo action="simul">&Ctrl;
++<keycap>9</keycap></keycombo>) and <guimenuitem>Reuse Word Above</guimenuitem> 
++(<keycombo action="simul">&Ctrl; <keycap>8</keycap></keycombo>) complete the 
++currently typed text by searching for similar
+ words backward or forward from the current cursor position. <guimenuitem>Shell
+ Completion</guimenuitem> pops up a completion box with matching entries.</para>
+ </listitem>
+@@ -1436,10 +1438,10 @@
+ <keycombo action="simul">&Ctrl;&Shift;<keycap>O</keycap></keycombo>
+ </shortcut>
+ <guimenu>Tools</guimenu>
+-<guimenuitem>Automatic Spelling</guimenuitem>
++<guimenuitem>Automatic Spell Checking</guimenuitem>
+ </menuchoice></term>
  <listitem>
--<para>If this is enabled, the editor will calculate the number
--of spaces up to the next tab position as defined by the tab width,
--and insert that number of spaces instead of a &Tab; character.</para>
-+<para>If enabled, a word completion box automatically pops up during typing
-+showing a list of text entries to complete the current text under the
-+cursor.</para>
+-<para>When <guimenuitem>Automatic Spelling</guimenuitem> is enabled, wrong text
++<para>When <guimenuitem>Automatic Spell Checking</guimenuitem> is enabled, wrong text
+ is underlined in the document on-the-fly.</para>
  </listitem>
  </varlistentry>
+@@ -1581,6 +1583,7 @@
+  </listitem>
+ </varlistentry>
+ 
++<!-- Indent/Inindent no longer in the menu ???, but shortcuts work-->
+ <varlistentry>
+ <term><anchor id="indent"/><menuchoice>
+ <shortcut>
+@@ -1603,10 +1606,9 @@
+ <listitem>
+ <para>This reduces the paragraph's indentation by one step. The size of the step
+ depends on the <link linkend="pref-edit-indent"> indentation settings</link>.</para>
+-
+ </listitem>
+ </varlistentry>
+-
++<!-- -->
+ <varlistentry>
+ <term><anchor id="cleanindent"/><menuchoice>
+ <guimenu>Tools</guimenu><guimenuitem>Clean
+@@ -1682,7 +1684,7 @@
+ <varlistentry>
+ <term><menuchoice>
+ <shortcut>
+-<keycombo action="simul">&Alt;&Ctrl;<keycap>U</keycap></keycombo>
++<keycombo action="simul">&Ctrl;&Alt;<keycap>U</keycap></keycombo>
+ </shortcut>
+ <guimenu>Tools</guimenu>
+ <guimenuitem>Capitalize</guimenuitem>
+@@ -1707,7 +1709,7 @@
+ <varlistentry>
+ <term><menuchoice>
+ <guimenu>Tools</guimenu>
+-<guimenuitem>Word Wrap Document</guimenuitem>
++<guimenuitem>Apply Word Wrap</guimenuitem>
+ </menuchoice></term>
+ <listitem><para>Apply static word wrapping on all the document. That means that
+ a new line of text will automatically start when the current
+@@ -1721,6 +1723,7 @@
+ <para>If the <link linkend="pref-plugins">plugin</link> Insert File is enabled, you will
+ find here an additional menu item <guimenuitem>Insert File...</guimenuitem>.
+ </para>
++<!-- Data Tools and Insane HTML (LE) Expansion Ctrl+. when plugins are enabled-->
+ </sect1>
+ 
+ <sect1 id="settings">
+@@ -2240,7 +2243,7 @@
+ 
+ <varlistentry>
+ <term><guilabel>Allow scrolling past the end of the document</guilabel></term> <listitem>
+-<para>This option lets you scroll past the end of the document. This can be used to vertically centre the bottom of the document, or put it on top of the current view.</para></listitem>
++<para>This option lets you scroll past the end of the document. This can be used to vertically center the bottom of the document, or put it on top of the current view.</para></listitem>
+ </varlistentry>
  </variablelist>
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase/kde4-kdebase-branch.diff?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase/kde4-kdebase.spec?r1=1.136&r2=1.137&f=u

More information about the pld-cvs-commit mailing list