Add Russian translation; Various minor fixes/improvements

This commit is contained in:
Hanna K 2021-07-02 09:04:09 +02:00
parent 9153ca3543
commit 73d7def6b4
6 changed files with 9062 additions and 129 deletions

View File

@ -46,7 +46,7 @@ HEADERS += src/calendarconversiondialog.h src/csvdialog.h src/expressionedit.h s
SOURCES += src/calendarconversiondialog.cpp src/csvdialog.cpp src/expressionedit.cpp src/fpconversiondialog.cpp src/functioneditdialog.cpp src/functionsdialog.cpp src/historyview.cpp src/itemproxymodel.cpp src/keypadwidget.cpp src/main.cpp src/matrixwidget.cpp src/plotdialog.cpp src/preferencesdialog.cpp src/qalculateqtsettings.cpp src/qalculatewindow.cpp src/unitsdialog.cpp src/unknowneditdialog.cpp src/variableeditdialog.cpp src/variablesdialog.cpp
TRANSLATIONS = translations/qalculate_sv.ts translations/qalculate_de.ts
TRANSLATIONS = translations/qalculate-qt_sv.ts translations/qalculate-qt_de.ts translations/qalculate-qt_ru.ts
unix:!equals(COMPILE_RESOURCES,"yes"):!android:!macx {

View File

@ -1038,69 +1038,69 @@ void ExpressionEdit::updateCompletion() {
#define COMPLETION_CONVERT_STRING(x) str1 = tr(x); if(str1 != x) {str1 += " <i>"; str1 += x; str1 += "</i>";}
#define COMPLETION_CONVERT_STRING2(x, y) str1 = tr(x); if(str1 != x) {str1 += " <i>"; str1 += x; str1 += "</i>";} str2 = tr(y); str1 += " <i>"; str1 += str2; str1 += "</i>"; if(str2 != y) {str1 += " <i>"; str1 += y; str1 += "</i>";}
COMPLETION_CONVERT_STRING2("angle", "phasor")
COMPLETION_APPEND(str1, tr("Complex angle/phasor notation"), 400, NULL)
COMPLETION_APPEND(str1, tr("Complex Angle/Phasor Notation"), 400, NULL)
/*COMPLETION_CONVERT_STRING("bases")
COMPLETION_APPEND(str1, tr("Number bases"), 201, NULL)*/
COMPLETION_CONVERT_STRING("base")
COMPLETION_APPEND(str1, tr("Base units"), 101, NULL)
COMPLETION_CONVERT_STRING("base ")
COMPLETION_APPEND(str1, tr("Number base"), 200, NULL)
COMPLETION_APPEND(str1, tr("Number Base"), 200, NULL)
COMPLETION_CONVERT_STRING("bijective")
COMPLETION_APPEND(str1, tr("Bijective base-26"), 290, NULL)
COMPLETION_APPEND(str1, tr("Bijective Base-26"), 290, NULL)
COMPLETION_CONVERT_STRING("binary") str1 += " <i>"; str1 += "bin"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("Binary number"), 202, NULL)
COMPLETION_APPEND(str1, tr("Binary Bumber"), 202, NULL)
COMPLETION_CONVERT_STRING("calendars")
COMPLETION_APPEND(str1, tr("Calendars"), 500, NULL)
COMPLETION_CONVERT_STRING("cis")
COMPLETION_APPEND(str1, tr("Complex cis form"), 401, NULL)
COMPLETION_APPEND(str1, tr("Complex cis Form"), 401, NULL)
COMPLETION_CONVERT_STRING("decimal") str1 += " <i>"; str1 += "dec"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("Decimal number"), 210, NULL)
COMPLETION_APPEND(str1, tr("Decimal Number"), 210, NULL)
COMPLETION_CONVERT_STRING("duodecimal") str1 += " <i>"; str1 += "duo"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("Duodecimal number"), 212, NULL)
COMPLETION_APPEND(str1, tr("Duodecimal Number"), 212, NULL)
COMPLETION_CONVERT_STRING("exponential")
COMPLETION_APPEND(str1, tr("Complex exponential form"), 402, NULL)
COMPLETION_APPEND(str1, tr("Complex Exponential Form"), 402, NULL)
COMPLETION_CONVERT_STRING("factors")
COMPLETION_APPEND(str1, tr("Factors"), 600, NULL)
COMPLETION_CONVERT_STRING("fp16") str1 += " <i>"; str1 += "binary16"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("16-bit floating point binary format"), 310, NULL)
COMPLETION_APPEND(str1, tr("16-bit Floating Point Binary Format"), 310, NULL)
COMPLETION_CONVERT_STRING("fp32") str1 += " <i>"; str1 += "binary32"; str1 += "</i>"; str1 += " <i>"; str1 += "float"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("32-bit floating point binary format"), 311, NULL)
COMPLETION_APPEND(str1, tr("32-bit Floating Point Binary Format"), 311, NULL)
COMPLETION_CONVERT_STRING("fp64") str1 += " <i>"; str1 += "binary64"; str1 += "</i>"; str1 += " <i>"; str1 += "double"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("64-bit floating point binary format"), 312, NULL)
COMPLETION_APPEND(str1, tr("64-bit Floating Point Binary Format"), 312, NULL)
COMPLETION_CONVERT_STRING("fp80");
COMPLETION_APPEND(str1, tr("80-bit (x86) floating point binary format"), 313, NULL)
COMPLETION_APPEND(str1, tr("80-bit (x86) Floating Point Binary Format"), 313, NULL)
COMPLETION_CONVERT_STRING("fp128") str1 += " <i>"; str1 += "binary128"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("128-bit floating point binary format"), 314, NULL)
COMPLETION_APPEND(str1, tr("128-bit Floating Point Binary Format"), 314, NULL)
COMPLETION_CONVERT_STRING("fraction")
COMPLETION_APPEND(str1, tr("Fraction"), 300, NULL)
COMPLETION_CONVERT_STRING("hexadecimal") str1 += " <i>"; str1 += "hex"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("Hexadecimal number"), 216, NULL)
COMPLETION_APPEND(str1, tr("Hexadecimal Number"), 216, NULL)
COMPLETION_CONVERT_STRING("latitude") str1 += " <i>"; str1 += "latitude2"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("Latitude"), 294, NULL)
COMPLETION_CONVERT_STRING("longitude") str1 += " <i>"; str1 += "longitude2"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("Longitude"), 294, NULL)
COMPLETION_CONVERT_STRING("mixed")
COMPLETION_APPEND(str1, tr("Mixed units"), 102, NULL)
COMPLETION_APPEND(str1, tr("Mixed Units"), 102, NULL)
COMPLETION_CONVERT_STRING("octal") str1 += " <i>"; str1 += "oct"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("Octal number"), 208, NULL)
COMPLETION_APPEND(str1, tr("Octal Number"), 208, NULL)
COMPLETION_CONVERT_STRING("optimal")
COMPLETION_APPEND(str1, tr("Optimal units"), 100, NULL)
COMPLETION_APPEND(str1, tr("Optimal Units"), 100, NULL)
COMPLETION_CONVERT_STRING("partial fraction")
COMPLETION_APPEND(str1, tr("Expanded partial fractions"), 601, NULL)
COMPLETION_APPEND(str1, tr("Expanded Partial Fractions"), 601, NULL)
COMPLETION_CONVERT_STRING("polar")
COMPLETION_APPEND(str1, tr("Complex polar form"), 403, NULL)
COMPLETION_APPEND(str1, tr("Complex Polar Form"), 403, NULL)
COMPLETION_CONVERT_STRING2("rectangular", "cartesian")
COMPLETION_APPEND(str1, tr("Complex rectangular form"), 404, NULL)
COMPLETION_APPEND(str1, tr("Complex Rectangular Form"), 404, NULL)
COMPLETION_CONVERT_STRING("roman")
COMPLETION_APPEND(str1, tr("Roman numerals"), 280, NULL)
COMPLETION_APPEND(str1, tr("Roman Numerals"), 280, NULL)
COMPLETION_CONVERT_STRING("sexagesimal") str += " <i>"; str += "sexa"; str += "</i>"; str += " <i>"; str += "sexa2"; str += "</i>"; str += " <i>"; str += "sexa3"; str += "</i>";
COMPLETION_APPEND(str1, tr("Sexagesimal number"), 292, NULL)
COMPLETION_APPEND(str1, tr("Sexagesimal Number"), 292, NULL)
COMPLETION_CONVERT_STRING("time")
COMPLETION_APPEND(str1, tr("Time format"), 293, NULL)
COMPLETION_APPEND(str1, tr("Time Format"), 293, NULL)
COMPLETION_CONVERT_STRING("unicode")
COMPLETION_APPEND(str1, tr("Unicode"), 281, NULL)
COMPLETION_CONVERT_STRING("utc")
COMPLETION_APPEND(str1, tr("UTC time zone"), 501, NULL)
COMPLETION_APPEND(str1, tr("UTC Time Zone"), 501, NULL)
}
void ExpressionEdit::setExpression(std::string str) {

View File

@ -31,7 +31,7 @@
#include <QDebug>
#include <locale.h>
#include "libqalculate/qalculate.h"
#include <libqalculate/qalculate.h>
#include "qalculatewindow.h"
#include "qalculateqtsettings.h"
@ -54,7 +54,7 @@ int main(int argc, char **argv) {
QalculateTranslator eqtr;
app.installTranslator(&eqtr);
if(!settings->ignore_locale) {
if(translator.load(QLocale(), QLatin1String("qalculate"), QLatin1String("_"), QLatin1String(TRANSLATIONS_DIR))) app.installTranslator(&translator);
if(translator.load(QLocale(), QLatin1String("qalculate-qt"), QLatin1String("_"), QLatin1String(TRANSLATIONS_DIR))) app.installTranslator(&translator);
if(translator_qt.load(QLocale(), QLatin1String("qt"), QLatin1String("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) app.installTranslator(&translator_qt);
if(translator_qtbase.load(QLocale(), QLatin1String("qtbase"), QLatin1String("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) app.installTranslator(&translator_qtbase);
}

View File

@ -5377,12 +5377,11 @@ Möchten Sie sie überschreiben?</translation>
<message>
<location filename="../src/expressionedit.cpp" line="987"/>
<source>Prefix:</source>
<translation type="unfinished"></translation>
<translation>Präfix:</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1041"/>
<source>Complex angle/phasor notation</source>
<translation>Komplexe Winkel-/Phasenschreibweise</translation>
<translation type="vanished">Komplexe Winkel-/Phasenschreibweise</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1045"/>
@ -5390,19 +5389,16 @@ Möchten Sie sie überschreiben?</translation>
<translation>Basiseinheiten</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1047"/>
<source>Number base</source>
<translation>Zahlenbasis</translation>
<translation type="vanished">Zahlenbasis</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1049"/>
<source>Bijective base-26</source>
<translation>Bijektive Basis-26</translation>
<translation type="vanished">Bijektive Basis-26</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1051"/>
<source>Binary number</source>
<translation type="unfinished">Binäre Zahlen</translation>
<translation type="obsolete">Binäre Zahlen</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1053"/>
@ -5410,24 +5406,20 @@ Möchten Sie sie überschreiben?</translation>
<translation>Kalendarien</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1055"/>
<source>Complex cis form</source>
<translation>Komplexe cis-Form</translation>
<translation type="vanished">Komplexe cis-Form</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1057"/>
<source>Decimal number</source>
<translation>Dezimalzahl</translation>
<translation type="vanished">Dezimalzahl</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1059"/>
<source>Duodecimal number</source>
<translation>Duodezimale Zahl</translation>
<translation type="vanished">Duodezimale Zahl</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1061"/>
<source>Complex exponential form</source>
<translation>Komplexe Exponentialform</translation>
<translation type="vanished">Komplexe Exponentialform</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1063"/>
@ -5435,29 +5427,24 @@ Möchten Sie sie überschreiben?</translation>
<translation>Faktoren</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1065"/>
<source>16-bit floating point binary format</source>
<translation>16-Bit-Gleitkomma-Binärformat</translation>
<translation type="vanished">16-Bit-Gleitkomma-Binärformat</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1067"/>
<source>32-bit floating point binary format</source>
<translation>32-Bit-Gleitkomma-Binärformat</translation>
<translation type="vanished">32-Bit-Gleitkomma-Binärformat</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1069"/>
<source>64-bit floating point binary format</source>
<translation>64-Bit-Gleitkomma-Binärformat</translation>
<translation type="vanished">64-Bit-Gleitkomma-Binärformat</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1071"/>
<source>80-bit (x86) floating point binary format</source>
<translation>80-Bit (x86) Fließkomma-Binärformat</translation>
<translation type="vanished">80-Bit (x86) Fließkomma-Binärformat</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1073"/>
<source>128-bit floating point binary format</source>
<translation>128-Bit Fließkomma-Binärformat</translation>
<translation type="vanished">128-Bit Fließkomma-Binärformat</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1075"/>
@ -5465,9 +5452,8 @@ Möchten Sie sie überschreiben?</translation>
<translation>Bruchteil</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1077"/>
<source>Hexadecimal number</source>
<translation>Hexadezimalzahl</translation>
<translation type="vanished">Hexadezimalzahl</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1079"/>
@ -5480,49 +5466,40 @@ Möchten Sie sie überschreiben?</translation>
<translation>Längengrad</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1083"/>
<source>Mixed units</source>
<translation>Gemischte Einheiten</translation>
<translation type="vanished">Gemischte Einheiten</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1085"/>
<source>Octal number</source>
<translation>Oktalzahl</translation>
<translation type="vanished">Oktalzahl</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1087"/>
<source>Optimal units</source>
<translation>Optimale Einheiten</translation>
<translation type="vanished">Optimale Einheiten</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1089"/>
<source>Expanded partial fractions</source>
<translation>Erweiterte Teilbrüche</translation>
<translation type="vanished">Erweiterte Teilbrüche</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1091"/>
<source>Complex polar form</source>
<translation>Komplexe Polarform</translation>
<translation type="vanished">Komplexe Polarform</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1093"/>
<source>Complex rectangular form</source>
<translation>Komplexe Rechteckform</translation>
<translation type="vanished">Komplexe Rechteckform</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1095"/>
<source>Roman numerals</source>
<translation>Römische Ziffern</translation>
<translation type="vanished">Römische Ziffern</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1097"/>
<source>Sexagesimal number</source>
<translation>Sexagesimalzahl</translation>
<translation type="vanished">Sexagesimalzahl</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1099"/>
<source>Time format</source>
<translation>Zeitformat</translation>
<translation type="vanished">Zeitformat</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1101"/>
@ -5531,7 +5508,6 @@ Möchten Sie sie überschreiben?</translation>
<translation>Unicode</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1103"/>
<location filename="../src/expressionedit.cpp" line="1889"/>
<source>UTC time zone</source>
<translation>UTC-Zeitzone</translation>
@ -5541,6 +5517,130 @@ Möchten Sie sie überschreiben?</translation>
<source>Undo</source>
<translation>Rückgängig</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1041"/>
<source>Complex Angle/Phasor Notation</source>
<translation>Komplexe Winkel-/Phasenschreibweise</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1047"/>
<source>Number Base</source>
<translation>Zahlenbasis</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1049"/>
<source>Bijective Base-26</source>
<translation>Bijektive Basis-26</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1051"/>
<source>Binary Bumber</source>
<translation type="unfinished">Binäre Zahlen</translation>
</message>
<message>
<source>Complex Cis Form</source>
<translation type="vanished">Komplexe cis-Form</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1055"/>
<source>Complex cis Form</source>
<translation>Komplexe cis-Form</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1057"/>
<source>Decimal Number</source>
<translation type="unfinished">Dezimalzahl</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1059"/>
<source>Duodecimal Number</source>
<translation>Duodezimale Zahl</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1061"/>
<source>Complex Exponential Form</source>
<translation>Komplexe Exponentialform</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1065"/>
<source>16-bit Floating Point Binary Format</source>
<translation>16-Bit-Gleitkomma-Binärformat</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1067"/>
<source>32-bit Floating Point Binary Format</source>
<translation>32-Bit-Gleitkomma-Binärformat</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1069"/>
<source>64-bit Floating Point Binary Format</source>
<translation>64-Bit-Gleitkomma-Binärformat</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1071"/>
<source>80-bit (x86) Floating Point Binary Format</source>
<translation>80-Bit (x86) Fließkomma-Binärformat</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1073"/>
<source>128-bit Floating Point Binary Format</source>
<translation>128-Bit Fließkomma-Binärformat</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1077"/>
<source>Hexadecimal Number</source>
<translation type="unfinished">Hexadezimalzahl</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1083"/>
<source>Mixed Units</source>
<translation>Gemischte Einheiten</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1085"/>
<source>Octal Number</source>
<translation type="unfinished">Oktalzahl</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1087"/>
<source>Optimal Units</source>
<translation>Optimale Einheiten</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1089"/>
<source>Expanded Partial Fractions</source>
<translation>Erweiterte Teilbrüche</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1091"/>
<source>Complex Polar Form</source>
<translation>Komplexe Polarform</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1093"/>
<source>Complex Rectangular Form</source>
<translation type="unfinished">Komplexe Rechtwinklige Form</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1095"/>
<source>Roman Numerals</source>
<translation>Römische Ziffern</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1097"/>
<source>Sexagesimal Number</source>
<translation type="unfinished">Sexagesimalzahl</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1099"/>
<source>Time Format</source>
<translation>Zeitformat</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1103"/>
<source>UTC Time Zone</source>
<translation>UTC-Zeitzone</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1372"/>
<source>Redo</source>
@ -6684,18 +6784,18 @@ Möchten Sie die Funktion überschreiben?</translation>
<message>
<location filename="../src/plotdialog.cpp" line="355"/>
<source>Calculating</source>
<translation type="unfinished">Berechnen...</translation>
<translation>Berechnen...</translation>
</message>
<message>
<location filename="../src/plotdialog.cpp" line="355"/>
<location filename="../src/plotdialog.cpp" line="501"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
<translation>Abbruch</translation>
</message>
<message>
<location filename="../src/plotdialog.cpp" line="501"/>
<source>Processing</source>
<translation type="unfinished">Verarbeitung...</translation>
<translation>Verarbeitung...</translation>
</message>
<message>
<source>Minimum y value</source>
@ -7420,7 +7520,7 @@ Sie können die Version %3 unter %2 erhalten.</translation>
<location filename="../src/main.cpp" line="172"/>
<source>Cancel</source>
<extracomment>Only used when Qt translation is missing</extracomment>
<translation type="unfinished"></translation>
<translation type="unfinished">Abbruch</translation>
</message>
<message>
<location filename="../src/main.cpp" line="174"/>

File diff suppressed because it is too large Load Diff

View File

@ -6341,9 +6341,8 @@ Vill du ersätta den?</translation>
<translation>Prefix:</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1041"/>
<source>Complex angle/phasor notation</source>
<translation>Komplex vinkelnotation</translation>
<translation type="vanished">Komplex vinkelnotation</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1045"/>
@ -6351,19 +6350,16 @@ Vill du ersätta den?</translation>
<translation>Grundenheter</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1047"/>
<source>Number base</source>
<translation>Talbas</translation>
<translation type="vanished">Talbas</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1049"/>
<source>Bijective base-26</source>
<translation>Bijektiv talbas 26</translation>
<translation type="vanished">Bijektiv talbas 26</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1051"/>
<source>Binary number</source>
<translation>Binärt tal</translation>
<translation type="vanished">Binärt tal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1053"/>
@ -6371,24 +6367,20 @@ Vill du ersätta den?</translation>
<translation>Kalendrar</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1055"/>
<source>Complex cis form</source>
<translation>Komplex cis-form</translation>
<translation type="vanished">Komplex cis-form</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1057"/>
<source>Decimal number</source>
<translation>Decimalt tal</translation>
<translation type="vanished">Decimalt tal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1059"/>
<source>Duodecimal number</source>
<translation>Duodecimalt tal</translation>
<translation type="vanished">Duodecimalt tal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1061"/>
<source>Complex exponential form</source>
<translation>Komplex exponentiell form</translation>
<translation type="vanished">Komplex exponentiell form</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1063"/>
@ -6396,29 +6388,24 @@ Vill du ersätta den?</translation>
<translation>Faktorer</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1065"/>
<source>16-bit floating point binary format</source>
<translation>16-bit binärt flyttal</translation>
<translation type="vanished">16-bit binärt flyttal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1067"/>
<source>32-bit floating point binary format</source>
<translation>32-bit binärt flyttal</translation>
<translation type="vanished">32-bit binärt flyttal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1069"/>
<source>64-bit floating point binary format</source>
<translation>64-bit binärt flyttal</translation>
<translation type="vanished">64-bit binärt flyttal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1071"/>
<source>80-bit (x86) floating point binary format</source>
<translation>80-bit (x86) binärt flyttal</translation>
<translation type="vanished">80-bit (x86) binärt flyttal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1073"/>
<source>128-bit floating point binary format</source>
<translation>128-bit binärt flyttal</translation>
<translation type="vanished">128-bit binärt flyttal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1075"/>
@ -6426,9 +6413,8 @@ Vill du ersätta den?</translation>
<translation>Bråktal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1077"/>
<source>Hexadecimal number</source>
<translation>Hexadecimalt tal</translation>
<translation type="vanished">Hexadecimalt tal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1079"/>
@ -6441,49 +6427,40 @@ Vill du ersätta den?</translation>
<translation>Longitud</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1083"/>
<source>Mixed units</source>
<translation>Blandade enheter</translation>
<translation type="vanished">Blandade enheter</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1085"/>
<source>Octal number</source>
<translation>Oktalt tal</translation>
<translation type="vanished">Oktalt tal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1087"/>
<source>Optimal units</source>
<translation>Optimala enheter</translation>
<translation type="vanished">Optimala enheter</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1089"/>
<source>Expanded partial fractions</source>
<translation>Expanderade partialbråk</translation>
<translation type="vanished">Expanderade partialbråk</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1091"/>
<source>Complex polar form</source>
<translation>Komplex polär form</translation>
<translation type="vanished">Komplex polär form</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1093"/>
<source>Complex rectangular form</source>
<translation>Komplex rektangulär form</translation>
<translation type="vanished">Komplex rektangulär form</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1095"/>
<source>Roman numerals</source>
<translation>Romerska siffror</translation>
<translation type="vanished">Romerska siffror</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1097"/>
<source>Sexagesimal number</source>
<translation>Sexagesimalt tal</translation>
<translation type="vanished">Sexagesimalt tal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1099"/>
<source>Time format</source>
<translation>Tidsformat</translation>
<translation type="vanished">Tidsformat</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1101"/>
@ -6492,7 +6469,6 @@ Vill du ersätta den?</translation>
<translation>Unicode</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1103"/>
<location filename="../src/expressionedit.cpp" line="1889"/>
<source>UTC time zone</source>
<translation>UTC-tidszon</translation>
@ -6502,6 +6478,130 @@ Vill du ersätta den?</translation>
<source>Undo</source>
<translation>Ångra</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1041"/>
<source>Complex Angle/Phasor Notation</source>
<translation>Komplex vinkelnotation</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1047"/>
<source>Number Base</source>
<translation>Talbas</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1049"/>
<source>Bijective Base-26</source>
<translation>Bijektiv talbas 26</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1051"/>
<source>Binary Bumber</source>
<translation>Binärt tal</translation>
</message>
<message>
<source>Complex Cis Form</source>
<translation type="vanished">Komplex cis-form</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1055"/>
<source>Complex cis Form</source>
<translation>Komplex cis-form</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1057"/>
<source>Decimal Number</source>
<translation>Decimalt tal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1059"/>
<source>Duodecimal Number</source>
<translation>Duodecimalt tal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1061"/>
<source>Complex Exponential Form</source>
<translation>Komplex exponentiell form</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1065"/>
<source>16-bit Floating Point Binary Format</source>
<translation>16-bit binärt flyttal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1067"/>
<source>32-bit Floating Point Binary Format</source>
<translation>32-bit binärt flyttal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1069"/>
<source>64-bit Floating Point Binary Format</source>
<translation>64-bit binärt flyttal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1071"/>
<source>80-bit (x86) Floating Point Binary Format</source>
<translation>80-bit (x86) binärt flyttal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1073"/>
<source>128-bit Floating Point Binary Format</source>
<translation>128-bit binärt flyttal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1077"/>
<source>Hexadecimal Number</source>
<translation>Hexadecimalt tal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1083"/>
<source>Mixed Units</source>
<translation>Blandade enheter</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1085"/>
<source>Octal Number</source>
<translation>Oktalt tal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1087"/>
<source>Optimal Units</source>
<translation>Optimala enheter</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1089"/>
<source>Expanded Partial Fractions</source>
<translation>Expanderade partialbråk</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1091"/>
<source>Complex Polar Form</source>
<translation>Komplex polär form</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1093"/>
<source>Complex Rectangular Form</source>
<translation>Komplex rektangulär form</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1095"/>
<source>Roman Numerals</source>
<translation>Romerska siffror</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1097"/>
<source>Sexagesimal Number</source>
<translation>Sexagesimalt tal</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1099"/>
<source>Time Format</source>
<translation>Tidsformat</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1103"/>
<source>UTC Time Zone</source>
<translation>UTC-tidszon</translation>
</message>
<message>
<location filename="../src/expressionedit.cpp" line="1372"/>
<source>Redo</source>
@ -7657,18 +7757,18 @@ Vill du ersätta den?</translation>
<message>
<location filename="../src/plotdialog.cpp" line="355"/>
<source>Calculating</source>
<translation type="unfinished">Beräknar</translation>
<translation>Beräknar</translation>
</message>
<message>
<location filename="../src/plotdialog.cpp" line="355"/>
<location filename="../src/plotdialog.cpp" line="501"/>
<source>Cancel</source>
<translation type="unfinished">Avbryt</translation>
<translation>Avbryt</translation>
</message>
<message>
<location filename="../src/plotdialog.cpp" line="501"/>
<source>Processing</source>
<translation type="unfinished">Behandlar</translation>
<translation>Behandlar</translation>
</message>
<message>
<source>Minimum y value</source>