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 2020-09-29 06:04:37 +02:00
parent 8dd0111d99
commit be2d3947f1
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fileitemactionplugin/kdeconnectsendfile.json
View file

@ -7,6 +7,7 @@
"Description[ca]": "Envia fitxers a un altre dispositiu mitjançant el KDE Connect", "Description[ca]": "Envia fitxers a un altre dispositiu mitjançant el KDE Connect",
"Description[cs]": "Poslat soubor na jiné zařízení přes KDE Connect", "Description[cs]": "Poslat soubor na jiné zařízení přes KDE Connect",
"Description[da]": "Send fil til en anden enhed med brug af KDE Connect", "Description[da]": "Send fil til en anden enhed med brug af KDE Connect",
"Description[de]": "Datei zu anderem Gerät mit KDE Connect versenden",
"Description[en_GB]": "Send file to other device using KDE Connect", "Description[en_GB]": "Send file to other device using KDE Connect",
"Description[es]": "Enviar archivo a otro dispositivo usando KDE Connect", "Description[es]": "Enviar archivo a otro dispositivo usando KDE Connect",
"Description[et]": "Faili saatmine teise seadmesse KDE Connecti kaudu", "Description[et]": "Faili saatmine teise seadmesse KDE Connecti kaudu",

2
plugins/bigscreen/kdeconnect_bigscreen.json
View file

@ -39,6 +39,7 @@
"Description[ca]": "Connector de la Bigscreen", "Description[ca]": "Connector de la Bigscreen",
"Description[cs]": "Modul pro velkou obrazovku", "Description[cs]": "Modul pro velkou obrazovku",
"Description[da]": "Plugin til storskærm", "Description[da]": "Plugin til storskærm",
"Description[de]": "Bigscreen-Modul",
"Description[en_GB]": "Bigscreen Plugin", "Description[en_GB]": "Bigscreen Plugin",
"Description[es]": "Complemento Bigscreen", "Description[es]": "Complemento Bigscreen",
"Description[et]": "Suurekraani plugin", "Description[et]": "Suurekraani plugin",
@ -70,6 +71,7 @@
"Name[ca]": "Bigscreen", "Name[ca]": "Bigscreen",
"Name[cs]": "Velká obrazovka", "Name[cs]": "Velká obrazovka",
"Name[da]": "Storskærm", "Name[da]": "Storskærm",
"Name[de]": "Bigscreen",
"Name[en_GB]": "Bigscreen", "Name[en_GB]": "Bigscreen",
"Name[es]": "Bigscreen", "Name[es]": "Bigscreen",
"Name[et]": "Suurekraan", "Name[et]": "Suurekraan",