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
bee6c4a8be
commit
35f0747ff0
1 changed files with 21 additions and 0 deletions
|
@ -1,7 +1,28 @@
|
|||
[Desktop Entry]
|
||||
Name=KDE Connect SMS
|
||||
Name[ca]=SMS del KDE Connect
|
||||
Name[ca@valencia]=SMS del KDE Connect
|
||||
Name[nl]=KDE Connect SMS
|
||||
Name[pt]=SMS do KDE Connect
|
||||
Name[sv]=KDE-anslut SMS
|
||||
Name[uk]=KDE Connect SMS
|
||||
Name[x-test]=xxKDE Connect SMSxx
|
||||
GenericName=SMS
|
||||
GenericName[ca]=SMS
|
||||
GenericName[ca@valencia]=SMS
|
||||
GenericName[nl]=SMS
|
||||
GenericName[pt]=SMS
|
||||
GenericName[sv]=SMS
|
||||
GenericName[uk]=SMS
|
||||
GenericName[x-test]=xxSMSxx
|
||||
Comment=Text Messaging
|
||||
Comment[ca]=Missatgeria de text
|
||||
Comment[ca@valencia]=Missatgeria de text
|
||||
Comment[nl]=Tekstberichten versturen
|
||||
Comment[pt]=Mensagem de Texto
|
||||
Comment[sv]=Textmeddelanden
|
||||
Comment[uk]=Обмін текстовими повідомленнями
|
||||
Comment[x-test]=xxText Messagingxx
|
||||
Exec=kdeconnect-sms
|
||||
Icon=kdeconnect
|
||||
Type=Application
|
||||
|
|
Loading…
Reference in a new issue