From cc248c72c8a4cf3d5591db8b06dd8fa39b398032 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 25 May 2019 08:42:22 +0200 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" --- src/plugins/KDEFrameworksIntegration/metadata.desktop | 1 + src/scripts/helloqml/metadata.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop index adbc1fa8f..0825ed4c9 100644 --- a/src/plugins/KDEFrameworksIntegration/metadata.desktop +++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop @@ -24,6 +24,7 @@ Comment=Provides support for KIO and storing passwords in KWallet Comment[ca]=Proporciona suport pel KIO i per emmagatzemar les contrasenyes al KWallet Comment[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar les contrasenyes al KWallet Comment[cs]=Poskytuje podporu pro KIO a ukládání hesel v Kwallet +Comment[de]=Unterstützung für KIO und die Speicherung von Passwörtern in KWallet Comment[en_GB]=Provides support for KIO and storing passwords in KWallet Comment[es]=Implementa KIO y almacenamiento de contraseñas en KWallet Comment[fi]=Tarjoaa KIO-tuen sekä salasanojen tallentamisen KWalletiin diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index 781aa1821..11d8eca1e 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -24,6 +24,7 @@ Comment=Sample Qml Plugin Comment[ca]=Connector QML d'exemple Comment[ca@valencia]=Connector QML d'exemple Comment[cs]=Ukázkový modul QML +Comment[de]=Beispielmodul in Qml Comment[en_GB]=Sample QML Plugin Comment[es]=Complemento de ejemplo de Qml Comment[fi]=Esimerkki-QML-liitännäinen