From a9d4f3812caa2893ef6ca0c5adf7b2146e83e1ae Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 13 Jul 2018 05:26:12 +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" --- tabsrunner/plasma-runner-browsertabs.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/tabsrunner/plasma-runner-browsertabs.desktop b/tabsrunner/plasma-runner-browsertabs.desktop index f0ac967a..a00c57c7 100644 --- a/tabsrunner/plasma-runner-browsertabs.desktop +++ b/tabsrunner/plasma-runner-browsertabs.desktop @@ -4,6 +4,7 @@ Name[ar]=ألسنة المتصفّح Name[ca]=Pestanyes del navegador Name[ca@valencia]=Pestanyes del navegador Name[cs]=Karty prohlížeče +Name[da]=Browser-faneblade Name[de]=Browser-Unterfenster Name[el]=Καρτέλες περιηγητή Name[en_GB]=Browser Tabs -- GitLab