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"
8 years ago · 853baa8232
parent 7c570c93db
commit 853baa8232
5 changed files with 6 additions and 4 deletions
--- a/src/plugins/StatusBarIcons/metadata.desktop
+++ b/src/plugins/StatusBarIcons/metadata.desktop
@ -10,7 +10,7 @@ Name[es]=Iconos de la barra de tareas
 Name[fi]=Tilarivin kuvakkeet
 Name[fr]=Icônes de la barre d'état
 Name[gl]=Iconas da barra de estado
-Name[id]=Ikon BilahStatus
+Name[id]=StatusBar Icons
 Name[it]=Icone della barra di stato
 Name[nl]=Pictogrammen op de statusbalk
 Name[nn]=Statuslinje-ikon
--- a/src/plugins/TabManager/metadata.desktop
+++ b/src/plugins/TabManager/metadata.desktop
@ -10,7 +10,7 @@ Name[es]=Gestor de pestañas
 Name[fi]=Välilehtien hallinta
 Name[fr]=Gestionnaire d'onglets
 Name[gl]=Xestor de lapelas
-Name[id]=Pengelola Tab
+Name[id]=Tab Manager
 Name[it]=Gestore delle schede
 Name[nl]=Tabbladbeheerder
 Name[nn]=Fanehandsamar
--- a/src/plugins/TestPlugin/metadata.desktop
+++ b/src/plugins/TestPlugin/metadata.desktop
@ -10,7 +10,7 @@ Name[es]=Complemento de ejemplo
 Name[fi]=Esimerkkiliitännäinen
 Name[fr]=Module externe d'exemple
 Name[gl]=Complemento de exemplo
-Name[id]=Contoh Plugin
+Name[id]=Example Plugin
 Name[it]=Estensione di esempio
 Name[nl]=Voorbeeld plug-in
 Name[nn]=Eksempel-tillegg
--- a/src/plugins/VerticalTabs/metadata.desktop
+++ b/src/plugins/VerticalTabs/metadata.desktop
@ -10,7 +10,7 @@ Name[es]=Pestañas verticales
 Name[fi]=Pystyvälilehdet
 Name[fr]=Onglets verticaux
 Name[gl]=Lapelas verticais
-Name[id]=Tab Tegak
+Name[id]=Vertical Tabs
 Name[it]=Schede verticali
 Name[nl]=Verticale tabbladen
 Name[nn]=Loddrette faner
--- a/src/scripts/middleclickloader/metadata.desktop
+++ b/src/scripts/middleclickloader/metadata.desktop
@ -7,6 +7,7 @@ Name[en_GB]=MiddleClickLoader
 Name[es]=Cargador de clic central
 Name[fi]=Keskipainikelatain
 Name[fr]=MiddleClickLoader
+Name[id]=MiddleClickLoader
 Name[it]=Caricatore al clic centrale
 Name[nl]=MiddleClickLoader
 Name[nn]=Lasting med midtklikk
@ -22,6 +23,7 @@ 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[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[pt]=Carrega o texto na área de transferência como um URL