tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2020-03-11 06:07:22 +01:00
parent e066ef9236
commit 81a2be7670
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fileitemactionplugin/kdeconnectsendfile.json
View file

@ -24,6 +24,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",
@ -53,6 +54,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"

2
plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
View file

@ -44,7 +44,7 @@
],
"Description": "Inhibit the screensaver when the device is connected",
"Description[ar]": "امنع حافظة الشّاشة إن كان الجهاز متّصلًا",
"Description[ca@valencia]": "Inhibeix l'estalvi de pantalla quan es connecta el dispositiu",
"Description[ca@valencia]": "Inhibeix l'estalvi de pantalla quan el dispositiu està connectat",
"Description[ca]": "Inhibeix l'estalvi de pantalla quan el dispositiu està connectat",
"Description[cs]": "Potlačit spořič pokud je zařízení připojeno",
"Description[da]": "Tilbagehold pauseskærmen når enheden er tilsluttet",