mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-24 04: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:
parent
0abde8b755
commit
ce21076452
@ -1,6 +1,16 @@
|
||||
[Desktop Entry]
|
||||
Name=Hello Qml
|
||||
Name[ca]=Hola Qml
|
||||
Name[nl]=Hello Qml
|
||||
Name[pt]=Olá em QML
|
||||
Name[uk]=Привіт, Qml
|
||||
Name[x-test]=xxHello Qmlxx
|
||||
Comment=Sample Qml Plugin
|
||||
Comment[ca]=Connector Qml d'exemple
|
||||
Comment[nl]=Voorbeeld Qml-plug-in
|
||||
Comment[pt]='Plugin' de Exemplo em QML
|
||||
Comment[uk]=Зразок додатка Qml
|
||||
Comment[x-test]=xxSample Qml Pluginxx
|
||||
Icon=
|
||||
Type=Service
|
||||
X-Falkon-Author=Anmol Gautam
|
||||
|
Loading…
Reference in New Issue
Block a user