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"
icc-effect-5.14.5
l10n daemon script 2015-10-18 11:06:54 +00:00
parent 70e744fe26
commit b20ccf91c6
6 changed files with 12 additions and 0 deletions

View File

@ -4,6 +4,7 @@
"Description[ca]": "Renderitza mitjançant el node del DRM.",
"Description[en_GB]": "Render through drm node.",
"Description[es]": "Renderizar a través del nodo DRM.",
"Description[ko]": "DRM 노드로 렌더링합니다.",
"Description[nl]": "Via drm-node renderen.",
"Description[nn]": "Teikn opp gjennom drm-node.",
"Description[pl]": "Wyświetlaj przez węzeł drm.",
@ -24,6 +25,7 @@
"Name[cs]": "drm",
"Name[en_GB]": "drm",
"Name[es]": "drm",
"Name[ko]": "drm",
"Name[nl]": "drm",
"Name[nn]": "drm",
"Name[pl]": "drm",

View File

@ -4,6 +4,7 @@
"Description[ca]": "Renderitza al «framebuffer».",
"Description[en_GB]": "Render to framebuffer.",
"Description[es]": "Renderizar en el «framebuffer».",
"Description[ko]": "프레임버퍼에 렌더링합니다.",
"Description[nl]": "Naar framebuffer renderen.",
"Description[nn]": "Teikn opp til biletbuffer.",
"Description[pl]": "Wyświetlaj w buforze klatek.",
@ -24,6 +25,7 @@
"Name[cs]": "framebuffer",
"Name[en_GB]": "framebuffer",
"Name[es]": "framebuffer",
"Name[ko]": "framebuffer",
"Name[nl]": "framebuffer",
"Name[nn]": "biletbuffer",
"Name[pl]": "bufor klatek",

View File

@ -4,6 +4,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[ko]": "libhybris를 통하여 hwcomposer로 렌더링합니다.",
"Description[nl]": "Render via hwcomposer via libhybris.",
"Description[nn]": "Teikn opp via hwcomposer gjennom libhybris.",
"Description[pl]": "Wyświetlaj przez sprzętowy kompozytor przez libhybris.",
@ -24,6 +25,7 @@
"Name[cs]": "hwcomposer",
"Name[en_GB]": "hwcomposer",
"Name[es]": "hwcomposer",
"Name[ko]": "hwcomposer",
"Name[nl]": "hwcomposer",
"Name[nn]": "hwcomposer",
"Name[pl]": "sprzętowy kompozytor",

View File

@ -4,6 +4,7 @@
"Description[ca]": "Renderitza a un «framebuffer» virtual.",
"Description[en_GB]": "Render to a virtual framebuffer.",
"Description[es]": "Renderizar en un «framebuffer» virtual.",
"Description[ko]": "가상 프레임버퍼에 렌더링합니다.",
"Description[nl]": "Naar een virtuele framebuffer renderen.",
"Description[nn]": "Teikn opp til virtuell biletbuffer.",
"Description[pl]": "Wyświetlaj w wirtualnym buforze klatek.",
@ -23,6 +24,7 @@
"Name[ca]": "Virtual",
"Name[en_GB]": "virtual",
"Name[es]": "virtual",
"Name[ko]": "virtual",
"Name[nl]": "virtueel",
"Name[nn]": "virtuell",
"Name[pl]": "wirtualne",

View File

@ -4,6 +4,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[ko]": "Wayland 컴포지터에서 실행 중인 창에 렌더링합니다.",
"Description[nl]": "Render naar een genest venster in een werkende Wayland-compositor.",
"Description[nn]": "Teikn opp til innebygd vindauge på køyrande Wayland-samansetjar.",
"Description[pl]": "Wyświetlaj w zagnieżdżonym oknie w kompozytorze Wayland.",
@ -24,6 +25,7 @@
"Name[cs]": "wayland",
"Name[en_GB]": "wayland",
"Name[es]": "wayland",
"Name[ko]": "wayland",
"Name[nl]": "wayland",
"Name[nn]": "wayland",
"Name[pl]": "wayland",

View File

@ -4,6 +4,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[ko]": "X11 창 시스템에서 실행 중인 창에 렌더링합니다.",
"Description[nl]": "Render naar een genest venster in het X11 windowingsysteem.",
"Description[nn]": "Teikn opp til innebygd vindauge på køyrande X11-system.",
"Description[pl]": "Wyświetlaj w zagnieżdżonym oknie w systemie okien X11.",
@ -24,6 +25,7 @@
"Name[cs]": "x11",
"Name[en_GB]": "x11",
"Name[es]": "x11",
"Name[ko]": "x11",
"Name[nl]": "x11",
"Name[nn]": "x11",
"Name[pl]": "x11",