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:
l10n daemon script 2019-04-17 05:46:24 +02:00
parent c1be806f9d
commit 5cbc921f97

View file

@ -1,11 +1,16 @@
[Desktop Entry] [Desktop Entry]
Type=Service Type=Service
Name=Send file via KDE Connect service Name=Send file via KDE Connect service
Name[ca]=Envia el fitxer a través del servei KDE Connect
Name[uk]=Надіслати файл за допомогою служби KDE Connect
Name[x-test]=xxSend file via KDE Connect servicexx
Name[zh_TW]=使 KDE Connect
X-KDE-Library=kdeconnectfileitemaction X-KDE-Library=kdeconnectfileitemaction
X-KDE-Submenu=Connect X-KDE-Submenu=Connect
X-KDE-Submenu[ar]=اتّصل,اتصل X-KDE-Submenu[ar]=اتّصل,اتصل
X-KDE-Submenu[bg]=Свързване X-KDE-Submenu[bg]=Свързване
X-KDE-Submenu[bs]=Uspostavi vezu X-KDE-Submenu[bs]=Uspostavi vezu
X-KDE-Submenu[ca]=Connecta
X-KDE-Submenu[da]=Forbind X-KDE-Submenu[da]=Forbind
X-KDE-Submenu[de]=Verbinden X-KDE-Submenu[de]=Verbinden
X-KDE-Submenu[el]=Σύνδεση X-KDE-Submenu[el]=Σύνδεση
@ -28,6 +33,8 @@ X-KDE-Submenu[sk]=Pripojiť
X-KDE-Submenu[sv]=Anslut X-KDE-Submenu[sv]=Anslut
X-KDE-Submenu[tr]=Bağlan X-KDE-Submenu[tr]=Bağlan
X-KDE-Submenu[uk]=Зєднання X-KDE-Submenu[uk]=Зєднання
X-KDE-Submenu[x-test]=xxConnectxx
X-KDE-Submenu[zh_TW]=
Icon=preferences-system-network Icon=preferences-system-network
ServiceTypes=KFileItemAction/Plugin ServiceTypes=KFileItemAction/Plugin