From 3bc0c165af47db791be5b63038e799b439777aba Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 3 May 2019 05:50:54 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index 928162fd7..e17f69c08 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -35,6 +35,7 @@ Comment[gl]=Cargar texto no portapapeis de selección como URL Comment[id]=Muat teks dalam seleksi clipboard sebagai URL Comment[it]=Carica come URL il testo negli appunti della selezione Comment[nl]=Tekst laden in selectieklembord als URL +Comment[nn]=Last tekst i utvals-utklippstavla som adresser Comment[pl]=Wczytaj tekst ze schowka jako adres URL Comment[pt]=Carrega o texto na área de transferência como um URL Comment[pt_BR]=Carrega o texto na área de transferência como uma URL