From ef69c74bca9dd94f049f41422cb2f0caccb208b2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 26 May 2018 07:37:38 +0200 Subject: [PATCH 1/4] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- templates/ion-dataengine/src/ion-%{APPNAMELC}.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/ion-dataengine/src/ion-%{APPNAMELC}.desktop b/templates/ion-dataengine/src/ion-%{APPNAMELC}.desktop index e207fd83a..8b39db7af 100644 --- a/templates/ion-dataengine/src/ion-%{APPNAMELC}.desktop +++ b/templates/ion-dataengine/src/ion-%{APPNAMELC}.desktop @@ -22,6 +22,7 @@ Name[nl]=%{APPNAME} Leverancier van weergegevens Name[nn]=%{APPNAME} vêrdataleverandør Name[pa]=%{APPNAME} ਮੌਸਮ ਡਾਟਾ ਦੇਣ ਵਾਲਾ Name[pl]=%{APPNAME} - dostawca danych pogodowych +Name[pt]=Fornecedor de Dados Meteorológicos do %{APPNAME} Name[pt_BR]=Fornecedor de dados meteorológicos do %{APPNAME} Name[ru]=Источник данных о погоде %{APPNAME} Name[sk]=%{APPNAME} poskytovateľ údajov počasia @@ -53,6 +54,7 @@ Comment[lt]=Apsilankyti pas orų informacijos teikėją %{APPNAME} Comment[nl]=Toegang tot de leverancier van weergegevens %{APPNAME} Comment[nn]=Tilgang til vêrdataleverandøren %{APPNAME} Comment[pl]=Połącz się z dostawcą danych pogodowych %{APPNAME} +Comment[pt]=Acesso ao fornecedor de dados meteorológicos do %{APPNAME} Comment[pt_BR]=Acesso ao fornecedor de dados meteorológicos do %{APPNAME} Comment[ru]=Доступ к поставщику данных о погоде %{APPNAME} Comment[sk]=Prístup k poskytovateľovi údajov počasia %{APPNAME} From 948d5e781476b60b89734c67fbcd252a79615d17 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 28 May 2018 07:53:48 +0200 Subject: [PATCH 2/4] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- dataengines/places/plasma-dataengine-places.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataengines/places/plasma-dataengine-places.desktop b/dataengines/places/plasma-dataengine-places.desktop index d1edeb8ce..712fa0068 100644 --- a/dataengines/places/plasma-dataengine-places.desktop +++ b/dataengines/places/plasma-dataengine-places.desktop @@ -113,7 +113,7 @@ Comment[mr]=फाईल व्यवस्थापक व फाईल सं Comment[nb]=Steder, som sett i filbehandleren og fildialogene. Comment[nds]=Steden, as för den Dateipleger un binnen Dateidialogen Comment[nl]=Plaatsen, zoals deze gezien worden in de bestandsbeheerder en in bestandsdialogen. -Comment[nn]=Stader, slik ein kan sjå dei i filhandsamaren og dialogvindauge for filer. +Comment[nn]=Stadar, slik ein kan sjå dei i filhandsamaren og dialogvindauge for filer. Comment[pa]=ਥਾਵਾਂ, ਜਿਵੇਂ ਕਿ ਫਾਈਲ ਮੈਨੇਜਰ ਅਤੇ ਹੋਰ ਫਾਈਲ ਡਾਇਲਾਗ ਵਿੱਚ ਦਿਸਦੀਆਂ ਹਨ। Comment[pl]=Wyświetla miejsca, tak jak w przeglądarce plików i oknach dialogowych plików. Comment[pt]=Os locais vistos nas janelas e gestores de ficheiros. From 61c5a248a72949023c377d05dc9022b00d5fae77 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 29 May 2018 08:05:01 +0200 Subject: [PATCH 3/4] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- kioslave/desktop/directory.trash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kioslave/desktop/directory.trash b/kioslave/desktop/directory.trash index 3eb6bddb5..f8a506230 100644 --- a/kioslave/desktop/directory.trash +++ b/kioslave/desktop/directory.trash @@ -16,7 +16,7 @@ Name[fr]=Corbeille Name[gl]=Lixo Name[he]=אשפה Name[hu]=Kuka -Name[id]=Tong Sampah +Name[id]=Sesampahan Name[is]=Rusl Name[it]=Cestino Name[ja]=ごみ箱 From b39522e9e925c1dccc3759284846b53650d18eb8 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Fri, 1 Jun 2018 11:41:11 +0200 Subject: [PATCH 4/4] [Slideshow Wallpaper] Ignore hidden files and folders They are usually hidden for a reason and shouldn't show up in the slideshow. BUG: 394882 FIXED-IN: 5.12.6 Differential Revision: https://phabricator.kde.org/D13260 --- wallpapers/image/backgroundlistmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wallpapers/image/backgroundlistmodel.cpp b/wallpapers/image/backgroundlistmodel.cpp index 371e97ee9..c12571ab8 100644 --- a/wallpapers/image/backgroundlistmodel.cpp +++ b/wallpapers/image/backgroundlistmodel.cpp @@ -547,7 +547,7 @@ void BackgroundFinder::run() QStringList papersFound; QDir dir; - dir.setFilter(QDir::AllDirs | QDir::Files | QDir::Hidden | QDir::Readable); + dir.setFilter(QDir::AllDirs | QDir::Files | QDir::Readable); dir.setNameFilters(suffixes()); KPackage::Package package = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Wallpaper/Images"));