From 5722f9f996c2c57f43c254a5f0102843def5eca8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 16 Aug 2018 05:29:28 +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 eb5610ea0..31011091b 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -3,6 +3,7 @@ Name=MiddleClickLoader Name[ca]=MiddleClickLoader Name[ca@valencia]=MiddleClickLoader Name[cs]=Načtení prostředním tlačítkem myši +Name[en_GB]=MiddleClickLoader Name[es]=Cargador de clic central Name[fi]=Keskipainikelatain Name[fr]=MiddleClickLoader @@ -16,6 +17,7 @@ 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[cs]=Načíst text ve schránce výběru jako URL +Comment[en_GB]=Load text in selection clipboard as URL Comment[fi]=Lataa leikepöytävalinnan tekstin verkko-osoitteeksi Comment[fr]=Charger l'URL sélectionnée dans le presse-papier Comment[it]=Carica come URL il testo negli appunti della selezione