1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00

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"
This commit is contained in:
l10n daemon script 2024-02-03 01:14:13 +00:00
parent caacfe7e2a
commit 518b65037c

View File

@ -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