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:
l10n daemon script 2019-06-21 05:35:42 +02:00
parent e8fe3f2fb7
commit db12cb6742
10 changed files with 20 additions and 0 deletions

View file

@ -17,6 +17,7 @@
"Description[id]": "Render melalui simpul drm.",
"Description[it]": "Resa tramite nodo drm.",
"Description[ko]": "DRM 노드로 렌더링합니다.",
"Description[lt]": "Atvaizduoti per drm veikseną.",
"Description[nl]": "Via drm-node renderen.",
"Description[nn]": "Teikn opp gjennom drm-node.",
"Description[pl]": "Wyświetlaj przez węzeł drm.",
@ -54,6 +55,7 @@
"Name[id]": "drm",
"Name[it]": "drm",
"Name[ko]": "drm",
"Name[lt]": "drm",
"Name[nl]": "drm",
"Name[nn]": "drm",
"Name[pl]": "drm",

View file

@ -17,6 +17,7 @@
"Description[id]": "Render untuk framebuffer.",
"Description[it]": "Resa su framebuffer.",
"Description[ko]": "프레임버퍼에 렌더링합니다.",
"Description[lt]": "Atvaizduoti į vaizdų atnaujinimo buferį.",
"Description[nl]": "Naar framebuffer renderen.",
"Description[nn]": "Teikn opp til biletbuffer.",
"Description[pl]": "Wyświetlaj w buforze klatek.",
@ -54,6 +55,7 @@
"Name[id]": "framebuffer",
"Name[it]": "framebuffer",
"Name[ko]": "framebuffer",
"Name[lt]": "framebuffer",
"Name[nl]": "framebuffer",
"Name[nn]": "biletbuffer",
"Name[pl]": "bufor klatek",

View file

@ -17,6 +17,7 @@
"Description[id]": "Render melalui hwcomposer melalui libhybris.",
"Description[it]": "Resa tramite hwcomposer attraverso libhybris.",
"Description[ko]": "libhybris를 통하여 hwcomposer로 렌더링합니다.",
"Description[lt]": "Atvaizduoti per hwcomposer per libhybris.",
"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.",
@ -54,6 +55,7 @@
"Name[id]": "hwcomposer",
"Name[it]": "hwcomposer",
"Name[ko]": "hwcomposer",
"Name[lt]": "hwcomposer",
"Name[nl]": "hwcomposer",
"Name[nn]": "hwcomposer",
"Name[pl]": "sprzętowy kompozytor",

View file

@ -17,6 +17,7 @@
"Description[id]": "Render untuk sebuah virtual framebuffer.",
"Description[it]": "Resa su un framebuffer virtuale.",
"Description[ko]": "가상 프레임버퍼에 렌더링합니다.",
"Description[lt]": "Atvaizduoti į virtualų vaizdų atnaujinimo buferį.",
"Description[nl]": "Naar een virtuele framebuffer renderen.",
"Description[nn]": "Teikn opp til virtuell biletbuffer.",
"Description[pl]": "Wyświetlaj w wirtualnym buforze klatek.",
@ -54,6 +55,7 @@
"Name[id]": "virtual",
"Name[it]": "virtual",
"Name[ko]": "virtual",
"Name[lt]": "virtualus",
"Name[nl]": "virtueel",
"Name[nn]": "virtuell",
"Name[pl]": "wirtualne",

View file

@ -17,6 +17,7 @@
"Description[id]": "Render untuk sebuah window tersarang pada Wayland compositor yang berjalan.",
"Description[it]": "Resa in una finestra nidificata su compositore Wayland in esecuzione.",
"Description[ko]": "Wayland 컴포지터에서 실행 중인 창에 렌더링합니다.",
"Description[lt]": "Atvaizduoti į įdėtinį langą, veikiančiame Wayland kompozitoriuje.",
"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.",
@ -54,6 +55,7 @@
"Name[id]": "wayland",
"Name[it]": "wayland",
"Name[ko]": "wayland",
"Name[lt]": "wayland",
"Name[nl]": "wayland",
"Name[nn]": "wayland",
"Name[pl]": "wayland",

View file

@ -17,6 +17,7 @@
"Description[id]": "Plugin platform untuk standalone x11 dalam kwin_x11.",
"Description[it]": "Estensione di piattaforma per x11 autonomo in kwin_x11.",
"Description[ko]": "kwin_x11의 단독 X11 플러그인입니다.",
"Description[lt]": "Platformos priedas, skirtas kwin_x11 viduje esančiam, atskiram x11",
"Description[nl]": "Platform plug-in voor alleenstaande x11 in kwin_x11.",
"Description[nn]": "Plattformtillegg for frittståande X11 i kwin_x11.",
"Description[pl]": "Wtyczka platformy dla wolnostojącego x11 w kwin_x11.",
@ -53,6 +54,7 @@
"Name[id]": "x11-standalone",
"Name[it]": "X11-alone",
"Name[ko]": "x11-standalone",
"Name[lt]": "x11-atskiras",
"Name[nl]": "x11-alleenstaand",
"Name[nn]": "X11 frittståande",
"Name[pl]": "x11-wolnostojący",

View file

@ -17,6 +17,7 @@
"Description[id]": "Render untuk sebuah window tersarang pada sistem perwindowan X11",
"Description[it]": "Resa in una finestra nidificata su sistema di finestre X11.",
"Description[ko]": "X11 창 시스템에서 실행 중인 창에 렌더링합니다.",
"Description[lt]": "Atvaizduoti į įdėtinį langą X11 langų sistemoje.",
"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.",
@ -55,6 +56,7 @@
"Name[id]": "x11",
"Name[it]": "x11",
"Name[ko]": "x11",
"Name[lt]": "x11",
"Name[nl]": "x11",
"Name[nn]": "x11",
"Name[pl]": "x11",

View file

@ -15,6 +15,7 @@
"Description[id]": "Plugin KWin Compositor perenderan melalui OpenGL",
"Description[it]": "Estensione del compositore di KWin per la resa tramite OpenGL",
"Description[ko]": "OpenGL로 렌더링하는 KWin 컴포지터 플러그인",
"Description[lt]": "KWin kompozitoriaus priedas atvaizdavimui per OpenGL",
"Description[nl]": "KWin-compositor-plug-in rendering via OpenGL",
"Description[nn]": "KWin-samansetjartillegg som brukar OpenGL",
"Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez OpenGL",
@ -49,6 +50,7 @@
"Name[id]": "SceneOpenGL",
"Name[it]": "SceneOpenGL",
"Name[ko]": "SceneOpenGL",
"Name[lt]": "SceneOpenGL",
"Name[nl]": "SceneOpenGL",
"Name[nn]": "SceneOpenGL",
"Name[pl]": "OpenGL sceny",

View file

@ -16,6 +16,7 @@
"Description[id]": "Plugin KWin Compositor perenderan melalui QPainter",
"Description[it]": "Estensione del compositore di KWin per la resa tramite QPainter",
"Description[ko]": "QPainter로 렌더링하는 KWin 컴포지터 플러그인",
"Description[lt]": "KWin kompozitoriaus priedas atvaizdavimui per QPainter",
"Description[nl]": "KWin-compositor-plug-in rendering via QPainter",
"Description[nn]": "KWin-samansetjartillegg som brukar QPainter",
"Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez QPainter",
@ -51,6 +52,7 @@
"Name[id]": "SceneQPainter",
"Name[it]": "SceneQPainter",
"Name[ko]": "SceneQPainter",
"Name[lt]": "SceneQPainter",
"Name[nl]": "SceneQPainter",
"Name[nn]": "SceneQPainter",
"Name[pl]": "QPainter sceny",

View file

@ -16,6 +16,7 @@
"Description[id]": "Plugin KWin Compositor perenderan melalui XRender",
"Description[it]": "Estensione del compositore di KWin per la resa tramite XRender",
"Description[ko]": "XRender로 렌더링하는 KWin 컴포지터 플러그인",
"Description[lt]": "KWin kompozitoriaus priedas atvaizdavimui per XRender",
"Description[nl]": "KWin-compositor-plug-in rendering via XRender",
"Description[nn]": "KWin-samansetjartillegg som brukar XRender",
"Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez XRender",
@ -51,6 +52,7 @@
"Name[id]": "SceneXRender",
"Name[it]": "SceneXRender",
"Name[ko]": "SceneXRender",
"Name[lt]": "SceneXRender",
"Name[nl]": "SceneXRender",
"Name[nn]": "SceneXRender",
"Name[pl]": "XRender sceny",