No one want deal with source code. From no one we will have TS file for english

language. Changes from this file will be ported to source code. --HG-- branch : develop
2024-06-18 10:25:58 +02:00 · 2015-05-07 17:13:41 +03:00 · 2015-05-07 17:13:41 +03:00 · 90fe90118a
parent cd65c671f2
commit 90fe90118a
16 changed files with 6550 additions and 6 deletions
--- a/share/translations.pro
+++ b/share/translations.pro
@ -41,4 +41,5 @@ TRANSLATIONS += translations/valentina.ts \
                translations/valentina_nl_NL.ts \
                translations/valentina_id_ID.ts \
                translations/valentina_es_ES.ts \
-                translations/valentina_fi_FI.ts
+                translations/valentina_fi_FI.ts \
+                translations/valentina_en_US.ts
--- a/share/translations/valentina.ts
+++ b/share/translations/valentina.ts
@ -1266,6 +1266,10 @@
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Arranged workpieces: %1 from %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>DialogLayoutSettings</name>
--- a/share/translations/valentina_cs_CZ.ts
+++ b/share/translations/valentina_cs_CZ.ts
@ -1610,6 +1610,10 @@
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Arranged workpieces: %1 from %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>DialogLayoutSettings</name>
--- a/share/translations/valentina_de_DE.ts
+++ b/share/translations/valentina_de_DE.ts
@ -1610,6 +1610,10 @@
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Arranged workpieces: %1 from %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>DialogLayoutSettings</name>
--- a/share/translations/valentina_en_US.ts
+++ b/share/translations/valentina_en_US.ts
--- a/share/translations/valentina_es_ES.ts
+++ b/share/translations/valentina_es_ES.ts
@ -1618,6 +1618,10 @@
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Arranged workpieces: %1 from %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>DialogLayoutSettings</name>
--- a/share/translations/valentina_fi_FI.ts
+++ b/share/translations/valentina_fi_FI.ts
@ -1618,6 +1618,10 @@
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Arranged workpieces: %1 from %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>DialogLayoutSettings</name>
--- a/share/translations/valentina_fr_FR.ts
+++ b/share/translations/valentina_fr_FR.ts
@ -1610,6 +1610,10 @@
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Arranged workpieces: %1 from %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>DialogLayoutSettings</name>
--- a/share/translations/valentina_he_IL.ts
+++ b/share/translations/valentina_he_IL.ts
@ -1330,6 +1330,10 @@
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Arranged workpieces: %1 from %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>DialogLayoutSettings</name>
--- a/share/translations/valentina_id_ID.ts
+++ b/share/translations/valentina_id_ID.ts
@ -1579,6 +1579,10 @@
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Arranged workpieces: %1 from %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>DialogLayoutSettings</name>
--- a/share/translations/valentina_it_IT.ts
+++ b/share/translations/valentina_it_IT.ts
@ -1318,6 +1318,10 @@
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Arranged workpieces: %1 from %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>DialogLayoutSettings</name>
--- a/share/translations/valentina_nl_NL.ts
+++ b/share/translations/valentina_nl_NL.ts
@ -1610,6 +1610,10 @@
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Arranged workpieces: %1 from %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>DialogLayoutSettings</name>
--- a/share/translations/valentina_ru_RU.ts
+++ b/share/translations/valentina_ru_RU.ts
@ -1950,6 +1950,10 @@
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Поиск лутшей позиции для детали. Пожайлуста, подождите.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
    </message>
+    <message>
+        <source>Arranged workpieces: %1 from %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>DialogLayoutSettings</name>
--- a/share/translations/valentina_uk_UA.ts
+++ b/share/translations/valentina_uk_UA.ts
@ -1906,6 +1906,10 @@
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Finding best position for worpieces. Please, wait.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Зачекайте, відбувається пошук найкращої позиції для деталі.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
    </message>
+    <message>
+        <source>Arranged workpieces: %1 from %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>DialogLayoutSettings</name>
--- a/src/app/app.pro
+++ b/src/app/app.pro
@ -195,7 +195,8 @@ INSTALL_TRANSLATIONS += \
    $${TRANSLATIONS_PATH}/valentina_nl_NL.qm \
    $${TRANSLATIONS_PATH}/valentina_id_ID.qm \
    $${TRANSLATIONS_PATH}/valentina_es_ES.qm \
-    $${TRANSLATIONS_PATH}/valentina_fi_FI.qm
+    $${TRANSLATIONS_PATH}/valentina_fi_FI.qm \
+    $${TRANSLATIONS_PATH}/valentina_en_US.qm

 # Set "make install" command for Unix-like systems.
 unix{
@ -337,6 +338,14 @@ unix{
            QMAKE_BUNDLE_DATA += TRANSLATION_fi_FI
        }

+        exists($${TRANSLATIONS_PATH}/valentina_en_US.qm){
+            TRANSLATION_en_US.files += \
+                $${TRANSLATIONS_PATH}/valentina_en_US.qm \
+                $${TRANSLATIONS_PATH}/Localizable.strings
+            TRANSLATION_en_US.path = "$$RESOURCES_DIR/translations/en_US.lproj"
+            QMAKE_BUNDLE_DATA += TRANSLATION_en_US
+        }
+
    # Symlinks also good names for copying. Make will take origin file and copy them with using symlink name.
    # For bundle this names more then enough. We don't need care much about libraries versions.
    libraries.path = $$FRAMEWORKS_DIR
--- a/src/app/dialogs/app/configpages/configurationpage.cpp
+++ b/src/app/dialogs/app/configpages/configurationpage.cpp
@ -172,10 +172,13 @@ QGroupBox *ConfigurationPage::LangGroup()
        langCombo->addItem(ico, lang, locale);
    }

-    // English language is internal and doens't have own *.qm file.
-    QIcon ico(QString("%1/%2.png").arg("://flags").arg(QLocale::countryToString(QLocale::UnitedStates)));
-    QString lang = QLocale("en_US").nativeLanguageName();
-    langCombo->addItem(ico, lang, "en_US");
+    if (langCombo->count() == 0)
+    {
+        // English language is internal and doens't have own *.qm file.
+        QIcon ico(QString("%1/%2.png").arg("://flags").arg(QLocale::countryToString(QLocale::UnitedStates)));
+        QString lang = QLocale("en_US").nativeLanguageName();
+        langCombo->addItem(ico, lang, "en_US");
+    }

    // set default translators and language checked
    qint32 index = langCombo->findData(qApp->getSettings()->GetLocale());