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-06-06 05:03:00 +02:00
parent 8eee929e22
commit e338309ef5
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/bigscreen/kdeconnect_bigscreen.json
View file

@ -29,6 +29,7 @@
"Description[nl]": "Bigscreen plug-in", "Description[nl]": "Bigscreen plug-in",
"Description[nn]": "Bigscreen-tillegg", "Description[nn]": "Bigscreen-tillegg",
"Description[pt]": "'Plugin' de Ecrã Grande", "Description[pt]": "'Plugin' de Ecrã Grande",
"Description[pt_BR]": "Plugin de tela grande",
"Description[sk]": "Doplnok veľkej obrazovky", "Description[sk]": "Doplnok veľkej obrazovky",
"Description[uk]": "Додаток для великих екранів", "Description[uk]": "Додаток для великих екранів",
"Description[x-test]": "xxBigscreen Pluginxx", "Description[x-test]": "xxBigscreen Pluginxx",
@ -46,6 +47,7 @@
"Name[nl]": "Bigscreen", "Name[nl]": "Bigscreen",
"Name[nn]": "Bigscreen", "Name[nn]": "Bigscreen",
"Name[pt]": "Ecrã grande", "Name[pt]": "Ecrã grande",
"Name[pt_BR]": "Tela grande",
"Name[sk]": "Veľká obrazovka", "Name[sk]": "Veľká obrazovka",
"Name[uk]": "Великий екран", "Name[uk]": "Великий екран",
"Name[x-test]": "xxBigscreenxx", "Name[x-test]": "xxBigscreenxx",