From 1977a5250192447408a44ede4f8e32b3f03f8836 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 4 May 2024 03:21:19 +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" --- src/scripts/helloqml/metadata.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index 42e44fd5a..7693e8eb3 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -15,7 +15,7 @@ Name[es]=Hola Qml Name[et]=Tere QML Name[eu]=Kaixo QML Name[fi]=Hei QML -Name[fr]=Bonjour Qml +Name[fr]=Bonjour QML Name[gl]=Ola Qml Name[hu]=Helló QML Name[ia]=Salute Qml @@ -55,7 +55,7 @@ Comment[es]=Complemento de ejemplo de Qml Comment[et]=QML-i plugina näidis Comment[eu]=QML plugin lagina Comment[fi]=Esimerkki-QML-liitännäinen -Comment[fr]=Exemple de module externe Qml +Comment[fr]=Exemple de module externe QML Comment[gl]=Complemento de exemplo de Qml. Comment[hu]=Példa QML bővítmény Comment[ia]=Plugin de Qml de exemplo