mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +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:
parent
caacfe7e2a
commit
518b65037c
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user