[X2Go-Commits] x2godesktopsharing.git - build-main (branch) updated: 3.1.0.5-13-g24fc427
X2Go dev team
git-admin at x2go.org
Sat Jun 8 01:13:29 CEST 2013
The branch, build-main has been updated
via 24fc427bbbd2ee5cba544d70f148a3467fabaa7a (commit)
from e35dd7c318dbaf227b5a127aa919452801cd9481 (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 | 4 +++
x2godesktopsharing_nb_no.ts | 68 +++++++++++++++++++++++++------------------
2 files changed, 44 insertions(+), 28 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 92a420e..e73bbf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,10 @@ x2godesktopsharing (3.1.0.6-0~x2go1) UNRELEASED; urgency=low
* New upstream version (3.1.0.6):
- Add Spanish translation file.
+ [ Terje Andersen ]
+ * New upstream version (3.1.0.6):
+ - Add Bokmal (Norway) translation file.
+
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Tue, 13 Nov 2012 16:24:02 +0100
x2godesktopsharing (3.1.0.5-0~x2go1) unstable; urgency=low
diff --git a/x2godesktopsharing_nb_no.ts b/x2godesktopsharing_nb_no.ts
index 3227f2b..f8fc7d7 100644
--- a/x2godesktopsharing_nb_no.ts
+++ b/x2godesktopsharing_nb_no.ts
@@ -6,12 +6,12 @@
<message>
<location filename="messagebox.cpp" line="20"/>
<source>Save selection for %1</source>
- <translation type="unfinished"></translation>
+ <translation>Lagre valget for %1</translation>
</message>
<message>
<location filename="messagebox.cpp" line="24"/>
<source>Accept %1 from %2 ?</source>
- <translation type="unfinished"></translation>
+ <translation>Akseptere %1 fra %2 ?</translation>
</message>
</context>
<context>
@@ -19,120 +19,124 @@
<message>
<location filename="sharetray.cpp" line="68"/>
<source><b>X2GO DesktopSharing v</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Oversette, eller beholde "DesktopSharing"?</translatorcomment>
+ <translation type="unfinished"><b>X2GO DesktopSharing 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>
+ <translatorcomment>Må verifiseres: Er %1 en fil som filnavnet blir vist (med full sti)? Om ikke, må denne strengen fikses. </translatorcomment>
+ <translation type="unfinished">X2Go sin applikasjon for skrivebordsdeling er allerede aktiv for denne skjermen. Om applikasjonen ikke lenger kjører, vennligst fjern %1 og forsøk igjen </translation>
</message>
<message>
<location filename="sharetray.cpp" line="108"/>
<location filename="sharetray.cpp" line="337"/>
<source>Error</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Feil</translation>
</message>
<message>
<location filename="sharetray.cpp" line="128"/>
<source>X2Go desktop sharing application</source>
- <translation type="unfinished"></translation>
+ <translation>X2Go sin applikasjon for skrivebordsdeling</translation>
</message>
<message>
<location filename="sharetray.cpp" line="133"/>
<source>Granted users...</source>
- <translation type="unfinished"></translation>
+ <translation>Innvilgede brukere...</translation>
</message>
<message>
<location filename="sharetray.cpp" line="135"/>
<source>Banned users...</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>usikker på om "nektede", "utestengte", eller "svartelistede" er bedre.</translatorcomment>
+ <translation>Avviste brukere...</translation>
</message>
<message>
<location filename="sharetray.cpp" line="139"/>
<source>Activate desktop sharing</source>
- <translation type="unfinished"></translation>
+ <translation>Aktiver skrivebordsdeling</translation>
</message>
<message>
<location filename="sharetray.cpp" line="142"/>
<source>Deactivate desktop sharing</source>
- <translation type="unfinished"></translation>
+ <translation>Deaktiver skrivebordsdeling</translation>
</message>
<message>
<location filename="sharetray.cpp" line="147"/>
<source>About X2GO Sharing</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>hm... bør rapportere at den engelske strengen er feil/mangelful</translatorcomment>
+ <translation type="unfinished">Om X2Go DesktopSharing</translation>
</message>
<message>
<location filename="sharetray.cpp" line="160"/>
<source>&Quit</source>
- <translation type="unfinished"></translation>
+ <translation>&Avslutt</translation>
</message>
<message>
<location filename="sharetray.cpp" line="335"/>
<source>Can't listen on socket:</source>
- <translation type="unfinished"></translation>
+ <translation>Kan ikke lytte på sokkel:</translation>
</message>
<message>
<location filename="sharetray.cpp" line="371"/>
<source>Access granted</source>
- <translation type="unfinished"></translation>
+ <translation>Tilgang tillatt</translation>
</message>
<message>
<location filename="sharetray.cpp" line="371"/>
<source>%1(%2): access granted</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">%1(%2): tilgang tillatt</translation>
</message>
<message>
<location filename="sharetray.cpp" line="391"/>
<source>Disconnect %1(%2)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Frakoble %1(%2)</translation>
</message>
<message>
<location filename="sharetray.cpp" line="396"/>
<source>Remote connection</source>
- <translation type="unfinished"></translation>
+ <translation>Ekstern tilkobling</translation>
</message>
<message>
<location filename="sharetray.cpp" line="398"/>
<source>%1(%2) connected</source>
- <translation type="unfinished"></translation>
+ <translation>%1(%2) tilkoblet</translation>
</message>
<message>
<location filename="sharetray.cpp" line="403"/>
<source>Access denied</source>
- <translation type="unfinished"></translation>
+ <translation>Tilgang nektet</translation>
</message>
<message>
<location filename="sharetray.cpp" line="404"/>
<source>%1(%2): access denied</source>
- <translation type="unfinished"></translation>
+ <translation>%1(%2): tilgang nektet</translation>
</message>
<message>
<location filename="sharetray.cpp" line="477"/>
<source>User disconnected</source>
- <translation type="unfinished"></translation>
+ <translation>Bruker frakoblet</translation>
</message>
<message>
<location filename="sharetray.cpp" line="479"/>
<source>%1(%2) disconnected</source>
- <translation type="unfinished"></translation>
+ <translation>%1(%2) frakoblet</translation>
</message>
<message>
<location filename="sharetray.cpp" line="515"/>
<source>Banned users</source>
- <translation type="unfinished"></translation>
+ <translation>Avviste brukere</translation>
</message>
<message>
<location filename="sharetray.cpp" line="522"/>
<source>Granted users</source>
- <translation type="unfinished"></translation>
+ <translation>Innvilgede brukere</translation>
</message>
<message>
<location filename="sharetray.cpp" line="587"/>
<source>X2Go Desktop Sharing</source>
- <translation type="unfinished"></translation>
+ <translation>X2Go Skrivebordsdeling</translation>
</message>
</context>
<context>
@@ -140,12 +144,13 @@ and start again</source>
<message>
<location filename="dlg.ui" line="22"/>
<source>X2Go Desktop Sharing</source>
- <translation type="unfinished"></translation>
+ <translatorcomment>Skal/skal ikke benytte "Desktop Sharing" som egennavn i oversettelsen (altså beholde)?</translatorcomment>
+ <translation type="unfinished">X2Go Skrivebordsdeling</translation>
</message>
<message>
<location filename="dlg.ui" line="34"/>
<source>remove</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">fjern</translation>
</message>
<message>
<location filename="dlg.ui" line="75"/>
@@ -157,7 +162,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 />Denne applikasjonen gir deg muligheten til å dele din kjørende X-sesjon med andre brukere over lokalt nettverk, eller internett. Du vil ha muligheten til å tillate, eller nekte brukere å koble seg til, samt å lagre innstillingene dine. Et ikon i systemkurven vil informere deg om valgt konfigurasjon, og den vil også informere deg om alle tilkoblingshendelser. For mer informasjon, vennligst besøk: </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