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"

framebuffers/qt/krfb_framebuffer_qt.json

@@ -4,8 +4,8 @@
         "Description": "Qt based Framebuffer for KRfb.", 
         "Description[ca@valencia]": "«Framebuffer» basat en Qt per al KRfb.", 
         "Description[ca]": "«Framebuffer» basat en Qt per al KRfb.", 
+        "Description[cs]": "Framebuffer založený na Qt pro KRfb.", 
         "Description[de]": "Qt-basierter Framebuffer für KRfb", 
-        "Description[en_GB]": "Qt based Framebuffer for KRfb.", 
         "Description[es]": "Framebuffer basado en Qt para KRfb.", 
         "Description[fi]": "QT-perustainen Kehyspuskuri KRfb:lle", 
         "Description[gl]": "Framebuffer baseado en Qt para KRfb.", 
@@ -25,15 +25,15 @@
         "Description[uk]": "Заснований на Qt буфер кадрів для KRfb.", 
         "Description[x-test]": "xxQt based Framebuffer for KRfb.xx", 
         "Description[zh_CN]": "KRfb 的基于 Qt 的帧缓冲。", 
-        "Description[zh_TW]": "KRfb 的 Qt-based Framebuffer", 
         "EnabledByDefault": true, 
         "Id": "qt", 
         "License": "GPL", 
         "Name": "Qt Framebuffer for KRfb", 
+        "Name[ast]": "Framebuffer Qt pa KRfb", 
         "Name[ca@valencia]": "«Framebuffer» Qt per al KRfb.", 
         "Name[ca]": "«Framebuffer» Qt per al KRfb.", 
+        "Name[cs]": "Qt Framebuffer pro KRfb", 
         "Name[de]": "Qt-Framebuffer für KRfb", 
-        "Name[en_GB]": "Qt Framebuffer for KRfb", 
         "Name[es]": "Framebuffer de Qt para KRfb", 
         "Name[fi]": "QT-kehyspuskuri KRfb:lle", 
         "Name[gl]": "Framebuffer de Qt para KRfb", 
@@ -53,7 +53,6 @@
         "Name[uk]": "Буфер кадрів на Qt для KRfb", 
         "Name[x-test]": "xxQt Framebuffer for KRfbxx", 
         "Name[zh_CN]": "KRfb 的 Qt 帧缓冲", 
-        "Name[zh_TW]": "Krfb 的 Qt Framebuffer", 
         "ServiceTypes": [
             "krfb/framebuffer"
         ], 

framebuffers/x11/krfb_framebuffer_x11.json

@@ -4,8 +4,8 @@
         "Description": "X11 XDamage/XShm based Framebuffer for KRfb.", 
         "Description[ca@valencia]": "«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.", 
         "Description[ca]": "«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.", 
+        "Description[cs]": "Framebuffer založený na X11 XDamage/XShm pro KRfb.", 
         "Description[de]": "X11 XDamage/XShm-basierter Framebuffer für KRfb.", 
-        "Description[en_GB]": "X11 XDamage/XShm based Framebuffer for KRfb.", 
         "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.", 
@@ -25,15 +25,14 @@
         "Description[uk]": "Заснований на XDamage/XShm X11 буфер кадрів для KRfb.", 
         "Description[x-test]": "xxX11 XDamage/XShm based Framebuffer for KRfb.xx", 
         "Description[zh_CN]": "KRfb 的基于 X11 XDamage/XShm 的帧缓冲。", 
-        "Description[zh_TW]": "KRfb 的 X11 XDamage/XShm based Framebuffer", 
         "EnabledByDefault": true, 
         "Id": "x11", 
         "License": "GPL", 
         "Name": "X11 Framebuffer for KRfb", 
         "Name[ca@valencia]": "«Framebuffer» del X11 per al KRfb.", 
         "Name[ca]": "«Framebuffer» del X11 per al KRfb.", 
+        "Name[cs]": "X11 Framebuffer pro KRfb", 
         "Name[de]": "X11-Framebuffer für KRfb", 
-        "Name[en_GB]": "X11 Framebuffer for KRfb", 
         "Name[es]": "Framebuffer X11 para KRfb", 
         "Name[fi]": "X11-kehyspuskuri KRfb:lle", 
         "Name[gl]": "Framebuffer de X11 para KRfb", 
@@ -53,7 +52,6 @@
         "Name[uk]": "Буфер кадрів X11 для KRfb", 
         "Name[x-test]": "xxX11 Framebuffer for KRfbxx", 
         "Name[zh_CN]": "XRfb 的 X11 帧缓冲", 
-        "Name[zh_TW]": "KRfb 的 X11 Framebuffer", 
         "ServiceTypes": [
             "krfb/framebuffer"
         ], 

krfb/krfb-framebuffer.json

@@ -3,9 +3,9 @@
         "Description": "Frame Buffer plugins for KRfb", 
         "Description[ca@valencia]": "Connectors de «framebuffer» per al KRfb.", 
         "Description[ca]": "Connectors de «framebuffer» per al KRfb.", 
+        "Description[cs]": "Moduly Frame bufferu pro KRfb", 
         "Description[da]": "Framebuffer-plugins til KRfb", 
         "Description[de]": "Framebuffer-Module für KRfb", 
-        "Description[en_GB]": "Frame Buffer plugins for KRfb", 
         "Description[es]": "Complementos de framebuffer para KRfb", 
         "Description[fi]": "Kehyspuskuriliitännäinen kohteelle KRfb", 
         "Description[gl]": "Engadido de frame buffer para KRfb", 
@@ -24,8 +24,7 @@
         "Description[sv]": "Insticksprogram med rambuffert för Krfb", 
         "Description[uk]": "Додатки буфера кадрів для KRfb", 
         "Description[x-test]": "xxFrame Buffer plugins for KRfbxx", 
-        "Description[zh_CN]": "KRfb 的帧缓冲插件", 
-        "Description[zh_TW]": "KRfb 的 Frame Buffer 外掛程式"
+        "Description[zh_CN]": "KRfb 的帧缓冲插件"
     }, 
     "X-KDE-ServiceType": "krfb/framebuffer"
 }