diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | translations/assistant_de.ts | 4 | ||||
| -rw-r--r-- | translations/assistant_ru.ts | 4 | ||||
| -rw-r--r-- | translations/qt_ru.ts | 12 | ||||
| -rw-r--r-- | translations/qtbase_de.ts | 26 | ||||
| -rw-r--r-- | translations/qtbase_fi.ts | 38 | ||||
| -rw-r--r-- | translations/qtbase_ru.ts | 14 | ||||
| -rw-r--r-- | translations/qtconfig_ru.ts | 2 | ||||
| -rw-r--r-- | translations/qtconnectivity_de.ts | 4 | ||||
| -rw-r--r-- | translations/qtconnectivity_ru.ts | 25 | ||||
| -rw-r--r-- | translations/qtdeclarative_de.ts | 101 | ||||
| -rw-r--r-- | translations/qtdeclarative_fi.ts | 100 | ||||
| -rw-r--r-- | translations/qtdeclarative_ru.ts | 80 | ||||
| -rw-r--r-- | translations/qtmultimedia_fi.ts | 8 | ||||
| -rw-r--r-- | translations/qtmultimedia_ru.ts | 15 | ||||
| -rw-r--r-- | translations/qtquickcontrols_ru.ts | 27 | ||||
| -rw-r--r-- | translations/qtserialport_ru.ts | 20 | ||||
| -rw-r--r-- | translations/qtwebengine_de.ts | 26 | ||||
| -rw-r--r-- | translations/qtwebengine_ru.ts | 24 | ||||
| -rw-r--r-- | translations/translations.pro | 1 |
20 files changed, 377 insertions, 156 deletions
diff --git a/.qmake.conf b/.qmake.conf index 21c63db..4ef7016 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.6.2 +MODULE_VERSION = 5.7.0 diff --git a/translations/assistant_de.ts b/translations/assistant_de.ts index 9202c08..ab10444 100644 --- a/translations/assistant_de.ts +++ b/translations/assistant_de.ts @@ -951,6 +951,10 @@ Grund: <source>Show tabs for each individual page</source> <translation>Reiter für jede einzelne Seite anzeigen</translation> </message> + <message> + <source><Filter></source> + <translation><Filter></translation> + </message> </context> <context> <name>RemoteControl</name> diff --git a/translations/assistant_ru.ts b/translations/assistant_ru.ts index a4e1ecc..7865153 100644 --- a/translations/assistant_ru.ts +++ b/translations/assistant_ru.ts @@ -949,6 +949,10 @@ Reason: <source>Show tabs for each individual page</source> <translation>Показывать вкладки для каждой страницы</translation> </message> + <message> + <source><Filter></source> + <translation><Фильтр></translation> + </message> </context> <context> <name>RemoteControl</name> diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts index 344bfc0..e9353c9 100644 --- a/translations/qt_ru.ts +++ b/translations/qt_ru.ts @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="ru"> +<TS version="2.1" language="ru"> <dependencies> - <dependency catalog="qtbase_ru"/> - <dependency catalog="qtscript_ru"/> - <dependency catalog="qtquick1_ru"/> - <dependency catalog="qtmultimedia_ru"/> - <dependency catalog="qtxmlpatterns_ru"/> +<dependency catalog="qtbase_ru"/> +<dependency catalog="qtscript_ru"/> +<dependency catalog="qtquick1_ru"/> +<dependency catalog="qtmultimedia_ru"/> +<dependency catalog="qtxmlpatterns_ru"/> </dependencies> </TS> diff --git a/translations/qtbase_de.ts b/translations/qtbase_de.ts index 4f27238..36caf99 100644 --- a/translations/qtbase_de.ts +++ b/translations/qtbase_de.ts @@ -2343,6 +2343,14 @@ Möchten Sie die Datei trotzdem löschen?</translation> <translation>Vorübergehender Fehler</translation> </message> <message> + <source>Network dropped connection on reset</source> + <translation>Beim Rücksetzen wurde die Verbindung getrennt</translation> + </message> + <message> + <source>Connection reset by peer</source> + <translation>Verbindung durch Gegenseite zurückgesetzt</translation> + </message> + <message> <source>Unknown error</source> <translation>Unbekannter Fehler</translation> </message> @@ -3753,10 +3761,6 @@ Bitte deaktivieren Sie eine der beiden.</translation> <translation>Das Starten des Prozesses ist fehlgeschlagen</translation> </message> <message> - <source>Process failed to start (spawned process exited with code 127)</source> - <translation>Das Starten des Prozesses ist fehlgeschlagen (der Unterprozess wurde mit Rückgabewert 127 beendet)</translation> - </message> - <message> <source>No program defined</source> <translation>Es wurde kein Programm angegeben</translation> </message> @@ -3789,20 +3793,6 @@ Bitte deaktivieren Sie eine der beiden.</translation> </message> </context> <context> - <name>QQnxFileDialogHelper</name> - <message> - <source>All files (*.*)</source> - <translation>Alle Dateien (*.*)</translation> - </message> -</context> -<context> - <name>QQnxFilePicker</name> - <message> - <source>Pick a file</source> - <translation>Wählen Sie eine Datei aus</translation> - </message> -</context> -<context> <name>QRegExp</name> <message> <source>no error occurred</source> diff --git a/translations/qtbase_fi.ts b/translations/qtbase_fi.ts index ba350e8..111f8e3 100644 --- a/translations/qtbase_fi.ts +++ b/translations/qtbase_fi.ts @@ -729,6 +729,14 @@ Peru painamalla ESC</translation> <source>Invalid hostname</source> <translation>Virheellinen konenimi</translation> </message> + <message> + <source>Host %1 could not be found.</source> + <translation>Konetta %1 ei löydetty.</translation> + </message> + <message> + <source>Unknown error</source> + <translation>Tuntematon virhe</translation> + </message> </context> <context> <name>QDockWidget</name> @@ -1524,10 +1532,6 @@ Haluatko silti poistaa sen?</translation> <source>Unknown error (%1)</source> <translation>Tuntematon virhe (%1)</translation> </message> - <message> - <source>Host %1 could not be found.</source> - <translation>Konetta %1 ei löydetty.</translation> - </message> </context> <context> <name>QHttp</name> @@ -2352,6 +2356,14 @@ kun GNU LGPL 2.1:n ehtoja voidaan noudattaa.</p> <translation>Tilapäinen virhe</translation> </message> <message> + <source>Network dropped connection on reset</source> + <translation>Verkko pudotti yhteyden nollauksen yhteydessä</translation> + </message> + <message> + <source>Connection reset by peer</source> + <translation>Verkkovertainen nollasi yhteyden</translation> + </message> + <message> <source>Unknown error</source> <translation>Tuntematon virhe</translation> </message> @@ -3762,10 +3774,6 @@ Poista toinen niistä käytöstä.</translation> <translation>Prosessin käynnistyminen epäonnistui</translation> </message> <message> - <source>Process failed to start (spawned process exited with code 127)</source> - <translation>Prosessin käynnistyminen epäonnistui (luotu prosessi päättyi koodilla 127)</translation> - </message> - <message> <source>No program defined</source> <translation>Ohjelmaa ei ole määritetty</translation> </message> @@ -3798,20 +3806,6 @@ Poista toinen niistä käytöstä.</translation> </message> </context> <context> - <name>QQnxFileDialogHelper</name> - <message> - <source>All files (*.*)</source> - <translation>Kaikki tiedostot (*.*)</translation> - </message> -</context> -<context> - <name>QQnxFilePicker</name> - <message> - <source>Pick a file</source> - <translation>Valitse tiedosto</translation> - </message> -</context> -<context> <name>QRegExp</name> <message> <source>no error occurred</source> diff --git a/translations/qtbase_ru.ts b/translations/qtbase_ru.ts index dd765ae..fad1c05 100644 --- a/translations/qtbase_ru.ts +++ b/translations/qtbase_ru.ts @@ -3804,20 +3804,6 @@ Please turn one of those options off.</source> </message> </context> <context> - <name>QQnxFileDialogHelper</name> - <message> - <source>All files (*.*)</source> - <translation>Все файлы (*.*)</translation> - </message> -</context> -<context> - <name>QQnxFilePicker</name> - <message> - <source>Pick a file</source> - <translation>Выбор файла</translation> - </message> -</context> -<context> <name>QRegExp</name> <message> <source>no error occurred</source> diff --git a/translations/qtconfig_ru.ts b/translations/qtconfig_ru.ts index 58f9d2b..09a6fdc 100644 --- a/translations/qtconfig_ru.ts +++ b/translations/qtconfig_ru.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="ru"> +<TS version="2.1" language="ru"> <context> <name>MainWindow</name> <message> diff --git a/translations/qtconnectivity_de.ts b/translations/qtconnectivity_de.ts index d22a88c..b0b2424 100644 --- a/translations/qtconnectivity_de.ts +++ b/translations/qtconnectivity_de.ts @@ -1366,5 +1366,9 @@ <source>Error occurred trying to connect to remote device.</source> <translation>Beim Aufbau der Verbindung zum Gerät trat ein Fehler auf.</translation> </message> + <message> + <source>Error occurred trying to start advertising</source> + <translation>Bei der Ankündigung trat ein Fehler auf</translation> + </message> </context> </TS> diff --git a/translations/qtconnectivity_ru.ts b/translations/qtconnectivity_ru.ts index 1cc60cb..57a1bdc 100644 --- a/translations/qtconnectivity_ru.ts +++ b/translations/qtconnectivity_ru.ts @@ -44,18 +44,6 @@ <translation>Невозможно остановить обнаружение</translation> </message> <message> - <source>No Bluetooth device available</source> - <translation>Устройства Bluetooth не обнаружены</translation> - </message> - <message> - <source>Cannot open remote device socket</source> - <translation>Невозможно открыть сокет удалённого устройства</translation> - </message> - <message> - <source>Cannot connect to Bluetooth socket notifier</source> - <translation>Невозможно подключиться к сокету уведомлений Bluetooth</translation> - </message> - <message> <source>Cannot start device inquiry</source> <translation>Невозможно запустить опрос устройств</translation> </message> @@ -120,7 +108,7 @@ </message> <message> <source>Object Push</source> - <translation type="unfinished">Отправка объекта</translation> + <translation>Отправка объекта</translation> </message> <message> <source>File Transfer</source> @@ -136,11 +124,11 @@ </message> <message> <source>Browse Group Descriptor</source> - <translation type="unfinished"></translation> + <translation>Дескриптор обзорной группы</translation> </message> <message> <source>Public Browse Group</source> - <translation type="unfinished"></translation> + <translation>Доступная обзорная группа</translation> </message> <message> <source>Dial-Up Networking</source> @@ -1386,12 +1374,9 @@ <source>Error occurred trying to connect to remote device.</source> <translation>Возникла ошибка при попытке подключиться к удалённому устройству.</translation> </message> -</context> -<context> - <name>QObject</name> <message> - <source>Operation canceled</source> - <translation>Операция отменена</translation> + <source>Error occurred trying to start advertising</source> + <translation>Возникла ошибка при попытке запуска Bluetooth-маркетинга</translation> </message> </context> </TS> diff --git a/translations/qtdeclarative_de.ts b/translations/qtdeclarative_de.ts index 5614d17..e570a6d 100644 --- a/translations/qtdeclarative_de.ts +++ b/translations/qtdeclarative_de.ts @@ -180,6 +180,77 @@ </message> </context> <context> + <name>QQmlDebugServerImpl</name> + <message> + <source>QML Debugger: Invalid argument "%1" detected. Ignoring the same.</source> + <translation>QML Debugger: Ungültiges Argument "%1". Es hat keinerlei Auswirkung.</translation> + </message> + <message> + <source>QML Debugger: Ignoring "-qmljsdebugger=%1".</source> + <translation>QML Debugger: "-qmljsdebugger=%1" hat keinerlei Auswirkung.</translation> + </message> + <message> + <source>The format is "-qmljsdebugger=[file:<file>|port:<port_from>][,<port_to>][,host:<ip address>][,block][,services:<service>][,<service>]*"</source> + <translation>Das Format ist "-qmljsdebugger=[file:<file>|port:<port_from>][,<port_to>][,host:<ip address>][,block][,services:<service>][,<service>]*"</translation> + </message> + <message> + <source>"file:" can be used to specify the name of a file the debugger will try to connect to using a QLocalSocket. If "file:" is given any "host:" and"port:" arguments will be ignored.</source> + <translation>"file:" gibt einen Dateinamen an, auf den sich der Debugger mittels eines QLocalSocket verbinden wird. Wenn "file:" angegeben wird, haben die Argumente "host:" oder "port:" keinerlei Auswirkung.</translation> + </message> + <message> + <source>"host:" and "port:" can be used to specify an address and a single port or a range of ports the debugger will try to bind to with a QTcpServer.</source> + <translation>"host:" und "port:" geben eine Adresse beziehungsweise einen Port oder einen Bereich von Ports an, auf denen der Debugger mittels eines QTcpServer versuchen wird, zu lauschen.</translation> + </message> + <message> + <source>"block" makes the debugger and some services wait for clients to be connected and ready before the first QML engine starts.</source> + <translation>"block" bewirkt, dass der Debugger und einige Dienste warten, bis sich Clients verbinden und Bereitschaft signalisieren, bevor die erste QML-Engine startet.</translation> + </message> + <message> + <source>The QML debugger</source> + <translation>Der QML-Debugger</translation> + </message> + <message> + <source>The V4 debugger</source> + <translation>Der V4-Debugger</translation> + </message> + <message> + <source>The QML inspector</source> + <translation>Der QML-Inspector</translation> + </message> + <message> + <source>The QML profiler</source> + <translation>Der QML-Profiler</translation> + </message> + <message> + <source>Allows the client to delay the starting and stopping of + QML engines until other services are ready. QtCreator + uses this service with the QML profiler in order to + profile multiple QML engines at the same time.</source> + <translation>Ermöglicht dem Klienten das Starten und Anhalten von + QML-Engines zu verzögern, bis andere Dienste Bereitschaft + signalisieren. Qt Creator benutzt diesen Dienst mit dem + QML-Profiler, um mehrere QML-Engines gleichzeitig zu + analysieren.</translation> + </message> + <message> + <source>"services:" can be used to specify which debug services the debugger should load. Some debug services interact badly with others. The V4 debugger should not be loaded when using the QML profiler as it will force any V4 engines to use the JavaScript interpreter rather than the JIT. The following debug services are available by default:</source> + <translation>"services:" gibt an, welche Debug-Dienste der Debugger laden soll. Einige Debug-Dienste können sich gegenseitig behindern. Der V4-Debugger sollte nicht geladen werden, wenn der QML-Profiler benutzt wird, da er bewirkt, dass die V4-Engines den JavaScript-Interpreter an Stelle von JIT benutzen. Folgende Debug-Dienste stehen zur Verfügung:</translation> + </message> + <message> + <source>Sends qDebug() and similar messages over the QML debug + connection. QtCreator uses this for showing debug + messages in the debugger console.</source> + <translation>Sendet qDebug() und ähnliche Nachrichten über die + QML-Debug-Verbindung. Qt Creator benutzt dies, + um Debug-Nachrichten in der Debugger-Konsole + anzuzeigen.</translation> + </message> + <message> + <source>Other services offered by qmltooling plugins that implement QQmlDebugServiceFactory and which can be found in the standard plugin paths will also be available and can be specified. If no "services" argument is given, all services found this way, including the default ones, are loaded.</source> + <translation>Es können auch andere Dienste angegeben werden, die von qmltooling-Plugins bereitgestellt werden, die QQmlDebugServiceFactory implementieren und in den Standard-Plugin-Pfaden gefunden werden können. Wenn kein "services"-Argument angegeben wurde, werden alle auf diesem Wege gefundenen Dienste einschließlich der Standarddienste geladen.</translation> + </message> +</context> +<context> <name>QQmlDelegateModel</name> <message> <source>The delegate of a DelegateModel cannot be changed within onUpdated.</source> @@ -335,6 +406,10 @@ <context> <name>QQmlEnumTypeResolver</name> <message> + <source>Invalid property assignment: Enum value "%1" cannot start with a lowercase letter</source> + <translation>Ungültige Zuweisung bei Eigenschaft: Der Aufzählungswert "%1" darf nicht mit einem Kleinbuchstaben beginnen</translation> + </message> + <message> <source>Invalid property assignment: "%1" is a read-only property</source> <translation>Ungültige Zuweisung bei Eigenschaft: "%1" ist eine schreibgeschützte Eigenschaft</translation> </message> @@ -430,6 +505,10 @@ <translation>Der Modul-Namensraum '%1' entspricht nicht dem Import-URI '%2'</translation> </message> <message> + <source>library loading is disabled</source> + <translation>Das Laden von Bibliotheken ist deaktiviert</translation> + </message> + <message> <source>Namespace '%1' has already been used for type registration</source> <translation>Der Namensraum '%1' wurde bereits zur Typregistrierung verwendet</translation> </message> @@ -1174,6 +1253,13 @@ </message> </context> <context> + <name>QQuickMouseEvent</name> + <message> + <source>MouseEvent is only available within handlers in MouseArea</source> + <translation>MouseEvent ist nur in Handler-Funktionen von MouseArea verfügbar</translation> + </message> +</context> +<context> <name>QQuickOpenGLInfo</name> <message> <source>OpenGLInfo is only available via attached properties</source> @@ -1260,10 +1346,6 @@ <source>Cannot open: %1</source> <translation>Fehlschlag beim Öffnen: %1</translation> </message> - <message> - <source>Invalid image data: %1</source> - <translation>Ungültige Bilddaten: %1</translation> - </message> </context> <context> <name>QQuickPropertyAnimation</name> @@ -1406,6 +1488,17 @@ Installieren Sie einen Treiber, der OpenGL 2.0 oder neuer bereitstellt, oder ste </message> </context> <context> + <name>SignalTransition</name> + <message> + <source>Cannot assign to non-existent property "%1"</source> + <translation>Es kann keine Zuweisung erfolgen, da keine Eigenschaft des Namens "%1" existiert</translation> + </message> + <message> + <source>SignalTransition: script expected</source> + <translation>SignalTransition: Skript erwartet</translation> + </message> +</context> +<context> <name>qmlRegisterType</name> <message> <source>Invalid QML %1 name "%2"</source> diff --git a/translations/qtdeclarative_fi.ts b/translations/qtdeclarative_fi.ts index c358c32..de206b4 100644 --- a/translations/qtdeclarative_fi.ts +++ b/translations/qtdeclarative_fi.ts @@ -182,6 +182,75 @@ </message> </context> <context> + <name>QQmlDebugServerImpl</name> + <message> + <source>QML Debugger: Invalid argument "%1" detected. Ignoring the same.</source> + <translation>QML Debugger: Invalid argument "%1" detected. Ignoring the same.</translation> + </message> + <message> + <source>QML Debugger: Ignoring "-qmljsdebugger=%1".</source> + <translation>QML Debugger: Ignoring "-qmljsdebugger=%1".</translation> + </message> + <message> + <source>The format is "-qmljsdebugger=[file:<file>|port:<port_from>][,<port_to>][,host:<ip address>][,block][,services:<service>][,<service>]*"</source> + <translation>The format is "-qmljsdebugger=[file:<file>|port:<port_from>][,<port_to>][,host:<ip address>][,block][,services:<service>][,<service>]*"</translation> + </message> + <message> + <source>"file:" can be used to specify the name of a file the debugger will try to connect to using a QLocalSocket. If "file:" is given any "host:" and"port:" arguments will be ignored.</source> + <translation>"file:" can be used to specify the name of a file the debugger will try to connect to using a QLocalSocket. If "file:" is given any "host:" and"port:" arguments will be ignored.</translation> + </message> + <message> + <source>"host:" and "port:" can be used to specify an address and a single port or a range of ports the debugger will try to bind to with a QTcpServer.</source> + <translation>"host:" and "port:" can be used to specify an address and a single port or a range of ports the debugger will try to bind to with a QTcpServer.</translation> + </message> + <message> + <source>"block" makes the debugger and some services wait for clients to be connected and ready before the first QML engine starts.</source> + <translation>"block" makes the debugger and some services wait for clients to be connected and ready before the first QML engine starts.</translation> + </message> + <message> + <source>"services:" can be used to specify which debug services the debugger should load. Some debug services interact badly with others. The V4 debugger should not be loaded when using the QML profiler as it will force any V4 engines to use the JavaScript interpreter rather than the JIT. The following debug services are available by default:</source> + <translation>"services:" can be used to specify which debug services the debugger should load. Some debug services interact badly with others. The V4 debugger should not be loaded when using the QML profiler as it will force any V4 engines to use the JavaScript interpreter rather than the JIT. The following debug services are available by default:</translation> + </message> + <message> + <source>The QML debugger</source> + <translation>The QML debugger</translation> + </message> + <message> + <source>The V4 debugger</source> + <translation>The V4 debugger</translation> + </message> + <message> + <source>The QML inspector</source> + <translation>The QML inspector</translation> + </message> + <message> + <source>The QML profiler</source> + <translation>The QML profiler</translation> + </message> + <message> + <source>Allows the client to delay the starting and stopping of + QML engines until other services are ready. QtCreator + uses this service with the QML profiler in order to + profile multiple QML engines at the same time.</source> + <translation>Allows the client to delay the starting and stopping of + QML engines until other services are ready. QtCreator + uses this service with the QML profiler in order to + profile multiple QML engines at the same time.</translation> + </message> + <message> + <source>Sends qDebug() and similar messages over the QML debug + connection. QtCreator uses this for showing debug + messages in the debugger console.</source> + <translation>Sends qDebug() and similar messages over the QML debug + connection. QtCreator uses this for showing debug + messages in the debugger console.</translation> + </message> + <message> + <source>Other services offered by qmltooling plugins that implement QQmlDebugServiceFactory and which can be found in the standard plugin paths will also be available and can be specified. If no "services" argument is given, all services found this way, including the default ones, are loaded.</source> + <translation>Other services offered by qmltooling plugins that implement QQmlDebugServiceFactory and which can be found in the standard plugin paths will also be available and can be specified. If no "services" argument is given, all services found this way, including the default ones, are loaded.</translation> + </message> +</context> +<context> <name>QQmlDelegateModel</name> <message> <source>The delegate of a DelegateModel cannot be changed within onUpdated.</source> @@ -342,6 +411,10 @@ <context> <name>QQmlEnumTypeResolver</name> <message> + <source>Invalid property assignment: Enum value "%1" cannot start with a lowercase letter</source> + <translation>Invalid property assignment: Enum value "%1" cannot start with a lowercase letter</translation> + </message> + <message> <source>Invalid property assignment: "%1" is a read-only property</source> <translation>Invalid property assignment: "%1" is a read-only property</translation> </message> @@ -408,6 +481,10 @@ <translation>module "%1" plugin "%2" not found</translation> </message> <message> + <source>library loading is disabled</source> + <translation>kirjastojen lataaminen ei ole käytössä</translation> + </message> + <message> <source>"%1" version %2.%3 is defined more than once in module "%4"</source> <translation>"%1" version %2.%3 is defined more than once in module "%4"</translation> </message> @@ -1189,6 +1266,13 @@ </message> </context> <context> + <name>QQuickMouseEvent</name> + <message> + <source>MouseEvent is only available within handlers in MouseArea</source> + <translation>MouseEvent is only available within handlers in MouseArea</translation> + </message> +</context> +<context> <name>QQuickOpenGLInfo</name> <message> <source>OpenGLInfo is only available via attached properties</source> @@ -1276,11 +1360,6 @@ <translatorcomment>Tämä viesti on suomennettu, koska siitä voi olla hyötyä myös ongelmaa selvittävälle Qt:lla tehdyn ohjelman loppukäyttäjälle eikä tämän viestin suomentamisen luulisi vaikeuttavan ongelman selvittämistä.</translatorcomment> <translation>Ei voi avata: %1</translation> </message> - <message> - <source>Invalid image data: %1</source> - <translatorcomment>Tämä viesti on suomennettu, koska siitä voi olla hyötyä myös ongelmaa selvittävälle Qt:lla tehdyn ohjelman loppukäyttäjälle eikä tämän viestin suomentamisen luulisi vaikeuttavan ongelman selvittämistä.</translatorcomment> - <translation>Virheellinen kuvadata: %1</translation> - </message> </context> <context> <name>QQuickPropertyAnimation</name> @@ -1425,6 +1504,17 @@ Asenna ajuri, joka tukee OpenGL 2.0:aa tai uudempaa. Mikäli sellaisen asentamin </message> </context> <context> + <name>SignalTransition</name> + <message> + <source>Cannot assign to non-existent property "%1"</source> + <translation>Cannot assign to non-existent property "%1"</translation> + </message> + <message> + <source>SignalTransition: script expected</source> + <translation>SignalTransition: script expected</translation> + </message> +</context> +<context> <name>qmlRegisterType</name> <message> <source>Invalid QML %1 name "%2"</source> diff --git a/translations/qtdeclarative_ru.ts b/translations/qtdeclarative_ru.ts index 73e7144..41d4d87 100644 --- a/translations/qtdeclarative_ru.ts +++ b/translations/qtdeclarative_ru.ts @@ -180,6 +180,75 @@ </message> </context> <context> + <name>QQmlDebugServerImpl</name> + <message> + <source>QML Debugger: Invalid argument "%1" detected. Ignoring the same.</source> + <translation>Отладчик QML: Обнаружен неверный параметр «%1». Пропускается.</translation> + </message> + <message> + <source>QML Debugger: Ignoring "-qmljsdebugger=%1".</source> + <translation>Отладчик QML: Пропускается «-qmljsdebugger=%1».</translation> + </message> + <message> + <source>The format is "-qmljsdebugger=[file:<file>|port:<port_from>][,<port_to>][,host:<ip address>][,block][,services:<service>][,<service>]*"</source> + <translation>Формат: -qmljsdebugger=[file:<файл>|port:<начальный_порт>][,<конечный_порт>][,host:<ip адрес>][,блок][,services:<сервис>][,<сервис>]*</translation> + </message> + <message> + <source>"file:" can be used to specify the name of a file the debugger will try to connect to using a QLocalSocket. If "file:" is given any "host:" and"port:" arguments will be ignored.</source> + <translation>«file:» может использоваться для указания имени файла, к которому отладчик попытается подключиться с помощью QLocalSocket. Если передан параметр «file:», то «host:» и «port:» будут проигнорированы.</translation> + </message> + <message> + <source>"host:" and "port:" can be used to specify an address and a single port or a range of ports the debugger will try to bind to with a QTcpServer.</source> + <translation>«host:» и «port:» могут использоваться для задания адреса и одного или диапазона портов, к которым отладчик попытается подключиться через QTcpServer.</translation> + </message> + <message> + <source>"block" makes the debugger and some services wait for clients to be connected and ready before the first QML engine starts.</source> + <translation>«block» заставляет отладчик и некоторые сервисы ждать подключения и готовности клиентов перед первым запуском движка QML.</translation> + </message> + <message> + <source>"services:" can be used to specify which debug services the debugger should load. Some debug services interact badly with others. The V4 debugger should not be loaded when using the QML profiler as it will force any V4 engines to use the JavaScript interpreter rather than the JIT. The following debug services are available by default:</source> + <translation>«services:» используется для задания списка отладочных сервисов, загружаемых отладчиком. Некоторые из них могут конфликтовать с другими. Отладчик V4 не должен загружаться при использовании профайлера QML, так как последний отключает JIT в пользу интерпретатора JavaScript. Следующие сервисы доступны по умолчанию:</translation> + </message> + <message> + <source>The QML debugger</source> + <translation>Отладчик QML</translation> + </message> + <message> + <source>The V4 debugger</source> + <translation>Отладчик V4</translation> + </message> + <message> + <source>The QML inspector</source> + <translation>Инспектор QML</translation> + </message> + <message> + <source>The QML profiler</source> + <translation>Профайлер QML</translation> + </message> + <message> + <source>Allows the client to delay the starting and stopping of + QML engines until other services are ready. QtCreator + uses this service with the QML profiler in order to + profile multiple QML engines at the same time.</source> + <translation>Позволяет клиентам задерживать запуск и остановку + движков QML, пока остальные сервисы не будут готовы. QtCreator + использует этот сервис совместно с профайлером QML для + одновременного профилирования нескольких движков QML.</translation> + </message> + <message> + <source>Sends qDebug() and similar messages over the QML debug + connection. QtCreator uses this for showing debug + messages in the debugger console.</source> + <translation>Отправляет qDebug() и прочие сообщения через отладочное соединение + QML. QtCreator использует его для отображения + отладочных сообщений в консоли отладчика.</translation> + </message> + <message> + <source>Other services offered by qmltooling plugins that implement QQmlDebugServiceFactory and which can be found in the standard plugin paths will also be available and can be specified. If no "services" argument is given, all services found this way, including the default ones, are loaded.</source> + <translation>Другие сервисы, предоставляемые модулями qmltooling, реализующими QQmlDebugServiceFactory и находящимися в стандартных каталогах модулей, также будут доступны и могут быть указаны. Если параметр «services» не указан, то будут загружены все найденные сервисы.</translation> + </message> +</context> +<context> <name>QQmlDelegateModel</name> <message> <source>The delegate of a DelegateModel cannot be changed within onUpdated.</source> @@ -402,6 +471,10 @@ <translation>модуль «%1» плагина «%2» не найден</translation> </message> <message> + <source>library loading is disabled</source> + <translation>загрузка библиотек отключена</translation> + </message> + <message> <source>"%1" version %2.%3 is defined more than once in module "%4"</source> <translation>«%1» версии %2.%3 определено более одного раза в модуле «%4»</translation> </message> @@ -1178,6 +1251,13 @@ </message> </context> <context> + <name>QQuickMouseEvent</name> + <message> + <source>MouseEvent is only available within handlers in MouseArea</source> + <translation>MouseEvent доступен только внутри обработчиков в MouseArea</translation> + </message> +</context> +<context> <name>QQuickOpenGLInfo</name> <message> <source>OpenGLInfo is only available via attached properties</source> diff --git a/translations/qtmultimedia_fi.ts b/translations/qtmultimedia_fi.ts index 4f82d56..9528269 100644 --- a/translations/qtmultimedia_fi.ts +++ b/translations/qtmultimedia_fi.ts @@ -305,6 +305,14 @@ <translation>Kuvaustilaa ei tueta</translation> </message> <message> + <source>Failed to capture image</source> + <translation>Kuvan ottaminen epäonnistui</translation> + </message> + <message> + <source>Camera preview failed to start.</source> + <translation>Kameran esikatselun käynnistys epäonnistui.</translation> + </message> + <message> <source>Could not open destination file: %1</source> <translation>Kohdetiedostoa ei voitu avata: %1</translation> </message> diff --git a/translations/qtmultimedia_ru.ts b/translations/qtmultimedia_ru.ts index ced4ff8..daadc24 100644 --- a/translations/qtmultimedia_ru.ts +++ b/translations/qtmultimedia_ru.ts @@ -544,21 +544,6 @@ </message> </context> <context> - <name>QObject</name> - <message> - <source>%1 playlist type is unknown</source> - <translation>Неизвестный формат списка воспроизведения %1</translation> - </message> - <message> - <source>invalid line in playlist file</source> - <translation>неверная строка в файле списка воспроизведения</translation> - </message> - <message> - <source>Empty file provided</source> - <translation>Предоставлен пустой файл</translation> - </message> -</context> -<context> <name>QPlaylistFileParser</name> <message> <source>%1 playlist type is unknown</source> diff --git a/translations/qtquickcontrols_ru.ts b/translations/qtquickcontrols_ru.ts index 74bd3ec..8112dd1 100644 --- a/translations/qtquickcontrols_ru.ts +++ b/translations/qtquickcontrols_ru.ts @@ -299,31 +299,4 @@ <translation>Выделить всё</translation> </message> </context> -<context> - <name>EditMenu_ios</name> - <message> - <source>Cut</source> - <translation>Вырезать</translation> - </message> - <message> - <source>Copy</source> - <translation>Копировать</translation> - </message> - <message> - <source>Paste</source> - <translation>Вставить</translation> - </message> - <message> - <source>Delete</source> - <translation>Удалить</translation> - </message> - <message> - <source>Select</source> - <translation>Выбрать</translation> - </message> - <message> - <source>Select All</source> - <translation>Выбрать всё</translation> - </message> -</context> </TS> diff --git a/translations/qtserialport_ru.ts b/translations/qtserialport_ru.ts index 30b8580..a4c1f75 100644 --- a/translations/qtserialport_ru.ts +++ b/translations/qtserialport_ru.ts @@ -44,30 +44,10 @@ <translation>Время ожидания операции истекло</translation> </message> <message> - <source>Parity error detected while reading</source> - <translation>Обнаружена ошибка четности в процессе чтения</translation> - </message> - <message> - <source>Break condition detected while reading</source> - <translation>Обнаружено состояние прерывания в процессе чтения</translation> - </message> - <message> - <source>Framing error detected while reading</source> - <translation>Обнаружена ошибка кадра в процессе чтения</translation> - </message> - <message> <source>Custom baud rate direction is unsupported</source> <translation>Направления передачи для особых скоростей не поддерживаются</translation> </message> <message> - <source>ParityError error detected while reading</source> - <translation>Обнаружена ошибка четности в процессе чтения</translation> - </message> - <message> - <source>Unknown streaming error</source> - <translation>Неизвестная ошибка данных</translation> - </message> - <message> <source>No error</source> <translation>Нет ошибок</translation> </message> diff --git a/translations/qtwebengine_de.ts b/translations/qtwebengine_de.ts index 640948f..efbfddf 100644 --- a/translations/qtwebengine_de.ts +++ b/translations/qtwebengine_de.ts @@ -9,7 +9,7 @@ </message> <message> <source>Username:</source> - <translation>Benutzername:</translation> + <translation>Nutzername:</translation> </message> <message> <source>Password:</source> @@ -47,6 +47,10 @@ <translation>Kopieren</translation> </message> <message> + <source>Unselect</source> + <translation>Auswahl aufheben</translation> + </message> + <message> <source>Copy Link URL</source> <translation>Link-Adresse kopieren</translation> </message> @@ -158,6 +162,10 @@ <translation>Link in neuem Reiter öffnen</translation> </message> <message> + <source>Open Link in New Background Tab</source> + <translation>Link in neuem Reiter im Hintergrund öffnen</translation> + </message> + <message> <source>Copy Link URL</source> <translation>Link-Adresse kopieren</translation> </message> @@ -214,6 +222,14 @@ <translation>Seite schließen</translation> </message> <message> + <source>Unselect</source> + <translation>Auswahl aufheben</translation> + </message> + <message> + <source>Save &Page</source> + <translation>Seite s&peichern</translation> + </message> + <message> <source>Are you sure you want to leave this page?</source> <translation>Möchten Sie diese Seite wirklich verlassen?</translation> </message> @@ -267,6 +283,10 @@ <source>Cannot create a separate instance of WebEngineViewport</source> <translation>Es kann keine separate Instanz der Klasse WebEngineViewport erstellt werden</translation> </message> + <message> + <source>Cannot create a separate instance of WebEngineContextMenuData</source> + <translation>Es kann keine separate Instanz der Klasse WebEngineContextMenuData erstellt werden</translation> + </message> </context> <context> <name>QtWebEnginePlugin</name> @@ -317,8 +337,8 @@ <translation>Verbinde zu Proxy "%1" unter Verwendung von:</translation> </message> <message> - <source>Enter username and password for "%1" at %2</source> - <translation>Geben Sie Nutzername und Passwort für "%1" auf %2 ein</translation> + <source>Enter username and password for "%1" at %2://%3</source> + <translation>Geben Sie Nutzername und Passwort für "%1" auf %2://%3 ein</translation> </message> </context> </TS> diff --git a/translations/qtwebengine_ru.ts b/translations/qtwebengine_ru.ts index c02c1cb..5ba8304 100644 --- a/translations/qtwebengine_ru.ts +++ b/translations/qtwebengine_ru.ts @@ -47,6 +47,10 @@ <translation>Скопировать</translation> </message> <message> + <source>Unselect</source> + <translation>Снять выделение</translation> + </message> + <message> <source>Copy Link URL</source> <translation>Скопировать адрес ссылки</translation> </message> @@ -118,6 +122,10 @@ <translation>Перезагрузить</translation> </message> <message> + <source>Reload and Bypass Cache</source> + <translation>Перезагрузить без кэша</translation> + </message> + <message> <source>Cut</source> <translation>Вырезать</translation> </message> @@ -158,6 +166,10 @@ <translation>Открыть ссылку в новой вкладке</translation> </message> <message> + <source>Open Link in New Background Tab</source> + <translation>Открыть ссылку в новой фоновой вкладке</translation> + </message> + <message> <source>Copy Link URL</source> <translation>Скопировать адрес ссылки</translation> </message> @@ -214,6 +226,14 @@ <translation>Закрыть страницу</translation> </message> <message> + <source>Unselect</source> + <translation>Снять выделение</translation> + </message> + <message> + <source>Save &Page</source> + <translation>Сохранить страни&цу</translation> + </message> + <message> <source>Are you sure you want to leave this page?</source> <translation>Закрыть страницу?</translation> </message> @@ -267,6 +287,10 @@ <source>Cannot create a separate instance of WebEngineViewport</source> <translation>Невозможно создать отдельный экземпляр WebEngineViewport</translation> </message> + <message> + <source>Cannot create a separate instance of WebEngineContextMenuData</source> + <translation>Невозможно создать отдельный экземпляр WebEngineContextMenuData</translation> + </message> </context> <context> <name>QtWebEnginePlugin</name> diff --git a/translations/translations.pro b/translations/translations.pro index 14673aa..4ec2a08 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -107,6 +107,7 @@ updateqm.input = TRANSLATIONS updateqm.output = $$MODULE_BASE_OUTDIR/translations/${QMAKE_FILE_BASE}.qm updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} silent:updateqm.commands = @echo lrelease ${QMAKE_FILE_IN} && $$updateqm.commands +updateqm.depends = $$LRELEASE_EXE updateqm.name = LRELEASE ${QMAKE_FILE_IN} updateqm.CONFIG += no_link target_predeps QMAKE_EXTRA_COMPILERS += updateqm |