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-07-21 05:13:52 +02:00
parent 4c6ebdbd86
commit 6fc5d43cdf
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/org.kde.kdeconnect_open.desktop
View file

@ -1,7 +1,16 @@
[Desktop Entry] [Desktop Entry]
GenericName=Open on connected device via KDE Connect GenericName=Open on connected device via KDE Connect
GenericName[ca]=Obre al dispositiu connectat a través del KDE Connect
GenericName[uk]=Відкрити на з'єднаному пристрої за допомогою KDE Connect
GenericName[x-test]=xxOpen on connected device via KDE Connectxx
Name=Open on connected device via KDE Connect Name=Open on connected device via KDE Connect
Name[ca]=Obre al dispositiu connectat a través del KDE Connect
Name[uk]=Відкрити на з'єднаному пристрої за допомогою KDE Connect
Name[x-test]=xxOpen on connected device via KDE Connectxx
Comment=Open on a connected device using KDE Connect Comment=Open on a connected device using KDE Connect
Comment[ca]=Obre a un dispositiu connectat usant el KDE Connect
Comment[uk]=Відкрити на з'єднаному пристрої за допомогою KDE Connect
Comment[x-test]=xxOpen on a connected device using KDE Connectxx
MimeType=*/*; MimeType=*/*;
Exec=kdeconnect-handler --open %U Exec=kdeconnect-handler --open %U
Icon=kdeconnect Icon=kdeconnect