From daf02cc0283df83ac8a52aa7a0e09b8e42171cdd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 30 Apr 2021 01:17:56 +0000 Subject: [PATCH] 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" --- kwinmultitasking/metadata.desktop | 1 + look-and-feel/metadata.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/kwinmultitasking/metadata.desktop b/kwinmultitasking/metadata.desktop index 30f33291..81fc3a62 100644 --- a/kwinmultitasking/metadata.desktop +++ b/kwinmultitasking/metadata.desktop @@ -38,6 +38,7 @@ Comment[ast]=Interfaz d'usuariu multixera pa teléfonos Comment[ca]=Interfície d'usuari multitasca per als dispositius de telèfon Comment[ca@valencia]=Interfície d'usuari multitasca per als dispositius de telèfon Comment[da]=Brugerflade med multitasking til telefoner +Comment[de]=Multitasking-Benutzeroberfläche für Plasma-Telefongeräte Comment[en_GB]=Multitasking user interface for Phone devices Comment[es]=Interfaz de usuario multitarea para teléfonos Comment[et]=Telefonide multitegumtöö kasutajaliides diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop index 4dbb0cfd..d9e64337 100644 --- a/look-and-feel/metadata.desktop +++ b/look-and-feel/metadata.desktop @@ -5,6 +5,7 @@ Name[ca]=Telèfon del Plasma Name[ca@valencia]=Telèfon del Plasma Name[cs]=Plasma Phone Name[da]=Plasma Phone +Name[de]=Plasma Phone Name[en_GB]=Plasma Phone Name[es]=Plasma Phone Name[et]=Plasma telefon