From 742e2647078b4bb2ec2cc78fc8b5cbb8f7caeaa9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 13 Jan 2020 09:35:10 +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" --- settings/konqhtml/khtml_general.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/konqhtml/khtml_general.desktop b/settings/konqhtml/khtml_general.desktop index f470b84d8..716bcb7a8 100644 --- a/settings/konqhtml/khtml_general.desktop +++ b/settings/konqhtml/khtml_general.desktop @@ -178,7 +178,7 @@ X-KDE-Keywords[eu]=konqueror,fitxak X-KDE-Keywords[fi]=konqueror,välilehdet X-KDE-Keywords[fr]=konqueror, onglets X-KDE-Keywords[ga]=Konqueror,cluaisíní -X-KDE-Keywords[gl]=konqueror,lapelas +X-KDE-Keywords[gl]=konqueror,separadores X-KDE-Keywords[he]=konqueror,tabs X-KDE-Keywords[hu]=konqueror,lapok X-KDE-Keywords[ia]=konqueror,schedas -- GitLab