From fc674750e5abd7e29437bfeaaa3473543c03f263 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 26 Feb 2016 09:35:08 +0000 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" --- desktop/konsolehere.desktop | 1 + desktop/konsolepart.desktop | 1 + desktop/konsolerun.desktop | 1 + desktop/org.kde.konsole.desktop | 2 ++ desktop/terminalemulator.desktop | 1 + 5 files changed, 6 insertions(+) diff --git a/desktop/konsolehere.desktop b/desktop/konsolehere.desktop index a911c02d..badae206 100644 --- 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 diff --git a/desktop/konsolepart.desktop b/desktop/konsolepart.desktop index 2923554b..f343caa6 100644 --- 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 diff --git a/desktop/konsolerun.desktop b/desktop/konsolerun.desktop index 59d3ed03..f7e17e6a 100644 --- 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 diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop index 90c88ee3..a75228eb 100755 --- 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 diff --git a/desktop/terminalemulator.desktop b/desktop/terminalemulator.desktop index 4937fff4..c54c48ce 100644 --- 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