andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

SVN_SILENT made messages (.desktop file) - always resolve ours 

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-01-01 05:26:53 +01:00
parent faca8f7f0d
commit 66ded3229d
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/dummy/pmdummybackendplugin.json
View File

@ -4,6 +4,7 @@
{
"Email": "vl@fidra.de",
"Name": "Volker Lanz",
"Name[ast]": "Volker Lanz",
"Name[ca@valencia]": "Volker Lanz",
"Name[ca]": "Volker Lanz",
"Name[cs]": "Volker Lanz",

1
src/plugins/sfdisk/pmsfdiskbackendplugin.json
View File

@ -4,6 +4,7 @@
{
"Email": "andrius@stikonas.eu",
"Name": "Andrius Štikonas",
"Name[ast]": "Andrius Štikonas",
"Name[ca@valencia]": "Andrius Štikonas",
"Name[ca]": "Andrius Štikonas",
"Name[cs]": "Andrius Štikonas",