From aca5cb0e1cf801193427a02a120e9c6bbb294f07 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 19 Jul 2018 05:21:21 +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/scripts/middleclickloader/metadata.desktop | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index ca7de41f4..c2babbd61 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -1,6 +1,19 @@ [Desktop Entry] Name=MiddleClickLoader +Name[ca]=MiddleClickLoader +Name[ca@valencia]=MiddleClickLoader +Name[es]=Cargador de clic central +Name[nl]=MiddleClickLoader +Name[pt]=CarregadorBotãoMeio +Name[uk]=Завантажувач за клацанням середньою +Name[x-test]=xxMiddleClickLoaderxx Comment=Load text in selection clipboard as URL +Comment[ca]=Carrega text com a URL en una selecció del porta-retalls +Comment[ca@valencia]=Carrega text com a URL en una selecció del porta-retalls +Comment[nl]=Tekst laden in selectieklembord als URL +Comment[pt]=Carrega o texto na área de transferência como um URL +Comment[uk]=Завантажує текст у буфері обміну як адресу +Comment[x-test]=xxLoad text in selection clipboard as URLxx Icon= Type=Service