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
2c44f55f55
commit
af97c5f1ff
1 changed files with 8 additions and 0 deletions
|
@ -1,5 +1,13 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=KDE Connect SMS URL Handler
|
Name=KDE Connect SMS URL Handler
|
||||||
|
Name[ca]=Gestor d'URL de SMS del KDE Connect
|
||||||
|
Name[en_GB]=KDE Connect SMS URL Handler
|
||||||
|
Name[nl]=URL behandelaar van KDE-Connect-SMS
|
||||||
|
Name[pt]=Tratamento de URL's de SMS do KDE Connect
|
||||||
|
Name[sv]=KDE-anslut hanterare av SMS-webbadress
|
||||||
|
Name[uk]=Обробник адрес у SMS KDE Connect
|
||||||
|
Name[x-test]=xxKDE Connect SMS URL Handlerxx
|
||||||
|
Name[zh_TW]=KDE 連線簡訊網址處理器
|
||||||
Exec=kdeconnect-handler %U
|
Exec=kdeconnect-handler %U
|
||||||
Icon=kdeconnect
|
Icon=kdeconnect
|
||||||
Type=Application
|
Type=Application
|
||||||
|
|
Loading…
Reference in a new issue