Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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 02:56:48 +00:00
parent 13ffc9fbc9
commit 63e4b293e1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scripts/helloqml/metadata.desktop
View File

@ -64,7 +64,7 @@ Comment[is]=Dæmi um Qml-viðbót
Comment[it]=Estensione di esempio in Qml Comment[it]=Estensione di esempio in Qml
Comment[ka]=მაგალითისთვის მოყვანილი QML დამატება Comment[ka]=მაგალითისთვის მოყვანილი QML დამატება
Comment[ko]=예제 QML 플러그인 Comment[ko]=예제 QML 플러그인
Comment[lt]=Pavyzdinis Qml papildinys Comment[lt]=Pavyzdinis Qml įskiepis
Comment[nl]=Voorbeeld Qml-plug-in Comment[nl]=Voorbeeld Qml-plug-in
Comment[nn]=Eksempel på QML-tillegg Comment[nn]=Eksempel på QML-tillegg
Comment[pl]=Przykładowa wtyczka QML Comment[pl]=Przykładowa wtyczka QML