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
This commit is contained in:
parent
cd65c671f2
commit
90fe90118a
|
@ -41,4 +41,5 @@ TRANSLATIONS += translations/valentina.ts \
|
||||||
translations/valentina_nl_NL.ts \
|
translations/valentina_nl_NL.ts \
|
||||||
translations/valentina_id_ID.ts \
|
translations/valentina_id_ID.ts \
|
||||||
translations/valentina_es_ES.ts \
|
translations/valentina_es_ES.ts \
|
||||||
translations/valentina_fi_FI.ts
|
translations/valentina_fi_FI.ts \
|
||||||
|
translations/valentina_en_US.ts
|
||||||
|
|
|
@ -1266,6 +1266,10 @@
|
||||||
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Arranged workpieces: %1 from %2</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>DialogLayoutSettings</name>
|
<name>DialogLayoutSettings</name>
|
||||||
|
|
|
@ -1610,6 +1610,10 @@
|
||||||
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Arranged workpieces: %1 from %2</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>DialogLayoutSettings</name>
|
<name>DialogLayoutSettings</name>
|
||||||
|
|
|
@ -1610,6 +1610,10 @@
|
||||||
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Arranged workpieces: %1 from %2</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>DialogLayoutSettings</name>
|
<name>DialogLayoutSettings</name>
|
||||||
|
|
6483
share/translations/valentina_en_US.ts
Normal file
6483
share/translations/valentina_en_US.ts
Normal file
File diff suppressed because it is too large
Load Diff
|
@ -1618,6 +1618,10 @@
|
||||||
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Arranged workpieces: %1 from %2</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>DialogLayoutSettings</name>
|
<name>DialogLayoutSettings</name>
|
||||||
|
|
|
@ -1618,6 +1618,10 @@
|
||||||
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Arranged workpieces: %1 from %2</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>DialogLayoutSettings</name>
|
<name>DialogLayoutSettings</name>
|
||||||
|
|
|
@ -1610,6 +1610,10 @@
|
||||||
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Arranged workpieces: %1 from %2</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>DialogLayoutSettings</name>
|
<name>DialogLayoutSettings</name>
|
||||||
|
|
|
@ -1330,6 +1330,10 @@
|
||||||
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Arranged workpieces: %1 from %2</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>DialogLayoutSettings</name>
|
<name>DialogLayoutSettings</name>
|
||||||
|
|
|
@ -1579,6 +1579,10 @@
|
||||||
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Arranged workpieces: %1 from %2</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>DialogLayoutSettings</name>
|
<name>DialogLayoutSettings</name>
|
||||||
|
|
|
@ -1318,6 +1318,10 @@
|
||||||
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Arranged workpieces: %1 from %2</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>DialogLayoutSettings</name>
|
<name>DialogLayoutSettings</name>
|
||||||
|
|
|
@ -1610,6 +1610,10 @@
|
||||||
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Arranged workpieces: %1 from %2</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>DialogLayoutSettings</name>
|
<name>DialogLayoutSettings</name>
|
||||||
|
|
|
@ -1950,6 +1950,10 @@
|
||||||
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
||||||
<translation><html><head/><body><p>Поиск лутшей позиции для детали. Пожайлуста, подождите.</p></body></html></translation>
|
<translation><html><head/><body><p>Поиск лутшей позиции для детали. Пожайлуста, подождите.</p></body></html></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Arranged workpieces: %1 from %2</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>DialogLayoutSettings</name>
|
<name>DialogLayoutSettings</name>
|
||||||
|
|
|
@ -1906,6 +1906,10 @@
|
||||||
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
<source><html><head/><body><p>Finding best position for worpieces. Please, wait.</p></body></html></source>
|
||||||
<translation><html><head/><body><p>Зачекайте, відбувається пошук найкращої позиції для деталі.</p></body></html></translation>
|
<translation><html><head/><body><p>Зачекайте, відбувається пошук найкращої позиції для деталі.</p></body></html></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Arranged workpieces: %1 from %2</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>DialogLayoutSettings</name>
|
<name>DialogLayoutSettings</name>
|
||||||
|
|
|
@ -195,7 +195,8 @@ INSTALL_TRANSLATIONS += \
|
||||||
$${TRANSLATIONS_PATH}/valentina_nl_NL.qm \
|
$${TRANSLATIONS_PATH}/valentina_nl_NL.qm \
|
||||||
$${TRANSLATIONS_PATH}/valentina_id_ID.qm \
|
$${TRANSLATIONS_PATH}/valentina_id_ID.qm \
|
||||||
$${TRANSLATIONS_PATH}/valentina_es_ES.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.
|
# Set "make install" command for Unix-like systems.
|
||||||
unix{
|
unix{
|
||||||
|
@ -337,6 +338,14 @@ unix{
|
||||||
QMAKE_BUNDLE_DATA += TRANSLATION_fi_FI
|
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.
|
# 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.
|
# For bundle this names more then enough. We don't need care much about libraries versions.
|
||||||
libraries.path = $$FRAMEWORKS_DIR
|
libraries.path = $$FRAMEWORKS_DIR
|
||||||
|
|
|
@ -172,10 +172,13 @@ QGroupBox *ConfigurationPage::LangGroup()
|
||||||
langCombo->addItem(ico, lang, locale);
|
langCombo->addItem(ico, lang, locale);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (langCombo->count() == 0)
|
||||||
|
{
|
||||||
// English language is internal and doens't have own *.qm file.
|
// English language is internal and doens't have own *.qm file.
|
||||||
QIcon ico(QString("%1/%2.png").arg("://flags").arg(QLocale::countryToString(QLocale::UnitedStates)));
|
QIcon ico(QString("%1/%2.png").arg("://flags").arg(QLocale::countryToString(QLocale::UnitedStates)));
|
||||||
QString lang = QLocale("en_US").nativeLanguageName();
|
QString lang = QLocale("en_US").nativeLanguageName();
|
||||||
langCombo->addItem(ico, lang, "en_US");
|
langCombo->addItem(ico, lang, "en_US");
|
||||||
|
}
|
||||||
|
|
||||||
// set default translators and language checked
|
// set default translators and language checked
|
||||||
qint32 index = langCombo->findData(qApp->getSettings()->GetLocale());
|
qint32 index = langCombo->findData(qApp->getSettings()->GetLocale());
|
||||||
|
|
Loading…
Reference in New Issue
Block a user