From 6ae5f0e9e52d3c30ed73cf680fc3906afd8f60ac Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 23 Jun 2019 18:39:57 +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, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index 224fb1ae0..840d01525 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -33,7 +33,7 @@ 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[gl]=Cargar texto no portapapeis de selección como URL -Comment[id]=Muat teks dalam seleksi clipboard sebagai URL +Comment[id]=Muat teks dalam seleksi papan-klip sebagai URL Comment[it]=Carica come URL il testo negli appunti della selezione Comment[ko]=선택 클립보드에 있는 텍스트를 URL로 불러오기 Comment[nl]=Tekst laden in selectieklembord als URL