From cff2b68ce9b39aace15aa1c81af1b127c8cc1f8e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 20 Jul 2018 05:26:58 +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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index c2babbd61..a9e01e7b5 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=MiddleClickLoader Name[es]=Cargador de clic central Name[nl]=MiddleClickLoader Name[pt]=CarregadorBotãoMeio +Name[sv]=Mittenklicksinläsning Name[uk]=Завантажувач за клацанням середньою Name[x-test]=xxMiddleClickLoaderxx Comment=Load text in selection clipboard as URL @@ -12,6 +13,7 @@ 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[sv]=Läs in text i markeringen eller klippbordet som webbadress Comment[uk]=Завантажує текст у буфері обміну як адресу Comment[x-test]=xxLoad text in selection clipboard as URLxx