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-05-04 05:49:17 +02:00
parent 6fb67d0261
commit ac2ac5ba20
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fileitemactionplugin/kdeconnectsendfile.desktop
View file

@ -3,6 +3,7 @@ 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[ca]=Envia el fitxer a través del servei KDE Connect
Name[ca@valencia]=Envia el fitxer a través del servei KDE Connect Name[ca@valencia]=Envia el fitxer a través del servei KDE Connect
Name[cs]=Poslat soubor přes službu KDE Connect
Name[en_GB]=Send file via KDE Connect service Name[en_GB]=Send file via KDE Connect service
Name[es]=Enviar archivo a través del servicio KDE Connect Name[es]=Enviar archivo a través del servicio KDE Connect
Name[fi]=Lähetä tiedosto KDE Connect -palvelulla Name[fi]=Lähetä tiedosto KDE Connect -palvelulla
@ -24,6 +25,7 @@ X-KDE-Submenu[bg]=Свързване
X-KDE-Submenu[bs]=Uspostavi vezu X-KDE-Submenu[bs]=Uspostavi vezu
X-KDE-Submenu[ca]=Connecta X-KDE-Submenu[ca]=Connecta
X-KDE-Submenu[ca@valencia]=Connecta X-KDE-Submenu[ca@valencia]=Connecta
X-KDE-Submenu[cs]=Připojit
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]=Σύνδεση