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 2017-11-10 04:50:10 +01:00
parent 405825b304
commit fc13865911
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
indicator/org.kde.kdeconnect.nonplasma.desktop
View file

@ -24,6 +24,7 @@ Name[sv]=KDE-anslut indikator
Name[tr]=KDE Connect Göstergesi
Name[uk]=Індикатор KDE Connect
Name[x-test]=xxKDE Connect Indicatorxx
Name[zh_CN]=KDE Connect 指示器
Comment=Display information about your devices
Comment[ar]=اعرض معلومات عن أجهزتك
Comment[ast]=Amuesa información tocante a los tos preseos

1
urlhandler/org.kde.kdeconnect.telhandler.desktop
View file

@ -23,6 +23,7 @@ Name[sv]=KDE-anslut hanterare av telefonwebbadress
Name[tr]=KDE Connect Telefon URL İşleyici
Name[uk]=Обробник телефонних адрес KDE Connect
Name[x-test]=xxKDE Connect Phone URL Handlerxx
Name[zh_CN]=KDE Connect 电话 URL 处理程序
Exec=kdeconnect-handler %U
Icon=kdeconnect
Type=Application