[X2Go-Commits] x2godesktopsharing.git - build-main (branch) updated: 3.1.0.6-4-g1d71a0a

X2Go dev team git-admin at x2go.org
Sat Jun 8 01:13:30 CEST 2013


The branch, build-main has been updated
       via  1d71a0a39cb3430f0efd54d24b7a329390d8aaa3 (commit)
      from  df2c3b52274c257402026571d9ed00a9dd905762 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog         |    5 +++
 x2godesktopsharing_fr.ts |   97 ++++++++++++++++++----------------------------
 2 files changed, 42 insertions(+), 60 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c05a3df..ac4f6ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 x2godesktopsharing (3.1.1.0-0~x2go1) UNRELEASED; urgency=low
 
+  [ Frédéric Motte ]
+  * New upstream version (3.1.1.0):
+    - Add French translation file.
+
+  [ Mike Gabriel ]
   * Continue development...
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 10 Jan 2013 10:06:02 +0100
diff --git a/x2godesktopsharing_fr.ts b/x2godesktopsharing_fr.ts
index bde94cf..c3c6c8e 100644
--- a/x2godesktopsharing_fr.ts
+++ b/x2godesktopsharing_fr.ts
@@ -1,154 +1,124 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
+<!DOCTYPE TS><TS>
 <context>
     <name>MessageBox</name>
     <message>
-        <location filename="messagebox.cpp" line="20"/>
         <source>Save selection for %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Sauver la selection de %1</translation>
     </message>
     <message>
-        <location filename="messagebox.cpp" line="24"/>
         <source>Accept %1 from %2 ?</source>
-        <translation type="unfinished"></translation>
+        <translation>Accepter %1 de %2 ?</translation>
     </message>
 </context>
 <context>
     <name>ShareTray</name>
     <message>
-        <location filename="sharetray.cpp" line="68"/>
         <source><b>X2GO DesktopSharing v</source>
-        <translation type="unfinished"></translation>
+        <translation><b>X2GO Desktop Sharing v</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="101"/>
         <source>X2Go desktop sharing application is already active for this display 
 if this application is no longer running, remove %1
 and start again</source>
-        <translation type="unfinished"></translation>
+        <translation>L'application X2Go Desktop Sharing est déjà active pour ce display.
+Si cette application n'est plus en cours d'execution, effacez le fichier %1 et redémarrez</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="108"/>
-        <location filename="sharetray.cpp" line="337"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="128"/>
         <source>X2Go desktop sharing application</source>
-        <translation type="unfinished"></translation>
+        <translation>Application X2Go Desktop Sharing</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="133"/>
         <source>Granted users...</source>
-        <translation type="unfinished"></translation>
+        <translation>Utilisateurs autorisés...</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="135"/>
         <source>Banned users...</source>
-        <translation type="unfinished"></translation>
+        <translation>Utilisateurs bannis...</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="139"/>
         <source>Activate desktop sharing</source>
-        <translation type="unfinished"></translation>
+        <translation>Activer X2Go Desktop Sharing</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="142"/>
         <source>Deactivate desktop sharing</source>
-        <translation type="unfinished"></translation>
+        <translation>Désactiver X2Go Desktop Sharing</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="147"/>
         <source>About X2GO Sharing</source>
-        <translation type="unfinished"></translation>
+        <translation>Apropos de X2Go Desktop Sharing</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="160"/>
         <source>&Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>&Quitter</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="335"/>
         <source>Can't listen on socket:</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d'écouter sur le socket:</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="371"/>
         <source>Access granted</source>
-        <translation type="unfinished"></translation>
+        <translation>Accès autorisé</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="371"/>
         <source>%1(%2): access granted</source>
-        <translation type="unfinished"></translation>
+        <translation>%1(%2): accès autorisé</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="391"/>
         <source>Disconnect %1(%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Déconnecté %1(%2)</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="396"/>
         <source>Remote connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Connection distante</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="398"/>
         <source>%1(%2) connected</source>
-        <translation type="unfinished"></translation>
+        <translation>%1(%2) connecté</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="403"/>
         <source>Access denied</source>
-        <translation type="unfinished"></translation>
+        <translation>Accès refusé</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="404"/>
         <source>%1(%2): access denied</source>
-        <translation type="unfinished"></translation>
+        <translation>%1(%2): accès refusé</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="477"/>
         <source>User disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation>Utilisateur déconnecté</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="479"/>
         <source>%1(%2) disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation>%1(%2) déconnecté</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="515"/>
         <source>Banned users</source>
-        <translation type="unfinished"></translation>
+        <translation>Utilisateurs bannis</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="522"/>
         <source>Granted users</source>
-        <translation type="unfinished"></translation>
+        <translation>Utilisateurs autorisés</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="587"/>
         <source>X2Go Desktop Sharing</source>
-        <translation type="unfinished"></translation>
+        <translation>X2Go Desktop Sharing</translation>
     </message>
 </context>
 <context>
     <name>mwnd</name>
     <message>
-        <location filename="dlg.ui" line="22"/>
         <source>X2Go Desktop Sharing</source>
-        <translation type="unfinished"></translation>
+        <translation>X2Go Desktop Sharing</translation>
     </message>
     <message>
-        <location filename="dlg.ui" line="34"/>
         <source>remove</source>
-        <translation type="unfinished"></translation>
+        <translation>retirer</translation>
     </message>
     <message>
-        <location filename="dlg.ui" line="75"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -157,7 +127,14 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit </p>
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">http://www.x2go.org</span></a></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C. 2006-2010 <span style=" font-weight:600;">obviously nice</span>: Oleksandr Shneyder, Heinz-Markus Graesing)</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />X2Go Desktop Sharing vous permet de partager votre session X en cours sur le réseau local ou à travers Internet. Vous aurez la possibilité d'autoriser ou refuser les connections d'utilisateurs et de sauver vos préférences. Une icone dans la barre de meun vous informera de la configuration choisie et vous informera de l'activité des connections. Pour plus d'information, merci de vous rendre sur le site web</p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">http://www.x2go.org</span></a></p></body></html></translation>
     </message>
 </context>
 </TS>


hooks/post-receive
-- 
x2godesktopsharing.git (Desktop Sharing 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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).




More information about the x2go-commits mailing list