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:
parent
bfdb1c7ff5
commit
09e1f60035
1 changed files with 15 additions and 1 deletions
|
@ -49,7 +49,21 @@
|
|||
},
|
||||
{
|
||||
"Email": "fabian.arndt@root-core.net",
|
||||
"Name": "Fabian Arndt"
|
||||
"Name": "Fabian Arndt",
|
||||
"Name[ar]": "فابيان أرندت",
|
||||
"Name[ca@valencia]": "Fabian Arndt",
|
||||
"Name[ca]": "Fabian Arndt",
|
||||
"Name[cs]": "Fabian Arndt",
|
||||
"Name[eo]": "Fabian Arndt",
|
||||
"Name[he]": "פביאן ארנדט",
|
||||
"Name[hu]": "Fabian Arndt",
|
||||
"Name[ia]": "Fabian Arndt",
|
||||
"Name[ka]": "Fabian Arndt",
|
||||
"Name[nl]": "Fabian Arndt",
|
||||
"Name[sl]": "Fabian Arndt",
|
||||
"Name[tr]": "Fabian Arndt",
|
||||
"Name[uk]": "Fabian Arndt",
|
||||
"Name[x-test]": "xxFabian Arndtxx"
|
||||
}
|
||||
],
|
||||
"Description": "Use your devices as virtual monitors",
|
||||
|
|
Loading…
Reference in a new issue