From 2fe55e759415fab9eda087286b9f162639c73c8c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 19 Aug 2021 02:13:52 +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 3607415ca..0c5d614e9 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -52,7 +52,7 @@ 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 +Comment[pt_BR]=Plugin QML de exemplo Comment[ru]=Пример подключаемого модуля QML Comment[sk]=Ukážkový QML plugin Comment[sl]=Primer vtičnika za Qml