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
parent
a503efad45
commit
31cdb8676d
13 changed files with 16 additions and 1 deletions
|
|
@ -17,6 +17,7 @@ Name[ko]=화면 위의 눈
|
|||
Name[lt]=Akis ekrane
|
||||
Name[nl]=Oog op scherm
|
||||
Name[nn]=Auge på skjerm
|
||||
Name[pa]=ਸਕਰੀਨ 'ਤੇ ਅੱਖ
|
||||
Name[pl]=Oko na ekranie
|
||||
Name[pt]=Olho no Ecrã
|
||||
Name[pt_BR]=Olho na tela
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ Name[ko]=전체 화면
|
|||
Name[lt]=Visas ekranas
|
||||
Name[nl]=Volledig scherm
|
||||
Name[nn]=Fullskjerm
|
||||
Name[pa]=ਪੂਰੀ ਸਕਰੀਨ
|
||||
Name[pl]=Pełny ekran
|
||||
Name[pt]=Ecrã Completo
|
||||
Name[pt_BR]=Tela inteira
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ Name[ko]=로그아웃
|
|||
Name[lt]=Atsijungimas
|
||||
Name[nl]=Afmelden
|
||||
Name[nn]=Logg ut
|
||||
Name[pa]=ਲਾਗਆਉਟ
|
||||
Name[pl]=Wylogowywanie
|
||||
Name[pt]=Encerrar
|
||||
Name[pt_BR]=Encerrar sessão
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ Name[nds]=Kiekglas
|
|||
Name[ne]=हेर्ने ऐना
|
||||
Name[nl]=Vergrootglas
|
||||
Name[nn]=Forstørringsglas
|
||||
Name[pa]=ਸ਼ੀਸ਼ਾ ਵੇਖਣਾ
|
||||
Name[pa]=ਸ਼ੀਸ਼ੇ ਵਰਗਾ
|
||||
Name[pl]=Lupa
|
||||
Name[pt]=Aparência de Vidro
|
||||
Name[pt_BR]=Espelho
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
"Description[lt]": "Atvaizduoti per drm veikseną.",
|
||||
"Description[nl]": "Via drm-node renderen.",
|
||||
"Description[nn]": "Teikn opp gjennom drm-node.",
|
||||
"Description[pa]": "ਡੀਆਰਐਮ ਨੋਡ ਰਾਹੀਂ ਰੈਂਡਰ।",
|
||||
"Description[pl]": "Wyświetlaj przez węzeł drm.",
|
||||
"Description[pt]": "Desenhar através de um nó DRM.",
|
||||
"Description[pt_BR]": "Renderizar pelo nó de DRM.",
|
||||
|
|
@ -62,6 +63,7 @@
|
|||
"Name[lt]": "drm",
|
||||
"Name[nl]": "drm",
|
||||
"Name[nn]": "drm",
|
||||
"Name[pa]": "ਡੀਆਰਐਮ",
|
||||
"Name[pl]": "drm",
|
||||
"Name[pt]": "DRM",
|
||||
"Name[pt_BR]": "drm",
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
"Description[lt]": "Atvaizduoti į vaizdų atnaujinimo buferį.",
|
||||
"Description[nl]": "Naar framebuffer renderen.",
|
||||
"Description[nn]": "Teikn opp til biletbuffer.",
|
||||
"Description[pa]": "ਫਰੇਮਬਫ਼ਰ ਲਈ ਰੈਂਡਰ ਹੈ।",
|
||||
"Description[pl]": "Wyświetlaj w buforze klatek.",
|
||||
"Description[pt]": "Desenhar no 'framebuffer'.",
|
||||
"Description[pt_BR]": "Renderizar no framebuffer.",
|
||||
|
|
@ -62,6 +63,7 @@
|
|||
"Name[lt]": "framebuffer",
|
||||
"Name[nl]": "framebuffer",
|
||||
"Name[nn]": "biletbuffer",
|
||||
"Name[pa]": "ਫਰੇਮ-ਬਫ਼ਰ",
|
||||
"Name[pl]": "bufor klatek",
|
||||
"Name[pt]": "'Framebuffer'",
|
||||
"Name[pt_BR]": "framebuffer",
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
"Description[lt]": "Atvaizduoti į virtualų vaizdų atnaujinimo buferį.",
|
||||
"Description[nl]": "Naar een virtuele framebuffer renderen.",
|
||||
"Description[nn]": "Teikn opp til virtuell biletbuffer.",
|
||||
"Description[pa]": "ਵਰਚੁਅਲ ਫ਼ਰੇਮਬਫ਼ਰ ਲਈ ਰੈਂਡਰ।",
|
||||
"Description[pl]": "Wyświetlaj w wirtualnym buforze klatek.",
|
||||
"Description[pt]": "Desenhar num 'framebuffer' virtual.",
|
||||
"Description[pt_BR]": "Renderizar no framebuffer virtual.",
|
||||
|
|
@ -62,6 +63,7 @@
|
|||
"Name[lt]": "virtualus",
|
||||
"Name[nl]": "virtueel",
|
||||
"Name[nn]": "virtuell",
|
||||
"Name[pa]": "ਵਰਚੁਅਲ",
|
||||
"Name[pl]": "wirtualne",
|
||||
"Name[pt]": "virtual",
|
||||
"Name[pt_BR]": "virtual",
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@
|
|||
"Name[lt]": "wayland",
|
||||
"Name[nl]": "wayland",
|
||||
"Name[nn]": "wayland",
|
||||
"Name[pa]": "ਵੇਲੈਂਡ",
|
||||
"Name[pl]": "wayland",
|
||||
"Name[pt]": "Wayland",
|
||||
"Name[pt_BR]": "wayland",
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@
|
|||
"Name[lt]": "x11-atskiras",
|
||||
"Name[nl]": "x11-alleenstaand",
|
||||
"Name[nn]": "X11 frittståande",
|
||||
"Name[pa]": "x11-ਸਟੈਡਅਲੋਨ",
|
||||
"Name[pl]": "x11-wolnostojący",
|
||||
"Name[pt]": "x11-autónomo",
|
||||
"Name[pt_BR]": "x11-standalone",
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@
|
|||
"Name[lt]": "x11",
|
||||
"Name[nl]": "x11",
|
||||
"Name[nn]": "x11",
|
||||
"Name[pa]": "x11",
|
||||
"Name[pl]": "x11",
|
||||
"Name[pt]": "X11",
|
||||
"Name[pt_BR]": "x11",
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@
|
|||
"Name[lt]": "SceneOpenGL",
|
||||
"Name[nl]": "SceneOpenGL",
|
||||
"Name[nn]": "SceneOpenGL",
|
||||
"Name[pa]": "ਸੀਨ-ਓਪਨ-ਜੀਐਲ",
|
||||
"Name[pl]": "OpenGL sceny",
|
||||
"Name[pt]": "SceneOpenGL",
|
||||
"Name[pt_BR]": "SceneOpenGL",
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@
|
|||
"Name[lt]": "SceneQPainter",
|
||||
"Name[nl]": "SceneQPainter",
|
||||
"Name[nn]": "SceneQPainter",
|
||||
"Name[pa]": "ਸੀਨ-ਕਿਊ-ਪੇਂਟਰ",
|
||||
"Name[pl]": "QPainter sceny",
|
||||
"Name[pt]": "SceneQPainter",
|
||||
"Name[pt_BR]": "SceneQPainter",
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@
|
|||
"Name[lt]": "SceneXRender",
|
||||
"Name[nl]": "SceneXRender",
|
||||
"Name[nn]": "SceneXRender",
|
||||
"Name[pa]": "ਸੀਨ-ਐਕਸ-ਰੈਂਡਰ",
|
||||
"Name[pl]": "XRender sceny",
|
||||
"Name[pt]": "SceneXRender",
|
||||
"Name[pt_BR]": "SceneXRender",
|
||||
|
|
|
|||
Loading…
Reference in a new issue