From 10574667b138145719a3a43703030713e5c204e2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 26 Jul 2018 05:43:51 +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 27e9617ef..a98194050 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -2,6 +2,7 @@ Name=MiddleClickLoader Name[ca]=MiddleClickLoader Name[ca@valencia]=MiddleClickLoader +Name[cs]=Načtení prostředním tlačítkem myši Name[es]=Cargador de clic central Name[fr]=MiddleClickLoader Name[it]=Caricatore al clic centrale @@ -13,6 +14,7 @@ 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[cs]=Načíst text ve schránce výběru jako URL Comment[fr]=Charger l'URL sélectionnée dans le presse-papier Comment[it]=Carica come URL il testo negli appunti della selezione Comment[nl]=Tekst laden in selectieklembord als URL