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"
7 years ago · 6ae5f0e9e5
parent 3fdd1d95d3
commit 6ae5f0e9e5
1 changed files with 1 additions and 1 deletions
--- 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