From 42e0c865b221afa9a18bc0f8c8e8241f7c3e8749 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 17 Oct 2018 06:32:51 +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/plugins/TestPlugin/metadata.desktop | 2 +- src/scripts/helloqml/metadata.desktop | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/TestPlugin/metadata.desktop b/src/plugins/TestPlugin/metadata.desktop index e91dd6006..d91108e31 100644 --- a/src/plugins/TestPlugin/metadata.desktop +++ b/src/plugins/TestPlugin/metadata.desktop @@ -8,7 +8,7 @@ Name[de]=Beispielmodul Name[en_GB]=Example Plugin Name[es]=Complemento de ejemplo Name[fi]=Esimerkkiliitännäinen -Name[fr]=Module externe d'exemple +Name[fr]=Exemple de module externe Name[gl]=Complemento de exemplo Name[id]=Example Plugin Name[it]=Estensione di esempio diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index b183781b6..3a2a052c8 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -3,6 +3,7 @@ Name=Hello Qml Name[ca]=Hola Qml Name[ca@valencia]=Hola Qml Name[es]=Hola Qml +Name[fr]=Bonjour Qml Name[id]=Hello Qml Name[nl]=Hello Qml Name[pt]=Olá em QML @@ -13,6 +14,7 @@ Comment=Sample Qml Plugin Comment[ca]=Connector Qml d'exemple Comment[ca@valencia]=Connector Qml d'exemple Comment[es]=Complemento de ejemplo de Qml +Comment[fr]=Exemple de module externe Qml Comment[id]=Contoh Plugin Qml Comment[nl]=Voorbeeld Qml-plug-in Comment[pt]='Plugin' de Exemplo em QML