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
68b7274c5d
commit
8e17059be7
5 changed files with 5 additions and 0 deletions
|
@ -16,6 +16,7 @@
|
|||
"Id": "KWinWaylandDrmBackend",
|
||||
"Name": "drm",
|
||||
"Name[ca]": "DRM",
|
||||
"Name[cs]": "drm",
|
||||
"Name[en_GB]": "drm",
|
||||
"Name[es]": "drm",
|
||||
"Name[nl]": "drm",
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
"Id": "KWinWaylandFbdevBackend",
|
||||
"Name": "framebuffer",
|
||||
"Name[ca]": "Framebuffer",
|
||||
"Name[cs]": "framebuffer",
|
||||
"Name[en_GB]": "framebuffer",
|
||||
"Name[es]": "framebuffer",
|
||||
"Name[nl]": "framebuffer",
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
"Id": "KWinWaylandHwcomposerBackend",
|
||||
"Name": "hwcomposer",
|
||||
"Name[ca]": "hwcomposer",
|
||||
"Name[cs]": "hwcomposer",
|
||||
"Name[en_GB]": "hwcomposer",
|
||||
"Name[es]": "hwcomposer",
|
||||
"Name[nl]": "hwcomposer",
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
"Id": "KWinWaylandWaylandBackend",
|
||||
"Name": "wayland",
|
||||
"Name[ca]": "Wayland",
|
||||
"Name[cs]": "wayland",
|
||||
"Name[en_GB]": "wayland",
|
||||
"Name[es]": "wayland",
|
||||
"Name[nl]": "wayland",
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
"Id": "KWinWaylandX11Backend",
|
||||
"Name": "x11",
|
||||
"Name[ca]": "X11",
|
||||
"Name[cs]": "x11",
|
||||
"Name[en_GB]": "x11",
|
||||
"Name[es]": "x11",
|
||||
"Name[nl]": "x11",
|
||||
|
|
Loading…
Reference in a new issue