[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.1.0-4-g4a93130
X2go dev team
git-admin at x2go.org
Wed Feb 22 21:26:31 CET 2012
The branch, master has been updated
via 4a931302e089e07c9d9f01ca263c1c682ce00974 (commit)
via a783ba67041653511cff25031dc9c81995225e66 (commit)
from c56b99a96b23d2978231b5d3a892b658a727e363 (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 4a931302e089e07c9d9f01ca263c1c682ce00974
Author: Daniel Lindgren <bd.dali at gmail.com>
Date: Wed Feb 22 21:21:56 2012 +0100
Update/improve Swedish translation after testing x2goclient on Windows.
commit a783ba67041653511cff25031dc9c81995225e66
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Feb 22 21:20:19 2012 +0100
Update copyright year in about window. Including all translations.
-----------------------------------------------------------------------
Summary of changes:
configdialog.cpp | 2 +-
debian/changelog | 8 ++++++++
onmainwindow_part3.cpp | 2 +-
x2goclient_de.ts | 4 ++--
x2goclient_en.ts | 2 +-
x2goclient_fr.ts | 2 +-
x2goclient_nb_no.ts | 4 ++--
x2goclient_ru.ts | 4 ++--
x2goclient_sv.ts | 39 ++++++++++++++++++++-------------------
x2goclient_zh_tw.ts | 2 +-
10 files changed, 39 insertions(+), 30 deletions(-)
The diff of changes is:
diff --git a/configdialog.cpp b/configdialog.cpp
index 6dad751..e8e2a43 100644
--- a/configdialog.cpp
+++ b/configdialog.cpp
@@ -4,7 +4,7 @@
// Description:
//
//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006-2011
+// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006-2012
//
// Copyright: See COPYING file that comes with this distribution
//
diff --git a/debian/changelog b/debian/changelog
index ceeed80..e3e0b5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,14 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low
[ Oleksandr Shneyder ]
* New upstream version (3.99.1.1):
- not including <netinet/in.h> on Q_OS_WIN platform.
+
+ [ Mike Gabriel ]
+ * New upstream version (3.99.1.1):
+ - Update copyright year in about window. Including all translations.
+
+ [ Daniel Lindgren ]
+ * New upstream version (3.99.1.1):
+ - Update/improve Swedish translation after testing x2goclient on Windows.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 22 Feb 2012 15:11:58 +0100
diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp
index a2ff1e6..a2e4b07 100644
--- a/onmainwindow_part3.cpp
+++ b/onmainwindow_part3.cpp
@@ -1520,7 +1520,7 @@ void ONMainWindow::slotSupport()
void ONMainWindow::slotAbout()
{
QString aboutStr=tr (
- "</b><br> (C. 2006-2011 <b>obviously nice</b>: "
+ "</b><br> (C. 2006-2012 <b>obviously nice</b>: "
"Oleksandr Shneyder, Heinz-Markus Graesing)<br>" );
if ( embedMode )
aboutStr+=tr ( "<br>x2goplugin mode was sponsored by "
diff --git a/x2goclient_de.ts b/x2goclient_de.ts
index 09baf25..157a4f2 100644
--- a/x2goclient_de.ts
+++ b/x2goclient_de.ts
@@ -1415,8 +1415,8 @@ sound system connections through firewalls</source>
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1522"/>
- <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
- <translation></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+ <source></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
+ <translation></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1588"/>
diff --git a/x2goclient_en.ts b/x2goclient_en.ts
index ff3ab11..1dfa80c 100644
--- a/x2goclient_en.ts
+++ b/x2goclient_en.ts
@@ -1364,7 +1364,7 @@ Unsaved documents will be lost</source>
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1522"/>
- <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
+ <source></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts
index 02cf546..78387f4 100644
--- a/x2goclient_fr.ts
+++ b/x2goclient_fr.ts
@@ -1358,7 +1358,7 @@ Unsaved documents will be lost</source>
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1522"/>
- <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
+ <source></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/x2goclient_nb_no.ts b/x2goclient_nb_no.ts
index f541e95..d14dbcf 100644
--- a/x2goclient_nb_no.ts
+++ b/x2goclient_nb_no.ts
@@ -1057,8 +1057,8 @@
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1522"/>
- <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
- <translation></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+ <source></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
+ <translation></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1588"/>
diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts
index 3bc79f4..ba0ed9b 100644
--- a/x2goclient_ru.ts
+++ b/x2goclient_ru.ts
@@ -1604,8 +1604,8 @@ Public key hash: </source>
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1522"/>
- <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
- <translation></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+ <source></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
+ <translation></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
</message>
<message>
<source>Can't read host rsa key:</source>
diff --git a/x2goclient_sv.ts b/x2goclient_sv.ts
index 94fcf10..32025c8 100644
--- a/x2goclient_sv.ts
+++ b/x2goclient_sv.ts
@@ -165,7 +165,7 @@
<message>
<location filename="contest.cpp" line="150"/>
<source>Socket operation timed out</source>
- <translatorcomment>Hittade ingen bra översättning för socket</translatorcomment>
+ <translatorcomment>Couldn't find a good translation for socket</translatorcomment>
<translation>Socketoperation överskred tidsgräns</translation>
</message>
<message>
@@ -479,7 +479,7 @@
<message>
<location filename="editconnectiondialog.cpp" line="109"/>
<source>Session preferences - </source>
- <translation>Sessionspreferenser - </translation>
+ <translation>Sessionsinställningar - </translation>
</message>
</context>
<context>
@@ -497,8 +497,7 @@
<message>
<location filename="exportdialog.cpp" line="45"/>
<source>&Preferences ...</source>
- <translatorcomment>Kanske skulle "Egna inställningar" vara bättre.</translatorcomment>
- <translation>&Preferenser...</translation>
+ <translation>&Inställningar...</translation>
</message>
<message>
<location filename="exportdialog.cpp" line="46"/>
@@ -527,13 +526,13 @@
<message>
<location filename="httpbrokerclient.cpp" line="178"/>
<source>us</source>
- <translatorcomment>Språkkod för svenska i X.org</translatorcomment>
+ <translatorcomment>Swedish keyboard layout</translatorcomment>
<translation>se</translation>
</message>
<message>
<location filename="httpbrokerclient.cpp" line="181"/>
<source>pc105/us</source>
- <translatorcomment>Svenskt tangentbord</translatorcomment>
+ <translatorcomment>Swedish keyboard model</translatorcomment>
<translation>pc105/se</translation>
</message>
<message>
@@ -786,6 +785,7 @@
<message>
<location filename="onmainwindow.cpp" line="673"/>
<source>Session management...</source>
+ <translatorcomment>Added Alt shortcut, same letter as Ctrl shortcut (like &New session...)</translatorcomment>
<translation>S&essionshantering...</translation>
</message>
<message>
@@ -973,7 +973,7 @@ Använd dolt läge?</translation>
<message>
<location filename="onmainwindow.cpp" line="1905"/>
<source>X2Go Link to session </source>
- <translation>X2Go Länk till session</translation>
+ <translation>Länk till X2Go-session</translation>
</message>
<message>
<location filename="onmainwindow.cpp" line="1955"/>
@@ -1096,7 +1096,7 @@ Publik nyckel: </translation>
<message>
<location filename="onmainwindow_part2.cpp" line="417"/>
<source>unknown</source>
- <translation>okänd</translation>
+ <translation>okänt</translation>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="482"/>
@@ -1183,13 +1183,13 @@ Publik nyckel: </translation>
<message>
<location filename="onmainwindow_part2.cpp" line="1170"/>
<source>24 or 32</source>
- <translation>24- eller 32-</translation>
+ <translation>24 eller 32</translation>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="1171"/>
<location filename="onmainwindow_part2.cpp" line="1191"/>
<source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
- <translation>bitar och startar om X-servern innan du återansluter till denna X2Go-session.<br>Återanslut session ändå?</translation>
+ <translation> bitar och startar om X-servern innan du återansluter till denna X2Go-session.<br>Återanslut session ändå?</translation>
</message>
<message>
<location filename="onmainwindow_part2.cpp" line="1258"/>
@@ -1381,8 +1381,8 @@ Data som ej sparats kommer att förloras</translation>
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1522"/>
- <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
- <translation></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+ <source></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
+ <translation></b><br> (© 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1526"/>
@@ -1503,7 +1503,7 @@ Uppdatera till en nyare version av x2goserver</translation>
<message>
<location filename="onmainwindow_part4.cpp" line="1658"/>
<source>Keyboard layout:</source>
- <translatorcomment>Verkar vara vanligt förekommande "svengelskt" ord</translatorcomment>
+ <translatorcomment>Swenglish, but commonly used.</translatorcomment>
<translation>Tangentbordslayout:</translation>
</message>
<message>
@@ -1740,7 +1740,7 @@ du kan installera sshd med (Debian/Ubuntu)
<message>
<location filename="printwidget.cpp" line="53"/>
<source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a> and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find further information <a href="http://www.x2go.org/index.php?id=49">here</a>.</source>
- <translation>Konfigurera utskriftsinställningar för klienten.<br><br>Om du vill skriva ut den skapade filen så behöver du en extern applikation. Du kan oftast använda <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a> och<a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Mer information finns <a href="http://www.x2go.org/index.php?id=49">här</a>.</translation>
+ <translation>Konfigurera utskriftsinställningar för klienten.<br><br>Om du vill skriva ut den skapade filen så behöver du en extern applikation. Du kan oftast använda <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a> och <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Mer information finns <a href="http://www.x2go.org/index.php?id=49">här</a>.</translation>
</message>
</context>
<context>
@@ -1824,7 +1824,7 @@ Example:
<message>
<location filename="sessionbutton.cpp" line="116"/>
<source>Session preferences...</source>
- <translation>Sessionspreferenser...</translation>
+ <translation>Sessionsinställningar...</translation>
</message>
<message>
<location filename="sessionbutton.cpp" line="120"/>
@@ -1937,7 +1937,7 @@ Example:
<message>
<location filename="sessionmanagedialog.cpp" line="35"/>
<source>E&xit</source>
- <translation>&Avsluta</translation>
+ <translation>&Avbryt</translation>
</message>
<message>
<location filename="sessionmanagedialog.cpp" line="41"/>
@@ -1947,7 +1947,8 @@ Example:
<message>
<location filename="sessionmanagedialog.cpp" line="42"/>
<source>&Session preferences</source>
- <translation>&Sessionspreferenser</translation>
+ <translatorcomment>There are "..." on every other button so why not here ...</translatorcomment>
+ <translation>&Sessionsinställningar...</translation>
</message>
<message>
<location filename="sessionmanagedialog.cpp" line="43"/>
@@ -1981,7 +1982,7 @@ Example:
<message>
<location filename="sessionwidget.cpp" line="57"/>
<source><< change icon</source>
- <translation><< ändra ikon</translation>
+ <translation><< klicka för att ändra ikon</translation>
</message>
<message>
<location filename="sessionwidget.cpp" line="60"/>
@@ -2230,7 +2231,7 @@ Example:
<location filename="settingswidget.cpp" line="178"/>
<source>Use SSH port forwarding to tunnel
sound system connections through firewalls</source>
- <translatorcomment>Hittade ingen bra översättning för "port forwarding"</translatorcomment>
+ <translatorcomment>Couldn't find a good translation for port forwarding.</translatorcomment>
<translation>Använd SSH port forwarding för att tunnla
ljudström genom brandväggar</translation>
</message>
diff --git a/x2goclient_zh_tw.ts b/x2goclient_zh_tw.ts
index 142418c..9525470 100644
--- a/x2goclient_zh_tw.ts
+++ b/x2goclient_zh_tw.ts
@@ -1372,7 +1372,7 @@ Unsaved documents will be lost</source>
</message>
<message>
<location filename="onmainwindow_part3.cpp" line="1522"/>
- <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
+ <source></b><br> (C. 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
<translation type="unfinished"></translation>
</message>
<message>
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).
More information about the x2go-commits
mailing list