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-06-25 05:10:45 +02:00
parent cd55d5e050
commit d712dbbd40
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/photo/kdeconnect_photo.json
View file

@ -56,6 +56,7 @@
"Name": "Photo", "Name": "Photo",
"Name[ca@valencia]": "Fotografia", "Name[ca@valencia]": "Fotografia",
"Name[ca]": "Fotografia", "Name[ca]": "Fotografia",
"Name[de]": "Foto",
"Name[en_GB]": "Photo", "Name[en_GB]": "Photo",
"Name[es]": "Fotografía", "Name[es]": "Fotografía",
"Name[fi]": "Valokuva", "Name[fi]": "Valokuva",

1
plugins/telephony/kdeconnect_telephony.json
View file

@ -43,6 +43,7 @@
"Description": "Show notifications for incoming calls", "Description": "Show notifications for incoming calls",
"Description[ca@valencia]": "Mostra les notificacions de les trucades entrants", "Description[ca@valencia]": "Mostra les notificacions de les trucades entrants",
"Description[ca]": "Mostra les notificacions de les trucades entrants", "Description[ca]": "Mostra les notificacions de les trucades entrants",
"Description[de]": "Benachrichtigungen über eingehende Anrufe anzeigen",
"Description[en_GB]": "Show notifications for incoming calls", "Description[en_GB]": "Show notifications for incoming calls",
"Description[es]": "Mostrar notificaciones para llamadas entrantes", "Description[es]": "Mostrar notificaciones para llamadas entrantes",
"Description[fi]": "Näytä saapuvista puheluista ilmoitus", "Description[fi]": "Näytä saapuvista puheluista ilmoitus",

1
runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop
View file

@ -3,6 +3,7 @@ Name=Run command
Name[ca]=Executa una ordre Name[ca]=Executa una ordre
Name[ca@valencia]=Executa una ordre Name[ca@valencia]=Executa una ordre
Name[cs]=Spustit příkaz Name[cs]=Spustit příkaz
Name[de]=Befehl ausführen
Name[en_GB]=Run command Name[en_GB]=Run command
Name[es]=Ejecutar orden Name[es]=Ejecutar orden
Name[fi]=Suorita komento Name[fi]=Suorita komento