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-07-02 05:57:52 +02:00
parent 752070add9
commit aef817e786
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/bigscreen/kdeconnect_bigscreen.json
View file

@ -13,6 +13,7 @@
"Name[fi]": "Aditya Mehra",
"Name[fr]": "Aditya Mehra",
"Name[it]": "Aditya Mehra",
"Name[ko]": "Aditya Mehra",
"Name[lt]": "Aditya Mehra",
"Name[nl]": "Aditya Mehra",
"Name[nn]": "Aditya Mehra",
@ -35,6 +36,7 @@
"Description[fi]": "Bigscreen-liitännäinen",
"Description[fr]": "Module externe « Bigscreen »",
"Description[it]": "Estensione Bigscreen",
"Description[ko]": "큰 화면 플러그인",
"Description[lt]": "Bigscreen papildinys",
"Description[nl]": "Bigscreen plug-in",
"Description[nn]": "Bigscreen-tillegg",
@ -59,6 +61,7 @@
"Name[fi]": "Bigscreen",
"Name[fr]": "Bigscreen",
"Name[it]": "Bigscreen",
"Name[ko]": "큰 화면",
"Name[lt]": "Bigscreen",
"Name[nl]": "Bigscreen",
"Name[nn]": "Bigscreen",