From d5fa8bcf86fc5b3ed2e5f3b795faab4c9a01e6fe Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 13 Feb 2019 08:49:28 +0100 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/GnomeKeyringPasswords/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/GnomeKeyringPasswords/metadata.desktop b/src/plugins/GnomeKeyringPasswords/metadata.desktop index 64ab27dc5..cfb340fbd 100644 --- a/src/plugins/GnomeKeyringPasswords/metadata.desktop +++ b/src/plugins/GnomeKeyringPasswords/metadata.desktop @@ -16,7 +16,7 @@ Name[nl]=GNOME-sleutelbos wachtwoorden Name[nn]=Passord for Gnome-nøkkelring Name[pl]=Hasła pęku kluczy Gnome Name[pt]=Senhas no Porta-Chaves do Gnome -Name[pt_BR]=Senhas do chaveiro do Gnome +Name[pt_BR]=Senhas do chaveiro do GNOME Name[sk]=Heslá Gnome kľúčenky Name[sv]=Gnome-nyckelring lösenord Name[uk]=Паролі сховища ключів Gnome