From ba16c6711544350b6fc45c1a63d09b1e9ba845f8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 9 Apr 2018 07:08:34 +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/KWalletPasswords/metadata.desktop | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/KWalletPasswords/metadata.desktop b/src/plugins/KWalletPasswords/metadata.desktop index b160721b9..d02c67a30 100644 --- a/src/plugins/KWalletPasswords/metadata.desktop +++ b/src/plugins/KWalletPasswords/metadata.desktop @@ -11,7 +11,11 @@ Name[uk]=Паролі KWallet Name[x-test]=xxKWallet Passwordsxx Comment=Provides support for storing passwords in KWallet Comment[ca]=Proporciona suport per emmagatzemar contrasenyes al KWallet +Comment[en_GB]=Provides support for storing passwords in KWallet Comment[it]=Fornisce un supporto per l'immagazzinamento delle password in KWallet +Comment[nl]=Biedt ondersteuning voor opslaan van wachtwoorden in KWallet +Comment[sv]=Tillhandahåller stöd för att lagra lösenord i plånboken +Comment[uk]=Забезпечує підтримку зберігання паролів у KWallet Comment[x-test]=xxProvides support for storing passwords in KWalletxx Icon=:kwp/data/icon.png