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-01-10 06:44:36 +01:00
parent 1711f8b3d8
commit ed1d230797
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/bigscreen/kdeconnect_bigscreen.json
View file

@ -54,7 +54,7 @@
"Description[lt]": "Bigscreen papildinys", "Description[lt]": "Bigscreen papildinys",
"Description[nl]": "Bigscreen plug-in", "Description[nl]": "Bigscreen plug-in",
"Description[nn]": "Bigscreen-tillegg", "Description[nn]": "Bigscreen-tillegg",
"Description[pl]": "Wtyczka Bigscreen", "Description[pl]": "Wtyczka Dużego Ekranu",
"Description[pt]": "'Plugin' de Ecrã Grande", "Description[pt]": "'Plugin' de Ecrã Grande",
"Description[pt_BR]": "Plugin de tela grande", "Description[pt_BR]": "Plugin de tela grande",
"Description[ro]": "Extensia „ecran mare”", "Description[ro]": "Extensia „ecran mare”",
@ -87,7 +87,7 @@
"Name[lt]": "Bigscreen", "Name[lt]": "Bigscreen",
"Name[nl]": "Bigscreen", "Name[nl]": "Bigscreen",
"Name[nn]": "Bigscreen", "Name[nn]": "Bigscreen",
"Name[pl]": "Bigscreen", "Name[pl]": "Duży Ekran",
"Name[pt]": "Ecrã grande", "Name[pt]": "Ecrã grande",
"Name[pt_BR]": "Tela grande", "Name[pt_BR]": "Tela grande",
"Name[ro]": "Ecran mare", "Name[ro]": "Ecran mare",