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 2019-04-10 06:05:14 +02:00
parent 7df58d0d04
commit 0fa2bcd464
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop
View file

@ -16,6 +16,7 @@ Name[sk]=Nájsť moje zariadenie
Name[sv]=Hitta min apparat
Name[uk]=Знайти пристрій
Name[x-test]=xx Find my devicexx
Name[zh_CN]= 查找我的设备
Name[zh_TW]= 尋找我的裝置
Comment=Ring connected devices
Comment[ca]=Fa sonar als dispositius connectats
@ -34,6 +35,7 @@ Comment[sk]=Prezvoniť pripojené zariadenia
Comment[sv]=Ring anslutna apparater
Comment[uk]=Дзвінок на з'єднаних пристроях
Comment[x-test]=xxRing connected devicesxx
Comment[zh_CN]=已连接的设备
Comment[zh_TW]=讓連結的裝置發出鈴聲
Icon=kdeconnect
Type=Service

2
runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop
View file

@ -16,6 +16,7 @@ Name[sk]=Spustiť príkaz
Name[sv]=Kör kommando
Name[uk]=Виконати команду
Name[x-test]=xxRun commandxx
Name[zh_CN]=运行命令
Name[zh_TW]=執行指令
Comment=Run commands on connected devices
Comment[ca]=Executa les ordres als dispositius connectats
@ -34,6 +35,7 @@ Comment[sk]=Spustiť príkaz na pripojených zariadeniach
Comment[sv]=Kör kommando på anslutna apparater
Comment[uk]=Виконання команд на з'єднаних пристроях
Comment[x-test]=xxRun commands on connected devicesxx
Comment[zh_CN]=在连接的设备上运行命令
Comment[zh_TW]=在連結的裝置上執行指令
Icon=kdeconnect
Type=Service