Ark/krfb
1
0
Fork 0
mirror of https://github.com/KDE/krfb synced 2026-07-01 07:41:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

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-26 15:56:42 +00:00
parent 17752eba7c
commit c1904c41c7
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framebuffers/qt/krfb_framebuffer_qt.json
View File

@@ -9,6 +9,7 @@
"Description[es]": "Framebuffer basado en Qt para KRfb.",
"Description[fi]": "QT-perustainen Kehyspuskuri KRfb:lle",
"Description[gl]": "Framebuffer baseado en Qt para KRfb.",
"Description[it]": "Framebuffer basato su Qt per KRfb.",
"Description[ko]": "KRfb용 Qt 기반 프레임버퍼입니다.",
"Description[nl]": "Op Qt gebaseerd framebuffer voor KRfb.",
"Description[pl]": "Bufor ramki na podstawie Qt dla KRfb.",
@@ -35,6 +36,7 @@
"Name[es]": "Framebuffer de Qt para KRfb",
"Name[fi]": "QT-kehyspuskuri KRfb:lle",
"Name[gl]": "Framebuffer de Qt para KRfb",
"Name[it]": "Framebuffer Qt per KRfb",
"Name[ko]": "KRfb용 Qt 프레임버퍼",
"Name[nl]": "Qt-framebuffer voor KRfb",
"Name[pl]": "Bufor ramki Qt dla KRfb",

2
framebuffers/x11/krfb_framebuffer_x11.json
View File

@@ -9,6 +9,7 @@
"Description[es]": "Framebuffer basado en XDamage/XShm de X11 para KRfb.",
"Description[fi]": "X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.",
"Description[gl]": "Framebuffer baseado en Xll XDamage/Xshm para XRfb.",
"Description[it]": "Framebuffer basato su XDamage/XShm di X11 per KRfb.",
"Description[ko]": "KRfb용 X11 XDamage/XShm 기반 프레임버퍼입니다.",
"Description[nl]": "Op X11 XDamage/XShm gebaseerd framebuffer voor KRfb.",
"Description[pl]": "Bufor ramki na podstawie X11 XDamage/XShm dla KRfb.",
@@ -34,6 +35,7 @@
"Name[es]": "Framebuffer X11 para KRfb",
"Name[fi]": "X11-kehyspuskuri KRfb:lle",
"Name[gl]": "Framebuffer de X11 para KRfb",
"Name[it]": "Framebuffer X11 per KRfb",
"Name[ko]": "KRfb용 X11 프레임버퍼",
"Name[nl]": "X11 framebuffer voor KRfb",
"Name[pl]": "Bufor ramki X11 dla KRfb",

1
krfb/krfb-framebuffer.json
View File

@@ -8,6 +8,7 @@
"Description[es]": "Complementos de framebuffer para KRfb",
"Description[fi]": "Kehyspuskuriliitännäinen kohteelle KRfb",
"Description[gl]": "Engadido de frame buffer para KRfb",
"Description[it]": "Estensioni del framebuffer per KRfb",
"Description[ko]": "KRfb 프레임버퍼 플러그인",
"Description[nl]": "Framebuffer-plugins voor KRfb",
"Description[pl]": "Wtyczki buforów ramek dla KRfb",