This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 85056d923095f25859d8bc404d1869db6a1a6890 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 24 13:36:33 2017 +0100 {src/printdialog.cpp,res/i18n/x2goclient_*.ts}: drop spurious left-over parenthesis in warning message and adapt translations. --- debian/changelog | 2 ++ res/i18n/x2goclient_da.ts | 2 +- res/i18n/x2goclient_de.ts | 2 +- res/i18n/x2goclient_es.ts | 2 +- res/i18n/x2goclient_et.ts | 2 +- res/i18n/x2goclient_fi.ts | 2 +- res/i18n/x2goclient_fr.ts | 2 +- res/i18n/x2goclient_nb_no.ts | 3 ++- res/i18n/x2goclient_nl.ts | 5 +++-- res/i18n/x2goclient_pt.ts | 2 +- res/i18n/x2goclient_ru.ts | 2 +- res/i18n/x2goclient_sv.ts | 5 +++-- res/i18n/x2goclient_tr.ts | 2 +- res/i18n/x2goclient_zh_tw.ts | 2 +- src/printdialog.cpp | 4 ++-- 15 files changed, 22 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index e0603ef..a929815 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,6 +90,8 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium use correct plural forms in translations and split string up in a translation-friendly form. I'll leave translators to handle this beast, as languages are unique in the number of plural forms and the like. + - {src/printdialog.cpp,res/i18n/x2goclient_*.ts}: drop spurious left-over + parenthesis in warning message and adapt translations. [ Oleksandr Shneyder ] * New upstream version (4.1.0.1): diff --git a/res/i18n/x2goclient_da.ts b/res/i18n/x2goclient_da.ts index b4036cb..046d73a 100644 --- a/res/i18n/x2goclient_da.ts +++ b/res/i18n/x2goclient_da.ts @@ -3156,7 +3156,7 @@ du kan installere sshd med </message> <message> <location filename="../../src/printdialog.cpp" line="63"/> - <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source> + <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings</source> <translation type="unfinished"></translation> </message> <message> diff --git a/res/i18n/x2goclient_de.ts b/res/i18n/x2goclient_de.ts index d12f045..fa86157 100644 --- a/res/i18n/x2goclient_de.ts +++ b/res/i18n/x2goclient_de.ts @@ -3895,7 +3895,7 @@ Bitte installieren Sie dort eine neuere Version des X2GoServer-Pakets.</translat </message> <message> <location filename="../../src/printdialog.cpp" line="63"/> - <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source> + <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings</source> <translation>Über die Clienteinstellungen (Menü -> Einstellungen -> Konfiguration) können Sie den Dialog wieder einblenden.</translation> </message> <message> diff --git a/res/i18n/x2goclient_es.ts b/res/i18n/x2goclient_es.ts index cea6fba..33e8c2c 100644 --- a/res/i18n/x2goclient_es.ts +++ b/res/i18n/x2goclient_es.ts @@ -3395,7 +3395,7 @@ puedes instalar sshd con </message> <message> <location filename="../../src/printdialog.cpp" line="63"/> - <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source> + <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings</source> <translation>Puedes reactivar este diálogo dentro de las preferencia del cliente X2Go (Menú -> Opciones -> Preferencias)</translation> </message> <message> diff --git a/res/i18n/x2goclient_et.ts b/res/i18n/x2goclient_et.ts index d21891a..7e72101 100644 --- a/res/i18n/x2goclient_et.ts +++ b/res/i18n/x2goclient_et.ts @@ -3196,7 +3196,7 @@ võid installeerida selle kasutades käsku </message> <message> <location filename="../../src/printdialog.cpp" line="63"/> - <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source> + <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings</source> <translation>Sa võid selle dialoogi uuesti taastada X2Go Client-Seadete menüüs. Kasuta menüüs: Valikud -> Seaded)</translation> </message> <message> diff --git a/res/i18n/x2goclient_fi.ts b/res/i18n/x2goclient_fi.ts index 6ceda75..3834656 100644 --- a/res/i18n/x2goclient_fi.ts +++ b/res/i18n/x2goclient_fi.ts @@ -3370,7 +3370,7 @@ voit asentaa sshd komennolla </message> <message> <location filename="../../src/printdialog.cpp" line="63"/> - <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source> + <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings</source> <translation>Voit palauttaa takaisin tämän vaihtoehdon käyttäen X2Go asiakasohjelman asetuksia. Se onnistuu päävalikon toiminnnolla: Valinnat -> Asetukset)</translation> </message> <message> diff --git a/res/i18n/x2goclient_fr.ts b/res/i18n/x2goclient_fr.ts index b8e4f44..5b64f4c 100644 --- a/res/i18n/x2goclient_fr.ts +++ b/res/i18n/x2goclient_fr.ts @@ -2444,7 +2444,7 @@ Veuillez rapporter le bug sur : <translation>Vous avez désactivé la fenêtre de dialogue d'impression de X2Go Client.</translation> </message> <message> - <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source> + <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings</source> <translatorcomment>bizarre cette parenthèse toute seule</translatorcomment> <translation>Vous pouvez réactiver cette fenêtre de dialogue en utilisant la fenêtre des préférences de X2Go Client. Pour ce faire, suivez ce chemin dans la barre de menu : Options -> Préférences)</translation> </message> diff --git a/res/i18n/x2goclient_nb_no.ts b/res/i18n/x2goclient_nb_no.ts index 95d7d48..14d632b 100644 --- a/res/i18n/x2goclient_nb_no.ts +++ b/res/i18n/x2goclient_nb_no.ts @@ -2904,7 +2904,8 @@ Please report a bug on: <translation type="obsolete">Du kan reaktivere denne dialogen ved å benytte X2Go Client innstillingene (Innstillinger -> Innstillinger)</translation> </message> <message> - <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source> + <comment>Please adapt this to the new message, note that it has changed.</comment> + <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings</source> <translation type="unfinished">Du kan reaktivere denne dialogen ved å benytte X2Go Client innstillingene (Innstillinger -> Innstillinger)</translation> </message> </context> diff --git a/res/i18n/x2goclient_nl.ts b/res/i18n/x2goclient_nl.ts index 34575fe..f6023ea 100644 --- a/res/i18n/x2goclient_nl.ts +++ b/res/i18n/x2goclient_nl.ts @@ -3336,8 +3336,9 @@ u kunt sshd installeren met </message> <message> <location filename="../../src/printdialog.cpp" line="63"/> - <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source> - <translation>U kunt deze dialoog opnieuw activeren via de X2Go Client instellingen dialoog (Menu -> Opties -> Instellingen)</translation> + <comment>Please adapt this to the new message. Note that it has changed.</comment> + <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings</source> + <translation type="unfinished">U kunt deze dialoog opnieuw activeren via de X2Go Client instellingen dialoog (Menu -> Opties -> Instellingen)</translation> </message> <message> <source>You've deactivated the x2go client printing dialog.</source> diff --git a/res/i18n/x2goclient_pt.ts b/res/i18n/x2goclient_pt.ts index 65ef3fe..262f3d1 100644 --- a/res/i18n/x2goclient_pt.ts +++ b/res/i18n/x2goclient_pt.ts @@ -2646,7 +2646,7 @@ used for exporting folders and printers.</source> </message> <message> <location filename="../../src/printdialog.cpp" line="63"/> - <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source> + <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings</source> <translation type="unfinished"></translation> </message> </context> diff --git a/res/i18n/x2goclient_ru.ts b/res/i18n/x2goclient_ru.ts index d8827ae..0434ebf 100644 --- a/res/i18n/x2goclient_ru.ts +++ b/res/i18n/x2goclient_ru.ts @@ -3574,7 +3574,7 @@ Please update your x2goserver package.</source> </message> <message> <location filename="../../src/printdialog.cpp" line="63"/> - <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source> + <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings</source> <translation type="unfinished"></translation> </message> <message> diff --git a/res/i18n/x2goclient_sv.ts b/res/i18n/x2goclient_sv.ts index 5e61f38..9330a72 100644 --- a/res/i18n/x2goclient_sv.ts +++ b/res/i18n/x2goclient_sv.ts @@ -3421,8 +3421,9 @@ du kan installera sshd med (Debian/Ubuntu) </message> <message> <location filename="../../src/printdialog.cpp" line="63"/> - <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source> - <translation>Du kan återaktivera denna dialog via X2Go-klientens inställningar (Meny -> Alternativ -> Inställningar)</translation> + <comment>Please adapt this to the new message. Note that it has changed.</comment> + <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings</source> + <translation type="unfinished">Du kan återaktivera denna dialog via X2Go-klientens inställningar (Meny -> Alternativ -> Inställningar)</translation> </message> <message> <source>You've deactivated the x2go client printing dialog.</source> diff --git a/res/i18n/x2goclient_tr.ts b/res/i18n/x2goclient_tr.ts index 2d2b8da..3625e3d 100644 --- a/res/i18n/x2goclient_tr.ts +++ b/res/i18n/x2goclient_tr.ts @@ -3125,7 +3125,7 @@ açmakta başarısız oldu.</translation> </message> <message> <location filename="../../src/printdialog.cpp" line="63"/> - <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source> + <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings</source> <translation type="unfinished"></translation> </message> <message> diff --git a/res/i18n/x2goclient_zh_tw.ts b/res/i18n/x2goclient_zh_tw.ts index 230d430..2bea357 100644 --- a/res/i18n/x2goclient_zh_tw.ts +++ b/res/i18n/x2goclient_zh_tw.ts @@ -2998,7 +2998,7 @@ you can install sshd with </message> <message> <location filename="../../src/printdialog.cpp" line="63"/> - <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source> + <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/printdialog.cpp b/src/printdialog.cpp index b412bbc..d998b87 100644 --- a/src/printdialog.cpp +++ b/src/printdialog.cpp @@ -63,6 +63,6 @@ void PrintDialog::slot_dlgShowEnabled ( bool enable ) tr ( "You may reactivate this dialog " "using the X2Go Client settings " "dialog. To do so, follow this path " - "in the menu bar: Options -> " - "Settings)" ) ); + "in the menu bar: Options -> " + "Settings" ) ); } -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git