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 2021-07-23 01:13:23 +00:00
parent 3cde8c73f7
commit a6c8498e9b
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/kdeconnect-dde.desktop
View file

@ -5,6 +5,7 @@ Encoding=UTF-8
Exec=kdeconnect-handler %F Exec=kdeconnect-handler %F
Icon=kdeconnect Icon=kdeconnect
Name=Send via KDE Connect Name=Send via KDE Connect
Name[ar]=أرسل عبر خدمة «كدي المتّصل»
Name[az]=KDE Connect ilə göndərin Name[az]=KDE Connect ilə göndərin
Name[ca]=Envia a través del KDE Connect Name[ca]=Envia a través del KDE Connect
Name[ca@valencia]=Envia a través del KDE Connect Name[ca@valencia]=Envia a través del KDE Connect

1
data/kdeconnect-thunar.desktop
View file

@ -5,6 +5,7 @@ Encoding=UTF-8
Exec=kdeconnect-handler %F Exec=kdeconnect-handler %F
Icon=kdeconnect Icon=kdeconnect
Name=Send via KDE Connect Name=Send via KDE Connect
Name[ar]=أرسل عبر خدمة «كدي المتّصل»
Name[az]=KDE Connect ilə göndərin Name[az]=KDE Connect ilə göndərin
Name[ca]=Envia a través del KDE Connect Name[ca]=Envia a través del KDE Connect
Name[ca@valencia]=Envia a través del KDE Connect Name[ca@valencia]=Envia a través del KDE Connect