Text/translation update

l3dlp-sandbox · Jul 23, 2013 · 9429bfe · 9429bfe
1 parent 58bc0ae
commit 9429bfe
Show file tree

Hide file tree

Showing 8 changed files with 372 additions and 263 deletions.
diff --git a/HelpDialog.cpp b/HelpDialog.cpp
@@ -115,6 +115,20 @@ QString HelpDialog::getWebSite()
     #endif
 }
 
+
+QString HelpDialog::getUpdateUrl()
+{
+    #ifdef ULTRACOPIER_MODE_SUPERCOPIER
+        return tr("http://ultracopier.first-world.info/")+QString("supercopier.html");
+    #else
+        #if defined(ULTRACOPIER_CGMINER) || !defined(ULTRACOPIER_VERSION_ULTIMATE)
+            return tr("http://ultracopier.first-world.info/download.html");
+        #else
+            return "http://ultracopier-shop.first-world.info/en/order-history";
+        #endif
+    #endif
+}
+
 #ifdef ULTRACOPIER_DEBUG
 void HelpDialog::on_lineEditInsertDebug_returnPressed()
 {

diff --git a/HelpDialog.h b/HelpDialog.h
@@ -28,6 +28,7 @@ class HelpDialog : public QDialog {
         /// \brief Destruct the object
         ~HelpDialog();
         static QString getWebSite();
+        static QString getUpdateUrl();
     protected:
         /// \brief To re-translate the ui
         void changeEvent(QEvent *e);

diff --git a/SystrayIcon.cpp b/SystrayIcon.cpp
@@ -165,7 +165,7 @@ void SystrayIcon::showSystrayMessage(const QString& text)
 #ifdef ULTRACOPIER_INTERNET_SUPPORT
 void SystrayIcon::messageClicked()
 {
-    QDesktopServices::openUrl(HelpDialog::getWebSite());
+    QDesktopServices::openUrl(HelpDialog::getUpdateUrl());
 }
 #endif
 
@@ -463,7 +463,13 @@ void SystrayIcon::newUpdate(const QString &version)
     /*if(version==lastVersion)
         return;*/
     lastVersion=version;
-    showSystrayMessage(tr("New version: %1\nSite: %2").arg(version).arg(HelpDialog::getWebSite()));
+    showSystrayMessage(tr("New version: %1").arg(version)+"\n"+
+                           #if defined(ULTRACOPIER_CGMINER) || !defined(ULTRACOPIER_VERSION_ULTIMATE)
+                               tr("Click here to go on download page")
+                           #else
+                               tr("Click here to go to the shop and login.\nDownload the new version into the order details")
+                           #endif
+                       );
 }
 #endif
 

diff --git a/plugins/CopyEngine/Ultracopier/Languages/es/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/es/translation.ts
diff --git a/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts
diff --git a/plugins/CopyEngine/Ultracopier/MkPath.cpp b/plugins/CopyEngine/Ultracopier/MkPath.cpp
@@ -161,8 +161,8 @@ void MkPath::internalDoThisPath()
                 if(stopIt)
                     return;
                 waitAction=true;
-                ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to final real mvoe the folder: "+pathList.first().destination.absoluteFilePath());
-                emit errorOnFolder(pathList.first().destination,tr("Unable to final real mvoe the folder"));
+                ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Unable to do the final real move the folder: "+pathList.first().destination.absoluteFilePath());
+                emit errorOnFolder(pathList.first().destination,tr("Unable to do the final real move the folder"));
                 return;
             }
         }

diff --git a/plugins/Languages/es/translation.ts b/plugins/Languages/es/translation.ts
@@ -560,9 +560,15 @@ Esta versión está compilada en versión:%1.</translation>
     <message>
         <location filename="../../../HelpDialog.cpp" line="112"/>
         <location filename="../../../HelpDialog.cpp" line="114"/>
+        <location filename="../../../HelpDialog.cpp" line="122"/>
         <source>http://ultracopier.first-world.info/</source>
         <translation>http://ultracopier-es.first-world.info/</translation>
     </message>
+    <message>
+        <location filename="../../../HelpDialog.cpp" line="125"/>
+        <source>http://ultracopier.first-world.info/download.html</source>
+        <translation>http://ultracopier-es.first-world.info/descarga.html</translation>
+    </message>
     <message>
         <location filename="../../../HelpDialog.ui" line="75"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;For more information see the website &lt;a href=&quot;%1&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;%1&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -676,7 +682,7 @@ Esta versión está compilada en versión:%1.</translation>
     <message>
         <location filename="../../../OptionDialog.ui" line="66"/>
         <location filename="../../../OptionDialog.ui" line="301"/>
-        <location filename="../../../OptionDialog.cpp" line="339"/>
+        <location filename="../../../OptionDialog.cpp" line="341"/>
         <source>Copy engine</source>
         <translation>Motor de copia</translation>
     </message>
@@ -731,21 +737,21 @@ Esta versión está compilada en versión:%1.</translation>
     <message>
         <location filename="../../../OptionDialog.ui" line="71"/>
         <location filename="../../../OptionDialog.ui" line="314"/>
-        <location filename="../../../OptionDialog.cpp" line="340"/>
+        <location filename="../../../OptionDialog.cpp" line="342"/>
         <source>Listener</source>
         <translation>Oyente</translation>
     </message>
     <message>
         <location filename="../../../OptionDialog.ui" line="76"/>
         <location filename="../../../OptionDialog.ui" line="319"/>
-        <location filename="../../../OptionDialog.cpp" line="341"/>
+        <location filename="../../../OptionDialog.cpp" line="343"/>
         <source>Plugin loader</source>
         <translation>Plugin cargador</translation>
     </message>
     <message>
         <location filename="../../../OptionDialog.ui" line="84"/>
         <location filename="../../../OptionDialog.ui" line="324"/>
-        <location filename="../../../OptionDialog.cpp" line="342"/>
+        <location filename="../../../OptionDialog.cpp" line="344"/>
         <source>Session loader</source>
         <translation>Sesión cargador</translation>
     </message>
@@ -900,18 +906,18 @@ Esta versión está compilada en versión:%1.</translation>
         <translation type="obsolete">Escriba la carpeta de las operaciones:</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="245"/>
-        <location filename="../../../OptionDialog.cpp" line="259"/>
+        <location filename="../../../OptionDialog.cpp" line="247"/>
+        <location filename="../../../OptionDialog.cpp" line="261"/>
         <source>Load</source>
         <translation>Cargar</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="245"/>
+        <location filename="../../../OptionDialog.cpp" line="247"/>
         <source>Load the theme?</source>
         <translation>Cargue el tema?</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="259"/>
+        <location filename="../../../OptionDialog.cpp" line="261"/>
         <source>Load the language?</source>
         <translation>Cargue el idioma?</translation>
     </message>
@@ -920,87 +926,87 @@ Esta versión está compilada en versión:%1.</translation>
         <translation type="obsolete">Desactiveado porque no tienes niguano plugin SessionLoader</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="463"/>
+        <location filename="../../../OptionDialog.cpp" line="465"/>
         <source>Allow the application</source>
         <translation>Permitir la aplicación</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="463"/>
+        <location filename="../../../OptionDialog.cpp" line="465"/>
         <source>This Ultimate free version is only if %1 is allowed by your antivirus. Else you can get the normal free version</source>
         <translation>Esta versión gratuita de ruptura es sólo si %1 es permitido por su antivirus. Cosa que usted puede obtener la versión normal gratis</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="468"/>
+        <location filename="../../../OptionDialog.cpp" line="470"/>
         <source>Enable the OpenCL</source>
         <translation>Habilite el OpenCL</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="468"/>
+        <location filename="../../../OptionDialog.cpp" line="470"/>
         <source>This Ultimate version is only if the OpenCL is installed with your graphic card drivers. Else you can get the normal free version</source>
         <translation>Esta versión Ultimate es sólo si el OpenCL se instala con los controladores de la tarjeta gráfica. Cosa que usted puede obtener la versión normal gratis</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="343"/>
         <location filename="../../../OptionDialog.cpp" line="345"/>
-        <location filename="../../../OptionDialog.cpp" line="718"/>
-        <location filename="../../../OptionDialog.cpp" line="719"/>
+        <location filename="../../../OptionDialog.cpp" line="347"/>
+        <location filename="../../../OptionDialog.cpp" line="708"/>
+        <location filename="../../../OptionDialog.cpp" line="709"/>
         <source>Disabled because you do not have any SessionLoader plugin</source>
         <translation>Discapacitados, ya que no tiene ningún plugin SessionLoader</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="347"/>
+        <location filename="../../../OptionDialog.cpp" line="349"/>
         <source>Do nothing</source>
         <translation>No hacer nada</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="348"/>
+        <location filename="../../../OptionDialog.cpp" line="350"/>
         <source>Ask source as folder</source>
         <translation>Pregunte a la fuente que la carpeta</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="349"/>
+        <location filename="../../../OptionDialog.cpp" line="351"/>
         <source>Ask sources as files</source>
         <translation>Pregunte a las fuentes como archivos</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="350"/>
+        <location filename="../../../OptionDialog.cpp" line="352"/>
         <source>Never</source>
         <translation>Nunca</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="351"/>
+        <location filename="../../../OptionDialog.cpp" line="353"/>
         <source>When source is same</source>
         <translation>Cuando la fuente es la misma</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="352"/>
+        <location filename="../../../OptionDialog.cpp" line="354"/>
         <source>When destination is same</source>
         <translation>Cuando destino es el mismo</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="353"/>
+        <location filename="../../../OptionDialog.cpp" line="355"/>
         <source>When source and destination are same</source>
         <translation>Cuando la fuente y el destino son los mismos</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="354"/>
+        <location filename="../../../OptionDialog.cpp" line="356"/>
         <source>When source or destination are same</source>
         <translation>Cuando la fuente o el destino son los mismos</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="355"/>
+        <location filename="../../../OptionDialog.cpp" line="357"/>
         <source>Always</source>
         <translation>Siempre</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="369"/>
-        <location filename="../../../OptionDialog.cpp" line="370"/>
         <location filename="../../../OptionDialog.cpp" line="371"/>
+        <location filename="../../../OptionDialog.cpp" line="372"/>
+        <location filename="../../../OptionDialog.cpp" line="373"/>
         <source>The variables are %1</source>
         <translation>Las variables son %1</translation>
     </message>
     <message>
-        <location filename="../../../OptionDialog.cpp" line="1357"/>
+        <location filename="../../../OptionDialog.cpp" line="1365"/>
         <source>Save logs as: </source>
         <translation>Guardar registros como: </translation>
     </message>
@@ -1377,6 +1383,23 @@ No se puede cargar el contenido del plugin, por favor verifique que</translation
         <source>&amp;About</source>
         <translation>&amp;Sobre</translation>
     </message>
+    <message>
+        <location filename="../../../SystrayIcon.cpp" line="466"/>
+        <source>New version: %1</source>
+        <translation>Nueva versión: %1</translation>
+    </message>
+    <message>
+        <location filename="../../../SystrayIcon.cpp" line="468"/>
+        <source>Click here to go on download page</source>
+        <translation>Haga clic aquí para ir a la página de descarga</translation>
+    </message>
+    <message>
+        <location filename="../../../SystrayIcon.cpp" line="470"/>
+        <source>Click here to go to the shop and login.
+Download the new version into the order details</source>
+        <translation>Haga clic aquí para ir a la tienda y al acceso.
+Descarga la nueva versión en los detalles de la orden</translation>
+    </message>
     <message>
         <source>&amp;Save bug Report</source>
         <translation type="obsolete">&amp;Guardar informe de error</translation>
@@ -1402,39 +1425,38 @@ No se puede cargar el contenido del plugin, por favor verifique que</translation
         <translation>Aña&amp;dir copiar/mover</translation>
     </message>
     <message>
-        <location filename="../../../SystrayIcon.cpp" line="466"/>
         <source>New version: %1
 Site: %2</source>
-        <translation>Nueva versión: %1
+        <translation type="obsolete">Nueva versión: %1
 Sitio web: %2</translation>
     </message>
     <message>
-        <location filename="../../../SystrayIcon.cpp" line="483"/>
+        <location filename="../../../SystrayIcon.cpp" line="489"/>
         <source>&amp;Copy</source>
         <translation>&amp;Copia</translation>
     </message>
     <message>
-        <location filename="../../../SystrayIcon.cpp" line="489"/>
+        <location filename="../../../SystrayIcon.cpp" line="495"/>
         <source>&amp;Transfer</source>
         <translation>&amp;Transferencia</translation>
     </message>
     <message>
-        <location filename="../../../SystrayIcon.cpp" line="493"/>
+        <location filename="../../../SystrayIcon.cpp" line="499"/>
         <source>&amp;Move</source>
         <translation>&amp;Movimiento</translation>
     </message>
     <message>
-        <location filename="../../../SystrayIcon.cpp" line="505"/>
+        <location filename="../../../SystrayIcon.cpp" line="511"/>
         <source>Add &amp;copy</source>
         <translation>Agregar &amp;copia</translation>
     </message>
     <message>
-        <location filename="../../../SystrayIcon.cpp" line="511"/>
+        <location filename="../../../SystrayIcon.cpp" line="517"/>
         <source>Add &amp;transfer</source>
         <translation>Añadir &amp;transferencia</translation>
     </message>
     <message>
-        <location filename="../../../SystrayIcon.cpp" line="515"/>
+        <location filename="../../../SystrayIcon.cpp" line="521"/>
         <source>Add &amp;move</source>
         <translation>Añadir &amp;movimiento</translation>
     </message>