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"
10 years ago · fc674750e5
parent 9a5ded6a96
commit fc674750e5
5 changed files with 6 additions and 0 deletions
--- a/desktop/konsolehere.desktop
+++ b/desktop/konsolehere.desktop
@ -114,6 +114,7 @@ Comment[ia]=Aperi un terminal al dossier currente
 Comment[it]=Apre un terminale alla cartella attuale
 Comment[ko]=현재 폴더에서 터미널 열기
 Comment[nl]=Opent een terminal in de huidige map
 Comment[nn]=Opnar eit terminalvindauge i gjeldande mappe
 Comment[pl]=Otwiera terminal w bieżącym katalogu
 Comment[pt]=Abre um terminal na pasta actual
 Comment[pt_BR]=Abre um terminal na pasta atual
--- a/desktop/konsolepart.desktop
+++ b/desktop/konsolepart.desktop
@ -116,6 +116,7 @@ Comment[ia]=Accesso a linea de commando
 Comment[it]=Accesso alla riga di comando
 Comment[ko]=명령행 접근
 Comment[nl]=Toegang tot de opdrachtregel
 Comment[nn]=Kommandolinjetilgang
 Comment[pl]=Dostęp do wiersza poleceń
 Comment[pt]=Acesso à linha de comandos
 Comment[pt_BR]=Acesso à linha de comandos
--- a/desktop/konsolerun.desktop
+++ b/desktop/konsolerun.desktop
@ -70,6 +70,7 @@ Comment[ia]=Executa intra Konsole
 Comment[it]=Esegui in Konsole
 Comment[ko]=Konsole에서 실행
 Comment[nl]=In Konsole uitvoeren
 Comment[nn]=Køyr inni konsoll
 Comment[pl]=Uruchom wewnątrz konsoli
 Comment[pt]=Executar no Konsole
 Comment[pt_BR]=Executar no Konsole
--- a/desktop/org.kde.konsole.desktop
+++ b/desktop/org.kde.konsole.desktop
@ -200,6 +200,7 @@ Comment[ia]=Accesso a linea de commando
 Comment[it]=Accesso alla riga di comando
 Comment[ko]=명령행 접근
 Comment[nl]=Toegang tot de opdrachtregel
 Comment[nn]=Kommandolinjetilgang
 Comment[pl]=Dostęp do wiersza poleceń
 Comment[pt]=Acesso à linha de comandos
 Comment[pt_BR]=Acesso à linha de comandos
@ -277,6 +278,7 @@ Name[ia]=Aperi un nove scheda
 Name[it]=Apri in una nuova scheda
 Name[ko]=새 탭 열기
 Name[nl]=Een nieuw tabblad openen
 Name[nn]=Opna ny fane
 Name[pl]=Otwórz nową kartę
 Name[pt]=Abrir uma Nova Página
 Name[pt_BR]=Abre uma nova aba
--- a/desktop/terminalemulator.desktop
+++ b/desktop/terminalemulator.desktop
@ -107,6 +107,7 @@ Comment[ia]=Accesso a linea de commando
 Comment[it]=Accesso alla riga di comando
 Comment[ko]=명령행 접근
 Comment[nl]=Toegang tot de opdrachtregel
 Comment[nn]=Kommandolinjetilgang
 Comment[pl]=Dostęp do wiersza poleceń
 Comment[pt]=Acesso à linha de comandos
 Comment[pt_BR]=Acesso à linha de comandos