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"
9 years ago · c54ec46b65
parent 25d07c22da
commit c54ec46b65
1 changed files with 1 additions and 0 deletions
--- a/backends/x11/x11.json
+++ b/backends/x11/x11.json
@ -29,6 +29,7 @@
        "Name[ca@valencia]": "X11", 
        "Name[ca]": "X11", 
        "Name[de]": "X11", 
+        "Name[ia]": "x", 
        "Name[pt]": "X11", 
        "Name[sr@ijekavian]": "Икс11", 
        "Name[sr@ijekavianlatin]": "X11",