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 2016-09-14 09:23:44 +00:00
parent ded90756fb
commit b56a28e19c
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/platforms/drm/drm.json
View file

@ -17,6 +17,7 @@
"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.",
"Description[ru]": "Отрисовка через DRM",
"Description[sk]": "Renderovať cez režim drm.",
"Description[sl]": "Izriši preko vozlišča drm.",
"Description[sr@ijekavian]": "Рендеровање кроз ДРМ чвор.",

1
plugins/platforms/fbdev/fbdev.json
View file

@ -17,6 +17,7 @@
"Description[pl]": "Wyświetlaj w buforze klatek.",
"Description[pt]": "Desenhar no 'framebuffer'.",
"Description[pt_BR]": "Renderizar no framebuffer.",
"Description[ru]": "Отрисовка во фреймбуфер",
"Description[sk]": "Renderovať do framebuffera.",
"Description[sl]": "Izriši v medpomnilnik sličic.",
"Description[sr@ijekavian]": "Рендеровање у кадробафер.",

1
plugins/platforms/virtual/virtual.json
View file

@ -17,6 +17,7 @@
"Description[pl]": "Wyświetlaj w wirtualnym buforze klatek.",
"Description[pt]": "Desenhar num 'framebuffer' virtual.",
"Description[pt_BR]": "Renderizar no framebuffer virtual.",
"Description[ru]": "Отрисовка в виртуальный фреймбуфер",
"Description[sk]": "Renderovať na virtuálny framebuffer.",
"Description[sl]": "Izriši v navidezni medpomnilnik sličic.",
"Description[sr@ijekavian]": "Рендеровање у виртуелни кадробафер.",

14
plugins/platforms/x11/standalone/x11.json
View file

@ -1,14 +1,21 @@
{
"KPlugin": {
"Description": "Platform plugin for standalone x11 in kwin_x11.",
"Description[ca@valencia]": "Connector de plataforma per una X11 autònoma en el kwin_x11",
"Description[ca]": "Connector de plataforma per una X11 autònoma en el kwin_x11",
"Description[ca@valencia]": "Connector de plataforma per una X11 autònoma en el kwin_x11.",
"Description[ca]": "Connector de plataforma per una X11 autònoma en el kwin_x11.",
"Description[da]": "Platform-plugin til standalone x11 i kwin_x11.",
"Description[es]": "Complemento de Platform para X11 autónomo en kwin_x11.",
"Description[et]": "Autonoomse x11 platvormi plugin kwin_x11-s",
"Description[fi]": "Alustaliitännäinen itsenäiselle x11:lle kwin_x11:ssä.",
"Description[gl]": "Complemento de plataforma para x11 independente en kwin_x11.",
"Description[it]": "Estensione di piattaforma per x11 autonomo in kwin_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.",
"Description[pt]": "'Plugin' de plataformas para um X11 autónomo no X11 do KWin.",
"Description[pt_BR]": "Plugin de plataforma para um x11 independente no kwin_x11.",
"Description[sk]": "Platformový plugin pre standalone x11 v kwin_x11.",
"Description[sl]": "Okoljski vstavek za samostojni x11 v kwin_x11.",
"Description[sr@ijekavian]": "Платформски прикључак за самостални Икс11 у К‑вину.",
"Description[sr@ijekavianlatin]": "Platformski priključak za samostalni X11 u KWinu.",
"Description[sr@latin]": "Platformski priključak za samostalni X11 u KWinu.",
@ -23,9 +30,12 @@
"Name[ca]": "X11-autònoma",
"Name[es]": "x11-autónomo",
"Name[gl]": "x11-independente",
"Name[it]": "X11-alone",
"Name[nl]": "x11-alleenstaand",
"Name[nn]": "X11 frittståande",
"Name[pl]": "x11-wolnostojący",
"Name[pt]": "x11-autónomo",
"Name[sl]": "x11-samostojno",
"Name[sr@ijekavian]": "Икс11 самостални",
"Name[sr@ijekavianlatin]": "X11 samostalni",
"Name[sr@latin]": "X11 samostalni",