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 2015-11-13 10:44:04 +00:00
parent bcf76c0d2f
commit 22da928d2b
6 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backends/drm/drm.json
View file

@ -6,6 +6,7 @@
"Description[de]": "In DRM-Knoten rendern.",
"Description[en_GB]": "Render through drm node.",
"Description[es]": "Renderizar a través del nodo DRM.",
"Description[gl]": "Renderizar a través dun nodo de DRM.",
"Description[it]": "Resa tramite nodo drm.",
"Description[ko]": "DRM 노드로 렌더링합니다.",
"Description[nl]": "Via drm-node renderen.",
@ -31,6 +32,7 @@
"Name[de]": "DRM",
"Name[en_GB]": "drm",
"Name[es]": "drm",
"Name[gl]": "drm",
"Name[it]": "drm",
"Name[ko]": "drm",
"Name[nl]": "drm",

2
backends/fbdev/fbdev.json
View file

@ -6,6 +6,7 @@
"Description[de]": "In Framebuffer rendern.",
"Description[en_GB]": "Render to framebuffer.",
"Description[es]": "Renderizar en el «framebuffer».",
"Description[gl]": "Renderizar no búfer de fotogramas.",
"Description[it]": "Resa su framebuffer.",
"Description[ko]": "프레임버퍼에 렌더링합니다.",
"Description[nl]": "Naar framebuffer renderen.",
@ -31,6 +32,7 @@
"Name[de]": "Framebuffer",
"Name[en_GB]": "framebuffer",
"Name[es]": "framebuffer",
"Name[gl]": "framebuffer",
"Name[it]": "framebuffer",
"Name[ko]": "framebuffer",
"Name[nl]": "framebuffer",

2
backends/hwcomposer/hwcomposer.json
View file

@ -5,6 +5,7 @@
"Description[ca]": "Renderitza mitjançant el «hwcomposer» mitjançant «libhybris».",
"Description[en_GB]": "Render through hwcomposer through libhybris.",
"Description[es]": "Renderizar a través «hwcomposer» mediante «libhybris».",
"Description[gl]": "Renderizar a través de hwcomposer a través de libhybris.",
"Description[it]": "Resa tramite hwcomposer attraverso libhybris.",
"Description[ko]": "libhybris를 통하여 hwcomposer로 렌더링합니다.",
"Description[nl]": "Render via hwcomposer via libhybris.",
@ -29,6 +30,7 @@
"Name[cs]": "hwcomposer",
"Name[en_GB]": "hwcomposer",
"Name[es]": "hwcomposer",
"Name[gl]": "hwcomposer",
"Name[it]": "hwcomposer",
"Name[ko]": "hwcomposer",
"Name[nl]": "hwcomposer",

2
backends/virtual/virtual.json
View file

@ -5,6 +5,7 @@
"Description[ca]": "Renderitza a un «framebuffer» virtual.",
"Description[en_GB]": "Render to a virtual framebuffer.",
"Description[es]": "Renderizar en un «framebuffer» virtual.",
"Description[gl]": "Renderizar nun búfer de fotogramas virtual.",
"Description[it]": "Resa su un framebuffer virtuale.",
"Description[ko]": "가상 프레임버퍼에 렌더링합니다.",
"Description[nl]": "Naar een virtuele framebuffer renderen.",
@ -29,6 +30,7 @@
"Name[de]": "Virtuell",
"Name[en_GB]": "virtual",
"Name[es]": "virtual",
"Name[gl]": "virtual",
"Name[it]": "virtual",
"Name[ko]": "virtual",
"Name[nl]": "virtueel",

2
backends/wayland/wayland.json
View file

@ -5,6 +5,7 @@
"Description[ca]": "Renderitza a una finestra imbricada en un compositor Wayland en execució.",
"Description[en_GB]": "Render to a nested window on running Wayland compositor.",
"Description[es]": "Renderizar en una ventana anidada en el compositor Wayland en ejecución.",
"Description[gl]": "Renderizar unha xanela aniñada no compositor de Wayland en execución.",
"Description[it]": "Resa in una finestra nidificata su compositore Wayland in esecuzione.",
"Description[ko]": "Wayland 컴포지터에서 실행 중인 창에 렌더링합니다.",
"Description[nl]": "Render naar een genest venster in een werkende Wayland-compositor.",
@ -30,6 +31,7 @@
"Name[de]": "Wayland",
"Name[en_GB]": "wayland",
"Name[es]": "wayland",
"Name[gl]": "wayland",
"Name[it]": "wayland",
"Name[ko]": "wayland",
"Name[nl]": "wayland",

2
backends/x11/x11.json
View file

@ -5,6 +5,7 @@
"Description[ca]": "Renderitza a una finestra imbricada en el sistema de finestres X11.",
"Description[en_GB]": "Render to a nested window on X11 windowing system.",
"Description[es]": "Renderizar en una ventana anidada en el sistema de ventanas X11.",
"Description[gl]": "Renderizar unha xanela aniñada no sistema de xanelas X11.",
"Description[it]": "Resa in una finestra nidificata su sistema di finestre X11.",
"Description[ko]": "X11 창 시스템에서 실행 중인 창에 렌더링합니다.",
"Description[nl]": "Render naar een genest venster in het X11 windowingsysteem.",
@ -31,6 +32,7 @@
"Name[de]": "x11",
"Name[en_GB]": "x11",
"Name[es]": "x11",
"Name[gl]": "x11",
"Name[it]": "x11",
"Name[ko]": "x11",
"Name[nl]": "x11",