From 518b65037c456ea9420367dc050dcee44990d07b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 3 Feb 2024 01:14:13 +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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index 2b52ad4a4..a137009ca 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -64,7 +64,7 @@ Comment[is]=Dæmi um Qml-viðbót Comment[it]=Estensione di esempio in Qml Comment[ka]=მაგალითისთვის მოყვანილი QML დამატება Comment[ko]=예제 QML 플러그인 -Comment[lt]=Pavyzdinis Qml papildinys +Comment[lt]=Pavyzdinis Qml įskiepis Comment[nl]=Voorbeeld Qml-plug-in Comment[nn]=Eksempel på QML-tillegg Comment[pl]=Przykładowa wtyczka QML