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
49ac81c4b7
commit
0b8fda3ab3
1 changed files with 2 additions and 0 deletions
|
@ -23,6 +23,7 @@
|
|||
"Description[sv]": "Skicka fil till en annan enhet med användning av KDE:s anslutningstjänst",
|
||||
"Description[uk]": "Надіслати файл на інший пристрій за допомогою KDE Connect",
|
||||
"Description[x-test]": "xxSend file to other device using KDE Connectxx",
|
||||
"Description[zh_CN]": "使用 KDE Connect 将文件发送到其他设备",
|
||||
"Description[zh_TW]": "使用 KDE 連線傳送檔案至其他裝置",
|
||||
"Icon": "kdeconnect",
|
||||
"License": "GPL",
|
||||
|
@ -51,6 +52,7 @@
|
|||
"Name[sv]": "Skicka fil via KDE:s anslutningstjänst",
|
||||
"Name[uk]": "Надіслати файл за допомогою KDE Connect",
|
||||
"Name[x-test]": "xxSend file via KDE Connectxx",
|
||||
"Name[zh_CN]": "通过 KDE Connect 发送文件",
|
||||
"Name[zh_TW]": "使用 KDE 連線傳送檔案",
|
||||
"ServiceTypes": [
|
||||
"KFileItemAction/Plugin"
|
||||
|
|
Loading…
Reference in a new issue