Bug#857963: unblock: plasma-sdk/5.8.6-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear release team,
KDE Plasma 5.8 is an LTS release that I consider fit to be updated in stretch.
This particular request is for plasma-sdk 5.8.6.
The fixes included in the plasma-sdk 5.8.6 release are:
Translation updates
2 bug fixes:
+ Changes to support the new KDevplatform API (ad6e3b7 a655f87)
This change is of no consequence to Debian, as we still have the previous
KDevplatform, the KDevplatform version is detected at build time, so once
the new KDevplatform is uploaded, plasma-sdk would need to be rebuild.
+ Fix handling of paths with whitespace in bash (a18d9d3)
On the Debian side, we add a missing runtime dependency of
qml-module-org-kde-kirigami, needed by lookandfeelexplorer (#857633)
I'm attaching a poless version of the debdiff against the 5.8.4-1 version
currently in stretch, and the upstream gitlog, the full debdiff (388K) is available in:
https://freak.gnuservers.com.ar/~maxy/debian/plasma-sdk_5.8.6_unblock
I haven't uploaded the the 5.8.6-1 version just yet, but I would like to
upload it only after this gets approved.
Happy hacking,
Please unblock package plasma-sdk
unblock plasma-sdk/5.8.6-1
-- System Information:
Debian Release: 9.0
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'testing'), (500, 'stable'), (50, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf
Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)
diff -Nru --exclude po plasma-sdk-5.8.4/CMakeLists.txt plasma-sdk-5.8.6/CMakeLists.txt
--- plasma-sdk-5.8.4/CMakeLists.txt 2016-11-22 11:27:35.000000000 +0100
+++ plasma-sdk-5.8.6/CMakeLists.txt 2017-02-21 13:14:15.000000000 +0100
@@ -1,5 +1,5 @@
project(plasma-sdk)
-set(PROJECT_VERSION "5.8.4")
+set(PROJECT_VERSION "5.8.6")
set(PROJECT_VERSION_MAJOR 5)
cmake_minimum_required(VERSION 2.8.12)
diff -Nru --exclude po plasma-sdk-5.8.4/cuttlefish/org.kde.cuttlefish.desktop plasma-sdk-5.8.6/cuttlefish/org.kde.cuttlefish.desktop
--- plasma-sdk-5.8.4/cuttlefish/org.kde.cuttlefish.desktop 2016-11-22 11:26:27.000000000 +0100
+++ plasma-sdk-5.8.6/cuttlefish/org.kde.cuttlefish.desktop 2017-02-21 13:13:32.000000000 +0100
@@ -7,6 +7,7 @@
Name[cs]=Cuttlefish
Name[da]=Cuttlefish
Name[de]=Cuttlefish
+Name[el]=Cuttlefish
Name[en_GB]=Cuttlefish
Name[es]=Cuttlefish
Name[et]=Cuttlefish
@@ -39,6 +40,7 @@
GenericName[cs]=Prohlížeč ikon
GenericName[da]=Ikonfremviser
GenericName[de]=Symbol-Betrachter
+GenericName[el]=Προβολέας εικονιδίων
GenericName[en_GB]=Icon Viewer
GenericName[es]=Visor de iconos
GenericName[et]=Ikoonide näitaja
@@ -70,6 +72,7 @@
Comment[ca@valencia]=Vista prèvia de les icones pels artistes i desenvolupadors
Comment[da]=Forhåndsvisning af ikoner til kunstnere og udviklere
Comment[de]=Symbolvorschau für Künstler und Entwickler
+Comment[el]=Πρόγραμμα προεπισκόπησης εικονιδίων για καλλιτέχνες και προγραμματιστές
Comment[en_GB]=Icon Previewer for Artists and Developers
Comment[es]=Vista previa de iconos para artistas y desarrolladores
Comment[et]=Ikoonide eelvaaatlus kunstnikele ja arendajatele
diff -Nru --exclude po plasma-sdk-5.8.4/cuttlefish/package/metadata.desktop plasma-sdk-5.8.6/cuttlefish/package/metadata.desktop
--- plasma-sdk-5.8.4/cuttlefish/package/metadata.desktop 2016-11-22 11:26:27.000000000 +0100
+++ plasma-sdk-5.8.6/cuttlefish/package/metadata.desktop 2017-02-21 13:13:32.000000000 +0100
@@ -6,6 +6,7 @@
Name[cs]=Cuttlefish
Name[da]=Cuttlefish
Name[de]=Cuttlefish
+Name[el]=Cuttlefish
Name[en_GB]=Cuttlefish
Name[es]=Cuttlefish
Name[et]=Cuttlefish
@@ -35,7 +36,9 @@
Comment[ast]=Llista y previsualiza iconos disponibles
Comment[ca]=Llista i fa una vista prèvia de les icones disponibles
Comment[ca@valencia]=Llista i fa una vista prèvia de les icones disponibles
+Comment[da]=Oplist og forhåndsvis tilgængelige ikoner
Comment[de]=Auflistung und Vorschau verfügbarer Symbole
+Comment[el]=Εμφάνιση και προεπισκόπηση διαθέσιμων εικονιδίων
Comment[en_GB]=List and preview available icons
Comment[es]=Lista y vista previa de los iconos disponibles
Comment[et]=Saadaolevate ikoonide loend ja eelvaatlus
@@ -66,7 +69,9 @@
GenericName[ca]=Navegador d'icones
GenericName[ca@valencia]=Navegador d'icones
GenericName[cs]=Prohlížeč ikon
+GenericName[da]=Ikonbrowser
GenericName[de]=Symbol-Browser
+GenericName[el]=Περιηγητής εικονιδίων
GenericName[en_GB]=Icon Browser
GenericName[es]=Explorador de iconos
GenericName[et]=Ikoonibrauser
diff -Nru --exclude po plasma-sdk-5.8.4/cuttlefish/src/editorplugin/cuttlefishplugin.desktop plasma-sdk-5.8.6/cuttlefish/src/editorplugin/cuttlefishplugin.desktop
--- plasma-sdk-5.8.4/cuttlefish/src/editorplugin/cuttlefishplugin.desktop 2016-11-22 11:26:27.000000000 +0100
+++ plasma-sdk-5.8.6/cuttlefish/src/editorplugin/cuttlefishplugin.desktop 2017-02-21 13:13:32.000000000 +0100
@@ -6,7 +6,9 @@
Name[ast]=Seleutor d'iconos
Name[ca]=Selector d'icones
Name[ca@valencia]=Selector d'icones
+Name[da]=Ikonvælger
Name[de]=Symbol-Auswahl
+Name[el]=Επιλογέας εικονιδίων
Name[en_GB]=Icon Picker
Name[es]=Selector de iconos
Name[et]=Ikoonivalija
@@ -36,7 +38,9 @@
Comment[ast]=Invoca'l seleutor d'iconos Cuttlefish
Comment[ca]=Invoca al selector d'icones Cuttlefish
Comment[ca@valencia]=Invoca al selector d'icones Cuttlefish
+Comment[da]=Fremkalder Cuttlefish ikonvælger
Comment[de]=Öffnet die Symbol-Auswahl von Cuttlefish
+Comment[el]=Εκτελεί το πρόγραμμα επιλογής εικονιδίων Cuttlefish
Comment[en_GB]=Invokes Cuttlefish icon picker
Comment[es]=Llama al selector de iconos Cuttlefish
Comment[et]=Cuttlefishi ikoonivalija käivitamine
diff -Nru --exclude po plasma-sdk-5.8.4/debian/changelog plasma-sdk-5.8.6/debian/changelog
--- plasma-sdk-5.8.4/debian/changelog 2016-11-23 18:38:19.000000000 +0100
+++ plasma-sdk-5.8.6/debian/changelog 2017-03-16 18:51:34.000000000 +0100
@@ -1,3 +1,17 @@
+plasma-sdk (5.8.6-1) unstable; urgency=medium
+
+ * New upstream release (5.8.6)
+ * Add missing runtime dependency of qml-module-org-kde-kirigami.
+ Thanks to Luigi Toscano for reporting (Closes: 840695)
+
+ -- Maximiliano Curia <maxy@debian.org> Thu, 16 Mar 2017 18:51:34 +0100
+
+plasma-sdk (5.8.5-1) experimental; urgency=medium
+
+ * New upstream release (5.8.5).
+
+ -- Maximiliano Curia <maxy@debian.org> Fri, 30 Dec 2016 18:46:22 +0100
+
plasma-sdk (5.8.4-1) unstable; urgency=medium
* New upstream release (5.8.4)
diff -Nru --exclude po plasma-sdk-5.8.4/debian/control plasma-sdk-5.8.6/debian/control
--- plasma-sdk-5.8.4/debian/control 2016-11-23 18:38:19.000000000 +0100
+++ plasma-sdk-5.8.6/debian/control 2017-03-16 18:51:34.000000000 +0100
@@ -49,7 +49,10 @@
Package: plasma-sdk
Architecture: any
-Depends: plasma-framework, ${misc:Depends}, ${shlibs:Depends}
+Depends: plasma-framework,
+ qml-module-org-kde-kirigami,
+ ${misc:Depends},
+ ${shlibs:Depends}
Recommends: bash (>= 4.3)
Suggests: git
Description: IDE tailored for development of Plasma components
diff -Nru --exclude po plasma-sdk-5.8.4/lookandfeelexplorer/package/metadata.desktop plasma-sdk-5.8.6/lookandfeelexplorer/package/metadata.desktop
--- plasma-sdk-5.8.4/lookandfeelexplorer/package/metadata.desktop 2016-11-22 11:26:27.000000000 +0100
+++ plasma-sdk-5.8.6/lookandfeelexplorer/package/metadata.desktop 2017-02-21 13:13:32.000000000 +0100
@@ -2,7 +2,9 @@
Comment=Explore and edit your Plasma Look And Feel themes
Comment[ca]=Explora i edita els vostres temes d'Aspecte i comportament
Comment[ca@valencia]=Explora i edita els vostres temes d'Aspecte i comportament
+Comment[da]=Udforsk og redigér dine temaer for Plasmas udseende og fremtoning
Comment[de]=Erforschen und bearbeiten Sie Ihr Plasma-Erscheinungsbild
+Comment[el]=Περιήγηση και επεξεργασία των θεμάτων εμφάνισης και αίσθησης Plasma
Comment[en_GB]=Explore and edit your Plasma Look And Feel themes
Comment[es]=Explorar y editar sus temas de aspecto visual de Plasma
Comment[et]=Oma Plasma välimuse teemade uurimine ja muutmine
@@ -17,6 +19,10 @@
Comment[ru]=Просмотр и редактирование оформлений Plasma
Comment[sk]=Preskúmať a upraviť vaše témy Plasma
Comment[sl]=Raziščite in uredite vaše teme Videza in občutka za Plasmo
+Comment[sr]=Истражујте и уређујте плазма теме изгледа и осећаја
+Comment[sr@ijekavian]=Истражујте и уређујте плазма теме изгледа и осећаја
+Comment[sr@ijekavianlatin]=Istražujte i uređujte plasma teme izgleda i osećaja
+Comment[sr@latin]=Istražujte i uređujte plasma teme izgleda i osećaja
Comment[sv]=Utforska och redigera Plasma utseende och känsla-teman
Comment[uk]=Навігація вашими темами вигляду Плазми та редагування тем
Comment[x-test]=xxExplore and edit your Plasma Look And Feel themesxx
@@ -28,7 +34,9 @@
Name[ca]=Explorador pels temes d'Aspecte i comportament del Plasma
Name[ca@valencia]=Explorador pels temes d'Aspecte i comportament del Plasma
Name[cs]=Prohlížeč vzhledu a chování Plasmy
+Name[da]=Udforsker til Plasmas udseende og fremtoning
Name[de]=Plasma-Erscheinungsbild-Betrachter
+Name[el]=Περιηγητής εμφάνισης και αίσθησης Plasma
Name[en_GB]=Plasma Look And Feel Explorer
Name[es]=Explorador de temas aspecto visual de Plasma
Name[et]=Plasma välimuse uurija
@@ -43,6 +51,10 @@
Name[ru]=Редактор оформлений Plasma
Name[sk]=Prehliadač témy Plasma
Name[sl]=Raziskovalnik Videza in občutka za Plasmo
+Name[sr]=Истраживач плазма изгледа и осећаја
+Name[sr@ijekavian]=Истраживач плазма изгледа и осећаја
+Name[sr@ijekavianlatin]=Istraživač plasma izgleda i osećaja
+Name[sr@latin]=Istraživač plasma izgleda i osećaja
Name[sv]=Plasma utseende och känsla-utforskare
Name[uk]=Навігатор темами вигляду Плазми
Name[x-test]=xxPlasma Look And Feel Explorerxx
diff -Nru --exclude po plasma-sdk-5.8.4/plasmate/app/plasmateapp.cpp plasma-sdk-5.8.6/plasmate/app/plasmateapp.cpp
--- plasma-sdk-5.8.4/plasmate/app/plasmateapp.cpp 2016-11-22 11:26:27.000000000 +0100
+++ plasma-sdk-5.8.6/plasmate/app/plasmateapp.cpp 2017-02-21 13:13:32.000000000 +0100
@@ -34,6 +34,8 @@
#include <interfaces/idocumentcontroller.h>
#include <interfaces/iprojectcontroller.h>
+#include <kdevplatform_version.h>
+
#include <QMenuBar>
#include <QDockWidget>
@@ -58,12 +60,15 @@
void PlasmateApp::init()
{
- QObject *splash = 0;
-
QString session;
PlasmateExtension::init();
+#if KDEVPLATFORM_VERSION >= QT_VERSION_CHECK(5, 1, 40)
+ KDevelop::Core::initialize(KDevelop::Core::Default, session);
+#else
+ QObject *splash = 0;
KDevelop::Core::initialize(splash, KDevelop::Core::Default, session);
+#endif
m_core = KDevelop::Core::self();
m_uiControllerInternal = m_core->uiControllerInternal();
diff -Nru --exclude po plasma-sdk-5.8.4/plasmate/app/plasmate.desktop plasma-sdk-5.8.6/plasmate/app/plasmate.desktop
--- plasma-sdk-5.8.4/plasmate/app/plasmate.desktop 2016-11-22 11:26:27.000000000 +0100
+++ plasma-sdk-5.8.6/plasmate/app/plasmate.desktop 2017-02-21 13:13:32.000000000 +0100
@@ -6,7 +6,9 @@
Name[ca]=Plasmate
Name[ca@valencia]=Plasmate
Name[cs]=Plasmate
+Name[da]=Plasmate
Name[de]=Plasmate
+Name[el]=Plasmate
Name[en_GB]=Plasmate
Name[es]=Plasmate
Name[et]=Plasmate
@@ -35,7 +37,9 @@
GenericName=Plasma Addon Creator
GenericName[ca]=Creador de complements pel Plasma
GenericName[ca@valencia]=Creador de complements pel Plasma
+GenericName[da]=Plasma addon-skaber
GenericName[de]=Plasma Creator für Erweiterungen
+GenericName[el]=Δημιουργός προσθέτων Plasma
GenericName[en_GB]=Plasma Addon Creator
GenericName[es]=Creador de complementos para Plasma
GenericName[et]=Plasma lisandite looja
diff -Nru --exclude po plasma-sdk-5.8.4/plasmate/app/plasmateextention.cpp plasma-sdk-5.8.6/plasmate/app/plasmateextention.cpp
--- plasma-sdk-5.8.4/plasmate/app/plasmateextention.cpp 2016-11-22 11:26:27.000000000 +0100
+++ plasma-sdk-5.8.6/plasmate/app/plasmateextention.cpp 2017-02-21 13:13:32.000000000 +0100
@@ -39,7 +39,11 @@
return "plasmateui.rc";
}
+#if KDEVPLATFORM_VERSION >= QT_VERSION_CHECK(5, 1, 40)
+QString PlasmateExtension::executableFilePath()
+#else
QString PlasmateExtension::binaryPath()
+#endif
{
return QApplication::applicationDirPath() + "/plasmate";
}
diff -Nru --exclude po plasma-sdk-5.8.4/plasmate/app/plasmateextention.h plasma-sdk-5.8.6/plasmate/app/plasmateextention.h
--- plasma-sdk-5.8.4/plasmate/app/plasmateextention.h 2016-11-22 11:26:27.000000000 +0100
+++ plasma-sdk-5.8.6/plasmate/app/plasmateextention.h 2017-02-21 13:13:32.000000000 +0100
@@ -21,6 +21,7 @@
#define PLASMATEEXTENSION_H
#include <shell/shellextension.h>
+#include <kdevplatform_version.h>
class PlasmateExtension : public KDevelop::ShellExtension {
@@ -28,7 +29,11 @@
static void init();
virtual QString xmlFile();
+#if KDEVPLATFORM_VERSION >= QT_VERSION_CHECK(5, 1, 40)
+ virtual QString executableFilePath();
+#else
virtual QString binaryPath();
+#endif
virtual KDevelop::AreaParams defaultArea();
virtual QString projectFileExtension();
virtual QString projectFileDescription();
diff -Nru --exclude po plasma-sdk-5.8.4/plasmate/app/plasmate.knsrc plasma-sdk-5.8.6/plasmate/app/plasmate.knsrc
--- plasma-sdk-5.8.4/plasmate/app/plasmate.knsrc 2016-11-22 11:26:27.000000000 +0100
+++ plasma-sdk-5.8.6/plasmate/app/plasmate.knsrc 2017-02-21 13:13:32.000000000 +0100
@@ -1,4 +1,4 @@
[KNewStuff3]
-ProvidersUrl=http://download.kde.org/khotnewstuff/plasmoids-providers.xml
+ProvidersUrl=http://download.kde.org/khotnewstuff/plasmoids-providers.xml
TargetDir=plasmate/tmp
UploadCategories=Plasmoid Script,Plasma Comic,Test category 1
diff -Nru --exclude po plasma-sdk-5.8.4/plasmate/plugins/plasmaprojectmanager/kdevplasmamanager.json plasma-sdk-5.8.6/plasmate/plugins/plasmaprojectmanager/kdevplasmamanager.json
--- plasma-sdk-5.8.4/plasmate/plugins/plasmaprojectmanager/kdevplasmamanager.json 2016-11-22 11:26:27.000000000 +0100
+++ plasma-sdk-5.8.6/plasmate/plugins/plasmaprojectmanager/kdevplasmamanager.json 2017-02-21 13:13:32.000000000 +0100
@@ -55,6 +55,7 @@
"Description[nn]": "Tillat KDevPlatform å handtera Plasma-prosjekt",
"Description[pl]": "Zezwól KDevPlatform na zarządzanie projektami plazmy",
"Description[pt]": "Permite ao KDevPlatform gerir os projectos do Plasma",
+ "Description[pt_BR]": "Permite ao KDevPlatform gerenciar projetos do Plasma",
"Description[sk]": "Umožniť KDevPlatform spracovať projekty Plasma",
"Description[sl]": "Omogoči, da KDevPlatform upravlja s projekti Plasme",
"Description[sr@ijekavian]": "Омогућава К‑девелопу да управља плазма пројектима",
@@ -109,4 +110,4 @@
"org.kdevelop.IProjectFileManager"
],
"X-KDevelop-Mode": "GUI"
-}
\ No newline at end of file
+}
diff -Nru --exclude po plasma-sdk-5.8.4/plasmate/plugins/savesystemview/kdevsavesystemview.desktop.cmake plasma-sdk-5.8.6/plasmate/plugins/savesystemview/kdevsavesystemview.desktop.cmake
--- plasma-sdk-5.8.4/plasmate/plugins/savesystemview/kdevsavesystemview.desktop.cmake 2016-11-22 11:26:27.000000000 +0100
+++ plasma-sdk-5.8.6/plasmate/plugins/savesystemview/kdevsavesystemview.desktop.cmake 2017-02-21 13:13:32.000000000 +0100
@@ -5,7 +5,9 @@
Comment[ast]=Déxate xestionar el to repositoriu git.
Comment[ca]=Permet gestionar el vostre repositori git.
Comment[ca@valencia]=Permet gestionar el vostre repositori git.
+Comment[da]=Lader dig håndtere dit git-depot.
Comment[de]=Verwaltung von Git-Quelltextarchiven.
+Comment[el]=Επιτρέπει τη διαχείριση του αποθετηρίου σας (git).
Comment[en_GB]=Lets you manage your git repository.
Comment[es]=Le permite gestionar su repositorio git.
Comment[et]=Võimaldab hallata oma giti hoidlat.
@@ -33,6 +35,7 @@
Name=Save System View
Name[ca]=Desa la vista del sistema
Name[ca@valencia]=Guarda la vista del sistema
+Name[da]=Gem systemvisning
Name[de]=Systemansicht speichern
Name[en_GB]=Save System View
Name[es]=Guardar vista del sistema
@@ -61,6 +64,7 @@
GenericName=Save System View
GenericName[ca]=Desa la vista del sistema
GenericName[ca@valencia]=Guarda la vista del sistema
+GenericName[da]=Gem systemvisning
GenericName[de]=Systemansicht speichern
GenericName[en_GB]=Save System View
GenericName[es]=Guardar vista del sistema
diff -Nru --exclude po plasma-sdk-5.8.4/plasmoidviewer/qmlpackages/shell/metadata.desktop plasma-sdk-5.8.6/plasmoidviewer/qmlpackages/shell/metadata.desktop
--- plasma-sdk-5.8.4/plasmoidviewer/qmlpackages/shell/metadata.desktop 2016-11-22 11:26:27.000000000 +0100
+++ plasma-sdk-5.8.6/plasmoidviewer/qmlpackages/shell/metadata.desktop 2017-02-21 13:13:32.000000000 +0100
@@ -2,7 +2,9 @@
Comment=PlasmoidViewer Shell
Comment[ca]=Intèrpret d'ordres del visor de plasmoides
Comment[ca@valencia]=Intèrpret d'ordes del visor de plasmoides
+Comment[da]=PlasmoidViewer-skal
Comment[de]=PlasmoidViewer-Shell
+Comment[el]=Κέλυφος PlasmoidViewer
Comment[en_GB]=PlasmoidViewer Shell
Comment[es]=Entorno de vista de plasmoides
Comment[et]=PlasmoidVieweri shell
@@ -33,7 +35,9 @@
Name=PlasmoidViewerShell
Name[ca]=Intèrpret d'ordres del visor de plasmoides
Name[ca@valencia]=Intèrpret d'ordes del visor de plasmoides
+Name[da]=PlasmoidViewerShell
Name[de]=PlasmoidViewerShell
+Name[el]=PlasmoidViewerShell
Name[en_GB]=PlasmoidViewerShell
Name[es]=Entorno de vista de plasmoides
Name[et]=PlasmoidViewerShell
diff -Nru --exclude po plasma-sdk-5.8.4/themeexplorer/package/contents/code/openInEditor.sh plasma-sdk-5.8.6/themeexplorer/package/contents/code/openInEditor.sh
--- plasma-sdk-5.8.4/themeexplorer/package/contents/code/openInEditor.sh 2016-11-22 11:26:27.000000000 +0100
+++ plasma-sdk-5.8.6/themeexplorer/package/contents/code/openInEditor.sh 2017-02-21 13:13:32.000000000 +0100
@@ -5,20 +5,20 @@
exit 1
fi
-if [ ! -f $1 ]; then
+if [ ! -f "$1" ]; then
echo "you must specify a valid svg"
exit 1
fi
-inkscape $1
+inkscape "$1"
-file=${1%.*}
-mv $1 $file.svg.gz
-gunzip $file.svg.gz
+file="${1%.*}"
+mv "$1" "$file.svg.gz"
+gunzip "$file.svg.gz"
-echo Processing $file
+echo Processing "$file"
-/usr/bin/perl -p -i -e "s/color:#[^;]*;fill:currentColor/fill:currentColor/g" $file.svg
+/usr/bin/perl -p -i -e "s/color:#[^;]*;fill:currentColor/fill:currentColor/g" "$file.svg"
-gzip $file.svg
-mv $file.svg.gz $file.svgz
+gzip "$file.svg"
+mv "$file.svg.gz" "$file.svgz"
diff -Nru --exclude po plasma-sdk-5.8.4/themeexplorer/package/metadata.desktop plasma-sdk-5.8.6/themeexplorer/package/metadata.desktop
--- plasma-sdk-5.8.4/themeexplorer/package/metadata.desktop 2016-11-22 11:26:27.000000000 +0100
+++ plasma-sdk-5.8.6/themeexplorer/package/metadata.desktop 2017-02-21 13:13:32.000000000 +0100
@@ -3,7 +3,9 @@
Comment[ast]=Esplora y edita los tos temes Plasma
Comment[ca]=Explora i edita els vostres temes de Plasma
Comment[ca@valencia]=Explora i edita els vostres temes de Plasma
+Comment[da]=Udforsk og redigér dine Plasma-temaer
Comment[de]=Erforschen und bearbeiten Sie Ihre Plasma-Designs
+Comment[el]=Περιήγηση και επεξεργασία των θεμάτων Plasma
Comment[en_GB]=Explore and edit your Plasma themes
Comment[es]=Explorar y editar sus temas de Plasma
Comment[et]=Oma Plasma teemade uurimine ja muutmine
@@ -34,7 +36,9 @@
Name=Plasma Theme Explorer
Name[ca]=Explorador pels temes del Plasma
Name[ca@valencia]=Explorador pels temes del Plasma
+Name[da]=Plasma temaudforsker
Name[de]=Plasma-Designexplorer
+Name[el]=Περιηγητής θεμάτων Plasma
Name[en_GB]=Plasma Theme Explorer
Name[es]=Explorador de temas de Plasma
Name[et]=Plasma teemade uurija
commit 2fe78adb05f1f4cdeaffe5d2bb83ffd265303542
Author: Jonathan Riddell <jr@jriddell.org>
Date: Tue Feb 21 11:46:56 2017 +0000
Update version number for 5.8.6
GIT_SILENT
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddcae17..9678c44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
project(plasma-sdk)
-set(PROJECT_VERSION "5.8.5")
+set(PROJECT_VERSION "5.8.6")
set(PROJECT_VERSION_MAJOR 5)
cmake_minimum_required(VERSION 2.8.12)
commit ad6e3b7f937a846ec8a5532bb62f6bf2e923b49b
Author: Friedrich W. H. Kossebau <kossebau@kde.org>
Date: Tue Feb 14 07:40:24 2017 +0100
Update to KDevplatform API change
diff --git a/plasmate/app/plasmateextention.cpp b/plasmate/app/plasmateextention.cpp
index d333466..ccde17f 100644
--- a/plasmate/app/plasmateextention.cpp
+++ b/plasmate/app/plasmateextention.cpp
@@ -39,7 +39,11 @@ QString PlasmateExtension::xmlFile()
return "plasmateui.rc";
}
+#if KDEVPLATFORM_VERSION >= QT_VERSION_CHECK(5, 1, 40)
+QString PlasmateExtension::executableFilePath()
+#else
QString PlasmateExtension::binaryPath()
+#endif
{
return QApplication::applicationDirPath() + "/plasmate";
}
diff --git a/plasmate/app/plasmateextention.h b/plasmate/app/plasmateextention.h
index 4aa2979..a789291 100644
--- a/plasmate/app/plasmateextention.h
+++ b/plasmate/app/plasmateextention.h
@@ -21,6 +21,7 @@
#define PLASMATEEXTENSION_H
#include <shell/shellextension.h>
+#include <kdevplatform_version.h>
class PlasmateExtension : public KDevelop::ShellExtension {
@@ -28,7 +29,11 @@ public:
static void init();
virtual QString xmlFile();
+#if KDEVPLATFORM_VERSION >= QT_VERSION_CHECK(5, 1, 40)
+ virtual QString executableFilePath();
+#else
virtual QString binaryPath();
+#endif
virtual KDevelop::AreaParams defaultArea();
virtual QString projectFileExtension();
virtual QString projectFileDescription();
commit a18d9d32455a82be1dd5001dcffb78583fa27906
Author: Leonard König <leonard.r.koenig@googlemail.com>
Date: Fri Jan 20 23:44:33 2017 +0100
Fix handling of paths with whitespace in bash
REVIEW: 129013
diff --git a/themeexplorer/package/contents/code/openInEditor.sh b/themeexplorer/package/contents/code/openInEditor.sh
index b80e004..e45e0e5 100755
--- a/themeexplorer/package/contents/code/openInEditor.sh
+++ b/themeexplorer/package/contents/code/openInEditor.sh
@@ -5,20 +5,20 @@ if [ $# -ne 1 ];
exit 1
fi
-if [ ! -f $1 ]; then
+if [ ! -f "$1" ]; then
echo "you must specify a valid svg"
exit 1
fi
-inkscape $1
+inkscape "$1"
-file=${1%.*}
-mv $1 $file.svg.gz
-gunzip $file.svg.gz
+file="${1%.*}"
+mv "$1" "$file.svg.gz"
+gunzip "$file.svg.gz"
-echo Processing $file
+echo Processing "$file"
-/usr/bin/perl -p -i -e "s/color:#[^;]*;fill:currentColor/fill:currentColor/g" $file.svg
+/usr/bin/perl -p -i -e "s/color:#[^;]*;fill:currentColor/fill:currentColor/g" "$file.svg"
-gzip $file.svg
-mv $file.svg.gz $file.svgz
+gzip "$file.svg"
+mv "$file.svg.gz" "$file.svgz"
commit a655f87bd4ccfd72d8a1e5e109a8321747f396bf
Author: Friedrich W. H. Kossebau <kossebau@kde.org>
Date: Wed Jan 11 03:33:27 2017 +0100
Update to KDevplatform API change
diff --git a/plasmate/app/plasmateapp.cpp b/plasmate/app/plasmateapp.cpp
index 508ddf9..7c78328 100644
--- a/plasmate/app/plasmateapp.cpp
+++ b/plasmate/app/plasmateapp.cpp
@@ -34,6 +34,8 @@
#include <interfaces/idocumentcontroller.h>
#include <interfaces/iprojectcontroller.h>
+#include <kdevplatform_version.h>
+
#include <QMenuBar>
#include <QDockWidget>
@@ -58,12 +60,15 @@ PlasmateApp::~PlasmateApp()
void PlasmateApp::init()
{
- QObject *splash = 0;
-
QString session;
PlasmateExtension::init();
+#if KDEVPLATFORM_VERSION >= QT_VERSION_CHECK(5, 1, 40)
+ KDevelop::Core::initialize(KDevelop::Core::Default, session);
+#else
+ QObject *splash = 0;
KDevelop::Core::initialize(splash, KDevelop::Core::Default, session);
+#endif
m_core = KDevelop::Core::self();
m_uiControllerInternal = m_core->uiControllerInternal();
commit 1053124565b006a11434e3807048561ae9bba7c3
Author: Jonathan Riddell <jr@jriddell.org>
Date: Tue Dec 27 09:29:43 2016 +0000
Update version number for 5.8.5
GIT_SILENT
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe35d9c..ddcae17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
project(plasma-sdk)
-set(PROJECT_VERSION "5.8.4")
+set(PROJECT_VERSION "5.8.5")
set(PROJECT_VERSION_MAJOR 5)
cmake_minimum_required(VERSION 2.8.12)
commit 6abd560bde7f1886b1e3ad88f33adb2da41cc2dd
Author: l10n daemon script <scripty@kde.org>
Date: Sat Dec 24 08:26:43 2016 +0100
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"
diff --git a/cuttlefish/org.kde.cuttlefish.desktop b/cuttlefish/org.kde.cuttlefish.desktop
index 9f6e412..7bfb51f 100755
--- a/cuttlefish/org.kde.cuttlefish.desktop
+++ b/cuttlefish/org.kde.cuttlefish.desktop
@@ -7,6 +7,7 @@ Name[ca@valencia]=Cuttlefish
Name[cs]=Cuttlefish
Name[da]=Cuttlefish
Name[de]=Cuttlefish
+Name[el]=Cuttlefish
Name[en_GB]=Cuttlefish
Name[es]=Cuttlefish
Name[et]=Cuttlefish
@@ -39,6 +40,7 @@ GenericName[ca@valencia]=Visor d'icones
GenericName[cs]=Prohlížeč ikon
GenericName[da]=Ikonfremviser
GenericName[de]=Symbol-Betrachter
+GenericName[el]=Προβολέας εικονιδίων
GenericName[en_GB]=Icon Viewer
GenericName[es]=Visor de iconos
GenericName[et]=Ikoonide näitaja
@@ -70,6 +72,7 @@ Comment[ca]=Vista prèvia de les icones pels artistes i desenvolupadors
Comment[ca@valencia]=Vista prèvia de les icones pels artistes i desenvolupadors
Comment[da]=Forhåndsvisning af ikoner til kunstnere og udviklere
Comment[de]=Symbolvorschau für Künstler und Entwickler
+Comment[el]=Πρόγραμμα προεπισκόπησης εικονιδίων για καλλιτέχνες και προγραμματιστές
Comment[en_GB]=Icon Previewer for Artists and Developers
Comment[es]=Vista previa de iconos para artistas y desarrolladores
Comment[et]=Ikoonide eelvaaatlus kunstnikele ja arendajatele
diff --git a/cuttlefish/package/metadata.desktop b/cuttlefish/package/metadata.desktop
index 0614996..b034616 100644
--- a/cuttlefish/package/metadata.desktop
+++ b/cuttlefish/package/metadata.desktop
@@ -6,6 +6,7 @@ Name[ca@valencia]=Cuttlefish
Name[cs]=Cuttlefish
Name[da]=Cuttlefish
Name[de]=Cuttlefish
+Name[el]=Cuttlefish
Name[en_GB]=Cuttlefish
Name[es]=Cuttlefish
Name[et]=Cuttlefish
@@ -37,6 +38,7 @@ Comment[ca]=Llista i fa una vista prèvia de les icones disponibles
Comment[ca@valencia]=Llista i fa una vista prèvia de les icones disponibles
Comment[da]=Oplist og forhåndsvis tilgængelige ikoner
Comment[de]=Auflistung und Vorschau verfügbarer Symbole
+Comment[el]=Εμφάνιση και προεπισκόπηση διαθέσιμων εικονιδίων
Comment[en_GB]=List and preview available icons
Comment[es]=Lista y vista previa de los iconos disponibles
Comment[et]=Saadaolevate ikoonide loend ja eelvaatlus
@@ -69,6 +71,7 @@ GenericName[ca@valencia]=Navegador d'icones
GenericName[cs]=Prohlížeč ikon
GenericName[da]=Ikonbrowser
GenericName[de]=Symbol-Browser
+GenericName[el]=Περιηγητής εικονιδίων
GenericName[en_GB]=Icon Browser
GenericName[es]=Explorador de iconos
GenericName[et]=Ikoonibrauser
diff --git a/cuttlefish/src/editorplugin/cuttlefishplugin.desktop b/cuttlefish/src/editorplugin/cuttlefishplugin.desktop
index 3d3e70f..2426bc8 100644
--- a/cuttlefish/src/editorplugin/cuttlefishplugin.desktop
+++ b/cuttlefish/src/editorplugin/cuttlefishplugin.desktop
@@ -8,6 +8,7 @@ Name[ca]=Selector d'icones
Name[ca@valencia]=Selector d'icones
Name[da]=Ikonvælger
Name[de]=Symbol-Auswahl
+Name[el]=Επιλογέας εικονιδίων
Name[en_GB]=Icon Picker
Name[es]=Selector de iconos
Name[et]=Ikoonivalija
@@ -39,6 +40,7 @@ Comment[ca]=Invoca al selector d'icones Cuttlefish
Comment[ca@valencia]=Invoca al selector d'icones Cuttlefish
Comment[da]=Fremkalder Cuttlefish ikonvælger
Comment[de]=Öffnet die Symbol-Auswahl von Cuttlefish
+Comment[el]=Εκτελεί το πρόγραμμα επιλογής εικονιδίων Cuttlefish
Comment[en_GB]=Invokes Cuttlefish icon picker
Comment[es]=Llama al selector de iconos Cuttlefish
Comment[et]=Cuttlefishi ikoonivalija käivitamine
diff --git a/lookandfeelexplorer/package/metadata.desktop b/lookandfeelexplorer/package/metadata.desktop
index c9c4a6a..1331dd0 100644
--- a/lookandfeelexplorer/package/metadata.desktop
+++ b/lookandfeelexplorer/package/metadata.desktop
@@ -4,6 +4,7 @@ Comment[ca]=Explora i edita els vostres temes d'Aspecte i comportament
Comment[ca@valencia]=Explora i edita els vostres temes d'Aspecte i comportament
Comment[da]=Udforsk og redigér dine temaer for Plasmas udseende og fremtoning
Comment[de]=Erforschen und bearbeiten Sie Ihr Plasma-Erscheinungsbild
+Comment[el]=Περιήγηση και επεξεργασία των θεμάτων εμφάνισης και αίσθησης Plasma
Comment[en_GB]=Explore and edit your Plasma Look And Feel themes
Comment[es]=Explorar y editar sus temas de aspecto visual de Plasma
Comment[et]=Oma Plasma välimuse teemade uurimine ja muutmine
@@ -35,6 +36,7 @@ Name[ca@valencia]=Explorador pels temes d'Aspecte i comportament del Plasma
Name[cs]=Prohlížeč vzhledu a chování Plasmy
Name[da]=Udforsker til Plasmas udseende og fremtoning
Name[de]=Plasma-Erscheinungsbild-Betrachter
+Name[el]=Περιηγητής εμφάνισης και αίσθησης Plasma
Name[en_GB]=Plasma Look And Feel Explorer
Name[es]=Explorador de temas aspecto visual de Plasma
Name[et]=Plasma välimuse uurija
diff --git a/plasmate/app/plasmate.desktop b/plasmate/app/plasmate.desktop
index abd473d..5d502ac 100755
--- a/plasmate/app/plasmate.desktop
+++ b/plasmate/app/plasmate.desktop
@@ -8,6 +8,7 @@ Name[ca@valencia]=Plasmate
Name[cs]=Plasmate
Name[da]=Plasmate
Name[de]=Plasmate
+Name[el]=Plasmate
Name[en_GB]=Plasmate
Name[es]=Plasmate
Name[et]=Plasmate
@@ -38,6 +39,7 @@ GenericName[ca]=Creador de complements pel Plasma
GenericName[ca@valencia]=Creador de complements pel Plasma
GenericName[da]=Plasma addon-skaber
GenericName[de]=Plasma Creator für Erweiterungen
+GenericName[el]=Δημιουργός προσθέτων Plasma
GenericName[en_GB]=Plasma Addon Creator
GenericName[es]=Creador de complementos para Plasma
GenericName[et]=Plasma lisandite looja
diff --git a/plasmate/plugins/savesystemview/kdevsavesystemview.desktop.cmake b/plasmate/plugins/savesystemview/kdevsavesystemview.desktop.cmake
index 2f76f91..7709aa5 100644
--- a/plasmate/plugins/savesystemview/kdevsavesystemview.desktop.cmake
+++ b/plasmate/plugins/savesystemview/kdevsavesystemview.desktop.cmake
@@ -7,6 +7,7 @@ Comment[ca]=Permet gestionar el vostre repositori git.
Comment[ca@valencia]=Permet gestionar el vostre repositori git.
Comment[da]=Lader dig håndtere dit git-depot.
Comment[de]=Verwaltung von Git-Quelltextarchiven.
+Comment[el]=Επιτρέπει τη διαχείριση του αποθετηρίου σας (git).
Comment[en_GB]=Lets you manage your git repository.
Comment[es]=Le permite gestionar su repositorio git.
Comment[et]=Võimaldab hallata oma giti hoidlat.
diff --git a/plasmoidviewer/qmlpackages/shell/metadata.desktop b/plasmoidviewer/qmlpackages/shell/metadata.desktop
index 603743f..9f49a05 100644
--- a/plasmoidviewer/qmlpackages/shell/metadata.desktop
+++ b/plasmoidviewer/qmlpackages/shell/metadata.desktop
@@ -4,6 +4,7 @@ Comment[ca]=Intèrpret d'ordres del visor de plasmoides
Comment[ca@valencia]=Intèrpret d'ordes del visor de plasmoides
Comment[da]=PlasmoidViewer-skal
Comment[de]=PlasmoidViewer-Shell
+Comment[el]=Κέλυφος PlasmoidViewer
Comment[en_GB]=PlasmoidViewer Shell
Comment[es]=Entorno de vista de plasmoides
Comment[et]=PlasmoidVieweri shell
@@ -36,6 +37,7 @@ Name[ca]=Intèrpret d'ordres del visor de plasmoides
Name[ca@valencia]=Intèrpret d'ordes del visor de plasmoides
Name[da]=PlasmoidViewerShell
Name[de]=PlasmoidViewerShell
+Name[el]=PlasmoidViewerShell
Name[en_GB]=PlasmoidViewerShell
Name[es]=Entorno de vista de plasmoides
Name[et]=PlasmoidViewerShell
diff --git a/themeexplorer/package/metadata.desktop b/themeexplorer/package/metadata.desktop
index 4859d64..15fbba6 100644
--- a/themeexplorer/package/metadata.desktop
+++ b/themeexplorer/package/metadata.desktop
@@ -5,6 +5,7 @@ Comment[ca]=Explora i edita els vostres temes de Plasma
Comment[ca@valencia]=Explora i edita els vostres temes de Plasma
Comment[da]=Udforsk og redigér dine Plasma-temaer
Comment[de]=Erforschen und bearbeiten Sie Ihre Plasma-Designs
+Comment[el]=Περιήγηση και επεξεργασία των θεμάτων Plasma
Comment[en_GB]=Explore and edit your Plasma themes
Comment[es]=Explorar y editar sus temas de Plasma
Comment[et]=Oma Plasma teemade uurimine ja muutmine
@@ -37,6 +38,7 @@ Name[ca]=Explorador pels temes del Plasma
Name[ca@valencia]=Explorador pels temes del Plasma
Name[da]=Plasma temaudforsker
Name[de]=Plasma-Designexplorer
+Name[el]=Περιηγητής θεμάτων Plasma
Name[en_GB]=Plasma Theme Explorer
Name[es]=Explorador de temas de Plasma
Name[et]=Plasma teemade uurija
commit 8bc8defb71b0c109baa5da23e2af2f0c0bb6297a
Author: l10n daemon script <scripty@kde.org>
Date: Wed Dec 21 07:42:25 2016 +0100
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"
diff --git a/plasmate/plugins/plasmaprojectmanager/kdevplasmamanager.json b/plasmate/plugins/plasmaprojectmanager/kdevplasmamanager.json
index 2159cc3..9347e8e 100644
--- a/plasmate/plugins/plasmaprojectmanager/kdevplasmamanager.json
+++ b/plasmate/plugins/plasmaprojectmanager/kdevplasmamanager.json
@@ -55,6 +55,7 @@
"Description[nn]": "Tillat KDevPlatform å handtera Plasma-prosjekt",
"Description[pl]": "Zezwól KDevPlatform na zarządzanie projektami plazmy",
"Description[pt]": "Permite ao KDevPlatform gerir os projectos do Plasma",
+ "Description[pt_BR]": "Permite ao KDevPlatform gerenciar projetos do Plasma",
"Description[sk]": "Umožniť KDevPlatform spracovať projekty Plasma",
"Description[sl]": "Omogoči, da KDevPlatform upravlja s projekti Plasme",
"Description[sr@ijekavian]": "Омогућава К‑девелопу да управља плазма пројектима",
commit 720a9cb4916dfcad34e92f5044d18783adf74f1f
Author: l10n daemon script <scripty@kde.org>
Date: Tue Dec 20 15:08:31 2016 +0100
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"
diff --git a/plasmate/app/plasmate.knsrc b/plasmate/app/plasmate.knsrc
index a601e7e..52a280c 100644
--- a/plasmate/app/plasmate.knsrc
+++ b/plasmate/app/plasmate.knsrc
@@ -1,4 +1,4 @@
[KNewStuff3]
-ProvidersUrl=http://download.kde.org/khotnewstuff/plasmoids-providers.xml
+ProvidersUrl=http://download.kde.org/khotnewstuff/plasmoids-providers.xml
TargetDir=plasmate/tmp
UploadCategories=Plasmoid Script,Plasma Comic,Test category 1
commit 374fbc3f55e8a6a1a243f20c2bc8998f53b15b4a
Author: l10n daemon script <scripty@kde.org>
Date: Fri Dec 16 07:26:28 2016 +0100
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"
diff --git a/cuttlefish/package/metadata.desktop b/cuttlefish/package/metadata.desktop
index d59a8f6..0614996 100644
--- a/cuttlefish/package/metadata.desktop
+++ b/cuttlefish/package/metadata.desktop
@@ -35,6 +35,7 @@ Comment=List and preview available icons
Comment[ast]=Llista y previsualiza iconos disponibles
Comment[ca]=Llista i fa una vista prèvia de les icones disponibles
Comment[ca@valencia]=Llista i fa una vista prèvia de les icones disponibles
+Comment[da]=Oplist og forhåndsvis tilgængelige ikoner
Comment[de]=Auflistung und Vorschau verfügbarer Symbole
Comment[en_GB]=List and preview available icons
Comment[es]=Lista y vista previa de los iconos disponibles
@@ -66,6 +67,7 @@ GenericName[ast]=Restolador d'iconos
GenericName[ca]=Navegador d'icones
GenericName[ca@valencia]=Navegador d'icones
GenericName[cs]=Prohlížeč ikon
+GenericName[da]=Ikonbrowser
GenericName[de]=Symbol-Browser
GenericName[en_GB]=Icon Browser
GenericName[es]=Explorador de iconos
diff --git a/cuttlefish/src/editorplugin/cuttlefishplugin.desktop b/cuttlefish/src/editorplugin/cuttlefishplugin.desktop
index 9db9243..3d3e70f 100644
--- a/cuttlefish/src/editorplugin/cuttlefishplugin.desktop
+++ b/cuttlefish/src/editorplugin/cuttlefishplugin.desktop
@@ -6,6 +6,7 @@ Name=Icon Picker
Name[ast]=Seleutor d'iconos
Name[ca]=Selector d'icones
Name[ca@valencia]=Selector d'icones
+Name[da]=Ikonvælger
Name[de]=Symbol-Auswahl
Name[en_GB]=Icon Picker
Name[es]=Selector de iconos
@@ -36,6 +37,7 @@ Comment=Invokes Cuttlefish icon picker
Comment[ast]=Invoca'l seleutor d'iconos Cuttlefish
Comment[ca]=Invoca al selector d'icones Cuttlefish
Comment[ca@valencia]=Invoca al selector d'icones Cuttlefish
+Comment[da]=Fremkalder Cuttlefish ikonvælger
Comment[de]=Öffnet die Symbol-Auswahl von Cuttlefish
Comment[en_GB]=Invokes Cuttlefish icon picker
Comment[es]=Llama al selector de iconos Cuttlefish
diff --git a/lookandfeelexplorer/package/metadata.desktop b/lookandfeelexplorer/package/metadata.desktop
index 205a520..c9c4a6a 100644
--- a/lookandfeelexplorer/package/metadata.desktop
+++ b/lookandfeelexplorer/package/metadata.desktop
@@ -2,6 +2,7 @@
Comment=Explore and edit your Plasma Look And Feel themes
Comment[ca]=Explora i edita els vostres temes d'Aspecte i comportament
Comment[ca@valencia]=Explora i edita els vostres temes d'Aspecte i comportament
+Comment[da]=Udforsk og redigér dine temaer for Plasmas udseende og fremtoning
Comment[de]=Erforschen und bearbeiten Sie Ihr Plasma-Erscheinungsbild
Comment[en_GB]=Explore and edit your Plasma Look And Feel themes
Comment[es]=Explorar y editar sus temas de aspecto visual de Plasma
@@ -32,6 +33,7 @@ Name=Plasma Look And Feel Explorer
Name[ca]=Explorador pels temes d'Aspecte i comportament del Plasma
Name[ca@valencia]=Explorador pels temes d'Aspecte i comportament del Plasma
Name[cs]=Prohlížeč vzhledu a chování Plasmy
+Name[da]=Udforsker til Plasmas udseende og fremtoning
Name[de]=Plasma-Erscheinungsbild-Betrachter
Name[en_GB]=Plasma Look And Feel Explorer
Name[es]=Explorador de temas aspecto visual de Plasma
diff --git a/plasmate/app/plasmate.desktop b/plasmate/app/plasmate.desktop
index eeaa2a5..abd473d 100755
--- a/plasmate/app/plasmate.desktop
+++ b/plasmate/app/plasmate.desktop
@@ -6,6 +6,7 @@ Name[ast]=Plasmate
Name[ca]=Plasmate
Name[ca@valencia]=Plasmate
Name[cs]=Plasmate
+Name[da]=Plasmate
Name[de]=Plasmate
Name[en_GB]=Plasmate
Name[es]=Plasmate
@@ -35,6 +36,7 @@ Name[zh_TW]=Plasmate
GenericName=Plasma Addon Creator
GenericName[ca]=Creador de complements pel Plasma
GenericName[ca@valencia]=Creador de complements pel Plasma
+GenericName[da]=Plasma addon-skaber
GenericName[de]=Plasma Creator für Erweiterungen
GenericName[en_GB]=Plasma Addon Creator
GenericName[es]=Creador de complementos para Plasma
diff --git a/plasmate/plugins/savesystemview/kdevsavesystemview.desktop.cmake b/plasmate/plugins/savesystemview/kdevsavesystemview.desktop.cmake
index 0230e06..2f76f91 100644
--- a/plasmate/plugins/savesystemview/kdevsavesystemview.desktop.cmake
+++ b/plasmate/plugins/savesystemview/kdevsavesystemview.desktop.cmake
@@ -5,6 +5,7 @@ Comment=Lets you manage your git repository.
Comment[ast]=Déxate xestionar el to repositoriu git.
Comment[ca]=Permet gestionar el vostre repositori git.
Comment[ca@valencia]=Permet gestionar el vostre repositori git.
+Comment[da]=Lader dig håndtere dit git-depot.
Comment[de]=Verwaltung von Git-Quelltextarchiven.
Comment[en_GB]=Lets you manage your git repository.
Comment[es]=Le permite gestionar su repositorio git.
@@ -33,6 +34,7 @@ Comment[zh_TW]=讓您管理您的 git 主目錄。
Name=Save System View
Name[ca]=Desa la vista del sistema
Name[ca@valencia]=Guarda la vista del sistema
+Name[da]=Gem systemvisning
Name[de]=Systemansicht speichern
Name[en_GB]=Save System View
Name[es]=Guardar vista del sistema
@@ -61,6 +63,7 @@ Name[zh_TW]=儲存系統檢視
GenericName=Save System View
GenericName[ca]=Desa la vista del sistema
GenericName[ca@valencia]=Guarda la vista del sistema
+GenericName[da]=Gem systemvisning
GenericName[de]=Systemansicht speichern
GenericName[en_GB]=Save System View
GenericName[es]=Guardar vista del sistema
diff --git a/plasmoidviewer/qmlpackages/shell/metadata.desktop b/plasmoidviewer/qmlpackages/shell/metadata.desktop
index 0d2934f..603743f 100644
--- a/plasmoidviewer/qmlpackages/shell/metadata.desktop
+++ b/plasmoidviewer/qmlpackages/shell/metadata.desktop
@@ -2,6 +2,7 @@
Comment=PlasmoidViewer Shell
Comment[ca]=Intèrpret d'ordres del visor de plasmoides
Comment[ca@valencia]=Intèrpret d'ordes del visor de plasmoides
+Comment[da]=PlasmoidViewer-skal
Comment[de]=PlasmoidViewer-Shell
Comment[en_GB]=PlasmoidViewer Shell
Comment[es]=Entorno de vista de plasmoides
@@ -33,6 +34,7 @@ Keywords=
Name=PlasmoidViewerShell
Name[ca]=Intèrpret d'ordres del visor de plasmoides
Name[ca@valencia]=Intèrpret d'ordes del visor de plasmoides
+Name[da]=PlasmoidViewerShell
Name[de]=PlasmoidViewerShell
Name[en_GB]=PlasmoidViewerShell
Name[es]=Entorno de vista de plasmoides
diff --git a/themeexplorer/package/metadata.desktop b/themeexplorer/package/metadata.desktop
index 7577123..4859d64 100644
--- a/themeexplorer/package/metadata.desktop
+++ b/themeexplorer/package/metadata.desktop
@@ -3,6 +3,7 @@ Comment=Explore and edit your Plasma themes
Comment[ast]=Esplora y edita los tos temes Plasma
Comment[ca]=Explora i edita els vostres temes de Plasma
Comment[ca@valencia]=Explora i edita els vostres temes de Plasma
+Comment[da]=Udforsk og redigér dine Plasma-temaer
Comment[de]=Erforschen und bearbeiten Sie Ihre Plasma-Designs
Comment[en_GB]=Explore and edit your Plasma themes
Comment[es]=Explorar y editar sus temas de Plasma
@@ -34,6 +35,7 @@ Keywords=
Name=Plasma Theme Explorer
Name[ca]=Explorador pels temes del Plasma
Name[ca@valencia]=Explorador pels temes del Plasma
+Name[da]=Plasma temaudforsker
Name[de]=Plasma-Designexplorer
Name[en_GB]=Plasma Theme Explorer
Name[es]=Explorador de temas de Plasma
commit 315628c9290600139eb28c720ab8f2c06f7331ec
Author: l10n daemon script <scripty@kde.org>
Date: Fri Dec 2 05:51:35 2016 +0100
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"
diff --git a/plasmate/plugins/plasmaprojectmanager/kdevplasmamanager.json b/plasmate/plugins/plasmaprojectmanager/kdevplasmamanager.json
index 2cab26c..2159cc3 100644
--- a/plasmate/plugins/plasmaprojectmanager/kdevplasmamanager.json
+++ b/plasmate/plugins/plasmaprojectmanager/kdevplasmamanager.json
@@ -109,4 +109,4 @@
"org.kdevelop.IProjectFileManager"
],
"X-KDevelop-Mode": "GUI"
-}
\ No newline at end of file
+}
commit 75a6d306dfa3ee0a57e9a3ca949caadcfd0ee504
Author: l10n daemon script <scripty@kde.org>
Date: Tue Nov 29 05:46:32 2016 +0100
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"
diff --git a/lookandfeelexplorer/package/metadata.desktop b/lookandfeelexplorer/package/metadata.desktop
index c676212..205a520 100644
--- a/lookandfeelexplorer/package/metadata.desktop
+++ b/lookandfeelexplorer/package/metadata.desktop
@@ -17,6 +17,10 @@ Comment[pt]=Explore e edite os seus temas de Aparência e Comportamento do Plasm
Comment[ru]=Просмотр и редактирование оформлений Plasma
Comment[sk]=Preskúmať a upraviť vaše témy Plasma
Comment[sl]=Raziščite in uredite vaše teme Videza in občutka za Plasmo
+Comment[sr]=Истражујте и уређујте плазма теме изгледа и осећаја
+Comment[sr@ijekavian]=Истражујте и уређујте плазма теме изгледа и осећаја
+Comment[sr@ijekavianlatin]=Istražujte i uređujte plasma teme izgleda i osećaja
+Comment[sr@latin]=Istražujte i uređujte plasma teme izgleda i osećaja
Comment[sv]=Utforska och redigera Plasma utseende och känsla-teman
Comment[uk]=Навігація вашими темами вигляду Плазми та редагування тем
Comment[x-test]=xxExplore and edit your Plasma Look And Feel themesxx
@@ -43,6 +47,10 @@ Name[pt]=Explorador de Aparências e Comportamentos do Plasma
Name[ru]=Редактор оформлений Plasma
Name[sk]=Prehliadač témy Plasma
Name[sl]=Raziskovalnik Videza in občutka za Plasmo
+Name[sr]=Истраживач плазма изгледа и осећаја
+Name[sr@ijekavian]=Истраживач плазма изгледа и осећаја
+Name[sr@ijekavianlatin]=Istraživač plasma izgleda i osećaja
+Name[sr@latin]=Istraživač plasma izgleda i osećaja
Name[sv]=Plasma utseende och känsla-utforskare
Name[uk]=Навігатор темами вигляду Плазми
Name[x-test]=xxPlasma Look And Feel Explorerxx
Reply to: