From c304ca1bb0eb1e56716d6b828bab2fc6160206dc Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Mon, 17 Dec 2012 14:02:22 +0100 Subject: Fix Bug 287829 - inline rename multiple files does not honour sort order BUG: 287829 FIXED-IN: 4.9.5 REVIEW: 107718 --- src/views/dolphinview.cpp | 6 ++++-- src/views/renamedialog.cpp | 5 ----- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 0e97c5a2b..cca5846b6 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -342,10 +342,12 @@ int DolphinView::itemsCount() const KFileItemList DolphinView::selectedItems() const { const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); - const QSet selectedIndexes = selectionManager->selectedItems(); + QList selectedIndexes = selectionManager->selectedItems().toList(); + + qSort(selectedIndexes); KFileItemList selectedItems; - QSetIterator it(selectedIndexes); + QListIterator it(selectedIndexes); while (it.hasNext()) { const int index = it.next(); selectedItems.append(m_model->fileItem(index)); diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp index a91f91b1b..65125c3aa 100644 --- a/src/views/renamedialog.cpp +++ b/src/views/renamedialog.cpp @@ -162,11 +162,6 @@ void RenameDialog::slotTextChanged(const QString& newName) void RenameDialog::renameItems() { - // Currently the items are sorted by the selection order, resort - // them by the filename. This assures that the new sort order is similar to - // the current filename sort order. - qSort(m_items.begin(), m_items.end(), lessThan); - // Iterate through all items and rename them... int index = m_spinBox->value(); foreach (const KFileItem& item, m_items) { -- cgit v1.3 From 13d5441c6932b7ceac46cc23e54a0fd2cc528acf Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Wed, 19 Dec 2012 17:31:08 +0100 Subject: Fix Bug 311782 - Directory loading has been cancelled sometimes falsly triggered which was introduced by commit 9dbc24fd647e0457d50ec901d33100c33967be68 BUG: 311782 REVIEW: 107787 FIXED-IN: 4.10 --- src/dolphinviewcontainer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index c27550ae1..8800a1732 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -461,7 +461,7 @@ void DolphinViewContainer::slotDirectoryLoadingCanceled() m_statusBar->setProgress(100); } - showErrorMessage("Directory loading has been canceled."); + m_statusBar->setText(QString()); } void DolphinViewContainer::slotUrlIsFileError(const KUrl& url) -- cgit v1.3 From 752d5f22ac94bc0acab1d3f4ef6d455202307de6 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Sat, 22 Dec 2012 08:05:56 +0100 Subject: SVN_SILENT made messages (.desktop file) --- src/dolphinpart.desktop | 1 + src/settings/kcm/kcmdolphingeneral.desktop | 1 + src/settings/kcm/kcmdolphinnavigation.desktop | 1 + src/settings/kcm/kcmdolphinservices.desktop | 1 + src/settings/kcm/kcmdolphinviewmodes.desktop | 1 + 5 files changed, 5 insertions(+) (limited to 'src') diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index f5e3c8bff..caafdd6ee 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -196,6 +196,7 @@ Exec=dolphin [Desktop Action compact] Name=Compact Name[ar]=مضغوط +Name[bs]=Sabij Name[ca]=Compacte Name[ca@valencia]=Compacte Name[cs]=Kompaktní diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 54a18f087..524625991 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -293,6 +293,7 @@ Comment[zh_CN]=配置常规文件管理器设置 Comment[zh_TW]=設定一般檔案管理員 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير الملفات +X-KDE-Keywords[bs]=upravitelj datoteka X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index f1f83ad66..26721b11c 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -293,6 +293,7 @@ Comment[zh_CN]=配置文件管理器导航 Comment[zh_TW]=設定檔案管理員導覽 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير الملفات +X-KDE-Keywords[bs]=upravitelj datoteka X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 6fa68f3f9..ccea94b0c 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -244,6 +244,7 @@ Comment[zh_CN]=配置文件管理器服务 Comment[zh_TW]=設定檔案管理員服務 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير الملفات +X-KDE-Keywords[bs]=upravitelj datoteka X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 71c198be3..236630ac4 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -291,6 +291,7 @@ Comment[zh_CN]=配置文件管理器视图模式 Comment[zh_TW]=設定檔案管理員檢視模式 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير الملفات +X-KDE-Keywords[bs]=upravitelj datoteka X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů -- cgit v1.3 From 6d748107999a9ee8da52770c7fdd1726dfd4f6f0 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Sat, 22 Dec 2012 12:09:08 +0100 Subject: SVN_SILENT made messages (.desktop file) --- src/dolphinpart.desktop | 1 + src/settings/kcm/kcmdolphingeneral.desktop | 1 + src/settings/kcm/kcmdolphinnavigation.desktop | 1 + src/settings/kcm/kcmdolphinservices.desktop | 1 + src/settings/kcm/kcmdolphinviewmodes.desktop | 1 + 5 files changed, 5 insertions(+) (limited to 'src') diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index f5e3c8bff..caafdd6ee 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -196,6 +196,7 @@ Exec=dolphin [Desktop Action compact] Name=Compact Name[ar]=مضغوط +Name[bs]=Sabij Name[ca]=Compacte Name[ca@valencia]=Compacte Name[cs]=Kompaktní diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 54a18f087..524625991 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -293,6 +293,7 @@ Comment[zh_CN]=配置常规文件管理器设置 Comment[zh_TW]=設定一般檔案管理員 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير الملفات +X-KDE-Keywords[bs]=upravitelj datoteka X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index f1f83ad66..26721b11c 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -293,6 +293,7 @@ Comment[zh_CN]=配置文件管理器导航 Comment[zh_TW]=設定檔案管理員導覽 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير الملفات +X-KDE-Keywords[bs]=upravitelj datoteka X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 6fa68f3f9..ccea94b0c 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -244,6 +244,7 @@ Comment[zh_CN]=配置文件管理器服务 Comment[zh_TW]=設定檔案管理員服務 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير الملفات +X-KDE-Keywords[bs]=upravitelj datoteka X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 71c198be3..236630ac4 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -291,6 +291,7 @@ Comment[zh_CN]=配置文件管理器视图模式 Comment[zh_TW]=設定檔案管理員檢視模式 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير الملفات +X-KDE-Keywords[bs]=upravitelj datoteka X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů -- cgit v1.3 From bf3d164d60bf916fdc995e37d9588d4adc61afd9 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Sun, 23 Dec 2012 07:50:02 +0100 Subject: SVN_SILENT made messages (.desktop file) --- src/dolphin.desktop | 2 -- src/dolphinpart.desktop | 4 ---- src/settings/kcm/kcmdolphingeneral.desktop | 5 ----- src/settings/kcm/kcmdolphinnavigation.desktop | 5 ----- src/settings/kcm/kcmdolphinservices.desktop | 4 ---- src/settings/kcm/kcmdolphinviewmodes.desktop | 5 ----- src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 1 - 7 files changed, 26 deletions(-) (limited to 'src') diff --git a/src/dolphin.desktop b/src/dolphin.desktop index 82bae30d2..a5760bb12 100755 --- a/src/dolphin.desktop +++ b/src/dolphin.desktop @@ -9,7 +9,6 @@ Name[be@latin]=Dolphin Name[bg]=Dolphin Name[bn]=ডলফিন Name[bn_IN]=Dolphin -Name[bs]=Delfin Name[ca]=Dolphin Name[ca@valencia]=Dolphin Name[cs]=Dolphin @@ -103,7 +102,6 @@ GenericName[be@latin]=Kiraŭnik fajłaŭ GenericName[bg]=Файлов мениджър GenericName[bn]=ফাইল ম্যানেজার GenericName[bn_IN]=ফাইল পরিচালন ব্যবস্থা -GenericName[bs]=Menadžer datoteka GenericName[ca]=Gestor de fitxers GenericName[ca@valencia]=Gestor de fitxers GenericName[cs]=Správce souborů diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index caafdd6ee..26ed179a9 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -9,7 +9,6 @@ Name[be@latin]=Vyhlad „Dolphin” Name[bg]=Преглед в Dolphin Name[bn]=ডলফিন ভিউ Name[bn_IN]=Dolphin প্রদর্শন -Name[bs]=Delfinov prikaz Name[ca]=Vista del Dolphin Name[ca@valencia]=Vista del Dolphin Name[cs]=Pohled Dolphin @@ -107,7 +106,6 @@ Name[bg]=Икони Name[bn]=আইকন Name[bn_IN]=আইকন Name[br]=Arlunioù -Name[bs]=Ikone Name[ca]=Icones Name[ca@valencia]=Icones Name[cs]=Ikony @@ -196,7 +194,6 @@ Exec=dolphin [Desktop Action compact] Name=Compact Name[ar]=مضغوط -Name[bs]=Sabij Name[ca]=Compacte Name[ca@valencia]=Compacte Name[cs]=Kompaktní @@ -254,7 +251,6 @@ Name[be@latin]=Detali Name[bg]=Подробности Name[bn]=বিস্তারিত Name[bn_IN]=বিবরণ -Name[bs]=Detalji Name[ca]=Detalls Name[ca@valencia]=Detalls Name[cs]=Podrobnosti diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 524625991..6c3ba8bf5 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -3,7 +3,6 @@ Name[ar]=عام دولفين Name[ast]=Dolphin xeneral Name[bg]=Общо за програмата Name[bn]=ডলফিন সাধারণ -Name[bs]=Delfinovo opšte Name[ca]=General del Dolphin Name[ca@valencia]=General del Dolphin Name[cs]=Obecný Dolphin @@ -73,7 +72,6 @@ Comment=This service allows configuration of general Dolphin settings. Comment[ar]=هذه الخدمة تتيح التحكم بإعدادات دولفين العامة. Comment[ast]=Esti serviciu déxate facer la configuración xeneral de Dolphin. Comment[bg]=Това ви позволява да зададете общите настройки на програмата. -Comment[bs]=Ovaj servis omogućava podešavanje opštih Delfinovih postavki. Comment[ca]=Aquest servei permet la configuració de l'arranjament general del Dolphin. Comment[ca@valencia]=Este servei permet la configuració de l'arranjament general del Dolphin. Comment[cs]=Tato služba umožňuje obecné nastavení Dolphinu. @@ -154,7 +152,6 @@ Name[ar]=عام Name[ast]=Xeneral Name[bg]=Общи Name[bn]=সাধারণ -Name[bs]=Opšte Name[ca]=General Name[ca@valencia]=General Name[cs]=Obecné @@ -226,7 +223,6 @@ Comment[ar]=اضبط إعدادات مدير الملفات العامة Comment[ast]=Configurar les preferencies del xestor de ficheros Comment[bg]=Общи настройки на файловия мениджър Comment[bn]=সাধারণ ফাইল ম্যানেজার সেটিংস কনফিগার করুন -Comment[bs]=Podešavanje opštih postavki menadžera datoteka Comment[ca]=Configura les opcions generals del gestor de fitxers Comment[ca@valencia]=Configura les opcions generals del gestor de fitxers Comment[cs]=Obecné nastavení správce souborů @@ -293,7 +289,6 @@ Comment[zh_CN]=配置常规文件管理器设置 Comment[zh_TW]=設定一般檔案管理員 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير الملفات -X-KDE-Keywords[bs]=upravitelj datoteka X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 26721b11c..999808439 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -3,7 +3,6 @@ Name[ar]=تصفح دولفين Name[ast]=Navegación de Dolphin Name[bg]=Навигация в програмата Name[bn]=ডলফিন ন্যাভিগেশন -Name[bs]=Delfinova navigacija Name[ca]=Navegació del Dolphin Name[ca@valencia]=Navegació del Dolphin Name[cs]=Navigace Dolphinu @@ -74,7 +73,6 @@ Comment=This service allows configuration of the Dolphin navigation. Comment[ar]=هذه الخدمة تتيح التحكم بتصفح دولفين Comment[ast]=Esti serviciu permítete configurar la navegación de Dolphin. Comment[bg]=Това ви позволява да настроите навигацията в Dolphin. -Comment[bs]=Ovaj servis omogućava podešavanje navigacije u Delfinu. Comment[ca]=Aquest servei permet la configuració de la navegació del Dolphin. Comment[ca@valencia]=Este servei permet la configuració de la navegació del Dolphin. Comment[cs]=Tato služba umožňuje nastavení navigace v Dolphinu. @@ -154,7 +152,6 @@ Name[ar]=التصفح Name[ast]=Navegación Name[bg]=Навигация Name[bn]=ন্যাভিগেশন -Name[bs]=Navigacija Name[ca]=Navegació Name[ca@valencia]=Navegació Name[cs]=Navigace @@ -226,7 +223,6 @@ Comment[ar]=اضبط تصفح مدير الملفات Comment[ast]=Configurar les preferencies de navegación del xestor de ficheros Comment[bg]=Настройване навигацията във файловия мениджър Comment[bn]=ফাইল ম্যানেজার ন্যাভিগেশন কনফিগার করুন -Comment[bs]=Podešavanje navigacije u menadžeru datoteka Comment[ca]=Configura la navegació del gestor de fitxers Comment[ca@valencia]=Configura la navegació del gestor de fitxers Comment[cs]=Nastavení navigace správce souborů @@ -293,7 +289,6 @@ Comment[zh_CN]=配置文件管理器导航 Comment[zh_TW]=設定檔案管理員導覽 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير الملفات -X-KDE-Keywords[bs]=upravitelj datoteka X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index ccea94b0c..2c2c10b1e 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -3,7 +3,6 @@ Name[ar]=خدمات دولفين Name[ast]=Servicios de Dolphin Name[bg]=Услуги в Dolphin Name[bn]=ডলফিন সার্ভিসসমূহ -Name[bs]=Delfinovi servisi Name[ca]=Serveis del Dolphin Name[ca@valencia]=Serveis del Dolphin Name[cs]=Služby Dolphinu @@ -90,7 +89,6 @@ Name[bg]=Услуги Name[bn]=সার্ভিসসমূহ Name[bn_IN]=পরিসেবা Name[br]=Servijoù -Name[bs]=Servisi Name[ca]=Serveis Name[ca@valencia]=Serveis Name[cs]=Služby @@ -177,7 +175,6 @@ Comment[ar]=اضبط خدمات مدير الملفات Comment[ast]=Configurar les preferencies del xestor de ficheros Comment[bg]=Настройване услугите на файловия мениджър Comment[bn]=ফাইল ম্যানেজার সার্ভিসসমূহ কনফিগার করুন -Comment[bs]=Podešavanje servisa menadžera datoteka Comment[ca]=Configura els serveis del gestor de fitxers Comment[ca@valencia]=Configura els serveis del gestor de fitxers Comment[cs]=Nastavení služeb správce souborů @@ -244,7 +241,6 @@ Comment[zh_CN]=配置文件管理器服务 Comment[zh_TW]=設定檔案管理員服務 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير الملفات -X-KDE-Keywords[bs]=upravitelj datoteka X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 236630ac4..5b778f03f 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -3,7 +3,6 @@ Name[ar]=أنماط عرض دولفين Name[ast]=Moos de vista de Dolphin Name[bg]=Режими на преглед Name[bn]=ডলফিন ভিউ মোড -Name[bs]=Delfinovi režimi prikaza Name[ca]=Modes de vista del Dolphin Name[ca@valencia]=Modes de vista del Dolphin Name[cs]=Režimy pohledů Dolphinu @@ -73,7 +72,6 @@ Comment=This service allows configuration of the Dolphin view modes. Comment[ar]=هذه الخدمة تتيح التحكم بأنماط عرض دولفين Comment[ast]=Esti serviciu permítete configurar los moos de vista de Dolphin. Comment[bg]=Това ви позволява да настроите режимите на показване в Dolphin. -Comment[bs]=Ovaj servis omogućava podešavanje Delfinovih režima prikaza. Comment[ca]=Aquest servei permet la configuració dels modes de vista del Dolphin. Comment[ca@valencia]=Este servei permet la configuració dels modes de vista del Dolphin. Comment[cs]=Tato služba umožňuje nastavení režimů pohledu Dolphinu. @@ -152,7 +150,6 @@ Name[ar]=أنماط العرض Name[ast]=Moos de vista Name[bg]=Режими на преглед Name[bn]=ভিউ মোড -Name[bs]=Režimi prikaza Name[ca]=Modes de vista Name[ca@valencia]=Modes de vista Name[cs]=Režimy pohledu @@ -223,7 +220,6 @@ Comment[ar]=اضبط إعدادات أنماط عرض مدير الملفات Comment[ast]=Configurar los moos de vista del xestor de ficheros Comment[bg]=Настройване режимите на преглед във файловия мениджър Comment[bn]=ফাইল ম্যানেজার ভিউ মোড কনফিগার করুন -Comment[bs]=Podešavanje režima prikaza u menadžeru datoteka Comment[ca]=Configura els modes de vista del gestor de fitxers Comment[ca@valencia]=Configura els modes de vista del gestor de fitxers Comment[cs]=Nastavení režimů pohledu správce souborů @@ -291,7 +287,6 @@ Comment[zh_CN]=配置文件管理器视图模式 Comment[zh_TW]=設定檔案管理員檢視模式 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير الملفات -X-KDE-Keywords[bs]=upravitelj datoteka X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index f6616d167..f4e43a139 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -5,7 +5,6 @@ Comment=Version Control Plugin for File Views Comment[ar]=ملحق التحكم بالإصدارات لعروض الملفات Comment[ast]=Complementu de control de versiones pa vistes de ficheros Comment[bg]=Приставка за контрол на версиите при преглед на файлове -Comment[bs]=Priključak upravljanja verzijama za datotečne prikaze Comment[ca]=Connector de control de versions per a les vistes de fitxers Comment[ca@valencia]=Connector de control de versions per a les vistes de fitxers Comment[cs]=Modul pro správu verzí pro pohledy na soubory -- cgit v1.3 From 33c5fb301b4032d8122274889c157bc43713fa15 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Mon, 24 Dec 2012 08:54:15 +0100 Subject: SVN_SILENT made messages (.desktop file) --- src/dolphin.desktop | 2 ++ src/dolphinpart.desktop | 4 ++++ src/settings/kcm/kcmdolphingeneral.desktop | 5 +++++ src/settings/kcm/kcmdolphinnavigation.desktop | 5 +++++ src/settings/kcm/kcmdolphinservices.desktop | 4 ++++ src/settings/kcm/kcmdolphinviewmodes.desktop | 5 +++++ src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 1 + 7 files changed, 26 insertions(+) (limited to 'src') diff --git a/src/dolphin.desktop b/src/dolphin.desktop index a5760bb12..82bae30d2 100755 --- a/src/dolphin.desktop +++ b/src/dolphin.desktop @@ -9,6 +9,7 @@ Name[be@latin]=Dolphin Name[bg]=Dolphin Name[bn]=ডলফিন Name[bn_IN]=Dolphin +Name[bs]=Delfin Name[ca]=Dolphin Name[ca@valencia]=Dolphin Name[cs]=Dolphin @@ -102,6 +103,7 @@ GenericName[be@latin]=Kiraŭnik fajłaŭ GenericName[bg]=Файлов мениджър GenericName[bn]=ফাইল ম্যানেজার GenericName[bn_IN]=ফাইল পরিচালন ব্যবস্থা +GenericName[bs]=Menadžer datoteka GenericName[ca]=Gestor de fitxers GenericName[ca@valencia]=Gestor de fitxers GenericName[cs]=Správce souborů diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 26ed179a9..caafdd6ee 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -9,6 +9,7 @@ Name[be@latin]=Vyhlad „Dolphin” Name[bg]=Преглед в Dolphin Name[bn]=ডলফিন ভিউ Name[bn_IN]=Dolphin প্রদর্শন +Name[bs]=Delfinov prikaz Name[ca]=Vista del Dolphin Name[ca@valencia]=Vista del Dolphin Name[cs]=Pohled Dolphin @@ -106,6 +107,7 @@ Name[bg]=Икони Name[bn]=আইকন Name[bn_IN]=আইকন Name[br]=Arlunioù +Name[bs]=Ikone Name[ca]=Icones Name[ca@valencia]=Icones Name[cs]=Ikony @@ -194,6 +196,7 @@ Exec=dolphin [Desktop Action compact] Name=Compact Name[ar]=مضغوط +Name[bs]=Sabij Name[ca]=Compacte Name[ca@valencia]=Compacte Name[cs]=Kompaktní @@ -251,6 +254,7 @@ Name[be@latin]=Detali Name[bg]=Подробности Name[bn]=বিস্তারিত Name[bn_IN]=বিবরণ +Name[bs]=Detalji Name[ca]=Detalls Name[ca@valencia]=Detalls Name[cs]=Podrobnosti diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 6c3ba8bf5..524625991 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -3,6 +3,7 @@ Name[ar]=عام دولفين Name[ast]=Dolphin xeneral Name[bg]=Общо за програмата Name[bn]=ডলফিন সাধারণ +Name[bs]=Delfinovo opšte Name[ca]=General del Dolphin Name[ca@valencia]=General del Dolphin Name[cs]=Obecný Dolphin @@ -72,6 +73,7 @@ Comment=This service allows configuration of general Dolphin settings. Comment[ar]=هذه الخدمة تتيح التحكم بإعدادات دولفين العامة. Comment[ast]=Esti serviciu déxate facer la configuración xeneral de Dolphin. Comment[bg]=Това ви позволява да зададете общите настройки на програмата. +Comment[bs]=Ovaj servis omogućava podešavanje opštih Delfinovih postavki. Comment[ca]=Aquest servei permet la configuració de l'arranjament general del Dolphin. Comment[ca@valencia]=Este servei permet la configuració de l'arranjament general del Dolphin. Comment[cs]=Tato služba umožňuje obecné nastavení Dolphinu. @@ -152,6 +154,7 @@ Name[ar]=عام Name[ast]=Xeneral Name[bg]=Общи Name[bn]=সাধারণ +Name[bs]=Opšte Name[ca]=General Name[ca@valencia]=General Name[cs]=Obecné @@ -223,6 +226,7 @@ Comment[ar]=اضبط إعدادات مدير الملفات العامة Comment[ast]=Configurar les preferencies del xestor de ficheros Comment[bg]=Общи настройки на файловия мениджър Comment[bn]=সাধারণ ফাইল ম্যানেজার সেটিংস কনফিগার করুন +Comment[bs]=Podešavanje opštih postavki menadžera datoteka Comment[ca]=Configura les opcions generals del gestor de fitxers Comment[ca@valencia]=Configura les opcions generals del gestor de fitxers Comment[cs]=Obecné nastavení správce souborů @@ -289,6 +293,7 @@ Comment[zh_CN]=配置常规文件管理器设置 Comment[zh_TW]=設定一般檔案管理員 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير الملفات +X-KDE-Keywords[bs]=upravitelj datoteka X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 999808439..26721b11c 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -3,6 +3,7 @@ Name[ar]=تصفح دولفين Name[ast]=Navegación de Dolphin Name[bg]=Навигация в програмата Name[bn]=ডলফিন ন্যাভিগেশন +Name[bs]=Delfinova navigacija Name[ca]=Navegació del Dolphin Name[ca@valencia]=Navegació del Dolphin Name[cs]=Navigace Dolphinu @@ -73,6 +74,7 @@ Comment=This service allows configuration of the Dolphin navigation. Comment[ar]=هذه الخدمة تتيح التحكم بتصفح دولفين Comment[ast]=Esti serviciu permítete configurar la navegación de Dolphin. Comment[bg]=Това ви позволява да настроите навигацията в Dolphin. +Comment[bs]=Ovaj servis omogućava podešavanje navigacije u Delfinu. Comment[ca]=Aquest servei permet la configuració de la navegació del Dolphin. Comment[ca@valencia]=Este servei permet la configuració de la navegació del Dolphin. Comment[cs]=Tato služba umožňuje nastavení navigace v Dolphinu. @@ -152,6 +154,7 @@ Name[ar]=التصفح Name[ast]=Navegación Name[bg]=Навигация Name[bn]=ন্যাভিগেশন +Name[bs]=Navigacija Name[ca]=Navegació Name[ca@valencia]=Navegació Name[cs]=Navigace @@ -223,6 +226,7 @@ Comment[ar]=اضبط تصفح مدير الملفات Comment[ast]=Configurar les preferencies de navegación del xestor de ficheros Comment[bg]=Настройване навигацията във файловия мениджър Comment[bn]=ফাইল ম্যানেজার ন্যাভিগেশন কনফিগার করুন +Comment[bs]=Podešavanje navigacije u menadžeru datoteka Comment[ca]=Configura la navegació del gestor de fitxers Comment[ca@valencia]=Configura la navegació del gestor de fitxers Comment[cs]=Nastavení navigace správce souborů @@ -289,6 +293,7 @@ Comment[zh_CN]=配置文件管理器导航 Comment[zh_TW]=設定檔案管理員導覽 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير الملفات +X-KDE-Keywords[bs]=upravitelj datoteka X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 2c2c10b1e..ccea94b0c 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -3,6 +3,7 @@ Name[ar]=خدمات دولفين Name[ast]=Servicios de Dolphin Name[bg]=Услуги в Dolphin Name[bn]=ডলফিন সার্ভিসসমূহ +Name[bs]=Delfinovi servisi Name[ca]=Serveis del Dolphin Name[ca@valencia]=Serveis del Dolphin Name[cs]=Služby Dolphinu @@ -89,6 +90,7 @@ Name[bg]=Услуги Name[bn]=সার্ভিসসমূহ Name[bn_IN]=পরিসেবা Name[br]=Servijoù +Name[bs]=Servisi Name[ca]=Serveis Name[ca@valencia]=Serveis Name[cs]=Služby @@ -175,6 +177,7 @@ Comment[ar]=اضبط خدمات مدير الملفات Comment[ast]=Configurar les preferencies del xestor de ficheros Comment[bg]=Настройване услугите на файловия мениджър Comment[bn]=ফাইল ম্যানেজার সার্ভিসসমূহ কনফিগার করুন +Comment[bs]=Podešavanje servisa menadžera datoteka Comment[ca]=Configura els serveis del gestor de fitxers Comment[ca@valencia]=Configura els serveis del gestor de fitxers Comment[cs]=Nastavení služeb správce souborů @@ -241,6 +244,7 @@ Comment[zh_CN]=配置文件管理器服务 Comment[zh_TW]=設定檔案管理員服務 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير الملفات +X-KDE-Keywords[bs]=upravitelj datoteka X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 5b778f03f..236630ac4 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -3,6 +3,7 @@ Name[ar]=أنماط عرض دولفين Name[ast]=Moos de vista de Dolphin Name[bg]=Режими на преглед Name[bn]=ডলফিন ভিউ মোড +Name[bs]=Delfinovi režimi prikaza Name[ca]=Modes de vista del Dolphin Name[ca@valencia]=Modes de vista del Dolphin Name[cs]=Režimy pohledů Dolphinu @@ -72,6 +73,7 @@ Comment=This service allows configuration of the Dolphin view modes. Comment[ar]=هذه الخدمة تتيح التحكم بأنماط عرض دولفين Comment[ast]=Esti serviciu permítete configurar los moos de vista de Dolphin. Comment[bg]=Това ви позволява да настроите режимите на показване в Dolphin. +Comment[bs]=Ovaj servis omogućava podešavanje Delfinovih režima prikaza. Comment[ca]=Aquest servei permet la configuració dels modes de vista del Dolphin. Comment[ca@valencia]=Este servei permet la configuració dels modes de vista del Dolphin. Comment[cs]=Tato služba umožňuje nastavení režimů pohledu Dolphinu. @@ -150,6 +152,7 @@ Name[ar]=أنماط العرض Name[ast]=Moos de vista Name[bg]=Режими на преглед Name[bn]=ভিউ মোড +Name[bs]=Režimi prikaza Name[ca]=Modes de vista Name[ca@valencia]=Modes de vista Name[cs]=Režimy pohledu @@ -220,6 +223,7 @@ Comment[ar]=اضبط إعدادات أنماط عرض مدير الملفات Comment[ast]=Configurar los moos de vista del xestor de ficheros Comment[bg]=Настройване режимите на преглед във файловия мениджър Comment[bn]=ফাইল ম্যানেজার ভিউ মোড কনফিগার করুন +Comment[bs]=Podešavanje režima prikaza u menadžeru datoteka Comment[ca]=Configura els modes de vista del gestor de fitxers Comment[ca@valencia]=Configura els modes de vista del gestor de fitxers Comment[cs]=Nastavení režimů pohledu správce souborů @@ -287,6 +291,7 @@ Comment[zh_CN]=配置文件管理器视图模式 Comment[zh_TW]=設定檔案管理員檢視模式 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير الملفات +X-KDE-Keywords[bs]=upravitelj datoteka X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index f4e43a139..f6616d167 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -5,6 +5,7 @@ Comment=Version Control Plugin for File Views Comment[ar]=ملحق التحكم بالإصدارات لعروض الملفات Comment[ast]=Complementu de control de versiones pa vistes de ficheros Comment[bg]=Приставка за контрол на версиите при преглед на файлове +Comment[bs]=Priključak upravljanja verzijama za datotečne prikaze Comment[ca]=Connector de control de versions per a les vistes de fitxers Comment[ca@valencia]=Connector de control de versions per a les vistes de fitxers Comment[cs]=Modul pro správu verzí pro pohledy na soubory -- cgit v1.3 From eae273ad6e6cb522459480edacda262aecc6cd41 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Thu, 27 Dec 2012 22:20:03 +0100 Subject: Increase Dolphin version to 2.1.97 for the 2nd release candidate --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main.cpp b/src/main.cpp index e46c53a91..c262d0679 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,7 +33,7 @@ KDE_EXPORT int kdemain(int argc, char **argv) { KAboutData about("dolphin", 0, ki18nc("@title", "Dolphin"), - "2.1.95", + "2.1.97", ki18nc("@title", "File Manager"), KAboutData::License_GPL, ki18nc("@info:credit", "(C) 2006-2012 Peter Penz and Frank Reininghaus")); -- cgit v1.3