From 3bf1f80e85ef8451c3203b684a03c44e453a7ec1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 23 Apr 2019 06:05:39 +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/helloqml/metadata.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index d538cd3f5..b491a9bbb 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -12,6 +12,7 @@ Name[gl]=Ola Qml Name[id]=Hello Qml Name[it]=Hello Qml Name[nl]=Hello Qml +Name[nn]=Hei, QML Name[pl]=Hello QML Name[pt]=Olá em QML Name[pt_BR]=Olá Qml @@ -34,6 +35,7 @@ Comment[gl]=Complemento de exemplo de Qml Comment[id]=Contoh Plugin Qml Comment[it]=Estensione di esempio in Qml Comment[nl]=Voorbeeld Qml-plug-in +Comment[nn]=Eksempel på QML-tillegg Comment[pl]=Przykładowa wtyczka QML Comment[pt]='Plugin' de Exemplo em QML Comment[pt_BR]=Plug-in QML de exemplo