From 57e867035aa47b7fee5bc8882311d2ba4fb66742 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 4 May 2024 01:21:00 +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 38efa9276..6b3876026 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 @@ -56,7 +56,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