x2go-commits January 2013

x2go-commits@lists.x2go.org

1 participants
160 discussions

x2goclient.git - master (branch) updated: 4.0.0.0-9-gbd890a6
by git-admin＠x2go.org 30 Jan '13

30 Jan '13

The branch, master has been updated via bd890a600b25c48d2054c2708054db28cb776e7a (commit) from 88dc7a188651c07d52ede7b8ff6b2dd675a4ff0f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bd890a600b25c48d2054c2708054db28cb776e7a Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Wed Jan 30 15:32:00 2013 +0100 Fix X2Go Logo ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + svg/x2gologo.svg | 513 ++++++++++++++++++++++-------------------------------- 2 files changed, 209 insertions(+), 305 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f0ae9a9..b163966 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low - Set autologin as false by default. Quote session ID in SSH broker code - support for session key "usebrokerpassforproxy" - use broker pass for authentication on proxy + - Fix X2Go Logo -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 30 Dec 2012 15:41:04 +0100 diff --git a/svg/x2gologo.svg b/svg/x2gologo.svg index c88606a..7cc8da5 100644 --- a/svg/x2gologo.svg +++ b/svg/x2gologo.svg @@ -1,106 +1,35 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> + <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.48.3.1 r9886" + version="1.0" width="128" height="128" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.46" sodipodi:docname="x2go-logo.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.0" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata87"> + id="metadata45"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>x2go Logo</dc:title> - <dc:date>12.06.2007</dc:date> - <dc:creator> - <cc:Agent> - <dc:title>Heinz-M. Graesing</dc:title> - </cc:Agent> - </dc:creator> - <dc:rights> - <cc:Agent> - <dc:title>obviously-nice</dc:title> - </cc:Agent> - </dc:rights> - <dc:publisher> - <cc:Agent> - <dc:title>obviously-nice</dc:title> - </cc:Agent> - </dc:publisher> - <dc:source>http://www.x2go.org/artwork</dc:source> - <dc:language>DE</dc:language> - <dc:subject> - <rdf:Bag> - <rdf:li>Logo</rdf:li> - </rdf:Bag> - </dc:subject> - <cc:license - rdf:resource="http://www.gnu.org/licenses/gpl-2.0.txt" /> </cc:Work> </rdf:RDF> </metadata> - <defs - id="defs85"> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 64 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="128 : 64 : 1" - inkscape:persp3d-origin="64 : 42.666667 : 1" - id="perspective46" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4472" - id="radialGradient4478" - cx="44.602337" - cy="44.941875" - fx="44.602337" - fy="44.941875" - r="35.79092" - gradientTransform="matrix(1,0,0,1.15885,67.847226,-18.98329)" - gradientUnits="userSpaceOnUse" /> - <linearGradient - id="linearGradient4472"> - <stop - style="stop-color: rgb(23, 118, 255); stop-opacity: 1;" - offset="0" - id="stop4474" /> - <stop - id="stop4564" - offset="1" - style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" /> - </linearGradient> - <radialGradient - r="35.79092" - fy="44.941875" - fx="44.602337" - cy="44.941875" - cx="44.602337" - gradientTransform="matrix(1.5430561,0,0,1.7881705,-4.7786,-14.363356)" - gradientUnits="userSpaceOnUse" - id="radialGradient3195" - xlink:href="#linearGradient4472" - inkscape:collect="always" /> - </defs> <sodipodi:namedview - inkscape:window-height="1056" - inkscape:window-width="1855" + inkscape:window-height="713" + inkscape:window-width="1280" inkscape:pageshadow="2" inkscape:pageopacity="0.0" guidetolerance="10.0" @@ -110,232 +39,206 @@ bordercolor="#666666" pagecolor="#ffffff" id="base" - showgrid="true" - inkscape:object-nodes="true" - inkscape:grid-points="true" - inkscape:guide-points="true" - width="128px" - height="128px" - inkscape:zoom="3.82" + showgrid="false" + inkscape:zoom="3.890625" inkscape:cx="64" - inkscape:cy="64" - inkscape:window-x="65" - inkscape:window-y="24" - inkscape:current-layer="svg2" - inkscape:window-maximized="1"> - <inkscape:grid - id="GridFromPre046Settings" - type="xygrid" - originx="0px" - originy="0px" - spacingx="1px" - spacingy="1px" - color="#0000ff" - empcolor="#0000ff" - opacity="0.2" - empopacity="0.4" - empspacing="5" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" - dotted="true" /> - </sodipodi:namedview> - <path - style="fill:#ffffff;fill-opacity:1;stroke:none" - d="m 9.9375,2.03125 c -4.3962933,0 -8,3.5724569 -8,7.96875 l 0,108.0625 c 0,4.39629 3.6037067,8 8,8 l 108.0625,0 c 4.3963,0 7.96875,-3.60371 7.96875,-8 l 0,-108.0625 c 0,-4.3962931 -3.57245,-7.96875 -7.96875,-7.96875 z" - id="rect3043" - inkscape:connector-curvature="0" - sodipodi:nodetypes="sssssssss" /> - <path - sodipodi:nodetypes="cssccssccccssccssc" - inkscape:connector-curvature="0" - id="path3045" - d="M 9.0087977,0 C 4.0359413,0 0,4.0359413 0,9.0087977 L 0,118.9912 C 0,123.96406 4.0359413,128 9.0087977,128 L 118.9912,128 C 123.96406,128 128,123.96406 128,118.9912 L 128,9.0087977 C 128,4.0359413 123.96406,0 118.9912,0 82.330401,0 45.669599,0 9.0087977,0 z m 0.9384164,2.0332356 c 36.0143369,0 72.0286739,0 108.0430059,0 4.3963,0 7.97654,3.5802463 7.97654,7.9765394 l 0,108.043015 c 0,4.39629 -3.58024,8.00782 -7.97654,8.00782 l -108.0430059,0 c -4.3962933,0 -8.0078202,-3.61153 -8.0078202,-8.00782 l 0,-108.043015 c 0,-4.3962931 3.6115269,-7.9765394 8.0078202,-7.9765394 z" - style="fill:#4d4d4d" /> - <g - style="fill:#4d4d4d" - id="g4" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 90,977.626 13.32,-25.776 c 0.936,-2.52 1.368,-4.32 1.368,-5.256 0,-1.512 -0.504,-2.664 -1.44,-3.312 -1.008,-0.72 -2.736,-1.08 -5.184,-1.08 l 0,-2.376 22.104,0 0,2.376 c -3.024,0 -5.184,0.648 -6.696,1.944 -1.512,1.296 -3.6,4.752 -6.48,10.368 l -14.616,28.44 18.432,41.544 c 1.872,3.888 3.528,6.624 4.968,8.136 1.44,1.44 3.168,2.232 5.112,2.232 l 0,2.304 -26.352,0 0,-2.304 c 2.376,0 4.032,-0.288 5.04,-0.936 1.008,-0.576 1.512,-1.584 1.512,-2.88 0,-1.224 -0.72,-3.384 -2.016,-6.552 l -12.96,-29.016 -14.832,29.016 c -1.368,2.448 -2.088,4.464 -2.088,5.976 0,2.952 2.16,4.392 6.48,4.392 l 0,2.304 -19.944,0 0,-2.304 c 1.944,0 3.672,-0.648 5.112,-1.872 1.44,-1.224 2.952,-3.312 4.392,-6.408 L 83.736,990.01 67.248,952.498 c -1.728,-4.032 -3.312,-6.696 -4.824,-8.136 -1.584,-1.44 -3.816,-2.16 -6.696,-2.16 l 0,-2.376 28.296,0 0,2.376 c -4.392,0 -6.624,1.512 -6.624,4.536 0,1.512 0.432,3.24 1.296,5.112 L 90,977.626 z" - id="path6" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g8" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,940.474 43.992,-1.224 0,2.448 -43.992,-1.224 z" - id="path10" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g12" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,946.45 43.992,-1.152 0,1.656 5.184,0.072 0.36,0 0.288,0 0.288,0.072 0.288,0 0.288,0.072 0.216,0.072 0.216,0.072 0.216,0.072 0.144,0.072 0.144,0.072 0.144,0.072 0.144,0.072 0.072,0.072 0.144,0.072 0,0.072 0.072,0 -52.2,-1.44 z" - id="path14" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g16" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,952.498 54.288,-1.512 0.216,0.36 0.288,0.576 0.288,0.576 0.288,0.648 0.288,0.648 0.144,0.216 -55.8,-1.512 z" - id="path18" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g20" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,958.474 56.952,-1.584 1.44,3.168 -58.392,-1.584 z" - id="path22" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g24" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,964.45 59.544,-1.584 1.44,3.24 -60.984,-1.656 z" - id="path26" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g28" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,970.498 62.136,-1.728 1.512,3.456 -63.648,-1.728 z" - id="path30" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g32" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,976.474 64.728,-1.8 1.584,3.6 -66.312,-1.8 z" - id="path34" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g36" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,982.45 67.32,-1.8 1.656,3.672 -68.976,-1.872 z" - id="path38" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g40" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,988.426 69.912,-1.872 1.512,3.312 -0.216,0.504 -71.208,-1.944 z" - id="path42" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g44" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,994.402 70.128,-1.944 -1.944,3.816 -68.184,-1.872 z" - id="path46" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g48" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,1000.378 67.032,-1.8 -1.8,3.6 -65.232,-1.8 z" - id="path50" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g52" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,1006.354 63.936,-1.728 -1.728,3.456 -62.208,-1.728 z" - id="path54" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g56" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,1012.402 60.912,-1.656 -1.728,3.24 -59.184,-1.584 z" - id="path58" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g60" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,1036.378 43.992,-1.224 0,2.448 -43.992,-1.224 z" - id="path62" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g64" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,1030.402 51.12,-1.44 -0.072,0.144 -0.144,0.072 -0.144,0.144 -0.144,0.072 -0.072,0.144 -0.144,0.072 -0.072,0.072 -0.144,0 -0.144,0.072 -0.072,0.072 -0.144,0.072 -0.072,0 -0.144,0.072 -0.144,0 -0.072,0 -0.144,0.072 -0.144,0 -0.144,0 -4.968,0.072 0,1.44 -43.992,-1.152 z" - id="path66" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g68" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,1024.354 54.792,-1.44 -0.792,1.584 -0.288,0.504 -0.216,0.504 -0.216,0.36 -53.28,-1.512 z" - id="path70" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> + inkscape:cy="55.972543" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:current-layer="svg2" /> + <defs + id="defs85"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 64 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="128 : 64 : 1" + inkscape:persp3d-origin="64 : 42.666667 : 1" + id="perspective47" /> + </defs> <g - style="fill:#4d4d4d" - id="g72" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,1018.378 57.816,-1.584 -1.512,3.096 -56.304,-1.512 z" - id="path74" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> + id="g2420" + transform="matrix(0.8602352,0,0,0.8602352,9.0000023,8.8898921)" + style="fill:#ffffff"> + <g + style="fill:#ffffff" + id="g4" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path6" + d="M 90,977.626 L 103.32,951.85 C 104.256,949.33 104.688,947.53 104.688,946.594 C 104.688,945.082 104.184,943.93 103.248,943.282 C 102.24,942.562 100.512,942.202 98.064,942.202 L 98.064,939.826 L 120.168,939.826 L 120.168,942.202 C 117.144,942.202 114.984,942.85 113.472,944.146 C 111.96,945.442 109.872,948.898 106.992,954.514 L 92.376,982.954 L 110.808,1024.498 C 112.68,1028.386 114.336,1031.122 115.776,1032.634 C 117.216,1034.074 118.944,1034.866 120.888,1034.866 L 120.888,1037.17 L 94.536,1037.17 L 94.536,1034.866 C 96.912,1034.866 98.568,1034.578 99.576,1033.93 C 100.584,1033.354 101.088,1032.346 101.088,1031.05 C 101.088,1029.826 100.368,1027.666 99.072,1024.498 L 86.112,995.482 L 71.28,1024.498 C 69.912,1026.946 69.192,1028.962 69.192,1030.474 C 69.192,1033.426 71.352,1034.866 75.672,1034.866 L 75.672,1037.17 L 55.728,1037.17 L 55.728,1034.866 C 57.672,1034.866 59.4,1034.218 60.84,1032.994 C 62.28,1031.77 63.792,1029.682 65.232,1026.586 L 83.736,990.01 L 67.248 ,952.498 C 65.52,948.466 63.936,945.802 62.424,944.362 C 60.84,942.922 58.608,942.202 55.728,942.202 L 55.728,939.826 L 84.024,939.826 L 84.024,942.202 C 79.632,942.202 77.4,943.714 77.4,946.738 C 77.4,948.25 77.832,949.978 78.696,951.85 L 90,977.626 z" /> + </g> + <g + style="fill:#ffffff" + id="g8" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path10" + d="M 6.984,940.474 L 50.976,939.25 L 50.976,941.698 L 6.984,940.474 z" /> + </g> + <g + style="fill:#ffffff" + id="g12" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path14" + d="M 6.984,946.45 L 50.976,945.298 L 50.976,946.954 L 56.16,947.026 L 56.52,947.026 L 56.808,947.026 L 57.096,947.098 L 57.384,947.098 L 57.672,947.17 L 57.888,947.242 L 58.104,947.314 L 58.32,947.386 L 58.464,947.458 L 58.608,947.53 L 58.752,947.602 L 58.896,947.674 L 58.968,947.746 L 59.112,947.818 L 59.112,947.89 L 59.184,947.89 L 6.984,946.45 z" /> + </g> + <g + style="fill:#ffffff" + id="g16" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path18" + d="M 6.984,952.498 L 61.272,950.986 L 61.488,951.346 L 61.776,951.922 L 62.064,952.498 L 62.352,953.146 L 62.64,953.794 L 62.784,954.01 L 6.984,952.498 z" /> + </g> + <g + style="fill:#ffffff" + id="g20" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path22" + d="M 6.984,958.474 L 63.936,956.89 L 65.376,960.058 L 6.984,958.474 z" /> + </g> + <g + style="fill:#ffffff" + id="g24" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path26" + d="M 6.984,964.45 L 66.528,962.866 L 67.968,966.106 L 6.984,964.45 z" /> + </g> + <g + style="fill:#ffffff" + id="g28" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path30" + d="M 6.984,970.498 L 69.12,968.77 L 70.632,972.226 L 6.984,970.498 z" /> + </g> + <g + style="fill:#ffffff" + id="g32" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path34" + d="M 6.984,976.474 L 71.712,974.674 L 73.296,978.274 L 6.984,976.474 z" /> + </g> + <g + style="fill:#ffffff" + id="g36" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path38" + d="M 6.984,982.45 L 74.304,980.65 L 75.96,984.322 L 6.984,982.45 z" /> + </g> + <g + style="fill:#ffffff" + id="g40" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path42" + d="M 6.984,988.426 L 76.896,986.554 L 78.408,989.866 L 78.192,990.37 L 6.984,988.426 z" /> + </g> + <g + style="fill:#ffffff" + id="g44" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path46" + d="M 6.984,994.402 L 77.112,992.458 L 75.168,996.274 L 6.984,994.402 z" /> + </g> + <g + style="fill:#ffffff" + id="g48" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path50" + d="M 6.984,1000.378 L 74.016,998.578 L 72.216,1002.178 L 6.984,1000.378 z" /> + </g> + <g + style="fill:#ffffff" + id="g52" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path54" + d="M 6.984,1006.354 L 70.92,1004.626 L 69.192,1008.082 L 6.984,1006.354 z" /> + </g> + <g + style="fill:#ffffff" + id="g56" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path58" + d="M 6.984,1012.402 L 67.896,1010.746 L 66.168,1013.986 L 6.984,1012.402 z" /> + </g> + <g + style="fill:#ffffff" + id="g60" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path62" + d="M 6.984,1036.378 L 50.976,1035.154 L 50.976,1037.602 L 6.984,1036.378 z" /> + </g> + <g + style="fill:#ffffff" + id="g64" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path66" + d="M 6.984,1030.402 L 58.104,1028.962 L 58.032,1029.106 L 57.888,1029.178 L 57.744,1029.322 L 57.6,1029.394 L 57.528,1029.538 L 57.384,1029.61 L 57.312,1029.682 L 57.168,1029.682 L 57.024,1029.754 L 56.952,1029.826 L 56.808,1029.898 L 56.736,1029.898 L 56.592,1029.97 L 56.448,1029.97 L 56.376,1029.97 L 56.232,1030.042 L 56.088,1030.042 L 55.944,1030.042 L 50.976,1030.114 L 50.976,1031.554 L 6.984,1030.402 z" /> + </g> + <g + style="fill:#ffffff" + id="g68" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path70" + d="M 6.984,1024.354 L 61.776,1022.914 L 60.984,1024.498 L 60.696,1025.002 L 60.48,1025.506 L 60.264,1025.866 L 6.984,1024.354 z" /> + </g> + <g + style="fill:#ffffff" + id="g72" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path74" + d="M 6.984,1018.378 L 64.8,1016.794 L 63.288,1019.89 L 6.984,1018.378 z" /> + </g> + <g + style="fill:#ffffff" + id="g76" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path78" + d="M 63.936,924.49 L 118.872,924.49 C 123.84,924.49 127.872,928.522 127.872,933.49 L 127.872,1043.362 C 127.872,1048.33 123.84,1052.362 118.872,1052.362 L 63.936,1052.362 L 63.936,1050.418 L 117.864,1050.418 C 122.256,1050.418 125.856,1046.818 125.856,1042.426 L 125.856,934.498 C 125.856,930.106 122.256,926.506 117.864,926.506 L 63.936,926.506 L 63.936,924.49 z" /> + </g> + <g + style="fill:#ffffff" + id="g80" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path82" + d="M 9,924.49 L 63.936,924.49 L 63.936,926.506 L 9.936,926.506 C 5.544,926.506 1.944,930.106 1.944,934.498 L 1.944,1042.426 C 1.944,1046.818 5.544,1050.418 9.936,1050.418 L 63.936,1050.418 L 63.936,1052.362 L 9,1052.362 C 4.032,1052.362 0,1048.33 0,1043.362 L 0,933.49 C 0,928.522 4.032,924.49 9,924.49 z" /> + </g> </g> - <path - style="fill:#4d4d4d" - d="M 9.0087977,0 C 4.0359413,0 0,4.0359413 0,9.0087977 L 0,118.9912 C 0,123.96406 4.0359413,128 9.0087977,128 L 118.9912,128 C 123.96406,128 128,123.96406 128,118.9912 L 128,9.0087977 C 128,4.0359413 123.96406,0 118.9912,0 82.330401,0 45.669599,0 9.0087977,0 z m 0.9384164,2.0332356 c 36.0143369,0 72.0286739,0 108.0430059,0 4.3963,0 7.97654,3.5802463 7.97654,7.9765394 l 0,108.043015 c 0,4.39629 -3.58024,8.00782 -7.97654,8.00782 l -108.0430059,0 c -4.3962933,0 -8.0078202,-3.61153 -8.0078202,-8.00782 l 0,-108.043015 c 0,-4.3962931 3.6115269,-7.9765394 8.0078202,-7.9765394 z" - id="path78" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cssccssccccssccssc" /> </svg> hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 4.0.0.0-8-g88dc7a1
by git-admin＠x2go.org 30 Jan '13

30 Jan '13

The branch, master has been updated via 88dc7a188651c07d52ede7b8ff6b2dd675a4ff0f (commit) via d767876fde35b86ddb333fc3ad8ba2eed3c1dbcc (commit) from bae30fd56eb3d3eaf36c8b039dd309e6445fb593 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 88dc7a188651c07d52ede7b8ff6b2dd675a4ff0f Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Wed Jan 30 14:43:21 2013 +0100 support for session key "usebrokerpassforproxy" - use broker pass for authentication on proxy commit d767876fde35b86ddb333fc3ad8ba2eed3c1dbcc Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Wed Jan 30 14:22:29 2013 +0100 Set autologin as false by default. Quote session ID in SSH broker code ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ httpbrokerclient.cpp | 2 +- onmainwindow.cpp | 17 +++++++++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2cc467b..f0ae9a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low [ Oleksandr Shneyder ] * New upstream version (4.0.1.0): - Fix support for RSA Keys in X2Go Broker code. + - Set autologin as false by default. Quote session ID in SSH broker code + - support for session key "usebrokerpassforproxy" - use broker pass for + authentication on proxy -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 30 Dec 2012 15:41:04 +0100 diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index fe6d89f..3093a48 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -270,7 +270,7 @@ void HttpBrokerClient::selectUserSession(const QString& session) } else { - sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task selectsession --sid "+session, + sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task selectsession --sid \\\""+session+"\\\"", this,SLOT ( slotSelectSession(bool,QString,int))); } diff --git a/onmainwindow.cpp b/onmainwindow.cpp index db72c4a..24cdb2a 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -103,6 +103,9 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) appSeparator=0; config.brokerNoAuth=false; + config.brokerAutologin=false; + cmdAutologin=false; + #ifdef Q_OS_WIN @@ -3337,8 +3340,18 @@ bool ONMainWindow::startSession ( const QString& sid ) if(useproxy && !proxyAutologin && proxyKey.length()<=0) { bool ok; - proxypassword=QInputDialog::getText(0,proxylogin+"@"+proxyserver+":"+QString::number(proxyport), - tr("Enter password for SSH proxy"),QLineEdit::Password,QString::null, &ok); + bool useBrokerPassForProxy=false; + if(brokerMode) + { + useBrokerPassForProxy=(st->setting()->value ( + sid+"/usebrokerpassforproxy", false + ).toBool() ); + } + if(useBrokerPassForProxy) + proxypassword=config.brokerPass; + else + proxypassword=QInputDialog::getText(0,proxylogin+"@"+proxyserver+":"+QString::number(proxyport), + tr("Enter password for SSH proxy"),QLineEdit::Password,QString::null, &ok); } } hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2gobroker.git - master (branch) updated: f0df0578d48cb5eb91bfb1e482d68f4937817fce
by git-admin＠x2go.org 30 Jan '13

30 Jan '13

The branch, master has been updated via f0df0578d48cb5eb91bfb1e482d68f4937817fce (commit) via d705e7ba70e7866ce904a5f509158430db94def7 (commit) from e96a2eb0f50a5fbd8afbe5644f328eaa34caf725 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f0df0578d48cb5eb91bfb1e482d68f4937817fce Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 30 10:52:17 2013 +0100 typo fixes in test_broker_base.py commit d705e7ba70e7866ce904a5f509158430db94def7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jan 30 10:50:58 2013 +0100 enable debug mode when running unit tests ----------------------------------------------------------------------- Summary of changes: test.py | 1 + x2gobroker/tests/test_broker_base.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/test.py b/test.py index 5dce707..353cd16 100755 --- a/test.py +++ b/test.py @@ -24,5 +24,6 @@ Unit tests for Python X2GoBroker. import os if __name__ == "__main__": + os.environ.update({'X2GOBROKER_DEBUG': "1"}) os.chdir(os.path.join('x2gobroker', 'tests',)) os.system('python ./runalltests.py') diff --git a/x2gobroker/tests/test_broker_base.py b/x2gobroker/tests/test_broker_base.py index 8891103..bde1538 100644 --- a/x2gobroker/tests/test_broker_base.py +++ b/x2gobroker/tests/test_broker_base.py @@ -343,13 +343,13 @@ check-credentials = false # no ACLs will grant access acls = { 'acl-users-allow': [], - 'acl-user-deny': [], + 'acl-users-deny': [], 'acl-users-order': 'deny-allow', } self.assertEqual(base_backend.check_profile_acls(username, acls), True) acls = { 'acl-users-allow': [], - 'acl-user-deny': [], + 'acl-users-deny': [], 'acl-users-order': 'allow-deny', } self.assertEqual(base_backend.check_profile_acls(username, acls), True) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.1-78-ge03d857
by git-admin＠x2go.org 29 Jan '13

29 Jan '13

The branch, master has been updated via e03d857ea2dfabacde68f844dfe92dd228aacaff (commit) from f8e4f0889adc9af1e992629269774bff7c059e6c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e03d857ea2dfabacde68f844dfe92dd228aacaff Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jan 29 22:21:45 2013 +0100 rebuild i18n binary files ----------------------------------------------------------------------- Summary of changes: build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo | Bin 550 -> 550 bytes build/mo/da/LC_MESSAGES/PyHoca-GUI.mo | Bin 27456 -> 27534 bytes build/mo/de/LC_MESSAGES/PyHoca-GUI.mo | Bin 29214 -> 29214 bytes build/mo/en/LC_MESSAGES/PyHoca-GUI.mo | Bin 27342 -> 27342 bytes build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 29189 -> 29270 bytes build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo | Bin 546 -> 546 bytes build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo | Bin 27993 -> 27993 bytes build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 26295 -> 27862 bytes build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo | Bin 34172 -> 34172 bytes build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 27336 -> 27336 bytes po/PyHoca-GUI.pot | 2 +- po/bg.po | 2 +- po/da.po | 195 +++++++++++--------------- po/de.po | 2 +- po/en.po | 2 +- po/es.po | 18 ++- po/fr.po | 2 +- po/nb_NO.po | 2 +- po/nl.po | 223 +++++++++++++++--------------- po/ru.po | 2 +- po/sv.po | 2 +- 21 files changed, 215 insertions(+), 237 deletions(-) The diff of changes is: diff --git a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo index 075ee37..c5bb426 100644 Binary files a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo index 2a24b88..3736a42 100644 Binary files a/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo index dca5b77..55816a6 100644 Binary files a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo index c334cec..b5e5988 100644 Binary files a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo index a3a7a14..1dad1be 100644 Binary files a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo index a5c83b5..a785280 100644 Binary files a/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo index 955ba43..5115804 100644 Binary files a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo index e68b847..30183bc 100644 Binary files a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo index b8ae603..c0494a8 100644 Binary files a/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo index 010d39e..3b7ba95 100644 Binary files a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index 4647012..ceb618c 100644 --- a/po/PyHoca-GUI.pot +++ b/po/PyHoca-GUI.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 23:31+0100\n" +"POT-Creation-Date: 2013-01-29 22:21+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/po/bg.po b/po/bg.po index cd3adf4..4d1d4a3 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 23:31+0100\n" +"POT-Creation-Date: 2013-01-29 22:21+0100\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" diff --git a/po/da.po b/po/da.po index 883173b..3ee4d24 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI 0.2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 23:31+0100\n" +"POT-Creation-Date: 2013-01-29 22:21+0100\n" "PO-Revision-Date: 2013-01-29 16:38+0100\n" "Last-Translator: Christoffer Krakou <christoffer(a)fleten.net>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -23,13 +23,11 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:90 -#: ../pyhoca/wxgui/logon.py:102 +#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102 msgid "Username" msgstr "Brugernavn" -#: ../pyhoca/wxgui/logon.py:92 -#: ../pyhoca/wxgui/logon.py:104 +#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104 msgid "Password" msgstr "Kodeord" @@ -49,29 +47,23 @@ msgstr "Sessionslogin" msgid "SSH proxy server login" msgstr "SSH proxy server login" -#: ../pyhoca/wxgui/logon.py:127 -#: ../pyhoca/wxgui/profilemanager.py:373 -#: ../pyhoca/wxgui/listdesktops.py:99 -#: ../pyhoca/wxgui/messages.py:130 -#: ../pyhoca/wxgui/printingprefs.py:147 -#: ../pyhoca/wxgui/sessiontitle.py:85 +#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:373 +#: ../pyhoca/wxgui/listdesktops.py:99 ../pyhoca/wxgui/messages.py:130 +#: ../pyhoca/wxgui/printingprefs.py:147 ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Annullér" -#: ../pyhoca/wxgui/logon.py:297 -#: ../pyhoca/wxgui/logon.py:339 +#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339 #: ../pyhoca/wxgui/frontend.py:612 #, python-format msgid "%s - connect failure" msgstr "%s - forbindelsesfejl" -#: ../pyhoca/wxgui/logon.py:298 -#: ../pyhoca/wxgui/frontend.py:612 +#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:612 msgid "User is not allowed to start X2Go sessions!" msgstr "Bruger har ikke rettigheder til at starte X2Go sessioner!" -#: ../pyhoca/wxgui/logon.py:303 -#: ../pyhoca/wxgui/frontend.py:619 +#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:619 #, python-format msgid "%s - connect" msgstr "%s - forbind" @@ -97,32 +89,29 @@ msgstr "%s - SSH proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Autentificering mod SSH proxy server mislykkedes!" -#: ../pyhoca/wxgui/logon.py:376 -#: ../pyhoca/wxgui/frontend.py:670 +#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:670 #, python-format msgid "%s - socket error" msgstr "%s - socket fejl" -#: ../pyhoca/wxgui/logon.py:383 -#: ../pyhoca/wxgui/frontend.py:649 +#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:649 #: ../pyhoca/wxgui/frontend.py:656 #, python-format msgid "%s - host key error" msgstr "%s - værtsnøgle fejl" -#: ../pyhoca/wxgui/logon.py:384 -#: ../pyhoca/wxgui/frontend.py:649 -msgid "The remote server's host key is invalid or has not been accepted by the user" -msgstr "Fjernserverens værtsnøgle er ugyldig eller blev ikke accepteret af brugeren" +#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:649 +msgid "" +"The remote server's host key is invalid or has not been accepted by the user" +msgstr "" +"Fjernserverens værtsnøgle er ugyldig eller blev ikke accepteret af brugeren" -#: ../pyhoca/wxgui/logon.py:391 -#: ../pyhoca/wxgui/frontend.py:691 +#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:691 #, python-format msgid "%s - missing home directory" msgstr "%s - manglende hjemmemappe" -#: ../pyhoca/wxgui/logon.py:392 -#: ../pyhoca/wxgui/frontend.py:691 +#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:691 msgid "The remote user's home directory does not exist." msgstr "Fjernbrugerens hjemmemappe eksisterer ikke" @@ -131,14 +120,12 @@ msgstr "Fjernbrugerens hjemmemappe eksisterer ikke" msgid "%s - key error" msgstr "%s - nøglefejl" -#: ../pyhoca/wxgui/logon.py:407 -#: ../pyhoca/wxgui/frontend.py:698 +#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:698 #, python-format msgid "%s - auth error" msgstr "%s - auth fejl" -#: ../pyhoca/wxgui/logon.py:415 -#: ../pyhoca/wxgui/frontend.py:642 +#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:642 #, python-format msgid "%s - SSH error" msgstr "%s - SSH fejl" @@ -234,28 +221,23 @@ msgstr "Windows Terminal Server (RDP igennem X2Go-proxy)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminal Server (Direkte RDP)" -#: ../pyhoca/wxgui/profilemanager.py:91 -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:91 ../pyhoca/wxgui/profilemanager.py:243 msgid "Custom command" msgstr "Tilpasset kommando" -#: ../pyhoca/wxgui/profilemanager.py:96 -#: ../pyhoca/wxgui/menus_taskbar.py:406 +#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:406 msgid "Internet Browser" msgstr "Internet Browser" -#: ../pyhoca/wxgui/profilemanager.py:97 -#: ../pyhoca/wxgui/menus_taskbar.py:407 +#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:407 msgid "Email Client" msgstr "Email Klient" -#: ../pyhoca/wxgui/profilemanager.py:98 -#: ../pyhoca/wxgui/menus_taskbar.py:408 +#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:408 msgid "Office" msgstr "Kontorsoftware" -#: ../pyhoca/wxgui/profilemanager.py:99 -#: ../pyhoca/wxgui/menus_taskbar.py:409 +#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:409 msgid "Terminal" msgstr "Terminal" @@ -394,18 +376,15 @@ msgstr "Menu med udgivne applikationer" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:259 -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:259 ../pyhoca/wxgui/profilemanager.py:273 msgid "User" msgstr "Bruger" -#: ../pyhoca/wxgui/profilemanager.py:261 -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:261 ../pyhoca/wxgui/profilemanager.py:280 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:263 -#: ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282 msgid "Port" msgstr "Port" @@ -494,10 +473,13 @@ msgstr "Indstil display-DPI" #: ../pyhoca/wxgui/profilemanager.py:310 msgid "Do not set (use server-side tools to configure the keyboard)" -msgstr "Indstil ikke (brug server-side værktøjer til at konfigurere tastaturet)" +msgstr "" +"Indstil ikke (brug server-side værktøjer til at konfigurere tastaturet)" #: ../pyhoca/wxgui/profilemanager.py:311 -msgid "Automatically detect and use client-side keyboard configuration inside the session" +msgid "" +"Automatically detect and use client-side keyboard configuration inside the " +"session" msgstr "Indstil automatisk tastaturet under sessionen" #: ../pyhoca/wxgui/profilemanager.py:312 @@ -564,8 +546,7 @@ msgstr "Gem delemappeliste når sessionen slutter" msgid "Path" msgstr "Sti" -#: ../pyhoca/wxgui/profilemanager.py:347 -#: ../pyhoca/wxgui/profilemanager.py:366 +#: ../pyhoca/wxgui/profilemanager.py:347 ../pyhoca/wxgui/profilemanager.py:366 msgid "Add" msgstr "Tilføj" @@ -617,8 +598,7 @@ msgstr "Gem" msgid "Reset" msgstr "Nulstil" -#: ../pyhoca/wxgui/profilemanager.py:372 -#: ../pyhoca/wxgui/printingprefs.py:143 +#: ../pyhoca/wxgui/profilemanager.py:372 ../pyhoca/wxgui/printingprefs.py:143 msgid "Apply" msgstr "Anvend" @@ -710,8 +690,7 @@ msgstr "Vælg en mappe som skal deles i en session" #: ../pyhoca/wxgui/profilemanager.py:2383 #: ../pyhoca/wxgui/profilemanager.py:2386 -#: ../pyhoca/wxgui/profilemanager.py:2389 -#: ../pyhoca/wxgui/menus_taskbar.py:122 +#: ../pyhoca/wxgui/profilemanager.py:2389 ../pyhoca/wxgui/menus_taskbar.py:122 msgid "Profile Manager" msgstr "Profilmanager" @@ -801,8 +780,7 @@ msgstr "Printerindstillinger" msgid "Client Options" msgstr "Klientparamentre" -#: ../pyhoca/wxgui/menus_taskbar.py:160 -#: ../pyhoca/wxgui/menus_taskbar.py:828 +#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:828 #: ../pyhoca/wxgui/menus_taskbar.py:1033 msgid "E&xit" msgstr "E&xit" @@ -811,8 +789,7 @@ msgstr "E&xit" msgid "Window title" msgstr "Vinduestitel" -#: ../pyhoca/wxgui/menus_taskbar.py:238 -#: ../pyhoca/wxgui/menus_taskbar.py:631 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:631 msgid "Resume Session" msgstr "Fortsæt Session" @@ -828,33 +805,27 @@ msgstr "Overfør Session" msgid "Transfer Session (not possible)" msgstr "Overfør Session (ikke muligt)" -#: ../pyhoca/wxgui/menus_taskbar.py:258 -#: ../pyhoca/wxgui/menus_taskbar.py:622 +#: ../pyhoca/wxgui/menus_taskbar.py:258 ../pyhoca/wxgui/menus_taskbar.py:622 msgid "Suspend Session (and disconnect/exit)" msgstr "Suspendér Session (og afbryd forbindelse/luk)" -#: ../pyhoca/wxgui/menus_taskbar.py:260 -#: ../pyhoca/wxgui/menus_taskbar.py:624 +#: ../pyhoca/wxgui/menus_taskbar.py:260 ../pyhoca/wxgui/menus_taskbar.py:624 msgid "Suspend Session (and disconnect)" msgstr "Suspendér Session (og afbryd forbindelse)" -#: ../pyhoca/wxgui/menus_taskbar.py:262 -#: ../pyhoca/wxgui/menus_taskbar.py:626 +#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:626 msgid "Suspend Session" msgstr "Suspendér Session" -#: ../pyhoca/wxgui/menus_taskbar.py:268 -#: ../pyhoca/wxgui/menus_taskbar.py:635 +#: ../pyhoca/wxgui/menus_taskbar.py:268 ../pyhoca/wxgui/menus_taskbar.py:635 msgid "Terminate Session (and disconnect/exit)" msgstr "Terminér Session (og afbryd forbindelse/luk)" -#: ../pyhoca/wxgui/menus_taskbar.py:270 -#: ../pyhoca/wxgui/menus_taskbar.py:637 +#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:637 msgid "Terminate Session (and disconnect)" msgstr "Terminér Session (og afbryd forbindelse)" -#: ../pyhoca/wxgui/menus_taskbar.py:272 -#: ../pyhoca/wxgui/menus_taskbar.py:639 +#: ../pyhoca/wxgui/menus_taskbar.py:272 ../pyhoca/wxgui/menus_taskbar.py:639 msgid "Terminate Session" msgstr "Terminér Session" @@ -870,8 +841,7 @@ msgstr "Stop Skrivebordsdeling (og afbryd forbindelse)" msgid "End Desktop Sharing" msgstr "Stop Skrivebordsdeling" -#: ../pyhoca/wxgui/menus_taskbar.py:283 -#: ../pyhoca/wxgui/menus_taskbar.py:619 +#: ../pyhoca/wxgui/menus_taskbar.py:283 ../pyhoca/wxgui/menus_taskbar.py:619 msgid "Refresh menu tree" msgstr "Opfrisk menu" @@ -943,8 +913,7 @@ msgstr "Værktøjer" msgid "Other Applications" msgstr "Andre Programmer" -#: ../pyhoca/wxgui/menus_taskbar.py:535 -#: ../pyhoca/wxgui/menus_taskbar.py:547 +#: ../pyhoca/wxgui/menus_taskbar.py:535 ../pyhoca/wxgui/menus_taskbar.py:547 #, python-format msgid "Connect %s" msgstr "Forbind %s" @@ -957,18 +926,15 @@ msgstr "Forbinder..." msgid "Start &new Desktop Session" msgstr "Start &ny Skrivebordssession" -#: ../pyhoca/wxgui/menus_taskbar.py:560 -#: ../pyhoca/wxgui/menus_taskbar.py:660 +#: ../pyhoca/wxgui/menus_taskbar.py:560 ../pyhoca/wxgui/menus_taskbar.py:660 msgid "Start Desktop Sharing Session" msgstr "Start Skrivebordsdeling" -#: ../pyhoca/wxgui/menus_taskbar.py:566 -#: ../pyhoca/wxgui/menus_taskbar.py:710 +#: ../pyhoca/wxgui/menus_taskbar.py:566 ../pyhoca/wxgui/menus_taskbar.py:710 msgid "Retrieving Application Menu..." msgstr "Henter Applikationsmenu" -#: ../pyhoca/wxgui/menus_taskbar.py:570 -#: ../pyhoca/wxgui/menus_taskbar.py:713 +#: ../pyhoca/wxgui/menus_taskbar.py:570 ../pyhoca/wxgui/menus_taskbar.py:713 msgid "Retrieve Application Menu" msgstr "Hent Applikationsmenu" @@ -1044,8 +1010,7 @@ msgstr "Eksporter Profilgruppe" msgid "Connect Server" msgstr "Forbind Server" -#: ../pyhoca/wxgui/about.py:78 -#: ../pyhoca/wxgui/about.py:80 +#: ../pyhoca/wxgui/about.py:78 ../pyhoca/wxgui/about.py:80 #, python-format msgid "About %s ..." msgstr "Om %s" @@ -1077,8 +1042,11 @@ msgid "SSH key authentication has been successful." msgstr "SSH nøgleautentificering lykkedes" #: ../pyhoca/wxgui/frontend.py:656 -msgid "The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "SSH proxy'ens værstnøgle er ugyldig eller er ikke blevet accepteret af brugeren" +msgid "" +"The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "" +"SSH proxy'ens værstnøgle er ugyldig eller er ikke blevet accepteret af " +"brugeren" #: ../pyhoca/wxgui/frontend.py:677 #, python-format @@ -1148,8 +1116,7 @@ msgstr "" "Skrivebordsdeling med %s kræver \n" "X2Go Server 4.1.0.0 eller højere" -#: ../pyhoca/wxgui/frontend.py:837 -#: ../pyhoca/wxgui/frontend.py:1488 +#: ../pyhoca/wxgui/frontend.py:837 ../pyhoca/wxgui/frontend.py:1488 #, python-format msgid "%s - session warning" msgstr "%s - sessionsadvarsel" @@ -1284,13 +1251,14 @@ msgstr "%s - kanalfejl" #: ../pyhoca/wxgui/frontend.py:1409 #, python-format -msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." -msgstr "Mistede forbindelsen til server %s! Prøv at re-autentificere til serveren..." +msgid "" +"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"server..." +msgstr "" +"Mistede forbindelsen til server %s! Prøv at re-autentificere til serveren..." -#: ../pyhoca/wxgui/frontend.py:1426 -#: ../pyhoca/wxgui/frontend.py:1469 -#: ../pyhoca/wxgui/frontend.py:1471 -#: ../pyhoca/wxgui/frontend.py:1507 +#: ../pyhoca/wxgui/frontend.py:1426 ../pyhoca/wxgui/frontend.py:1469 +#: ../pyhoca/wxgui/frontend.py:1471 ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "%s - session failure" msgstr "%s - sessionen fejlede" @@ -1338,13 +1306,21 @@ msgstr "" #: ../pyhoca/wxgui/frontend.py:1488 #, python-format -msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." -msgstr "Omvendt TCP port forwarding forespørgsel for session %s til serverport %s blev afvist" +msgid "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." +msgstr "" +"Omvendt TCP port forwarding forespørgsel for session %s til serverport %s " +"blev afvist" #: ../pyhoca/wxgui/frontend.py:1507 #, python-format -msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2Go/SSH server. Session startup failed." -msgstr "Forwarding tunnel forespørgsler til [%s]:%s til session %s blev nægtet af X2Go/SSH fjernserveren. Sessionsstartop fejlede." +msgid "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2Go/SSH server. Session startup failed." +msgstr "" +"Forwarding tunnel forespørgsler til [%s]:%s til session %s blev nægtet af " +"X2Go/SSH fjernserveren. Sessionsstartop fejlede." #: ../pyhoca/wxgui/frontend.py:1526 #, python-format @@ -1352,11 +1328,12 @@ msgid "%s - audio warning" msgstr "%s - lydadvarsel" #: ../pyhoca/wxgui/frontend.py:1526 -msgid "The X2Go PulseAudio system is not available within Remote Desktop sessions." -msgstr "X2Go PulseAudio systemet er ikke tilgængeligt i Remote Desktop sessioner" +msgid "" +"The X2Go PulseAudio system is not available within Remote Desktop sessions." +msgstr "" +"X2Go PulseAudio systemet er ikke tilgængeligt i Remote Desktop sessioner" -#: ../pyhoca/wxgui/frontend.py:1533 -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1533 ../pyhoca/wxgui/frontend.py:1540 #, python-format msgid "%s - audio error" msgstr "%s - lydfejl" @@ -1439,8 +1416,7 @@ msgstr "" "Klientprintere og mapper kan ikke deles i denne session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1619 -#: ../pyhoca/wxgui/frontend.py:1621 +#: ../pyhoca/wxgui/frontend.py:1619 ../pyhoca/wxgui/frontend.py:1621 #, python-format msgid "%s - print error" msgstr "%s - printerfejl" @@ -1467,8 +1443,7 @@ msgstr "" "...skyldes session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1636 -#: ../pyhoca/wxgui/frontend.py:1651 +#: ../pyhoca/wxgui/frontend.py:1636 ../pyhoca/wxgui/frontend.py:1651 #, python-format msgid "%s - start" msgstr "%s - start" @@ -1491,8 +1466,7 @@ msgstr "" "En anden klient startede X2Go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1666 -#: ../pyhoca/wxgui/frontend.py:1681 +#: ../pyhoca/wxgui/frontend.py:1666 ../pyhoca/wxgui/frontend.py:1681 #, python-format msgid "%s - resume" msgstr "%s - fortsæt" @@ -1589,8 +1563,7 @@ msgstr "Ja" msgid "No" msgstr "Nej" -#: ../pyhoca/wxgui/messages.py:124 -#: ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "Ok" diff --git a/po/de.po b/po/de.po index 38250ac..9aa393f 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 23:31+0100\n" +"POT-Creation-Date: 2013-01-29 22:21+0100\n" "PO-Revision-Date: 2013-01-22 07:37+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" diff --git a/po/en.po b/po/en.po index 05a6e64..4338629 100644 --- a/po/en.po +++ b/po/en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 23:31+0100\n" +"POT-Creation-Date: 2013-01-29 22:21+0100\n" "PO-Revision-Date: 2013-01-22 07:36+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" diff --git a/po/es.po b/po/es.po index 77e156c..6104e83 100644 --- a/po/es.po +++ b/po/es.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 23:31+0100\n" +"POT-Creation-Date: 2013-01-29 22:21+0100\n" "PO-Revision-Date: 2013-01-24 09:59-0000\n" "Last-Translator: Ricardo Díaz <oceanosoftlapalma(a)gmail.com>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -355,8 +355,8 @@ msgstr "Iniciar sesión automáticamente tras el login" #, python-format msgid "Login automatically after %s has started (needs --auto-connect)" msgstr "" -"El inicio de sesión automático ha comenzado tras %s (se necesita " -"--auto-connect)" +"El inicio de sesión automático ha comenzado tras %s (se necesita --auto-" +"connect)" #: ../pyhoca/wxgui/profilemanager.py:239 msgid "Type" @@ -620,12 +620,14 @@ msgstr "Reiniciar" msgid "Apply" msgstr "Aplicar" -#: ../pyhoca/wxgui/profilemanager.py:423 ../pyhoca/wxgui/profilemanager.py:1135 +#: ../pyhoca/wxgui/profilemanager.py:423 +#: ../pyhoca/wxgui/profilemanager.py:1135 #: ../pyhoca/wxgui/profilemanager.py:2303 msgid "automatically" msgstr "automáticamente" -#: ../pyhoca/wxgui/profilemanager.py:425 ../pyhoca/wxgui/profilemanager.py:1137 +#: ../pyhoca/wxgui/profilemanager.py:425 +#: ../pyhoca/wxgui/profilemanager.py:1137 msgid "manually" msgstr "manualmente" @@ -695,7 +697,8 @@ msgstr "Elige un icono para este perfil de sesión" msgid "All files (*.*)|*" msgstr "Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1897 ../pyhoca/wxgui/profilemanager.py:1921 +#: ../pyhoca/wxgui/profilemanager.py:1897 +#: ../pyhoca/wxgui/profilemanager.py:1921 msgid "Choose a public SSH key" msgstr "Elige una clave pública SSH" @@ -713,7 +716,8 @@ msgstr "Gestor de Perfiles" msgid "Profile name is missing, profile unusable!!!" msgstr "¡¡¡Nombre de pefil no encontrado o no válido!!!" -#: ../pyhoca/wxgui/profilemanager.py:2386 ../pyhoca/wxgui/profilemanager.py:2389 +#: ../pyhoca/wxgui/profilemanager.py:2386 +#: ../pyhoca/wxgui/profilemanager.py:2389 #, python-format msgid "Profile name %s already exists!!!" msgstr "El perfil de usuario %s ya existe!!!" diff --git a/po/fr.po b/po/fr.po index d24888c..59c7a24 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 23:31+0100\n" +"POT-Creation-Date: 2013-01-29 22:21+0100\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" diff --git a/po/nb_NO.po b/po/nb_NO.po index e357fd3..7652968 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 23:31+0100\n" +"POT-Creation-Date: 2013-01-29 22:21+0100\n" "PO-Revision-Date: 2013-01-23 23:07+0100\n" "Last-Translator: Terje Andersen <teranders(a)gmail.com>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" diff --git a/po/nl.po b/po/nl.po index 94f50ea..eee1336 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-29 20:57+0100\n" +"POT-Creation-Date: 2013-01-29 22:21+0100\n" "PO-Revision-Date: 2013-01-29 20:57+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -25,13 +25,11 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:90 -#: ../pyhoca/wxgui/logon.py:102 +#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102 msgid "Username" msgstr "Gebruiker" -#: ../pyhoca/wxgui/logon.py:92 -#: ../pyhoca/wxgui/logon.py:104 +#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104 msgid "Password" msgstr "Wachtwoord" @@ -51,29 +49,23 @@ msgstr "Sessie login" msgid "SSH proxy server login" msgstr "Login via SSH Proxy" -#: ../pyhoca/wxgui/logon.py:127 -#: ../pyhoca/wxgui/profilemanager.py:373 -#: ../pyhoca/wxgui/listdesktops.py:99 -#: ../pyhoca/wxgui/messages.py:130 -#: ../pyhoca/wxgui/printingprefs.py:147 -#: ../pyhoca/wxgui/sessiontitle.py:85 +#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:373 +#: ../pyhoca/wxgui/listdesktops.py:99 ../pyhoca/wxgui/messages.py:130 +#: ../pyhoca/wxgui/printingprefs.py:147 ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Afbreken" -#: ../pyhoca/wxgui/logon.py:297 -#: ../pyhoca/wxgui/logon.py:339 +#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339 #: ../pyhoca/wxgui/frontend.py:612 #, python-format msgid "%s - connect failure" msgstr "%s - verbinden mislukt" -#: ../pyhoca/wxgui/logon.py:298 -#: ../pyhoca/wxgui/frontend.py:612 +#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:612 msgid "User is not allowed to start X2Go sessions!" msgstr "Gebruiker mag geen X2Go sessie starten!" -#: ../pyhoca/wxgui/logon.py:303 -#: ../pyhoca/wxgui/frontend.py:619 +#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:619 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -99,32 +91,30 @@ msgstr "%s - SSH Proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Authenticatie via SSH Proxy Server mislukt!" -#: ../pyhoca/wxgui/logon.py:376 -#: ../pyhoca/wxgui/frontend.py:670 +#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:670 #, python-format msgid "%s - socket error" msgstr "%s - socket fout" -#: ../pyhoca/wxgui/logon.py:383 -#: ../pyhoca/wxgui/frontend.py:649 +#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:649 #: ../pyhoca/wxgui/frontend.py:656 #, python-format msgid "%s - host key error" msgstr "%s - server sleutel fout" -#: ../pyhoca/wxgui/logon.py:384 -#: ../pyhoca/wxgui/frontend.py:649 -msgid "The remote server's host key is invalid or has not been accepted by the user" -msgstr "De sleutel van de server is ongeldig of is niet geaccepteerd door de gebruiker" +#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:649 +msgid "" +"The remote server's host key is invalid or has not been accepted by the user" +msgstr "" +"De sleutel van de server is ongeldig of is niet geaccepteerd door de " +"gebruiker" -#: ../pyhoca/wxgui/logon.py:391 -#: ../pyhoca/wxgui/frontend.py:691 +#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:691 #, python-format msgid "%s - missing home directory" msgstr "%s - home directory niet aanwezig" -#: ../pyhoca/wxgui/logon.py:392 -#: ../pyhoca/wxgui/frontend.py:691 +#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:691 msgid "The remote user's home directory does not exist." msgstr "De home directory op afstand van de gebruiker bestaat niet" @@ -133,14 +123,12 @@ msgstr "De home directory op afstand van de gebruiker bestaat niet" msgid "%s - key error" msgstr "%s - sleutel fout" -#: ../pyhoca/wxgui/logon.py:407 -#: ../pyhoca/wxgui/frontend.py:698 +#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:698 #, python-format msgid "%s - auth error" msgstr "%s - authenticatie fout" -#: ../pyhoca/wxgui/logon.py:415 -#: ../pyhoca/wxgui/frontend.py:642 +#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:642 #, python-format msgid "%s - SSH error" msgstr "%s - sleutel fout" @@ -234,28 +222,23 @@ msgstr "Windows Terminalserver (via X2Go-proxy)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminalserver (via X2Go-proxy)" -#: ../pyhoca/wxgui/profilemanager.py:91 -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:91 ../pyhoca/wxgui/profilemanager.py:243 msgid "Custom command" msgstr "Speciaal Commando" -#: ../pyhoca/wxgui/profilemanager.py:96 -#: ../pyhoca/wxgui/menus_taskbar.py:406 +#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:406 msgid "Internet Browser" msgstr "Internetbrowser" -#: ../pyhoca/wxgui/profilemanager.py:97 -#: ../pyhoca/wxgui/menus_taskbar.py:407 +#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:407 msgid "Email Client" msgstr "E-Mail Programma" -#: ../pyhoca/wxgui/profilemanager.py:98 -#: ../pyhoca/wxgui/menus_taskbar.py:408 +#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:408 msgid "Office" msgstr "Office" -#: ../pyhoca/wxgui/profilemanager.py:99 -#: ../pyhoca/wxgui/menus_taskbar.py:409 +#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:409 msgid "Terminal" msgstr "Terminal" @@ -394,18 +377,15 @@ msgstr "Menu met gepubliceerde applicaties" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:259 -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:259 ../pyhoca/wxgui/profilemanager.py:273 msgid "User" msgstr "Gebruiker" -#: ../pyhoca/wxgui/profilemanager.py:261 -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:261 ../pyhoca/wxgui/profilemanager.py:280 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:263 -#: ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282 msgid "Port" msgstr "Port" @@ -497,7 +477,9 @@ msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "Uitzetten (gebruik server-side tools om het toetsenbord in te stellen)" #: ../pyhoca/wxgui/profilemanager.py:311 -msgid "Automatically detect and use client-side keyboard configuration inside the session" +msgid "" +"Automatically detect and use client-side keyboard configuration inside the " +"session" msgstr "Gebruik automatisch gedetecteerd toetsenbord in de sessie" #: ../pyhoca/wxgui/profilemanager.py:312 @@ -564,8 +546,7 @@ msgstr "Sla de lijst met te delen informatie wanneer de sessie eindigt" msgid "Path" msgstr "Pad" -#: ../pyhoca/wxgui/profilemanager.py:347 -#: ../pyhoca/wxgui/profilemanager.py:366 +#: ../pyhoca/wxgui/profilemanager.py:347 ../pyhoca/wxgui/profilemanager.py:366 msgid "Add" msgstr "Toevoegen" @@ -617,8 +598,7 @@ msgstr "Opslaan" msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:372 -#: ../pyhoca/wxgui/printingprefs.py:143 +#: ../pyhoca/wxgui/profilemanager.py:372 ../pyhoca/wxgui/printingprefs.py:143 msgid "Apply" msgstr "Toepassen" @@ -710,8 +690,7 @@ msgstr "Kies een map om te delen" #: ../pyhoca/wxgui/profilemanager.py:2383 #: ../pyhoca/wxgui/profilemanager.py:2386 -#: ../pyhoca/wxgui/profilemanager.py:2389 -#: ../pyhoca/wxgui/menus_taskbar.py:122 +#: ../pyhoca/wxgui/profilemanager.py:2389 ../pyhoca/wxgui/menus_taskbar.py:122 msgid "Profile Manager" msgstr "Profiel manager" @@ -801,8 +780,7 @@ msgstr "Voorkeur voor afdrukken" msgid "Client Options" msgstr "Opties" -#: ../pyhoca/wxgui/menus_taskbar.py:160 -#: ../pyhoca/wxgui/menus_taskbar.py:828 +#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:828 #: ../pyhoca/wxgui/menus_taskbar.py:1033 msgid "E&xit" msgstr "&Beeindigen" @@ -811,8 +789,7 @@ msgstr "&Beeindigen" msgid "Window title" msgstr "Scherm titel" -#: ../pyhoca/wxgui/menus_taskbar.py:238 -#: ../pyhoca/wxgui/menus_taskbar.py:631 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:631 msgid "Resume Session" msgstr "Sessie hervatten" @@ -828,33 +805,27 @@ msgstr "Sessie overnemen" msgid "Transfer Session (not possible)" msgstr "Sessie overnemen (niet mogelijk)" -#: ../pyhoca/wxgui/menus_taskbar.py:258 -#: ../pyhoca/wxgui/menus_taskbar.py:622 +#: ../pyhoca/wxgui/menus_taskbar.py:258 ../pyhoca/wxgui/menus_taskbar.py:622 msgid "Suspend Session (and disconnect/exit)" msgstr "Suspend Sessie (en Verbinding verbreken / e&xit)" -#: ../pyhoca/wxgui/menus_taskbar.py:260 -#: ../pyhoca/wxgui/menus_taskbar.py:624 +#: ../pyhoca/wxgui/menus_taskbar.py:260 ../pyhoca/wxgui/menus_taskbar.py:624 msgid "Suspend Session (and disconnect)" msgstr "Suspend Sessie (en Verbinding verbreken)" -#: ../pyhoca/wxgui/menus_taskbar.py:262 -#: ../pyhoca/wxgui/menus_taskbar.py:626 +#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:626 msgid "Suspend Session" msgstr "Suspend Sessie" -#: ../pyhoca/wxgui/menus_taskbar.py:268 -#: ../pyhoca/wxgui/menus_taskbar.py:635 +#: ../pyhoca/wxgui/menus_taskbar.py:268 ../pyhoca/wxgui/menus_taskbar.py:635 msgid "Terminate Session (and disconnect/exit)" msgstr "Sessie beëindigen (en Verbinding verbreken / e&xit)" -#: ../pyhoca/wxgui/menus_taskbar.py:270 -#: ../pyhoca/wxgui/menus_taskbar.py:637 +#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:637 msgid "Terminate Session (and disconnect)" msgstr "Sessie beëindigen (en Verbinding verbreken)" -#: ../pyhoca/wxgui/menus_taskbar.py:272 -#: ../pyhoca/wxgui/menus_taskbar.py:639 +#: ../pyhoca/wxgui/menus_taskbar.py:272 ../pyhoca/wxgui/menus_taskbar.py:639 msgid "Terminate Session" msgstr "Sessie beëindigen" @@ -870,8 +841,7 @@ msgstr "Beëindig delen van de desktop (en verbreek verbinding)" msgid "End Desktop Sharing" msgstr "Beëindig delen van de desktop" -#: ../pyhoca/wxgui/menus_taskbar.py:283 -#: ../pyhoca/wxgui/menus_taskbar.py:619 +#: ../pyhoca/wxgui/menus_taskbar.py:283 ../pyhoca/wxgui/menus_taskbar.py:619 msgid "Refresh menu tree" msgstr "Ververs menu" @@ -943,8 +913,7 @@ msgstr "Hulpmiddelen" msgid "Other Applications" msgstr "Andere applicaties" -#: ../pyhoca/wxgui/menus_taskbar.py:535 -#: ../pyhoca/wxgui/menus_taskbar.py:547 +#: ../pyhoca/wxgui/menus_taskbar.py:535 ../pyhoca/wxgui/menus_taskbar.py:547 #, python-format msgid "Connect %s" msgstr "Verbind %s" @@ -957,18 +926,15 @@ msgstr "Nu aan het verbinden..." msgid "Start &new Desktop Session" msgstr "&Nieuwe Desktop Sessie starten" -#: ../pyhoca/wxgui/menus_taskbar.py:560 -#: ../pyhoca/wxgui/menus_taskbar.py:660 +#: ../pyhoca/wxgui/menus_taskbar.py:560 ../pyhoca/wxgui/menus_taskbar.py:660 msgid "Start Desktop Sharing Session" msgstr "Start delen van de desktop" -#: ../pyhoca/wxgui/menus_taskbar.py:566 -#: ../pyhoca/wxgui/menus_taskbar.py:710 +#: ../pyhoca/wxgui/menus_taskbar.py:566 ../pyhoca/wxgui/menus_taskbar.py:710 msgid "Retrieving Application Menu..." msgstr "Bezig met ophalen applicatiemenu..." -#: ../pyhoca/wxgui/menus_taskbar.py:570 -#: ../pyhoca/wxgui/menus_taskbar.py:713 +#: ../pyhoca/wxgui/menus_taskbar.py:570 ../pyhoca/wxgui/menus_taskbar.py:713 msgid "Retrieve Application Menu" msgstr "Haal applicatiemenu op" @@ -1044,8 +1010,7 @@ msgstr "Export profielgroep" msgid "Connect Server" msgstr "Verbinden met Server" -#: ../pyhoca/wxgui/about.py:78 -#: ../pyhoca/wxgui/about.py:80 +#: ../pyhoca/wxgui/about.py:78 ../pyhoca/wxgui/about.py:80 #, python-format msgid "About %s ..." msgstr "About %s ..." @@ -1077,8 +1042,11 @@ msgid "SSH key authentication has been successful." msgstr "SSH-key authenticatie is gelukt." #: ../pyhoca/wxgui/frontend.py:656 -msgid "The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de gebruiker" +msgid "" +"The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "" +"De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de " +"gebruiker" #: ../pyhoca/wxgui/frontend.py:677 #, python-format @@ -1148,8 +1116,7 @@ msgstr "" "Delen van de desktop met %s wordt ondersteund\n" "vanaf X2Go Server 4.1.0.0 en hoger" -#: ../pyhoca/wxgui/frontend.py:837 -#: ../pyhoca/wxgui/frontend.py:1488 +#: ../pyhoca/wxgui/frontend.py:837 ../pyhoca/wxgui/frontend.py:1488 #, python-format msgid "%s - session warning" msgstr "%s - sessie waarschuwing" @@ -1284,13 +1251,15 @@ msgstr "%s - Verbindingsfout (channel error)" #: ../pyhoca/wxgui/frontend.py:1409 #, python-format -msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." -msgstr "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u opnieuw aan te melden..." +msgid "" +"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"server..." +msgstr "" +"De Verbinding met de server %s werd onverwacht verbroken! Probeer om u " +"opnieuw aan te melden..." -#: ../pyhoca/wxgui/frontend.py:1426 -#: ../pyhoca/wxgui/frontend.py:1469 -#: ../pyhoca/wxgui/frontend.py:1471 -#: ../pyhoca/wxgui/frontend.py:1507 +#: ../pyhoca/wxgui/frontend.py:1426 ../pyhoca/wxgui/frontend.py:1469 +#: ../pyhoca/wxgui/frontend.py:1471 ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "%s - session failure" msgstr "%s - sessie fout" @@ -1338,13 +1307,21 @@ msgstr "" #: ../pyhoca/wxgui/frontend.py:1488 #, python-format -msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." -msgstr "Reverse TCP port forwarding request voor sessie %s naar server port %s niet toegestaan" +msgid "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." +msgstr "" +"Reverse TCP port forwarding request voor sessie %s naar server port %s niet " +"toegestaan" #: ../pyhoca/wxgui/frontend.py:1507 #, python-format -msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2Go/SSH server. Session startup failed." -msgstr "Forwarding tunnel request naar [%s]:%s voor sessie %s niet toegestaan door remote X2Go/SSH server. Het starten van de sessie is mislukt." +msgid "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2Go/SSH server. Session startup failed." +msgstr "" +"Forwarding tunnel request naar [%s]:%s voor sessie %s niet toegestaan door " +"remote X2Go/SSH server. Het starten van de sessie is mislukt." #: ../pyhoca/wxgui/frontend.py:1526 #, python-format @@ -1352,11 +1329,12 @@ msgid "%s - audio warning" msgstr "%s - audio waarschuwing" #: ../pyhoca/wxgui/frontend.py:1526 -msgid "The X2Go PulseAudio system is not available within Remote Desktop sessions." -msgstr "Het X2Go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" +msgid "" +"The X2Go PulseAudio system is not available within Remote Desktop sessions." +msgstr "" +"Het X2Go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" -#: ../pyhoca/wxgui/frontend.py:1533 -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1533 ../pyhoca/wxgui/frontend.py:1540 #, python-format msgid "%s - audio error" msgstr "%s - audio fout" @@ -1435,8 +1413,7 @@ msgstr "" "Client-side mappen en printers kunnen niet gedeeld worden in deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1619 -#: ../pyhoca/wxgui/frontend.py:1621 +#: ../pyhoca/wxgui/frontend.py:1619 ../pyhoca/wxgui/frontend.py:1621 #, python-format msgid "%s - print error" msgstr "%s - Printfout" @@ -1463,8 +1440,7 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1636 -#: ../pyhoca/wxgui/frontend.py:1651 +#: ../pyhoca/wxgui/frontend.py:1636 ../pyhoca/wxgui/frontend.py:1651 #, python-format msgid "%s - start" msgstr "%s - Start" @@ -1487,8 +1463,7 @@ msgstr "" "Een andere X2Go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1666 -#: ../pyhoca/wxgui/frontend.py:1681 +#: ../pyhoca/wxgui/frontend.py:1666 ../pyhoca/wxgui/frontend.py:1681 #, python-format msgid "%s - resume" msgstr "%s - hervatten" @@ -1585,8 +1560,7 @@ msgstr "Ja" msgid "No" msgstr "Nee" -#: ../pyhoca/wxgui/messages.py:124 -#: ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "Ok" @@ -1731,16 +1705,22 @@ msgstr "X2go Server mogelijkheden" #~ msgid "Settings" #~ msgstr "Instellingen" + #~ msgid "%s (%s)\n" #~ msgstr "%s (via %s)" + #~ msgid "Connect to another Desktop Session" #~ msgstr "Verbind met een andere Sessie" + #~ msgid "Start/Resume Session" #~ msgstr "Sessie starten/hervatten" + #~ msgid "SSH Proxy Tunnel" #~ msgstr "SSH Proxy Tunnel" + #~ msgid "The SSH proxy configuration is incomplete. Try again." #~ msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." + #~ msgid "" #~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH " #~ "proxy to.\n" @@ -1749,56 +1729,77 @@ msgstr "X2go Server mogelijkheden" #~ "Een ander profiel (%s) gebruikt [%s]:%s voor de verbinding met een lokale " #~ "SSH proxy.\n" #~ "Verander de SSH proxy instelling om dit probleem te verhelpen." + #~ msgid "Remember shared folders" #~ msgstr "Bewaar gedeelde mappen" + #~ msgid "RSA/DSA private key" #~ msgstr "Private RSA/DSA Key" + #~ msgid "Host[:Port]" #~ msgstr "Host[:Port]" + #~ msgid "us" #~ msgstr "us" + #~ msgid "pc105/us" #~ msgstr "altgr/intl" + #~ msgid "Keyboard layout" #~ msgstr "Toetsenbord layout" + #~ msgid "%s - DNS error" #~ msgstr "%s - DNS fout" + #~ msgid "still loading" #~ msgstr "nog aan het laden" + #~ msgid "" #~ "On slow connections, the loading of the application menu can take a " #~ "couple of seconds." #~ msgstr "" #~ "Bij een langzame verbinding kan het laden van het menu met de applicaties " #~ "enige seconden duren" + #~ msgid "Disconnect and E&xit" #~ msgstr "Verbreek verbinding en e&xit" + #~ msgid "%s - connect error" #~ msgstr "%s - Verbindingsfout" + #~ msgid "Unknown Session Profile" #~ msgstr "Onbekend sessie profiel" + #~ msgid "Retrieving Application menu..." #~ msgstr "Applicatie menu aan het ophalen..." + #~ msgid "RDP settings" #~ msgstr "RDP instellingen" + #~ msgid "Session Profile" #~ msgstr "Sessie Profiel" + #~ msgid "Icon" #~ msgstr "Icon" + #~ msgid "All session profiles are connected" #~ msgstr "Alle profielen zijn verbonden" + #~ msgid "New Profile" #~ msgstr "Nieuw Profiel" + #~ msgid "%s - print job" #~ msgstr "%s - print job" + #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" #~ msgstr "" #~ "De Print job dialog is nog niet geimplementeerd!!!\n" #~ "%s" + #~ msgid "Profile icon" #~ msgstr "Profile icon" + #~ msgid "Arts" #~ msgstr "Arts" - diff --git a/po/ru.po b/po/ru.po index 6c8e7ab..9914fd6 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 23:31+0100\n" +"POT-Creation-Date: 2013-01-29 22:21+0100\n" "PO-Revision-Date: 2013-01-28 13:39+0100\n" "Last-Translator: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de>\n" "Language-Team: German <x2go-i18n(a)lists.berlios.de>\n" diff --git a/po/sv.po b/po/sv.po index 5b8f358..ce72abf 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 23:31+0100\n" +"POT-Creation-Date: 2013-01-29 22:21+0100\n" "PO-Revision-Date: 2013-01-26 08:37+0100\n" "Last-Translator: Daniel Lindgren <dali.spam(a)gmail.com>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.1-77-gf8e4f08
by git-admin＠x2go.org 29 Jan '13

29 Jan '13

The branch, master has been updated via f8e4f0889adc9af1e992629269774bff7c059e6c (commit) from d20c1ff2e1434597d4436160bed261e92b40c87f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f8e4f0889adc9af1e992629269774bff7c059e6c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jan 29 22:21:20 2013 +0100 i18n update: Danish ----------------------------------------------------------------------- Summary of changes: po/da.po | 200 +++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 113 insertions(+), 87 deletions(-) The diff of changes is: diff --git a/po/da.po b/po/da.po index d7a5d04..883173b 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PyHoca-GUI 0.2.0.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-28 23:31+0100\n" -"PO-Revision-Date: 2013-01-28 14:25+0100\n" +"PO-Revision-Date: 2013-01-29 16:38+0100\n" "Last-Translator: Christoffer Krakou <christoffer(a)fleten.net>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" "Language: \n" @@ -23,11 +23,13 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102 +#: ../pyhoca/wxgui/logon.py:90 +#: ../pyhoca/wxgui/logon.py:102 msgid "Username" msgstr "Brugernavn" -#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104 +#: ../pyhoca/wxgui/logon.py:92 +#: ../pyhoca/wxgui/logon.py:104 msgid "Password" msgstr "Kodeord" @@ -47,23 +49,29 @@ msgstr "Sessionslogin" msgid "SSH proxy server login" msgstr "SSH proxy server login" -#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:373 -#: ../pyhoca/wxgui/listdesktops.py:99 ../pyhoca/wxgui/messages.py:130 -#: ../pyhoca/wxgui/printingprefs.py:147 ../pyhoca/wxgui/sessiontitle.py:85 +#: ../pyhoca/wxgui/logon.py:127 +#: ../pyhoca/wxgui/profilemanager.py:373 +#: ../pyhoca/wxgui/listdesktops.py:99 +#: ../pyhoca/wxgui/messages.py:130 +#: ../pyhoca/wxgui/printingprefs.py:147 +#: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Annullér" -#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339 +#: ../pyhoca/wxgui/logon.py:297 +#: ../pyhoca/wxgui/logon.py:339 #: ../pyhoca/wxgui/frontend.py:612 #, python-format msgid "%s - connect failure" msgstr "%s - forbindelsesfejl" -#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:612 +#: ../pyhoca/wxgui/logon.py:298 +#: ../pyhoca/wxgui/frontend.py:612 msgid "User is not allowed to start X2Go sessions!" msgstr "Bruger har ikke rettigheder til at starte X2Go sessioner!" -#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:619 +#: ../pyhoca/wxgui/logon.py:303 +#: ../pyhoca/wxgui/frontend.py:619 #, python-format msgid "%s - connect" msgstr "%s - forbind" @@ -89,29 +97,32 @@ msgstr "%s - SSH proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Autentificering mod SSH proxy server mislykkedes!" -#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:670 +#: ../pyhoca/wxgui/logon.py:376 +#: ../pyhoca/wxgui/frontend.py:670 #, python-format msgid "%s - socket error" msgstr "%s - socket fejl" -#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:649 +#: ../pyhoca/wxgui/logon.py:383 +#: ../pyhoca/wxgui/frontend.py:649 #: ../pyhoca/wxgui/frontend.py:656 #, python-format msgid "%s - host key error" msgstr "%s - værtsnøgle fejl" -#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:649 -msgid "" -"The remote server's host key is invalid or has not been accepted by the user" -msgstr "" -"Fjernserverens værtsnøgle er ugyldig eller blev ikke accepteret af brugeren" +#: ../pyhoca/wxgui/logon.py:384 +#: ../pyhoca/wxgui/frontend.py:649 +msgid "The remote server's host key is invalid or has not been accepted by the user" +msgstr "Fjernserverens værtsnøgle er ugyldig eller blev ikke accepteret af brugeren" -#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:691 +#: ../pyhoca/wxgui/logon.py:391 +#: ../pyhoca/wxgui/frontend.py:691 #, python-format msgid "%s - missing home directory" msgstr "%s - manglende hjemmemappe" -#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:691 +#: ../pyhoca/wxgui/logon.py:392 +#: ../pyhoca/wxgui/frontend.py:691 msgid "The remote user's home directory does not exist." msgstr "Fjernbrugerens hjemmemappe eksisterer ikke" @@ -120,12 +131,14 @@ msgstr "Fjernbrugerens hjemmemappe eksisterer ikke" msgid "%s - key error" msgstr "%s - nøglefejl" -#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:698 +#: ../pyhoca/wxgui/logon.py:407 +#: ../pyhoca/wxgui/frontend.py:698 #, python-format msgid "%s - auth error" msgstr "%s - auth fejl" -#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:642 +#: ../pyhoca/wxgui/logon.py:415 +#: ../pyhoca/wxgui/frontend.py:642 #, python-format msgid "%s - SSH error" msgstr "%s - SSH fejl" @@ -221,23 +234,28 @@ msgstr "Windows Terminal Server (RDP igennem X2Go-proxy)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminal Server (Direkte RDP)" -#: ../pyhoca/wxgui/profilemanager.py:91 ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:91 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "Custom command" msgstr "Tilpasset kommando" -#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:406 +#: ../pyhoca/wxgui/profilemanager.py:96 +#: ../pyhoca/wxgui/menus_taskbar.py:406 msgid "Internet Browser" msgstr "Internet Browser" -#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:407 +#: ../pyhoca/wxgui/profilemanager.py:97 +#: ../pyhoca/wxgui/menus_taskbar.py:407 msgid "Email Client" msgstr "Email Klient" -#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:408 +#: ../pyhoca/wxgui/profilemanager.py:98 +#: ../pyhoca/wxgui/menus_taskbar.py:408 msgid "Office" msgstr "Kontorsoftware" -#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:409 +#: ../pyhoca/wxgui/profilemanager.py:99 +#: ../pyhoca/wxgui/menus_taskbar.py:409 msgid "Terminal" msgstr "Terminal" @@ -376,15 +394,18 @@ msgstr "Menu med udgivne applikationer" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:259 ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:259 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "User" msgstr "Bruger" -#: ../pyhoca/wxgui/profilemanager.py:261 ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:261 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Port" msgstr "Port" @@ -473,13 +494,10 @@ msgstr "Indstil display-DPI" #: ../pyhoca/wxgui/profilemanager.py:310 msgid "Do not set (use server-side tools to configure the keyboard)" -msgstr "" -"Indstil ikke (brug server-side værktøjer til at konfigurere tastaturet)" +msgstr "Indstil ikke (brug server-side værktøjer til at konfigurere tastaturet)" #: ../pyhoca/wxgui/profilemanager.py:311 -msgid "" -"Automatically detect and use client-side keyboard configuration inside the " -"session" +msgid "Automatically detect and use client-side keyboard configuration inside the session" msgstr "Indstil automatisk tastaturet under sessionen" #: ../pyhoca/wxgui/profilemanager.py:312 @@ -546,7 +564,8 @@ msgstr "Gem delemappeliste når sessionen slutter" msgid "Path" msgstr "Sti" -#: ../pyhoca/wxgui/profilemanager.py:347 ../pyhoca/wxgui/profilemanager.py:366 +#: ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/profilemanager.py:366 msgid "Add" msgstr "Tilføj" @@ -598,7 +617,8 @@ msgstr "Gem" msgid "Reset" msgstr "Nulstil" -#: ../pyhoca/wxgui/profilemanager.py:372 ../pyhoca/wxgui/printingprefs.py:143 +#: ../pyhoca/wxgui/profilemanager.py:372 +#: ../pyhoca/wxgui/printingprefs.py:143 msgid "Apply" msgstr "Anvend" @@ -645,12 +665,11 @@ msgstr "Link Kvalitet" #: ../pyhoca/wxgui/profilemanager.py:808 msgid "Input/Output" -msgstr "" +msgstr "Input/Output" #: ../pyhoca/wxgui/profilemanager.py:809 -#, fuzzy msgid "Media" -msgstr "Multimedie" +msgstr "Medie" #: ../pyhoca/wxgui/profilemanager.py:810 msgid "Sharing" @@ -691,7 +710,8 @@ msgstr "Vælg en mappe som skal deles i en session" #: ../pyhoca/wxgui/profilemanager.py:2383 #: ../pyhoca/wxgui/profilemanager.py:2386 -#: ../pyhoca/wxgui/profilemanager.py:2389 ../pyhoca/wxgui/menus_taskbar.py:122 +#: ../pyhoca/wxgui/profilemanager.py:2389 +#: ../pyhoca/wxgui/menus_taskbar.py:122 msgid "Profile Manager" msgstr "Profilmanager" @@ -781,7 +801,8 @@ msgstr "Printerindstillinger" msgid "Client Options" msgstr "Klientparamentre" -#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:828 +#: ../pyhoca/wxgui/menus_taskbar.py:160 +#: ../pyhoca/wxgui/menus_taskbar.py:828 #: ../pyhoca/wxgui/menus_taskbar.py:1033 msgid "E&xit" msgstr "E&xit" @@ -790,7 +811,8 @@ msgstr "E&xit" msgid "Window title" msgstr "Vinduestitel" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:631 +#: ../pyhoca/wxgui/menus_taskbar.py:238 +#: ../pyhoca/wxgui/menus_taskbar.py:631 msgid "Resume Session" msgstr "Fortsæt Session" @@ -806,27 +828,33 @@ msgstr "Overfør Session" msgid "Transfer Session (not possible)" msgstr "Overfør Session (ikke muligt)" -#: ../pyhoca/wxgui/menus_taskbar.py:258 ../pyhoca/wxgui/menus_taskbar.py:622 +#: ../pyhoca/wxgui/menus_taskbar.py:258 +#: ../pyhoca/wxgui/menus_taskbar.py:622 msgid "Suspend Session (and disconnect/exit)" msgstr "Suspendér Session (og afbryd forbindelse/luk)" -#: ../pyhoca/wxgui/menus_taskbar.py:260 ../pyhoca/wxgui/menus_taskbar.py:624 +#: ../pyhoca/wxgui/menus_taskbar.py:260 +#: ../pyhoca/wxgui/menus_taskbar.py:624 msgid "Suspend Session (and disconnect)" msgstr "Suspendér Session (og afbryd forbindelse)" -#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:626 +#: ../pyhoca/wxgui/menus_taskbar.py:262 +#: ../pyhoca/wxgui/menus_taskbar.py:626 msgid "Suspend Session" msgstr "Suspendér Session" -#: ../pyhoca/wxgui/menus_taskbar.py:268 ../pyhoca/wxgui/menus_taskbar.py:635 +#: ../pyhoca/wxgui/menus_taskbar.py:268 +#: ../pyhoca/wxgui/menus_taskbar.py:635 msgid "Terminate Session (and disconnect/exit)" msgstr "Terminér Session (og afbryd forbindelse/luk)" -#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:637 +#: ../pyhoca/wxgui/menus_taskbar.py:270 +#: ../pyhoca/wxgui/menus_taskbar.py:637 msgid "Terminate Session (and disconnect)" msgstr "Terminér Session (og afbryd forbindelse)" -#: ../pyhoca/wxgui/menus_taskbar.py:272 ../pyhoca/wxgui/menus_taskbar.py:639 +#: ../pyhoca/wxgui/menus_taskbar.py:272 +#: ../pyhoca/wxgui/menus_taskbar.py:639 msgid "Terminate Session" msgstr "Terminér Session" @@ -842,7 +870,8 @@ msgstr "Stop Skrivebordsdeling (og afbryd forbindelse)" msgid "End Desktop Sharing" msgstr "Stop Skrivebordsdeling" -#: ../pyhoca/wxgui/menus_taskbar.py:283 ../pyhoca/wxgui/menus_taskbar.py:619 +#: ../pyhoca/wxgui/menus_taskbar.py:283 +#: ../pyhoca/wxgui/menus_taskbar.py:619 msgid "Refresh menu tree" msgstr "Opfrisk menu" @@ -914,7 +943,8 @@ msgstr "Værktøjer" msgid "Other Applications" msgstr "Andre Programmer" -#: ../pyhoca/wxgui/menus_taskbar.py:535 ../pyhoca/wxgui/menus_taskbar.py:547 +#: ../pyhoca/wxgui/menus_taskbar.py:535 +#: ../pyhoca/wxgui/menus_taskbar.py:547 #, python-format msgid "Connect %s" msgstr "Forbind %s" @@ -927,15 +957,18 @@ msgstr "Forbinder..." msgid "Start &new Desktop Session" msgstr "Start &ny Skrivebordssession" -#: ../pyhoca/wxgui/menus_taskbar.py:560 ../pyhoca/wxgui/menus_taskbar.py:660 +#: ../pyhoca/wxgui/menus_taskbar.py:560 +#: ../pyhoca/wxgui/menus_taskbar.py:660 msgid "Start Desktop Sharing Session" msgstr "Start Skrivebordsdeling" -#: ../pyhoca/wxgui/menus_taskbar.py:566 ../pyhoca/wxgui/menus_taskbar.py:710 +#: ../pyhoca/wxgui/menus_taskbar.py:566 +#: ../pyhoca/wxgui/menus_taskbar.py:710 msgid "Retrieving Application Menu..." msgstr "Henter Applikationsmenu" -#: ../pyhoca/wxgui/menus_taskbar.py:570 ../pyhoca/wxgui/menus_taskbar.py:713 +#: ../pyhoca/wxgui/menus_taskbar.py:570 +#: ../pyhoca/wxgui/menus_taskbar.py:713 msgid "Retrieve Application Menu" msgstr "Hent Applikationsmenu" @@ -1011,7 +1044,8 @@ msgstr "Eksporter Profilgruppe" msgid "Connect Server" msgstr "Forbind Server" -#: ../pyhoca/wxgui/about.py:78 ../pyhoca/wxgui/about.py:80 +#: ../pyhoca/wxgui/about.py:78 +#: ../pyhoca/wxgui/about.py:80 #, python-format msgid "About %s ..." msgstr "Om %s" @@ -1043,11 +1077,8 @@ msgid "SSH key authentication has been successful." msgstr "SSH nøgleautentificering lykkedes" #: ../pyhoca/wxgui/frontend.py:656 -msgid "" -"The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "" -"SSH proxy'ens værstnøgle er ugyldig eller er ikke blevet accepteret af " -"brugeren" +msgid "The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "SSH proxy'ens værstnøgle er ugyldig eller er ikke blevet accepteret af brugeren" #: ../pyhoca/wxgui/frontend.py:677 #, python-format @@ -1117,7 +1148,8 @@ msgstr "" "Skrivebordsdeling med %s kræver \n" "X2Go Server 4.1.0.0 eller højere" -#: ../pyhoca/wxgui/frontend.py:837 ../pyhoca/wxgui/frontend.py:1488 +#: ../pyhoca/wxgui/frontend.py:837 +#: ../pyhoca/wxgui/frontend.py:1488 #, python-format msgid "%s - session warning" msgstr "%s - sessionsadvarsel" @@ -1252,14 +1284,13 @@ msgstr "%s - kanalfejl" #: ../pyhoca/wxgui/frontend.py:1409 #, python-format -msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " -"server..." -msgstr "" -"Mistede forbindelsen til server %s! Prøv at re-autentificere til serveren..." +msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." +msgstr "Mistede forbindelsen til server %s! Prøv at re-autentificere til serveren..." -#: ../pyhoca/wxgui/frontend.py:1426 ../pyhoca/wxgui/frontend.py:1469 -#: ../pyhoca/wxgui/frontend.py:1471 ../pyhoca/wxgui/frontend.py:1507 +#: ../pyhoca/wxgui/frontend.py:1426 +#: ../pyhoca/wxgui/frontend.py:1469 +#: ../pyhoca/wxgui/frontend.py:1471 +#: ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "%s - session failure" msgstr "%s - sessionen fejlede" @@ -1307,21 +1338,13 @@ msgstr "" #: ../pyhoca/wxgui/frontend.py:1488 #, python-format -msgid "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied." -msgstr "" -"Omvendt TCP port forwarding forespørgsel for session %s til serverport %s " -"blev afvist" +msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." +msgstr "Omvendt TCP port forwarding forespørgsel for session %s til serverport %s blev afvist" #: ../pyhoca/wxgui/frontend.py:1507 #, python-format -msgid "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2Go/SSH server. Session startup failed." -msgstr "" -"Forwarding tunnel forespørgsler til [%s]:%s til session %s blev nægtet af " -"X2Go/SSH fjernserveren. Sessionsstartop fejlede." +msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2Go/SSH server. Session startup failed." +msgstr "Forwarding tunnel forespørgsler til [%s]:%s til session %s blev nægtet af X2Go/SSH fjernserveren. Sessionsstartop fejlede." #: ../pyhoca/wxgui/frontend.py:1526 #, python-format @@ -1329,12 +1352,11 @@ msgid "%s - audio warning" msgstr "%s - lydadvarsel" #: ../pyhoca/wxgui/frontend.py:1526 -msgid "" -"The X2Go PulseAudio system is not available within Remote Desktop sessions." -msgstr "" -"X2Go PulseAudio systemet er ikke tilgængeligt i Remote Desktop sessioner" +msgid "The X2Go PulseAudio system is not available within Remote Desktop sessions." +msgstr "X2Go PulseAudio systemet er ikke tilgængeligt i Remote Desktop sessioner" -#: ../pyhoca/wxgui/frontend.py:1533 ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1533 +#: ../pyhoca/wxgui/frontend.py:1540 #, python-format msgid "%s - audio error" msgstr "%s - lydfejl" @@ -1417,7 +1439,8 @@ msgstr "" "Klientprintere og mapper kan ikke deles i denne session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1619 ../pyhoca/wxgui/frontend.py:1621 +#: ../pyhoca/wxgui/frontend.py:1619 +#: ../pyhoca/wxgui/frontend.py:1621 #, python-format msgid "%s - print error" msgstr "%s - printerfejl" @@ -1444,7 +1467,8 @@ msgstr "" "...skyldes session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1636 ../pyhoca/wxgui/frontend.py:1651 +#: ../pyhoca/wxgui/frontend.py:1636 +#: ../pyhoca/wxgui/frontend.py:1651 #, python-format msgid "%s - start" msgstr "%s - start" @@ -1467,7 +1491,8 @@ msgstr "" "En anden klient startede X2Go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1666 ../pyhoca/wxgui/frontend.py:1681 +#: ../pyhoca/wxgui/frontend.py:1666 +#: ../pyhoca/wxgui/frontend.py:1681 #, python-format msgid "%s - resume" msgstr "%s - fortsæt" @@ -1564,7 +1589,8 @@ msgstr "Ja" msgid "No" msgstr "Nej" -#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 +#: ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "Ok" hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.1-76-gd20c1ff
by git-admin＠x2go.org 29 Jan '13

29 Jan '13

The branch, master has been updated via d20c1ff2e1434597d4436160bed261e92b40c87f (commit) from 6378e74760b442195b860cd07d75b0e4da9c5799 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d20c1ff2e1434597d4436160bed261e92b40c87f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jan 29 20:59:54 2013 +0100 i18n update: Dutch(2) ----------------------------------------------------------------------- Summary of changes: po/nl.po | 228 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 115 insertions(+), 113 deletions(-) The diff of changes is: diff --git a/po/nl.po b/po/nl.po index 2f84854..94f50ea 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 23:31+0100\n" -"PO-Revision-Date: 2013-01-21 10:49+0100\n" +"POT-Creation-Date: 2013-01-29 20:57+0100\n" +"PO-Revision-Date: 2013-01-29 20:57+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" "Language: \n" @@ -25,11 +25,13 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102 +#: ../pyhoca/wxgui/logon.py:90 +#: ../pyhoca/wxgui/logon.py:102 msgid "Username" msgstr "Gebruiker" -#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104 +#: ../pyhoca/wxgui/logon.py:92 +#: ../pyhoca/wxgui/logon.py:104 msgid "Password" msgstr "Wachtwoord" @@ -49,23 +51,29 @@ msgstr "Sessie login" msgid "SSH proxy server login" msgstr "Login via SSH Proxy" -#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:373 -#: ../pyhoca/wxgui/listdesktops.py:99 ../pyhoca/wxgui/messages.py:130 -#: ../pyhoca/wxgui/printingprefs.py:147 ../pyhoca/wxgui/sessiontitle.py:85 +#: ../pyhoca/wxgui/logon.py:127 +#: ../pyhoca/wxgui/profilemanager.py:373 +#: ../pyhoca/wxgui/listdesktops.py:99 +#: ../pyhoca/wxgui/messages.py:130 +#: ../pyhoca/wxgui/printingprefs.py:147 +#: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Afbreken" -#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339 +#: ../pyhoca/wxgui/logon.py:297 +#: ../pyhoca/wxgui/logon.py:339 #: ../pyhoca/wxgui/frontend.py:612 #, python-format msgid "%s - connect failure" msgstr "%s - verbinden mislukt" -#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:612 +#: ../pyhoca/wxgui/logon.py:298 +#: ../pyhoca/wxgui/frontend.py:612 msgid "User is not allowed to start X2Go sessions!" msgstr "Gebruiker mag geen X2Go sessie starten!" -#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:619 +#: ../pyhoca/wxgui/logon.py:303 +#: ../pyhoca/wxgui/frontend.py:619 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -91,30 +99,32 @@ msgstr "%s - SSH Proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Authenticatie via SSH Proxy Server mislukt!" -#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:670 +#: ../pyhoca/wxgui/logon.py:376 +#: ../pyhoca/wxgui/frontend.py:670 #, python-format msgid "%s - socket error" msgstr "%s - socket fout" -#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:649 +#: ../pyhoca/wxgui/logon.py:383 +#: ../pyhoca/wxgui/frontend.py:649 #: ../pyhoca/wxgui/frontend.py:656 #, python-format msgid "%s - host key error" msgstr "%s - server sleutel fout" -#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:649 -msgid "" -"The remote server's host key is invalid or has not been accepted by the user" -msgstr "" -"De sleutel van de server is ongeldig of is niet geaccepteerd door de " -"gebruiker" +#: ../pyhoca/wxgui/logon.py:384 +#: ../pyhoca/wxgui/frontend.py:649 +msgid "The remote server's host key is invalid or has not been accepted by the user" +msgstr "De sleutel van de server is ongeldig of is niet geaccepteerd door de gebruiker" -#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:691 +#: ../pyhoca/wxgui/logon.py:391 +#: ../pyhoca/wxgui/frontend.py:691 #, python-format msgid "%s - missing home directory" msgstr "%s - home directory niet aanwezig" -#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:691 +#: ../pyhoca/wxgui/logon.py:392 +#: ../pyhoca/wxgui/frontend.py:691 msgid "The remote user's home directory does not exist." msgstr "De home directory op afstand van de gebruiker bestaat niet" @@ -123,12 +133,14 @@ msgstr "De home directory op afstand van de gebruiker bestaat niet" msgid "%s - key error" msgstr "%s - sleutel fout" -#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:698 +#: ../pyhoca/wxgui/logon.py:407 +#: ../pyhoca/wxgui/frontend.py:698 #, python-format msgid "%s - auth error" msgstr "%s - authenticatie fout" -#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:642 +#: ../pyhoca/wxgui/logon.py:415 +#: ../pyhoca/wxgui/frontend.py:642 #, python-format msgid "%s - SSH error" msgstr "%s - sleutel fout" @@ -222,23 +234,28 @@ msgstr "Windows Terminalserver (via X2Go-proxy)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminalserver (via X2Go-proxy)" -#: ../pyhoca/wxgui/profilemanager.py:91 ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:91 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "Custom command" msgstr "Speciaal Commando" -#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:406 +#: ../pyhoca/wxgui/profilemanager.py:96 +#: ../pyhoca/wxgui/menus_taskbar.py:406 msgid "Internet Browser" msgstr "Internetbrowser" -#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:407 +#: ../pyhoca/wxgui/profilemanager.py:97 +#: ../pyhoca/wxgui/menus_taskbar.py:407 msgid "Email Client" msgstr "E-Mail Programma" -#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:408 +#: ../pyhoca/wxgui/profilemanager.py:98 +#: ../pyhoca/wxgui/menus_taskbar.py:408 msgid "Office" msgstr "Office" -#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:409 +#: ../pyhoca/wxgui/profilemanager.py:99 +#: ../pyhoca/wxgui/menus_taskbar.py:409 msgid "Terminal" msgstr "Terminal" @@ -377,15 +394,18 @@ msgstr "Menu met gepubliceerde applicaties" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:259 ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:259 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "User" msgstr "Gebruiker" -#: ../pyhoca/wxgui/profilemanager.py:261 ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:261 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Port" msgstr "Port" @@ -477,9 +497,7 @@ msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "Uitzetten (gebruik server-side tools om het toetsenbord in te stellen)" #: ../pyhoca/wxgui/profilemanager.py:311 -msgid "" -"Automatically detect and use client-side keyboard configuration inside the " -"session" +msgid "Automatically detect and use client-side keyboard configuration inside the session" msgstr "Gebruik automatisch gedetecteerd toetsenbord in de sessie" #: ../pyhoca/wxgui/profilemanager.py:312 @@ -546,7 +564,8 @@ msgstr "Sla de lijst met te delen informatie wanneer de sessie eindigt" msgid "Path" msgstr "Pad" -#: ../pyhoca/wxgui/profilemanager.py:347 ../pyhoca/wxgui/profilemanager.py:366 +#: ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/profilemanager.py:366 msgid "Add" msgstr "Toevoegen" @@ -598,7 +617,8 @@ msgstr "Opslaan" msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:372 ../pyhoca/wxgui/printingprefs.py:143 +#: ../pyhoca/wxgui/profilemanager.py:372 +#: ../pyhoca/wxgui/printingprefs.py:143 msgid "Apply" msgstr "Toepassen" @@ -690,7 +710,8 @@ msgstr "Kies een map om te delen" #: ../pyhoca/wxgui/profilemanager.py:2383 #: ../pyhoca/wxgui/profilemanager.py:2386 -#: ../pyhoca/wxgui/profilemanager.py:2389 ../pyhoca/wxgui/menus_taskbar.py:122 +#: ../pyhoca/wxgui/profilemanager.py:2389 +#: ../pyhoca/wxgui/menus_taskbar.py:122 msgid "Profile Manager" msgstr "Profiel manager" @@ -780,7 +801,8 @@ msgstr "Voorkeur voor afdrukken" msgid "Client Options" msgstr "Opties" -#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:828 +#: ../pyhoca/wxgui/menus_taskbar.py:160 +#: ../pyhoca/wxgui/menus_taskbar.py:828 #: ../pyhoca/wxgui/menus_taskbar.py:1033 msgid "E&xit" msgstr "&Beeindigen" @@ -789,7 +811,8 @@ msgstr "&Beeindigen" msgid "Window title" msgstr "Scherm titel" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:631 +#: ../pyhoca/wxgui/menus_taskbar.py:238 +#: ../pyhoca/wxgui/menus_taskbar.py:631 msgid "Resume Session" msgstr "Sessie hervatten" @@ -805,27 +828,33 @@ msgstr "Sessie overnemen" msgid "Transfer Session (not possible)" msgstr "Sessie overnemen (niet mogelijk)" -#: ../pyhoca/wxgui/menus_taskbar.py:258 ../pyhoca/wxgui/menus_taskbar.py:622 +#: ../pyhoca/wxgui/menus_taskbar.py:258 +#: ../pyhoca/wxgui/menus_taskbar.py:622 msgid "Suspend Session (and disconnect/exit)" msgstr "Suspend Sessie (en Verbinding verbreken / e&xit)" -#: ../pyhoca/wxgui/menus_taskbar.py:260 ../pyhoca/wxgui/menus_taskbar.py:624 +#: ../pyhoca/wxgui/menus_taskbar.py:260 +#: ../pyhoca/wxgui/menus_taskbar.py:624 msgid "Suspend Session (and disconnect)" msgstr "Suspend Sessie (en Verbinding verbreken)" -#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:626 +#: ../pyhoca/wxgui/menus_taskbar.py:262 +#: ../pyhoca/wxgui/menus_taskbar.py:626 msgid "Suspend Session" msgstr "Suspend Sessie" -#: ../pyhoca/wxgui/menus_taskbar.py:268 ../pyhoca/wxgui/menus_taskbar.py:635 +#: ../pyhoca/wxgui/menus_taskbar.py:268 +#: ../pyhoca/wxgui/menus_taskbar.py:635 msgid "Terminate Session (and disconnect/exit)" msgstr "Sessie beëindigen (en Verbinding verbreken / e&xit)" -#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:637 +#: ../pyhoca/wxgui/menus_taskbar.py:270 +#: ../pyhoca/wxgui/menus_taskbar.py:637 msgid "Terminate Session (and disconnect)" msgstr "Sessie beëindigen (en Verbinding verbreken)" -#: ../pyhoca/wxgui/menus_taskbar.py:272 ../pyhoca/wxgui/menus_taskbar.py:639 +#: ../pyhoca/wxgui/menus_taskbar.py:272 +#: ../pyhoca/wxgui/menus_taskbar.py:639 msgid "Terminate Session" msgstr "Sessie beëindigen" @@ -841,7 +870,8 @@ msgstr "Beëindig delen van de desktop (en verbreek verbinding)" msgid "End Desktop Sharing" msgstr "Beëindig delen van de desktop" -#: ../pyhoca/wxgui/menus_taskbar.py:283 ../pyhoca/wxgui/menus_taskbar.py:619 +#: ../pyhoca/wxgui/menus_taskbar.py:283 +#: ../pyhoca/wxgui/menus_taskbar.py:619 msgid "Refresh menu tree" msgstr "Ververs menu" @@ -913,7 +943,8 @@ msgstr "Hulpmiddelen" msgid "Other Applications" msgstr "Andere applicaties" -#: ../pyhoca/wxgui/menus_taskbar.py:535 ../pyhoca/wxgui/menus_taskbar.py:547 +#: ../pyhoca/wxgui/menus_taskbar.py:535 +#: ../pyhoca/wxgui/menus_taskbar.py:547 #, python-format msgid "Connect %s" msgstr "Verbind %s" @@ -926,15 +957,18 @@ msgstr "Nu aan het verbinden..." msgid "Start &new Desktop Session" msgstr "&Nieuwe Desktop Sessie starten" -#: ../pyhoca/wxgui/menus_taskbar.py:560 ../pyhoca/wxgui/menus_taskbar.py:660 +#: ../pyhoca/wxgui/menus_taskbar.py:560 +#: ../pyhoca/wxgui/menus_taskbar.py:660 msgid "Start Desktop Sharing Session" msgstr "Start delen van de desktop" -#: ../pyhoca/wxgui/menus_taskbar.py:566 ../pyhoca/wxgui/menus_taskbar.py:710 +#: ../pyhoca/wxgui/menus_taskbar.py:566 +#: ../pyhoca/wxgui/menus_taskbar.py:710 msgid "Retrieving Application Menu..." msgstr "Bezig met ophalen applicatiemenu..." -#: ../pyhoca/wxgui/menus_taskbar.py:570 ../pyhoca/wxgui/menus_taskbar.py:713 +#: ../pyhoca/wxgui/menus_taskbar.py:570 +#: ../pyhoca/wxgui/menus_taskbar.py:713 msgid "Retrieve Application Menu" msgstr "Haal applicatiemenu op" @@ -1010,7 +1044,8 @@ msgstr "Export profielgroep" msgid "Connect Server" msgstr "Verbinden met Server" -#: ../pyhoca/wxgui/about.py:78 ../pyhoca/wxgui/about.py:80 +#: ../pyhoca/wxgui/about.py:78 +#: ../pyhoca/wxgui/about.py:80 #, python-format msgid "About %s ..." msgstr "About %s ..." @@ -1042,11 +1077,8 @@ msgid "SSH key authentication has been successful." msgstr "SSH-key authenticatie is gelukt." #: ../pyhoca/wxgui/frontend.py:656 -msgid "" -"The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "" -"De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de " -"gebruiker" +msgid "The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de gebruiker" #: ../pyhoca/wxgui/frontend.py:677 #, python-format @@ -1098,6 +1130,7 @@ msgid "Desktop Sharing with %s not supported by server" msgstr "Delen van de desktop met %s wordt niet ondersteund door de server" #: ../pyhoca/wxgui/frontend.py:779 +#, python-format msgid "" "We apologize for the inconvenience...\n" "\n" @@ -1115,7 +1148,8 @@ msgstr "" "Delen van de desktop met %s wordt ondersteund\n" "vanaf X2Go Server 4.1.0.0 en hoger" -#: ../pyhoca/wxgui/frontend.py:837 ../pyhoca/wxgui/frontend.py:1488 +#: ../pyhoca/wxgui/frontend.py:837 +#: ../pyhoca/wxgui/frontend.py:1488 #, python-format msgid "%s - session warning" msgstr "%s - sessie waarschuwing" @@ -1177,7 +1211,8 @@ msgid "" "The file »%s« already exists in this folder.\n" "\n" "Do you want to replace it?" -msgstr "Het bestand »%s« bestaat al in deze map\n" +msgstr "" +"Het bestand »%s« bestaat al in deze map\n" "\n" "Wilt u het vervangen?" @@ -1249,15 +1284,13 @@ msgstr "%s - Verbindingsfout (channel error)" #: ../pyhoca/wxgui/frontend.py:1409 #, python-format -msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " -"server..." -msgstr "" -"De Verbinding met de server %s werd onverwacht verbroken! Probeer om u " -"opnieuw aan te melden..." +msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." +msgstr "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u opnieuw aan te melden..." -#: ../pyhoca/wxgui/frontend.py:1426 ../pyhoca/wxgui/frontend.py:1469 -#: ../pyhoca/wxgui/frontend.py:1471 ../pyhoca/wxgui/frontend.py:1507 +#: ../pyhoca/wxgui/frontend.py:1426 +#: ../pyhoca/wxgui/frontend.py:1469 +#: ../pyhoca/wxgui/frontend.py:1471 +#: ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "%s - session failure" msgstr "%s - sessie fout" @@ -1305,20 +1338,13 @@ msgstr "" #: ../pyhoca/wxgui/frontend.py:1488 #, python-format -msgid "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied." -msgstr "" -"Reverse TCP port forwarding request voor sessie %s naar server port %s niet toegestaan" +msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." +msgstr "Reverse TCP port forwarding request voor sessie %s naar server port %s niet toegestaan" #: ../pyhoca/wxgui/frontend.py:1507 #, python-format -msgid "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2Go/SSH server. Session startup failed." -msgstr "" -"Forwarding tunnel request naar [%s]:%s voor sessie %s niet toegestaan door remote " -"X2Go/SSH server. Het starten van de sessie is mislukt." +msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2Go/SSH server. Session startup failed." +msgstr "Forwarding tunnel request naar [%s]:%s voor sessie %s niet toegestaan door remote X2Go/SSH server. Het starten van de sessie is mislukt." #: ../pyhoca/wxgui/frontend.py:1526 #, python-format @@ -1326,12 +1352,11 @@ msgid "%s - audio warning" msgstr "%s - audio waarschuwing" #: ../pyhoca/wxgui/frontend.py:1526 -msgid "" -"The X2Go PulseAudio system is not available within Remote Desktop sessions." -msgstr "" -"Het X2Go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" +msgid "The X2Go PulseAudio system is not available within Remote Desktop sessions." +msgstr "Het X2Go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" -#: ../pyhoca/wxgui/frontend.py:1533 ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1533 +#: ../pyhoca/wxgui/frontend.py:1540 #, python-format msgid "%s - audio error" msgstr "%s - audio fout" @@ -1410,7 +1435,8 @@ msgstr "" "Client-side mappen en printers kunnen niet gedeeld worden in deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1619 ../pyhoca/wxgui/frontend.py:1621 +#: ../pyhoca/wxgui/frontend.py:1619 +#: ../pyhoca/wxgui/frontend.py:1621 #, python-format msgid "%s - print error" msgstr "%s - Printfout" @@ -1437,7 +1463,8 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1636 ../pyhoca/wxgui/frontend.py:1651 +#: ../pyhoca/wxgui/frontend.py:1636 +#: ../pyhoca/wxgui/frontend.py:1651 #, python-format msgid "%s - start" msgstr "%s - Start" @@ -1460,7 +1487,8 @@ msgstr "" "Een andere X2Go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1666 ../pyhoca/wxgui/frontend.py:1681 +#: ../pyhoca/wxgui/frontend.py:1666 +#: ../pyhoca/wxgui/frontend.py:1681 #, python-format msgid "%s - resume" msgstr "%s - hervatten" @@ -1557,7 +1585,8 @@ msgstr "Ja" msgid "No" msgstr "Nee" -#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 +#: ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "Ok" @@ -1702,22 +1731,16 @@ msgstr "X2go Server mogelijkheden" #~ msgid "Settings" #~ msgstr "Instellingen" - #~ msgid "%s (%s)\n" #~ msgstr "%s (via %s)" - #~ msgid "Connect to another Desktop Session" #~ msgstr "Verbind met een andere Sessie" - #~ msgid "Start/Resume Session" #~ msgstr "Sessie starten/hervatten" - #~ msgid "SSH Proxy Tunnel" #~ msgstr "SSH Proxy Tunnel" - #~ msgid "The SSH proxy configuration is incomplete. Try again." #~ msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." - #~ msgid "" #~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH " #~ "proxy to.\n" @@ -1726,77 +1749,56 @@ msgstr "X2go Server mogelijkheden" #~ "Een ander profiel (%s) gebruikt [%s]:%s voor de verbinding met een lokale " #~ "SSH proxy.\n" #~ "Verander de SSH proxy instelling om dit probleem te verhelpen." - #~ msgid "Remember shared folders" #~ msgstr "Bewaar gedeelde mappen" - #~ msgid "RSA/DSA private key" #~ msgstr "Private RSA/DSA Key" - #~ msgid "Host[:Port]" #~ msgstr "Host[:Port]" - #~ msgid "us" #~ msgstr "us" - #~ msgid "pc105/us" #~ msgstr "altgr/intl" - #~ msgid "Keyboard layout" #~ msgstr "Toetsenbord layout" - #~ msgid "%s - DNS error" #~ msgstr "%s - DNS fout" - #~ msgid "still loading" #~ msgstr "nog aan het laden" - #~ msgid "" #~ "On slow connections, the loading of the application menu can take a " #~ "couple of seconds." #~ msgstr "" #~ "Bij een langzame verbinding kan het laden van het menu met de applicaties " #~ "enige seconden duren" - #~ msgid "Disconnect and E&xit" #~ msgstr "Verbreek verbinding en e&xit" - #~ msgid "%s - connect error" #~ msgstr "%s - Verbindingsfout" - #~ msgid "Unknown Session Profile" #~ msgstr "Onbekend sessie profiel" - #~ msgid "Retrieving Application menu..." #~ msgstr "Applicatie menu aan het ophalen..." - #~ msgid "RDP settings" #~ msgstr "RDP instellingen" - #~ msgid "Session Profile" #~ msgstr "Sessie Profiel" - #~ msgid "Icon" #~ msgstr "Icon" - #~ msgid "All session profiles are connected" #~ msgstr "Alle profielen zijn verbonden" - #~ msgid "New Profile" #~ msgstr "Nieuw Profiel" - #~ msgid "%s - print job" #~ msgstr "%s - print job" - #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" #~ msgstr "" #~ "De Print job dialog is nog niet geimplementeerd!!!\n" #~ "%s" - #~ msgid "Profile icon" #~ msgstr "Profile icon" - #~ msgid "Arts" #~ msgstr "Arts" + hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.1-75-g6378e74
by git-admin＠x2go.org 29 Jan '13

29 Jan '13

The branch, master has been updated via 6378e74760b442195b860cd07d75b0e4da9c5799 (commit) from f700b5663966586c05466681e025356c27699be4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6378e74760b442195b860cd07d75b0e4da9c5799 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jan 29 20:56:36 2013 +0100 i18n update: Dutch ----------------------------------------------------------------------- Summary of changes: po/nl.po | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/po/nl.po b/po/nl.po index 70f0afe..2f84854 100644 --- a/po/nl.po +++ b/po/nl.po @@ -403,7 +403,7 @@ msgstr "Gebruik SSH forwarding van SSH authenticatie agent" #: ../pyhoca/wxgui/profilemanager.py:271 msgid "Store SSH host keys under (unique) X2Go session profile ID" -msgstr "" +msgstr "Sla SSH host keys op onder (uniek) X2Go sessie profiel" #: ../pyhoca/wxgui/profilemanager.py:272 msgid "Server behind SSH proxy" @@ -729,7 +729,7 @@ msgstr "Delen desktop sessie - %s" #: ../pyhoca/wxgui/listdesktops.py:84 msgid "Select one of the available desktop sessions on this server" -msgstr "" +msgstr "Kies één van de beschikbare desktop sessies op deze server" #: ../pyhoca/wxgui/listdesktops.py:90 msgid "View session only" @@ -871,7 +871,7 @@ msgstr "Niet langer delen alle lokale &mappen" #: ../pyhoca/wxgui/menus_taskbar.py:373 msgid "Restore shares in next session" -msgstr "" +msgstr "Herstel gedeelde mappen in de volgende sessie" #: ../pyhoca/wxgui/menus_taskbar.py:453 msgid "Multimedia" @@ -1095,10 +1095,9 @@ msgstr "Onekend sessie profiel, stel dit in voordat je het gebruikt..." #: ../pyhoca/wxgui/frontend.py:778 #, python-format msgid "Desktop Sharing with %s not supported by server" -msgstr "" +msgstr "Delen van de desktop met %s wordt niet ondersteund door de server" #: ../pyhoca/wxgui/frontend.py:779 -#, fuzzy, python-format msgid "" "We apologize for the inconvenience...\n" "\n" @@ -1178,7 +1177,9 @@ msgid "" "The file »%s« already exists in this folder.\n" "\n" "Do you want to replace it?" -msgstr "" +msgstr "Het bestand »%s« bestaat al in deze map\n" +"\n" +"Wilt u het vervangen?" #: ../pyhoca/wxgui/frontend.py:1176 #, python-format @@ -1275,6 +1276,8 @@ msgid "" "The server took long to provide a list of sharable desktops.\n" "This can happen from time to time, please try again" msgstr "" +"Het duurde te lang om de lijst met deelbare desktops op te halen\n" +"Dit gebeurt soms, probeer het nogmaals" #: ../pyhoca/wxgui/frontend.py:1451 #, python-format @@ -1306,8 +1309,7 @@ msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." msgstr "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied." +"Reverse TCP port forwarding request voor sessie %s naar server port %s niet toegestaan" #: ../pyhoca/wxgui/frontend.py:1507 #, python-format @@ -1315,8 +1317,8 @@ msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2Go/SSH server. Session startup failed." msgstr "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2Go/SSH server. Session startup failed." +"Forwarding tunnel request naar [%s]:%s voor sessie %s niet toegestaan door remote " +"X2Go/SSH server. Het starten van de sessie is mislukt." #: ../pyhoca/wxgui/frontend.py:1526 #, python-format @@ -1657,7 +1659,7 @@ msgstr "OK" #: ../pyhoca/wxgui/serverinfo.py:76 #, python-format msgid "Server Information - %s" -msgstr "" +msgstr "Server informatie - %s" #: ../pyhoca/wxgui/serverinfo.py:78 #, python-format @@ -1666,6 +1668,9 @@ msgid "" "\n" "List of X2Go Server components, add-ons and their versions..." msgstr "" +"Sessie profiel: %s\n" +"\n" +"Lijst met X2Go Server componenten, add-ons and hun versies..." #: ../pyhoca/wxgui/serverinfo.py:83 msgid "Refresh" hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.1-74-gf700b56
by git-admin＠x2go.org 29 Jan '13

29 Jan '13

The branch, master has been updated via f700b5663966586c05466681e025356c27699be4 (commit) from acb5f6ad49f5d090e964fb9599a3287b996f5a82 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f700b5663966586c05466681e025356c27699be4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jan 29 20:53:27 2013 +0100 i18n update: Spanish ----------------------------------------------------------------------- Summary of changes: po/es.po | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) The diff of changes is: diff --git a/po/es.po b/po/es.po index c5cb754..77e156c 100644 --- a/po/es.po +++ b/po/es.po @@ -355,8 +355,8 @@ msgstr "Iniciar sesión automáticamente tras el login" #, python-format msgid "Login automatically after %s has started (needs --auto-connect)" msgstr "" -"El inicio de sesión automático ha comenzado tras %s (se necesita --auto-" -"connect)" +"El inicio de sesión automático ha comenzado tras %s (se necesita " +"--auto-connect)" #: ../pyhoca/wxgui/profilemanager.py:239 msgid "Type" @@ -620,14 +620,12 @@ msgstr "Reiniciar" msgid "Apply" msgstr "Aplicar" -#: ../pyhoca/wxgui/profilemanager.py:423 -#: ../pyhoca/wxgui/profilemanager.py:1135 +#: ../pyhoca/wxgui/profilemanager.py:423 ../pyhoca/wxgui/profilemanager.py:1135 #: ../pyhoca/wxgui/profilemanager.py:2303 msgid "automatically" msgstr "automáticamente" -#: ../pyhoca/wxgui/profilemanager.py:425 -#: ../pyhoca/wxgui/profilemanager.py:1137 +#: ../pyhoca/wxgui/profilemanager.py:425 ../pyhoca/wxgui/profilemanager.py:1137 msgid "manually" msgstr "manualmente" @@ -663,12 +661,11 @@ msgstr "Calidad del enlace" #: ../pyhoca/wxgui/profilemanager.py:808 msgid "Input/Output" -msgstr "" +msgstr "Entrada/Salida" #: ../pyhoca/wxgui/profilemanager.py:809 -#, fuzzy msgid "Media" -msgstr "Multimedia" +msgstr "Medios" #: ../pyhoca/wxgui/profilemanager.py:810 msgid "Sharing" @@ -698,8 +695,7 @@ msgstr "Elige un icono para este perfil de sesión" msgid "All files (*.*)|*" msgstr "Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1897 -#: ../pyhoca/wxgui/profilemanager.py:1921 +#: ../pyhoca/wxgui/profilemanager.py:1897 ../pyhoca/wxgui/profilemanager.py:1921 msgid "Choose a public SSH key" msgstr "Elige una clave pública SSH" @@ -717,8 +713,7 @@ msgstr "Gestor de Perfiles" msgid "Profile name is missing, profile unusable!!!" msgstr "¡¡¡Nombre de pefil no encontrado o no válido!!!" -#: ../pyhoca/wxgui/profilemanager.py:2386 -#: ../pyhoca/wxgui/profilemanager.py:2389 +#: ../pyhoca/wxgui/profilemanager.py:2386 ../pyhoca/wxgui/profilemanager.py:2389 #, python-format msgid "Profile name %s already exists!!!" msgstr "El perfil de usuario %s ya existe!!!" hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

x2gobroker.git - master (branch) updated: e96a2eb0f50a5fbd8afbe5644f328eaa34caf725
by git-admin＠x2go.org 29 Jan '13

29 Jan '13

The branch, master has been updated via e96a2eb0f50a5fbd8afbe5644f328eaa34caf725 (commit) from 5390f605e0c3d1ce459626985922dc051bc638ed (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e96a2eb0f50a5fbd8afbe5644f328eaa34caf725 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jan 29 10:36:06 2013 +0100 fix X2GOBROKER_DEBUG env var ----------------------------------------------------------------------- Summary of changes: debian/x2gobroker-daemon.default | 4 ++-- debian/x2gobroker-daemon.init | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default index a0090df..d7466e6 100644 --- a/debian/x2gobroker-daemon.default +++ b/debian/x2gobroker-daemon.default @@ -6,8 +6,8 @@ START_DAEMON=true # run XGo Session Broker in debug mode, this will make the broker # available through http GET method calls (otherwise: POST method # only) and you will be able to test the broker through your web -# browser -#X2GOBROKER_DEBUG=false +# browser (0=disable, 1=enable). +#X2GOBROKER_DEBUG=0 # bind standalone daemon to this address:port #DAEMON_BIND_ADDRESS=127.0.0.1:8080 diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init index 3dda287..2ee927a 100644 --- a/debian/x2gobroker-daemon.init +++ b/debian/x2gobroker-daemon.init @@ -27,6 +27,7 @@ test -x "$DAEMON" || exit 0 START_DAEMON=false DAEMON_BIND_ADDRESS=127.0.0.1:8080 +X2GOBROKER_DEBUG=0 X2GOBROKER_DEFAULT_BACKEND="zeroconf" X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 5390f605e0c3d1ce459626985922dc051bc638ed
by git-admin＠x2go.org 29 Jan '13

29 Jan '13

The branch, master has been updated via 5390f605e0c3d1ce459626985922dc051bc638ed (commit) via fd8d9373b9d278eea303b69170f25fccc3e3ee1b (commit) via 1a77bd8337305a0996a8e1fc17ec81b3a8197670 (commit) via 93478923dd6bf64fcea8fa4b3cebfaf9e8b288ee (commit) from bf53dfab0b17eb1ab474fddccf7220dd14c1ba81 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5390f605e0c3d1ce459626985922dc051bc638ed Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jan 29 06:44:08 2013 +0100 update README, TODO commit fd8d9373b9d278eea303b69170f25fccc3e3ee1b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jan 29 06:43:35 2013 +0100 no load balancing support, yet commit 1a77bd8337305a0996a8e1fc17ec81b3a8197670 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jan 29 06:43:04 2013 +0100 empty test unit for the web frontend + inifile broker backend commit 93478923dd6bf64fcea8fa4b3cebfaf9e8b288ee Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jan 29 06:24:04 2013 +0100 add X2GOBROKER_DEBUG to x2gobroker-daemon.default ----------------------------------------------------------------------- Summary of changes: NEWS | 4 +- README | 54 +++++++++++++++++++- TODO | 25 ++++++++- debian/x2gobroker-daemon.default | 6 +++ etc/broker/x2gobroker-sessionprofiles.conf | 4 +- .../test_web_plain_inifile.py} | 28 ++++++---- 6 files changed, 106 insertions(+), 15 deletions(-) copy x2gobroker/{authmechs/pam_authmech.py => tests/test_web_plain_inifile.py} (59%) The diff of changes is: diff --git a/NEWS b/NEWS index 37d39b4..ec72a39 100644 --- a/NEWS +++ b/NEWS @@ -4,9 +4,9 @@ NEWS on X2Go Session Broker X2Go Session Broker is a Web project that provides session brokerage for X2Go via HTTP(S). -The framework was originally designed in Perl and his +The framework was originally designed in Perl and has been rewritten in Python using the web.py framework in 2012/2013. light+love, -Mike Gabriel, 20121129 \ No newline at end of file +Mike Gabriel, 20121129 diff --git a/README b/README index 763a825..03d87e4 100644 --- a/README +++ b/README @@ -4,5 +4,57 @@ README for X2Go Session Broker X2Go Session Broker is a Web project that provides session brokerage for X2Go via HTTP(S). +Dependencies: + + * This version of X2Go Session Broker requires X2Go Server + 4.1.0.0 and above. + * This version X2Go Session Broker works with X2Go Client + (>= 4.0.0.0) and Python X2Go (>= 0.5.0.0, not yet available) + as client. + +Available features: + + * easily extendible backend / submodule concept + * ACL based session profile provisioning + * X2Go load balancing + +Available backends: + + * ZEROCONF: the ,,zeroconf'' broker backend (which is the default) + is for testing X2Go client applications without much hassle + against the X2Go Session Broker + * INIFILE: the ,,inifile'' broker backend scales well with + small and medium X2Go deployments. It is configurable through + a single file (/etc/x2go/broker/x2gobroker-sessionprofiles.conf). + It provides flexible provisioning of session profiles based + on user, group and host ACLs. + +Configuration files: + + /etc/default/x2gobroker-daemon + /etc/x2go/x2gobroker.conf + /etc/x2go/broker/** + +Environment variables (and their defaults): + + # run XGo Session Broker in debug mode, this will make the broker + # available through http GET method calls (otherwise: POST method + # only) and you will be able to test the broker through your web + # browser + X2GOBROKER_DEBUG=false + + # default X2Go Session Broker backend (available: zeroconf, inifile) + X2GOBROKER_DEFAULT_BACKEND=zeroconf + + # path to the X2Go Session Broker's configuration file + X2GOBROKER_CONFIG=/etc/x2go/x2gobroker.conf + + # path to the X2Go Session Broker's session profiles file (when using the inifile backend) + X2GOBROKER_SESSIONPROFILES=/etc/x2go/broker/x2gobroker-sessionprofiles.conf + + # path to the X2Go Session Broker's agent command + X2GOBROKER_AGENT_CMD=/usr/lib/x2go/x2gobroker-agent + + light+love, -Mike Gabriel, 20121129 \ No newline at end of file +Mike Gabriel, 20130129 diff --git a/TODO b/TODO index 4787426..dc1c5f9 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,28 @@ TODO list for X2Go Session Broker ================================= -Plenty of work in the loop... +Several more thinkable broker backends: + + o USERGROUP backend (provide one session profiles file per user/group) + o LDAP backend (provide session profiles through LDAP) + o DNS backend (store X2Go server information in DNS and detect it from there) + o WEBCONFIG backend (click your session together TTW) + o ... + +For the INIFILE backend: + + o implement load balancing + o implement session resuing + o make use of X2Go::Server Perl API in x2gobroker-agent + o add Apache2 CGI support + +For the communication with Python X2Go: + + o add a JSON based server/client protocol + +For the communication with LightDM (being a replacement of UCS): + + o add an XML based server/client protocol light+love, -Mike Gabriel, 20121129 \ No newline at end of file +Mike Gabriel, 20130129 \ No newline at end of file diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default index 0165e17..a0090df 100644 --- a/debian/x2gobroker-daemon.default +++ b/debian/x2gobroker-daemon.default @@ -3,6 +3,12 @@ # Uncomment to enable the X2Go Session Broker standalone daemon START_DAEMON=true +# run XGo Session Broker in debug mode, this will make the broker +# available through http GET method calls (otherwise: POST method +# only) and you will be able to test the broker through your web +# browser +#X2GOBROKER_DEBUG=false + # bind standalone daemon to this address:port #DAEMON_BIND_ADDRESS=127.0.0.1:8080 diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf index 05c582a..8b332a3 100644 --- a/etc/broker/x2gobroker-sessionprofiles.conf +++ b/etc/broker/x2gobroker-sessionprofiles.conf @@ -143,7 +143,9 @@ acl-any-order=deny-allow [pool-C-XFCE] user= -host=s-E1.pool-c.domain.local,s-E2.pool-c.domain.local,s-E3.pool-c.domain.local,s-E4.pool-c.domain.local,s-E5.pool-c.domain.local,s-E6.pool-c.domain.local +# no load balancing support, yet +#host=s-E1.pool-c.domain.local,s-E2.pool-c.domain.local,s-E3.pool-c.domain.local,s-E4.pool-c.domain.local,s-E5.pool-c.domain.local,s-E6.pool-c.domain.local +host=s-E1.pool-c.domain.local name=XFCE - pool-C command=XFCE acl-users-allow=testuser-A,testuser-B diff --git a/x2gobroker/authmechs/pam_authmech.py b/x2gobroker/tests/test_web_plain_inifile.py similarity index 59% copy from x2gobroker/authmechs/pam_authmech.py copy to x2gobroker/tests/test_web_plain_inifile.py index fca5ec0..e957ed7 100644 --- a/x2gobroker/authmechs/pam_authmech.py +++ b/x2gobroker/tests/test_web_plain_inifile.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -18,15 +17,26 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -import pam +import unittest +import tempfile +from paste.fixture import TestApp +from nose.tools import * -class X2GoBrokerAuthMech(object): +# Python X2GoBroker modules +import x2gobroker.defaults - def authenticate(self, username, password): +from x2gobroker.web.plain import * - # do a simple PAM authentication against the PAM service ,,x2gobroker'' - if username and password: - if pam.authenticate(username, password, service="x2gobroker"): - return True +urls = ( '/plain/(.*)', 'X2GoBrokerWebPlain',) +app = web.application(urls, globals()) - return False +x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS.update({'base': {'enable': True, },}) + +class TestX2GoBrokerWebPlainInifile(unittest.TestCase): + pass + +def test_suite(): + from unittest import TestSuite, makeSuite + suite = TestSuite() + suite.addTest(makeSuite(TestX2GoBrokerWebPlainInifile)) + return suite hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits January 2013