yukijoou/kwin
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 2016-02-03 09:28:15 +00:00
parent 25d07c22da
commit c54ec46b65
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
backends/x11/x11.json
View file

@ -29,6 +29,7 @@
"Name[ca@valencia]": "X11", "Name[ca@valencia]": "X11",
"Name[ca]": "X11", "Name[ca]": "X11",
"Name[de]": "X11", "Name[de]": "X11",
"Name[ia]": "x",
"Name[pt]": "X11", "Name[pt]": "X11",
"Name[sr@ijekavian]": "Икс11", "Name[sr@ijekavian]": "Икс11",
"Name[sr@ijekavianlatin]": "X11", "Name[sr@ijekavianlatin]": "X11",