[X2Go-Commits] [x2godesktopsharing] 02/02: misc: fix X2GO => X2Go and add "Desktop" where missing. Fixes: #936.

git-admin at x2go.org git-admin at x2go.org
Thu Jan 14 07:29:51 CET 2016


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2godesktopsharing.

commit a92075b48d1d03b688583059f0f5923deeb9edcf
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Jan 14 07:10:05 2016 +0100

    misc: fix X2GO => X2Go and add "Desktop" where missing. Fixes: #936.
---
 debian/changelog               |    1 +
 debian/x2godesktopsharing.menu |    2 +-
 sharetray.cpp                  |    4 ++--
 x2godesktopsharing_da.ts       |    8 ++++----
 x2godesktopsharing_de.ts       |    6 +++---
 x2godesktopsharing_es.ts       |    8 ++++----
 x2godesktopsharing_et.ts       |    8 ++++----
 x2godesktopsharing_fi.ts       |    6 +++---
 x2godesktopsharing_fr.ts       |    6 +++---
 x2godesktopsharing_nb_no.ts    |    8 ++++----
 x2godesktopsharing_nl.ts       |    6 +++---
 x2godesktopsharing_pt.ts       |    4 ++--
 x2godesktopsharing_ru.ts       |    4 ++--
 x2godesktopsharing_sv.ts       |    6 +++---
 x2godesktopsharing_tr.ts       |    8 ++++----
 x2godesktopsharing_zh_tw.ts    |    4 ++--
 16 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 85030d0..4e21389 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x2godesktopsharing (3.1.1.3-0x2go1) UNRELEASED; urgency=low
     - x2godesktopsharing_zh_tw: rename to x2godesktopsharing_zh_tw.ts. Oops.
     - x2godesktopsharing.pro: also rename x2godesktopsharing_zh_tw in project
       file.
+    - misc: fix X2GO => X2Go and add "Desktop" where missing. Fixes: #936.
   * debian/control:
     - Drop libqt4-gui Depends. Already handled by shlibs and misc Depends.
       Fixes: #905.
diff --git a/debian/x2godesktopsharing.menu b/debian/x2godesktopsharing.menu
index 0d5b6e7..f397f77 100644
--- a/debian/x2godesktopsharing.menu
+++ b/debian/x2godesktopsharing.menu
@@ -1,6 +1,6 @@
 ?package(x2godesktopsharing):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
-	title="X2GO Desktop Sharing"\
+	title="X2Go Desktop Sharing"\
 	icon="/usr/share/x2godesktopsharing/icons/x2godesktopsharing.xpm"\
 	command="/usr/bin/x2godesktopsharing"
diff --git a/sharetray.cpp b/sharetray.cpp
index 6548ca4..16aa101 100644
--- a/sharetray.cpp
+++ b/sharetray.cpp
@@ -65,7 +65,7 @@ ShareTray::ShareTray()
 
 	ui.icon->setPixmap ( QPixmap ( ":icons/128x128/x2godesktopsharing.png" ) );
 
-	ui.text->setText ( tr ( "<b>X2GO DesktopSharing v" ) +VERSION+
+	ui.text->setText ( tr ( "<b>X2Go Desktop Sharing v" ) +VERSION+
 	                   " </b >(Qt - "+qVersion() +")"+
 	                   ui.text->text() );
 
@@ -144,7 +144,7 @@ ShareTray::ShareTray()
 	menu->addSeparator();
 	QAction* actAbout=menu->addAction (
 	                                    QIcon ( ":icons/32x32/x2godesktopsharing.png" ),
-	                                    tr ( "About X2GO Sharing" ) );
+	                                    tr ( "About X2Go Desktop Sharing" ) );
 	//
 	//     QAction* actAboutQt=menu->addAction(
 	//                              tr("About Qt"));
diff --git a/x2godesktopsharing_da.ts b/x2godesktopsharing_da.ts
index 41c1710..174eff6 100644
--- a/x2godesktopsharing_da.ts
+++ b/x2godesktopsharing_da.ts
@@ -18,8 +18,8 @@
     <name>ShareTray</name>
     <message>
         <location filename="sharetray.cpp" line="68"/>
-        <source><b>X2GO DesktopSharing v</source>
-        <translation><b>X2GO Skrivebords Deling v</translation>
+        <source><b>X2Go Desktop Sharing v</source>
+        <translation><b>X2Go Skrivebords Deling v</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="101"/>
@@ -63,8 +63,8 @@ og start igen</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="147"/>
-        <source>About X2GO Sharing</source>
-        <translation>Om X2Go Deling</translation>
+        <source>About X2Go Desktop Sharing</source>
+        <translation>Om X2Go Skrivebords Deling</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="160"/>
diff --git a/x2godesktopsharing_de.ts b/x2godesktopsharing_de.ts
index 608434c..be5cd76 100644
--- a/x2godesktopsharing_de.ts
+++ b/x2godesktopsharing_de.ts
@@ -100,8 +100,8 @@ entfernen und Dienst neu starten</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="68"/>
-        <source><b>X2GO DesktopSharing v</source>
-        <translation><b>X2GO DesktopSharing v</translation>
+        <source><b>X2Go Desktop Sharing v</source>
+        <translation><b>X2Go Desktop Sharing v</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="419"/>
@@ -129,7 +129,7 @@ entfernen und Dienst neu starten</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="147"/>
-        <source>About X2GO Sharing</source>
+        <source>About X2Go Desktop Sharing</source>
         <translation>Über X2Go Desktopfreigabe</translation>
     </message>
     <message>
diff --git a/x2godesktopsharing_es.ts b/x2godesktopsharing_es.ts
index a095784..107484d 100644
--- a/x2godesktopsharing_es.ts
+++ b/x2godesktopsharing_es.ts
@@ -18,8 +18,8 @@
     <name>ShareTray</name>
     <message>
         <location filename="sharetray.cpp" line="68"/>
-        <source><b>X2GO DesktopSharing v</source>
-        <translation><b>X2GO DesktopSharing v</translation>
+        <source><b>X2Go Desktop Sharing v</source>
+        <translation><b>X2Go Desktop Sharing v</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="101"/>
@@ -62,8 +62,8 @@ si no está funcionando borra %1 e iníciala de nuevo</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="147"/>
-        <source>About X2GO Sharing</source>
-        <translation>Acerca de X2Go DesktopSharing</translation>
+        <source>About X2Go Desktop Sharing</source>
+        <translation>Acerca de X2Go Desktop Sharing</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="160"/>
diff --git a/x2godesktopsharing_et.ts b/x2godesktopsharing_et.ts
index 00a7fff..69d12bf 100644
--- a/x2godesktopsharing_et.ts
+++ b/x2godesktopsharing_et.ts
@@ -18,8 +18,8 @@
     <name>ShareTray</name>
     <message>
         <location filename="sharetray.cpp" line="68"/>
-        <source><b>X2GO DesktopSharing v</source>
-        <translation><b>X2GO Töölaua jagamine v</translation>
+        <source><b>X2Go Desktop Sharing v</source>
+        <translation><b>X2Go Töölaua jagamine v</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="101"/>
@@ -63,8 +63,8 @@ ja alusta uuesti</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="147"/>
-        <source>About X2GO Sharing</source>
-        <translation>Info X2Go jagamisest</translation>
+        <source>About X2Go Desktop Sharing</source>
+        <translation>Info X2Go Töölaua jagamisest</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="160"/>
diff --git a/x2godesktopsharing_fi.ts b/x2godesktopsharing_fi.ts
index 4844d34..8418c39 100644
--- a/x2godesktopsharing_fi.ts
+++ b/x2godesktopsharing_fi.ts
@@ -18,8 +18,8 @@
     <name>ShareTray</name>
     <message>
         <location filename="sharetray.cpp" line="68"/>
-        <source><b>X2GO DesktopSharing v</source>
-        <translation><b>X2GO Työpöydänjako v</translation>
+        <source><b>X2Go Desktop Sharing v</source>
+        <translation><b>X2Go Työpöydänjako v</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="101"/>
@@ -63,7 +63,7 @@ ja käynnistä uudelleen</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="147"/>
-        <source>About X2GO Sharing</source>
+        <source>About X2Go Desktop Sharing</source>
         <translation>Tietoja X2Go työpöydänjaosta</translation>
     </message>
     <message>
diff --git a/x2godesktopsharing_fr.ts b/x2godesktopsharing_fr.ts
index 1d3b4d6..f4658d4 100644
--- a/x2godesktopsharing_fr.ts
+++ b/x2godesktopsharing_fr.ts
@@ -15,8 +15,8 @@
 <context>
     <name>ShareTray</name>
     <message>
-        <source><b>X2GO DesktopSharing v</source>
-        <translation><b>X2GO Desktop Sharing v</translation>
+        <source><b>X2Go Desktop Sharing v</source>
+        <translation><b>X2Go Desktop Sharing v</translation>
     </message>
     <message>
         <source>X2Go desktop sharing application is already active for this display 
@@ -50,7 +50,7 @@ Si cette application n'est plus en cours d'execution, effacez le fichi
         <translation>Désactiver X2Go Desktop Sharing</translation>
     </message>
     <message>
-        <source>About X2GO Sharing</source>
+        <source>About X2Go Desktop Sharing</source>
         <translation>Apropos de X2Go Desktop Sharing</translation>
     </message>
     <message>
diff --git a/x2godesktopsharing_nb_no.ts b/x2godesktopsharing_nb_no.ts
index 75ce2c1..d366861 100644
--- a/x2godesktopsharing_nb_no.ts
+++ b/x2godesktopsharing_nb_no.ts
@@ -18,9 +18,9 @@
     <name>ShareTray</name>
     <message>
         <location filename="sharetray.cpp" line="68"/>
-        <source><b>X2GO DesktopSharing v</source>
+        <source><b>X2Go Desktop Sharing v</source>
         <translatorcomment>Oversette, eller beholde "DesktopSharing"?</translatorcomment>
-        <translation type="unfinished"><b>X2GO DesktopSharing v</translation>
+        <translation type="unfinished"><b>X2Go Desktop Sharing v</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="101"/>
@@ -64,9 +64,9 @@ and start again</source>
     </message>
     <message>
         <location filename="sharetray.cpp" line="147"/>
-        <source>About X2GO Sharing</source>
+        <source>About X2Go Desktop Sharing</source>
         <translatorcomment>hm... bør rapportere at den engelske strengen er feil/mangelful</translatorcomment>
-        <translation type="unfinished">Om X2Go DesktopSharing</translation>
+        <translation type="unfinished">Om X2Go Desktop Sharing</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="160"/>
diff --git a/x2godesktopsharing_nl.ts b/x2godesktopsharing_nl.ts
index d66ab20..f44e262 100644
--- a/x2godesktopsharing_nl.ts
+++ b/x2godesktopsharing_nl.ts
@@ -100,8 +100,8 @@ en start opnieuw</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="68"/>
-        <source><b>X2GO DesktopSharing v</source>
-        <translation><b>X2GO desktop delen v</translation>
+        <source><b>X2Go Desktop Sharing v</source>
+        <translation><b>X2Go desktop delen v</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="419"/>
@@ -129,7 +129,7 @@ en start opnieuw</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="147"/>
-        <source>About X2GO Sharing</source>
+        <source>About X2Go Desktop Sharing</source>
         <translation>Over X2Go desktop delen</translation>
     </message>
     <message>
diff --git a/x2godesktopsharing_pt.ts b/x2godesktopsharing_pt.ts
index 8bd2758..dd315c1 100644
--- a/x2godesktopsharing_pt.ts
+++ b/x2godesktopsharing_pt.ts
@@ -18,7 +18,7 @@
     <name>ShareTray</name>
     <message>
         <location filename="sharetray.cpp" line="68"/>
-        <source><b>X2GO DesktopSharing v</source>
+        <source><b>X2Go Desktop Sharing v</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -61,7 +61,7 @@ and start again</source>
     </message>
     <message>
         <location filename="sharetray.cpp" line="147"/>
-        <source>About X2GO Sharing</source>
+        <source>About X2Go Desktop Sharing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/x2godesktopsharing_ru.ts b/x2godesktopsharing_ru.ts
index 0cdcf73..e245b9d 100644
--- a/x2godesktopsharing_ru.ts
+++ b/x2godesktopsharing_ru.ts
@@ -100,7 +100,7 @@ and start again</source>
     </message>
     <message>
         <location filename="sharetray.cpp" line="68"/>
-        <source><b>X2GO DesktopSharing v</source>
+        <source><b>X2Go Desktop Sharing v</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -129,7 +129,7 @@ and start again</source>
     </message>
     <message>
         <location filename="sharetray.cpp" line="147"/>
-        <source>About X2GO Sharing</source>
+        <source>About X2Go Desktop Sharing</source>
         <translation>О программе</translation>
     </message>
     <message>
diff --git a/x2godesktopsharing_sv.ts b/x2godesktopsharing_sv.ts
index b12307b..f52303c 100644
--- a/x2godesktopsharing_sv.ts
+++ b/x2godesktopsharing_sv.ts
@@ -18,8 +18,8 @@
     <name>ShareTray</name>
     <message>
         <location filename="sharetray.cpp" line="68"/>
-        <source><b>X2GO DesktopSharing v</source>
-        <translation><b>X2GO Skrivbordsdelning v</translation>
+        <source><b>X2Go Desktop Sharing v</source>
+        <translation><b>X2Go Skrivbordsdelning v</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="101"/>
@@ -63,7 +63,7 @@ och starta igen</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="147"/>
-        <source>About X2GO Sharing</source>
+        <source>About X2Go Desktop Sharing</source>
         <translation>Om X2Go Skrivbordsdelning</translation>
     </message>
     <message>
diff --git a/x2godesktopsharing_tr.ts b/x2godesktopsharing_tr.ts
index 9546e9e..f3ec2e8 100644
--- a/x2godesktopsharing_tr.ts
+++ b/x2godesktopsharing_tr.ts
@@ -18,8 +18,8 @@
     <name>ShareTray</name>
     <message>
         <location filename="sharetray.cpp" line="68"/>
-        <source><b>X2GO DesktopSharing v</source>
-        <translation><b>X2GO DesktopSharing v</translation>
+        <source><b>X2Go Desktop Sharing v</source>
+        <translation><b>X2Go Desktop Sharing v</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="101"/>
@@ -62,8 +62,8 @@ eğer bu uygulama artık çalışmıyorsa, %1 silinip\tekrar başlatılmalıdır
     </message>
     <message>
         <location filename="sharetray.cpp" line="147"/>
-        <source>About X2GO Sharing</source>
-        <translation>X2GO Paylaşımı Hakkında</translation>
+        <source>About X2Go Desktop Sharing</source>
+        <translation>X2Go Paylaşımı Hakkında</translation>
     </message>
     <message>
         <location filename="sharetray.cpp" line="160"/>
diff --git a/x2godesktopsharing_zh_tw.ts b/x2godesktopsharing_zh_tw.ts
index 37463ba..1dcf06f 100644
--- a/x2godesktopsharing_zh_tw.ts
+++ b/x2godesktopsharing_zh_tw.ts
@@ -18,7 +18,7 @@
     <name>ShareTray</name>
     <message>
         <location filename="sharetray.cpp" line="68"/>
-        <source><b>X2GO DesktopSharing v</source>
+        <source><b>X2Go Desktop Sharing v</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -61,7 +61,7 @@ and start again</source>
     </message>
     <message>
         <location filename="sharetray.cpp" line="147"/>
-        <source>About X2GO Sharing</source>
+        <source>About X2Go Desktop Sharing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

--
Alioth's /srv/git/code.x2go.org/x2godesktopsharing.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git


More information about the x2go-commits mailing list