From b47d582d353c1b9db8fe85c9797626f6133260c1 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Tue, 15 Jan 2013 18:56:14 +0100 Subject: Update Dolphin version to 2.1.98 for KDE 4.10 RC 3 --- 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 c262d0679..9577259b5 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.97", + "2.1.98", ki18nc("@title", "File Manager"), KAboutData::License_GPL, ki18nc("@info:credit", "(C) 2006-2012 Peter Penz and Frank Reininghaus")); -- cgit v1.3 From b8584c8c8b14e1efb5bfbd1b478cc9b28d07b59d Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Wed, 16 Jan 2013 12:34:10 +0100 Subject: SVN_SILENT made messages (.desktop file) --- src/dolphin.desktop | 2 +- src/settings/kcm/kcmdolphingeneral.desktop | 4 ++-- src/settings/kcm/kcmdolphinnavigation.desktop | 4 ++-- src/settings/kcm/kcmdolphinservices.desktop | 4 ++-- src/settings/kcm/kcmdolphinviewmodes.desktop | 4 ++-- src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/dolphin.desktop b/src/dolphin.desktop index 82bae30d2..c42ef4534 100755 --- a/src/dolphin.desktop +++ b/src/dolphin.desktop @@ -145,7 +145,7 @@ GenericName[lv]=Failu pārvaldnieks GenericName[mai]=फाइल प्रबंधक GenericName[mk]=Менаџер на датотеки GenericName[ml]=ഫയല്‍ നടത്തിപ്പുകാരന്‍ -GenericName[mr]=फाइल व्यवस्थापक +GenericName[mr]=फाईल व्यवस्थापक GenericName[ms]=Pengurus Fail GenericName[nb]=Filbehandler GenericName[nds]=Dateipleger diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 2b5af8205..fbae37596 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -265,7 +265,7 @@ Comment[lt]=Bendrųjų failų tvarkyklės nustatymų konfigūravimas Comment[lv]=Konfigurē failu pārvaldnieka pamata iestatījumus Comment[mk]=Конфигурирајте ги општите поставувања за менаџерот на датотеки Comment[ml]=ഫയല്‍ നടത്തിപ്പുകാരന്റെ പൊതുവായ സജ്ജീകരണങ്ങള്‍ ക്രമീകരിയ്ക്കുക -Comment[mr]=फाइल व्यवस्थापकाच्या सामान्य व्यवस्थेचे संयोजन करा +Comment[mr]=फाईल व्यवस्थापकाच्या सामान्य व्यवस्थेचे संयोजन करा Comment[ms]=Selaraskan tetapan pengurus fail Comment[nb]=Tilpass generelle filbehandler-innstillinger Comment[nds]=Den Dateipleger allmeen instellen @@ -318,7 +318,7 @@ X-KDE-Keywords[km]=កម្មវិធី​គ្រប់គ្រង​ឯ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=Failų tvarkyklė X-KDE-Keywords[lv]=failu pārvaldnieks -X-KDE-Keywords[mr]=फाइल व्यवस्थापक +X-KDE-Keywords[mr]=फाईल व्यवस्थापक X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nds]=Dateipleger X-KDE-Keywords[nl]=bestandsbeheerder diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index cf4bdf898..12c2efa0b 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -265,7 +265,7 @@ Comment[lv]=Konfigurēē failu pārvaldnieka navigāciju Comment[mai]=फाइलक प्रबंधक संचरणकेँ बिन्यस्त करू Comment[mk]=Конфигурирајте ја навигацијата за менаџерот на датотеки Comment[ml]=ഫയല്‍ നടത്തിപ്പുകാരന്റെ നീക്കങ്ങള്‍ ക്രമീകരിയ്ക്കുക -Comment[mr]=फाइल व्यवस्थापक संचारण संयोजीत करा +Comment[mr]=फाईल व्यवस्थापक संचारण संयोजीत करा Comment[ms]=Selaraskan tetapan pengurus fail Comment[nb]=Sett opp navigasjon i filbehandleren Comment[nds]=De Dateipleger-Navigeren instellen @@ -318,7 +318,7 @@ X-KDE-Keywords[km]=កម្មវិធី​គ្រប់គ្រង​ឯ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=Failų tvarkyklė X-KDE-Keywords[lv]=failu pārvaldnieks -X-KDE-Keywords[mr]=फाइल व्यवस्थापक +X-KDE-Keywords[mr]=फाईल व्यवस्थापक X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nds]=Dateipleger X-KDE-Keywords[nl]=bestandsbeheerder diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index e3477950f..d55fd541d 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -215,7 +215,7 @@ Comment[lv]=Konfigurē failu pārvaldnieka servisus Comment[mai]=फाइलक प्रबंधकक सेवा बिन्यस्त करू Comment[mk]=Конфигурирајте ги сервисите за менаџерот на датотеки Comment[ml]=ഫയല്‍ നടത്തിപ്പുകാരന്റെ സേവനങ്ങള്‍ ക്രമീകരിയ്ക്കുക -Comment[mr]=फाइल व्यवस्थापक सेवा संयोजीत करा +Comment[mr]=फाईल व्यवस्थापक सेवा संयोजीत करा Comment[ms]=Selaraskan tetapan pengurus fail Comment[nb]=Sett opp tjenester i filbehandleren Comment[nds]=Dateipleger-Deensten instellen @@ -267,7 +267,7 @@ X-KDE-Keywords[km]=កម្មវិធី​គ្រប់គ្រង​ឯ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=Failų tvarkyklė X-KDE-Keywords[lv]=failu pārvaldnieks -X-KDE-Keywords[mr]=फाइल व्यवस्थापक +X-KDE-Keywords[mr]=फाईल व्यवस्थापक X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nds]=Dateipleger X-KDE-Keywords[nl]=bestandsbeheerder diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index b2eaa79a2..73c4cdc09 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -263,7 +263,7 @@ Comment[lv]=Konfigurē failu pārvaldnieka skata režīmus Comment[mai]=फाइलक प्रबंधक दृश्य विधि बिन्यस्त करू Comment[mk]=Конфигурирајте ги режимите за преглед за менаџерот на датотеки Comment[ml]=ഫയല്‍ നടത്തിപ്പുകാരന്റെ അവതരണ ദശകള്‍ ക്രമീകരിയ്ക്കുക -Comment[mr]=फाइल व्यवस्थापक दृश्य पद्धत संयोजीत करा +Comment[mr]=फाईल व्यवस्थापक दृश्य पद्धत संयोजीत करा Comment[ms]=Selaraskan mod pengurus fail Comment[nb]=Tilpass filbehandlerens visningsmåter Comment[nds]=Den Dateipleger sien Ansichten instellen @@ -316,7 +316,7 @@ X-KDE-Keywords[km]=កម្មវិធី​គ្រប់គ្រង​ឯ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=Failų tvarkyklė X-KDE-Keywords[lv]=failu pārvaldnieks -X-KDE-Keywords[mr]=फाइल व्यवस्थापक +X-KDE-Keywords[mr]=फाईल व्यवस्थापक X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nds]=Dateipleger X-KDE-Keywords[nl]=bestandsbeheerder diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 1c559c823..22fb7cc02 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -39,7 +39,7 @@ Comment[lt]=Versijų kontrolės priedas failų tvarkyklėms Comment[lv]=Versiju kontroles spraudnis Failu skatiem Comment[mk]=Приклучок за „Преглед на датотеки“ за контрола на верзии Comment[ml]=ഫയല്‍ അവതരണത്തിനുള്ള വേര്‍ഷന്‍ കണ്ട്രോള്‍ സംയോജകം -Comment[mr]=फाईल दृश्या करीता आवृत्ती नियंत्रण प्लगइन +Comment[mr]=फाईल दृश्या करिता आवृत्ती नियंत्रण प्लगइन Comment[nb]=Versjonskontrollmodul for filvisninger Comment[nds]=Verschoonkuntrull-Moduul för Dateiansichten Comment[nl]=Plugin voor versiecontrole op bestandoverzichten -- cgit v1.3 From 7c43fce8bf3bfa065fa0bc33a46f0409b98b2ad9 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Wed, 16 Jan 2013 22:54:32 +0100 Subject: Use proper IconSize for PlacesItemEditDialog's KIconButton REVIEW: 108443 --- src/panels/places/placesitemeditdialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp index f8b985f6f..08c910d17 100644 --- a/src/panels/places/placesitemeditdialog.cpp +++ b/src/panels/places/placesitemeditdialog.cpp @@ -137,7 +137,7 @@ void PlacesItemEditDialog::initialize() m_iconButton = new KIconButton(mainWidget); formLayout->addRow(i18nc("@label", "Choose an icon:"), m_iconButton); - m_iconButton->setIconSize(KIconLoader::SizeLarge); + m_iconButton->setIconSize(IconSize(KIconLoader::Desktop)); m_iconButton->setIconType(KIconLoader::NoGroup, KIconLoader::Place); if (m_icon.isEmpty()) { m_iconButton->setIcon(KMimeType::iconNameForUrl(m_url)); -- cgit v1.3 From ce4498ea06fd1b8714176fbc129285312377bac9 Mon Sep 17 00:00:00 2001 From: Andrea Scarpino Date: Wed, 16 Jan 2013 23:04:47 +0059 Subject: Allow Timeline-URLs as homepage FEATURE: 313151 REVIEW: 108428 --- src/settings/startup/startupsettingspage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp index 633cdacad..693826318 100644 --- a/src/settings/startup/startupsettingspage.cpp +++ b/src/settings/startup/startupsettingspage.cpp @@ -119,7 +119,7 @@ void StartupSettingsPage::applySettings() const KUrl url(m_homeUrl->text()); KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, url); - if (url.isValid() && fileItem.isDir()) { + if ((url.isValid() && fileItem.isDir()) || (url.protocol() == QLatin1String("timeline"))) { settings->setHomeUrl(url.prettyUrl()); } else { KMessageBox::error(this, i18nc("@info", "The location for the home folder is invalid or does not exist, it will not be applied.")); -- cgit v1.3