From f24c523ddfc25896ef85a1b3118358962d5c276f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 16 Feb 2016 11:14:35 +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" --- akregator/configuration/akregator_config_adblock.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/akregator/configuration/akregator_config_adblock.desktop b/akregator/configuration/akregator_config_adblock.desktop index 3a64a6e58f..3db110408d 100644 --- a/akregator/configuration/akregator_config_adblock.desktop +++ b/akregator/configuration/akregator_config_adblock.desktop @@ -12,6 +12,7 @@ X-KDE-Weight=100 Name=AdBlock Name[ca]=Bloqueig publicitari Name[ca@valencia]=Bloqueig publicitari +Name[cs]=AdBlock Name[de]=AdBlock Name[en_GB]=AdBlock Name[es]=AdBlock @@ -34,6 +35,7 @@ Name[x-test]=xxAdBlockxx Comment=Configure AdBlock Comment[ca]=Configura el bloqueig publicitari Comment[ca@valencia]=Configura el bloqueig publicitari +Comment[cs]=Nastavit AdBlock Comment[de]=AdBlock einrichten Comment[en_GB]=Configure AdBlock Comment[es]=Configurar AdBlock -- 2.11.4.GIT