From e1c4da47a946a9293d020512c802cb5abd2ec278 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 25 Aug 2018 05:37:27 +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 31011091b..7179e2453 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -9,6 +9,7 @@ Name[fi]=Keskipainikelatain Name[fr]=MiddleClickLoader Name[it]=Caricatore al clic centrale Name[nl]=MiddleClickLoader +Name[nn]=Lasting med midtklikk Name[pt]=CarregadorBotãoMeio Name[sv]=Mittenklicksinläsning Name[uk]=Завантажувач за клацанням середньою @@ -18,6 +19,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[cs]=Načíst text ve schránce výběru jako URL Comment[en_GB]=Load text in selection clipboard as URL +Comment[es]=Cargar texto seleccionado en el portapapeles como 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