summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf2
-rw-r--r--translations/assistant_de.ts106
-rw-r--r--translations/assistant_ru.ts90
-rw-r--r--translations/assistant_zh_TW.ts20
-rw-r--r--translations/designer_de.ts18
-rw-r--r--translations/designer_ru.ts27
-rw-r--r--translations/linguist_de.ts9
-rw-r--r--translations/linguist_ru.ts8
-rw-r--r--translations/linguist_zh_TW.ts18
-rw-r--r--translations/qt_help_de.ts12
-rw-r--r--translations/qt_help_ru.ts4
-rw-r--r--translations/qtbase_de.ts224
-rw-r--r--translations/qtbase_ru.ts243
-rw-r--r--translations/qtbase_zh_TW.ts149
-rw-r--r--translations/qtdeclarative_de.ts33
-rw-r--r--translations/qtdeclarative_ru.ts8
-rw-r--r--translations/qtlocation_de.ts13
-rw-r--r--translations/qtlocation_ru.ts11
-rw-r--r--translations/qtmultimedia_ru.ts4
-rw-r--r--translations/qtwebengine_de.ts4
-rw-r--r--translations/qtwebengine_ru.ts51
-rw-r--r--translations/qtxmlpatterns_ru.ts4
22 files changed, 792 insertions, 266 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 8f1500e..543d0a8 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.12.7
+MODULE_VERSION = 5.13.2
diff --git a/translations/assistant_de.ts b/translations/assistant_de.ts
index eded228..1b02c89 100644
--- a/translations/assistant_de.ts
+++ b/translations/assistant_de.ts
@@ -416,13 +416,13 @@ Grund:
<context>
<name>FilterNameDialogClass</name>
<message>
- <source>Add Filter Name</source>
- <translation>Filternamen hinzufügen</translation>
- </message>
- <message>
<source>Filter Name:</source>
<translation>Filtername:</translation>
</message>
+ <message>
+ <source>Add Filter</source>
+ <translation>Filter hinzufügen</translation>
+ </message>
</context>
<context>
<name>FindWidget</name>
@@ -510,13 +510,6 @@ Grund:
</message>
</context>
<context>
- <name>HelpEngineWrapper</name>
- <message>
- <source>Unfiltered</source>
- <translation>Ungefiltert</translation>
- </message>
-</context>
-<context>
<name>HelpViewer</name>
<message>
<source>&lt;title&gt;about:blank&lt;/title&gt;</source>
@@ -689,6 +682,10 @@ Grund:
<translation>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;Version %2&lt;/p&gt;&lt;p&gt;Browser: %3&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) %4 The Qt Company Ltd.&lt;/p&gt;</translation>
</message>
<message>
+ <source>Unfiltered</source>
+ <translation>Ungefiltert</translation>
+ </message>
+ <message>
<source>Could not register file &apos;%1&apos;: %2</source>
<translation>Die Datei &apos;%1&apos; konnte nicht registriert werden: %2</translation>
</message>
@@ -809,38 +806,69 @@ Grund:
</message>
</context>
<context>
+ <name>OptionsWidget</name>
+ <message>
+ <source>No Option</source>
+ <translation>Keine Option</translation>
+ </message>
+ <message>
+ <source>Invalid Option</source>
+ <translation>Ungültige Option</translation>
+ </message>
+</context>
+<context>
<name>PreferencesDialog</name>
<message>
- <source>Add Documentation</source>
- <translation>Dokumentation hinzufügen</translation>
+ <source>No Component</source>
+ <translation>Keine Komponente</translation>
</message>
<message>
- <source>Qt Compressed Help Files (*.qch)</source>
- <translation>Komprimierte Hilfedateien (*.qch)</translation>
+ <source>Invalid Component</source>
+ <translation>Ungültige Komponente</translation>
</message>
<message>
- <source>The specified file is not a valid Qt Help File!</source>
- <translation>Die angegebene Datei ist keine Qt-Hilfedatei.</translation>
+ <source>No Version</source>
+ <translation>Keine Version</translation>
</message>
<message>
- <source>The namespace %1 is already registered!</source>
- <translation>Der Namespace %1 ist bereits registriert.</translation>
+ <source>Invalid Version</source>
+ <translation>Ungültige Version</translation>
</message>
<message>
- <source>Remove Documentation</source>
- <translation>Dokumentation entfernen</translation>
+ <source>Filter Exists</source>
+ <translation>Filter existiert bereits</translation>
</message>
<message>
- <source>Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents.</source>
- <translation>Einige der derzeit geöffneten Dokumente stammen aus der Dokumentation, die Sie gerade zu löschen versuchen. Sie werden beim Löschen geschlossen.</translation>
+ <source>The filter &quot;%1&quot; already exists.</source>
+ <translation>Der Filter &quot;%1&quot; existiert bereits.</translation>
</message>
<message>
- <source>Cancel</source>
- <translation>Abbrechen</translation>
+ <source>Add Filter</source>
+ <translation>Filter hinzufügen</translation>
</message>
<message>
- <source>OK</source>
- <translation>OK</translation>
+ <source>New Filter</source>
+ <translation>Neuer Filter</translation>
+ </message>
+ <message>
+ <source>Rename Filter</source>
+ <translation>Filter umbenennen</translation>
+ </message>
+ <message>
+ <source>Remove Filter</source>
+ <translation>Filter löschen</translation>
+ </message>
+ <message>
+ <source>Are you sure you want to remove the &quot;%1&quot; filter?</source>
+ <translation>Möchten Sie den Filter &quot;%1&quot; wirklich löschen?</translation>
+ </message>
+ <message>
+ <source>Add Documentation</source>
+ <translation>Dokumentation hinzufügen</translation>
+ </message>
+ <message>
+ <source>Qt Compressed Help Files (*.qch)</source>
+ <translation>Komprimierte Hilfedateien (*.qch)</translation>
</message>
<message>
<source>Use custom settings</source>
@@ -878,18 +906,6 @@ Grund:
<translation>Filter:</translation>
</message>
<message>
- <source>Attributes:</source>
- <translation>Attribute:</translation>
- </message>
- <message>
- <source>1</source>
- <translation>1</translation>
- </message>
- <message>
- <source>Add</source>
- <translation>Hinzufügen</translation>
- </message>
- <message>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
@@ -953,6 +969,18 @@ Grund:
<source>&lt;Filter&gt;</source>
<translation>&lt;Filter&gt;</translation>
</message>
+ <message>
+ <source>Components:</source>
+ <translation>Komponenten:</translation>
+ </message>
+ <message>
+ <source>Rename...</source>
+ <translation>Umbenennen...</translation>
+ </message>
+ <message>
+ <source>Versions:</source>
+ <translation>Versionen:</translation>
+ </message>
</context>
<context>
<name>RemoteControl</name>
diff --git a/translations/assistant_ru.ts b/translations/assistant_ru.ts
index 63d4d55..5c5664c 100644
--- a/translations/assistant_ru.ts
+++ b/translations/assistant_ru.ts
@@ -417,8 +417,8 @@ Reason:
<translation>Название фильтра:</translation>
</message>
<message>
- <source>Add Filter Name</source>
- <translation>Добавление фильтра</translation>
+ <source>Add Filter</source>
+ <translation>Добавить фильтр</translation>
</message>
</context>
<context>
@@ -507,13 +507,6 @@ Reason:
</message>
</context>
<context>
- <name>HelpEngineWrapper</name>
- <message>
- <source>Unfiltered</source>
- <translation>Вся документация</translation>
- </message>
-</context>
-<context>
<name>HelpViewer</name>
<message>
<source>&lt;title&gt;about:blank&lt;/title&gt;</source>
@@ -790,6 +783,10 @@ Reason:
<translation>О %1</translation>
</message>
<message>
+ <source>Unfiltered</source>
+ <translation>Вся документация</translation>
+ </message>
+ <message>
<source>Updating search index</source>
<translation>Обновление индекса полнотекстового поиска</translation>
</message>
@@ -806,38 +803,69 @@ Reason:
</message>
</context>
<context>
+ <name>OptionsWidget</name>
+ <message>
+ <source>No Option</source>
+ <translation>Нет параметра</translation>
+ </message>
+ <message>
+ <source>Invalid Option</source>
+ <translation>Неверный параметр</translation>
+ </message>
+</context>
+<context>
<name>PreferencesDialog</name>
<message>
- <source>Add Documentation</source>
- <translation>Добавить документацию</translation>
+ <source>No Component</source>
+ <translation>Нет компонента</translation>
</message>
<message>
- <source>Qt Compressed Help Files (*.qch)</source>
- <translation>Сжатые файлы справки Qt (*.qch)</translation>
+ <source>Invalid Component</source>
+ <translation>Неверный компонент</translation>
</message>
<message>
- <source>The namespace %1 is already registered!</source>
- <translation>Пространство имён «%1» уже зарегистрировано!</translation>
+ <source>No Version</source>
+ <translation>Нет версии</translation>
</message>
<message>
- <source>The specified file is not a valid Qt Help File!</source>
- <translation>Указанный файл не является корректным файлом справки Qt!</translation>
+ <source>Invalid Version</source>
+ <translation>Неверная версия</translation>
</message>
<message>
- <source>Remove Documentation</source>
- <translation>Удалить документацию</translation>
+ <source>Filter Exists</source>
+ <translation>Фильтр уже существует</translation>
</message>
<message>
- <source>Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents.</source>
- <translation>Некоторые открытые в Qt Assistant документы ссылаются на документацию, которую вы пытаетесь удалить. Её удаление приведёт к закрытию этих документов.</translation>
+ <source>The filter &quot;%1&quot; already exists.</source>
+ <translation>Фильтр «%1» уже существует.</translation>
</message>
<message>
- <source>Cancel</source>
- <translation>Отмена</translation>
+ <source>Add Filter</source>
+ <translation>Добавить фильтр</translation>
</message>
<message>
- <source>OK</source>
- <translation>Удалить</translation>
+ <source>New Filter</source>
+ <translation>Новый фильтр</translation>
+ </message>
+ <message>
+ <source>Rename Filter</source>
+ <translation>Переименовать фильтр</translation>
+ </message>
+ <message>
+ <source>Remove Filter</source>
+ <translation>Удалить фильтр</translation>
+ </message>
+ <message>
+ <source>Are you sure you want to remove the &quot;%1&quot; filter?</source>
+ <translation>Удалить фильтр «%1»?</translation>
+ </message>
+ <message>
+ <source>Add Documentation</source>
+ <translation>Добавить документацию</translation>
+ </message>
+ <message>
+ <source>Qt Compressed Help Files (*.qch)</source>
+ <translation>Сжатые файлы справки Qt (*.qch)</translation>
</message>
<message>
<source>Use custom settings</source>
@@ -939,16 +967,16 @@ Reason:
<translation>&lt;Фильтр&gt;</translation>
</message>
<message>
- <source>Attributes:</source>
- <translation>Атрибуты:</translation>
+ <source>Components:</source>
+ <translation>Компоненты:</translation>
</message>
<message>
- <source>1</source>
- <translation>1</translation>
+ <source>Versions:</source>
+ <translation>Версии:</translation>
</message>
<message>
- <source>Add</source>
- <translation>Добавить</translation>
+ <source>Rename...</source>
+ <translation>Переименовать...</translation>
</message>
</context>
<context>
diff --git a/translations/assistant_zh_TW.ts b/translations/assistant_zh_TW.ts
index e16b60e..748e79f 100644
--- a/translations/assistant_zh_TW.ts
+++ b/translations/assistant_zh_TW.ts
@@ -837,6 +837,22 @@ Reason:
<translation>無效版本</translation>
</message>
<message>
+ <source>No Component</source>
+ <translation>沒有元件</translation>
+ </message>
+ <message>
+ <source>Invalid Component</source>
+ <translation>元件無效</translation>
+ </message>
+ <message>
+ <source>No Version</source>
+ <translation>沒有版本</translation>
+ </message>
+ <message>
+ <source>Invalid Version</source>
+ <translation>版本無效</translation>
+ </message>
+ <message>
<source>Filter Exists</source>
<translation>篩選器存在</translation>
</message>
@@ -1012,6 +1028,10 @@ Reason:
<translation>屬性:</translation>
</message>
<message>
+ <source>Versions:</source>
+ <translation>版本:</translation>
+ </message>
+ <message>
<source>1</source>
<translation>1</translation>
</message>
diff --git a/translations/designer_de.ts b/translations/designer_de.ts
index 8dd7fba..65e4810 100644
--- a/translations/designer_de.ts
+++ b/translations/designer_de.ts
@@ -23,6 +23,10 @@
<source>&lt;img src=&quot;:/qt-project.org/shared/images/wrap.png&quot;&gt;&amp;nbsp;Search wrapped</source>
<translation>&lt;img src=&quot;:/qt-project.org/shared/images/wrap.png&quot;&gt;&amp;nbsp;Die Suche hat das Ende erreicht</translation>
</message>
+ <message>
+ <source>&amp;Find in Text...</source>
+ <translation>&amp;Suchen...</translation>
+ </message>
</context>
<context>
<name>AbstractItemEditor</name>
@@ -1701,7 +1705,7 @@ Möchten Sie es noch einmal versuchen?</translation>
</message>
<message>
<source>Remove Menu &apos;%1&apos;</source>
- <translation>Menü &apos;%1&apos; öschen</translation>
+ <translation>Menü &apos;%1&apos; löschen</translation>
</message>
<message>
<source>Remove Menu Bar</source>
@@ -3463,10 +3467,6 @@ Möchten Sie sie überschreiben?</translation>
<translation>Alles kopieren</translation>
</message>
<message>
- <source>&amp;Find in Text...</source>
- <translation>&amp;Suchen...</translation>
- </message>
- <message>
<source>A temporary form file could not be created in %1.</source>
<translation>In dem Verzeichnis %1 konnte keine temporäre Formulardatei angelegt werden.</translation>
</message>
@@ -4524,12 +4524,12 @@ Please select another name.</source>
<context>
<name>qdesigner_internal::ObjectInspector</name>
<message>
- <source>Change Current Page</source>
- <translation>Seite wechseln</translation>
+ <source>Filter</source>
+ <translation>Filter</translation>
</message>
<message>
- <source>&amp;Find in Text...</source>
- <translation>&amp;Suchen...</translation>
+ <source>Change Current Page</source>
+ <translation>Seite wechseln</translation>
</message>
</context>
<context>
diff --git a/translations/designer_ru.ts b/translations/designer_ru.ts
index 5e50b99..66543c6 100644
--- a/translations/designer_ru.ts
+++ b/translations/designer_ru.ts
@@ -23,6 +23,10 @@
<source>&lt;img src=&quot;:/qt-project.org/shared/images/wrap.png&quot;&gt;&amp;nbsp;Search wrapped</source>
<translation>&lt;img src=&quot;:/qt-project.org/shared/images/wrap.png&quot;&gt;&amp;nbsp;Поиск с начала</translation>
</message>
+ <message>
+ <source>&amp;Find in Text...</source>
+ <translation>&amp;Найти в тексте...</translation>
+ </message>
</context>
<context>
<name>AbstractItemEditor</name>
@@ -3259,6 +3263,10 @@ Do you want overwrite the template?</source>
<context>
<name>WidgetDataBase</name>
<message>
+ <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
+ <translation>Обнаружен пользовательский модуль виджета, имя класса которого (%1) совпадает с уже имеющимся.</translation>
+ </message>
+ <message>
<source>The file contains a custom widget &apos;%1&apos; whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged.</source>
<translation>Файл содержит пользовательский виджет «%1», базовый класс (%2) которого отличается от текущей записи в базе виджетов (%3). База виджетов оставлена без изменений.</translation>
</message>
@@ -3466,10 +3474,6 @@ Do you want overwrite the template?</source>
<translation>Копировать всё</translation>
</message>
<message>
- <source>&amp;Find in Text...</source>
- <translation>&amp;Найти в тексте...</translation>
- </message>
- <message>
<source>A temporary form file could not be created in %1.</source>
<translation>Не удалось создать временный файл формы в %1.</translation>
</message>
@@ -4531,12 +4535,12 @@ Please select another name.</source>
<context>
<name>qdesigner_internal::ObjectInspector</name>
<message>
- <source>Change Current Page</source>
- <translation>Смена текущей страницы</translation>
+ <source>Filter</source>
+ <translation>Фильтр</translation>
</message>
<message>
- <source>&amp;Find in Text...</source>
- <translation>&amp;Найти в тексте...</translation>
+ <source>Change Current Page</source>
+ <translation>Смена текущей страницы</translation>
</message>
</context>
<context>
@@ -5700,13 +5704,6 @@ Class: %2</source>
</message>
</context>
<context>
- <name>qdesigner_internal::WidgetDataBase</name>
- <message>
- <source>A custom widget plugin whose class name (%1) matches that of an existing class has been found.</source>
- <translation>Обнаружен пользовательский модуль виджета, имя класса которого (%1) совпадает с уже имеющимся.</translation>
- </message>
-</context>
-<context>
<name>qdesigner_internal::WidgetEditorTool</name>
<message>
<source>Edit Widgets</source>
diff --git a/translations/linguist_de.ts b/translations/linguist_de.ts
index 232173b..db96ea1 100644
--- a/translations/linguist_de.ts
+++ b/translations/linguist_de.ts
@@ -120,6 +120,7 @@ Es wird mit einer einfachen Universalform gearbeitet.</translation>
</message>
<message>
<source>%1 (%2)</source>
+ <extracomment>&lt;language&gt; (&lt;country&gt;)</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
@@ -984,8 +985,12 @@ Alle Dateien (*)</translation>
<translation>Version %1</translation>
</message>
<message>
- <source>&lt;center&gt;&lt;img src=&quot;:/images/splash.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist is a tool for adding translations to Qt applications.&lt;/p&gt;&lt;p&gt;Copyright (C) %2 The Qt Company Ltd.</source>
- <translation>&lt;center&gt;&lt;img src=&quot;:/images/splash.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist is a tool for adding translations to Qt applications.&lt;/p&gt;&lt;p&gt;Copyright (C) %2 The Qt Company Ltd.</translation>
+ <source>Qt Linguist is a tool for adding translations to Qt applications.</source>
+ <translation>Qt Linguist ist ein Werkzeug zum Hinzufügen von Übersetzungen zu Qt-Anwendungen</translation>
+ </message>
+ <message>
+ <source>Copyright (C) %1 The Qt Company Ltd.</source>
+ <translation>Copyright (C) %1 The Qt Company Ltd.</translation>
</message>
<message>
<source>Do you want to save the modified files?</source>
diff --git a/translations/linguist_ru.ts b/translations/linguist_ru.ts
index fd6e669..a6f7c9b 100644
--- a/translations/linguist_ru.ts
+++ b/translations/linguist_ru.ts
@@ -574,8 +574,12 @@ All files (*)</source>
<translation>Версия %1</translation>
</message>
<message>
- <source>&lt;center&gt;&lt;img src=&quot;:/images/icons/linguist-128-32.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist is a tool for adding translations to Qt applications.&lt;/p&gt;&lt;p&gt;Copyright (C) %2 The Qt Company Ltd.</source>
- <translation>&lt;center&gt;&lt;img src=&quot;:/images/icons/linguist-128-32.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist — это программа для добавления переводов в приложения Qt.&lt;/p&gt;&lt;p&gt;Copyright (C) %2 The Qt Company Ltd.</translation>
+ <source>Qt Linguist is a tool for adding translations to Qt applications.</source>
+ <translation>Qt Linguist — это программа для добавления переводов в приложения Qt.</translation>
+ </message>
+ <message>
+ <source>Copyright (C) %1 The Qt Company Ltd.</source>
+ <translation>Copyright (C) %1 The Qt Company Ltd.</translation>
</message>
<message>
<source>Do you want to save the modified files?</source>
diff --git a/translations/linguist_zh_TW.ts b/translations/linguist_zh_TW.ts
index c51a05b..2db9820 100644
--- a/translations/linguist_zh_TW.ts
+++ b/translations/linguist_zh_TW.ts
@@ -1177,14 +1177,6 @@ All files (*)</source>
<translation>版本 %1</translation>
</message>
<message>
- <source>Qt Linguist is a tool for adding translations to Qt applications.</source>
- <translation>Qt 語言家是個用來將翻譯新增至 Qt 應用程式的工具。</translation>
- </message>
- <message>
- <source>Copyright (C) %1 The Qt Company Ltd.</source>
- <translation>版權所有 (C) %1 The Qt Company Ltd.</translation>
- </message>
- <message>
<source>Do you want to save the modified files?</source>
<translation>您要儲存已變更的檔案嗎?</translation>
</message>
@@ -1315,13 +1307,17 @@ All files (*)</source>
<translation>全部</translation>
</message>
<message>
- <source>&lt;center&gt;&lt;img src=&quot;:/images/icons/linguist-128-32.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist is a tool for adding translations to Qt applications.&lt;/p&gt;&lt;p&gt;Copyright (C) %2 The Qt Company Ltd.</source>
- <translation>&lt;center&gt;&lt;img src=&quot;:/images/icons/linguist-128-32.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt 語言家是款能新增翻譯至 Qt 應用程式的工具。&lt;/p&gt;&lt;p&gt;版權所有 (C) %2 Qt The Qt Company Ltd.</translation>
+ <source>Qt Linguist is a tool for adding translations to Qt applications.</source>
+ <translation>Qt Linguist 是個用來將翻譯新增至 Qt 應用程式的工具。</translation>
+ </message>
+ <message>
+ <source>Copyright (C) %1 The Qt Company Ltd.</source>
+ <translation>版權所有 (C) %1 The Qt Company Ltd.</translation>
</message>
<message>
<source>&lt;center&gt;&lt;img src=&quot;:/images/splash.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist is a tool for adding translations to Qt applications.&lt;/p&gt;&lt;p&gt;Copyright (C) %2 The Qt Company Ltd.</source>
<translatorcomment>請忽略警告!</translatorcomment>
- <translation>&lt;center&gt;&lt;img src=&quot;:/images/splash.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist 是個對 Qt 應用程式加入翻譯的工具。&lt;/p&gt;&lt;p&gt;版權所有 (C) %2 Qt The Qt Company Ltd.</translation>
+ <translation>&lt;center&gt;&lt;img src=&quot;:/images/splash.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist 是個對 Qt 應用程式加入翻譯的工具。&lt;/p&gt;&lt;p&gt;版權所有 (C) %2 The Qt Company Ltd.</translation>
</message>
</context>
<context>
diff --git a/translations/qt_help_de.ts b/translations/qt_help_de.ts
index d4c3c88..828b107 100644
--- a/translations/qt_help_de.ts
+++ b/translations/qt_help_de.ts
@@ -31,6 +31,14 @@
<translation>In der Datei %1 konnten keine Index-Tabellen erzeugt werden.</translation>
</message>
<message>
+ <source>Cannot register index tables in file %1.</source>
+ <translation>Die Index-Tabellen können nicht in der Datei %1 registriert werden.</translation>
+ </message>
+ <message>
+ <source>Cannot unregister index tables in file %1.</source>
+ <translation>Die Index-Tabellen können nicht aus der Datei %1 entfernt werden.</translation>
+ </message>
+ <message>
<source>The collection file &quot;%1&quot; already exists.</source>
<translation>Die Katalogdatei &quot;%1&quot; existiert bereits.</translation>
</message>
@@ -51,6 +59,10 @@
<translation>Der virtuelle Ordner &apos;%1&apos; kann nicht registriert werden.</translation>
</message>
<message>
+ <source>Version %1</source>
+ <translation>Version %1</translation>
+ </message>
+ <message>
<source>Cannot create directory: %1</source>
<translation>Das Verzeichnis kann nicht angelegt werden: %1</translation>
</message>
diff --git a/translations/qt_help_ru.ts b/translations/qt_help_ru.ts
index 20ca0cb..7413321 100644
--- a/translations/qt_help_ru.ts
+++ b/translations/qt_help_ru.ts
@@ -59,6 +59,10 @@
<translation>Не удалось зарегистрировать виртуальный каталог «%1».</translation>
</message>
<message>
+ <source>Version %1</source>
+ <translation>Версия %1</translation>
+ </message>
+ <message>
<source>Cannot create directory: %1</source>
<translation>Не удалось создать каталог: %1</translation>
</message>
diff --git a/translations/qtbase_de.ts b/translations/qtbase_de.ts
index 8ef6d6f..5fe47fd 100644
--- a/translations/qtbase_de.ts
+++ b/translations/qtbase_de.ts
@@ -40,6 +40,20 @@
</message>
</context>
<context>
+ <name>Print Device Input Slot</name>
+ <message>
+ <source>Automatic</source>
+ <translation>Automatisch</translation>
+ </message>
+</context>
+<context>
+ <name>Print Device Output Bin</name>
+ <message>
+ <source>Automatic</source>
+ <translation>Automatisch</translation>
+ </message>
+</context>
+<context>
<name>QAbstractSocket</name>
<message>
<source>Socket operation timed out</source>
@@ -979,8 +993,8 @@ Drücken Sie ESC, um abzubrechen</translation>
<translation>%1 kann nicht zum Lesen geöffnet werden</translation>
</message>
<message>
- <source>Cannot open for output</source>
- <translation>Öffnen zum Schreiben fehlgeschlagen</translation>
+ <source>Cannot open for output: %1</source>
+ <translation>Kann nicht zum Schreiben geöffnet werden: %1</translation>
</message>
<message>
<source>Failure to write block</source>
@@ -2414,6 +2428,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
</message>
<message>
<source>&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across all major desktop operating systems. It is also available for embedded Linux and other embedded and mobile operating systems.&lt;/p&gt;&lt;p&gt;Qt is available under multiple licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of GNU (L)GPL.&lt;/p&gt;&lt;p&gt;Qt licensed under GNU (L)GPL is appropriate for the development of Qt&amp;nbsp;applications provided you can comply with the terms and conditions of the respective licenses.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) %1 The Qt Company Ltd and other contributors.&lt;/p&gt;&lt;p&gt;Qt and the Qt logo are trademarks of The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt is The Qt Company Ltd product developed as an open source project. See &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; for more information.&lt;/p&gt;</source>
+ <extracomment>Leave this text untranslated or include a verbatim copy of it below and note that it is the authoritative version in case of doubt.</extracomment>
<translation>&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across all major desktop operating systems. It is also available for embedded Linux and other embedded and mobile operating systems.&lt;/p&gt;&lt;p&gt;Qt is available under multiple licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of GNU (L)GPL.&lt;/p&gt;&lt;p&gt;Qt licensed under GNU (L)GPL is appropriate for the development of Qt&amp;nbsp;applications provided you can comply with the terms and conditions of the respective licenses.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) %1 The Qt Company Ltd and other contributors.&lt;/p&gt;&lt;p&gt;Qt and the Qt logo are trademarks of The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt is The Qt Company Ltd product developed as an open source project. See &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; for more information.&lt;/p&gt;</translation>
</message>
<message>
@@ -3723,10 +3738,6 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<source>OK</source>
<translation>OK</translation>
</message>
- <message>
- <source>Automatic</source>
- <translation>Automatisch</translation>
- </message>
</context>
<context>
<name>QPrintPreviewDialog</name>
@@ -5930,6 +5941,7 @@ Bitte deaktivieren Sie eine der beiden.</translation>
</message>
<message>
<source>+</source>
+ <extracomment>Key separator in shortcut string</extracomment>
<translation>+</translation>
</message>
<message>
@@ -6466,6 +6478,50 @@ Role of an accessible object</extracomment>
<translation>Das Zertifikat der Gegenstelle ist in einer Schwarzen Liste enthalten</translation>
</message>
<message>
+ <source>No OCSP status response found</source>
+ <translation>Es wurde keine OCSP-Status-Antwort gefunden</translation>
+ </message>
+ <message>
+ <source>The OCSP status request had invalid syntax</source>
+ <translation>Die OCSP Status-Anforderung hatte eine ungültige Syntax</translation>
+ </message>
+ <message>
+ <source>OCSP response contains an unexpected number of SingleResponse structures</source>
+ <translation>Die OCSP-Antwort enthält eine unerwartete Anzahl von SingleResponse-Strukturen</translation>
+ </message>
+ <message>
+ <source>OCSP responder reached an inconsistent internal state</source>
+ <translation>Der OCSP-Responder ist in einen inkonsistenten internen Zustand gelangt</translation>
+ </message>
+ <message>
+ <source>OCSP responder was unable to return a status for the requested certificate</source>
+ <translation>Der OCSP-Responder konnte keinen Status für das angeforderte Zertifikat zurückgeben</translation>
+ </message>
+ <message>
+ <source>The server requires the client to sign the OCSP request in order to construct a response</source>
+ <translation>Der Server verlangt, dass der Client die OCSP-Anforderung signiert, um eine Antwort zu erstellen</translation>
+ </message>
+ <message>
+ <source>The client is not authorized to request OCSP status from this server</source>
+ <translation>Der Client ist nicht berechtigt, einen OCSP-Status von diesem Server anzufordern</translation>
+ </message>
+ <message>
+ <source>OCSP responder&apos;s identity cannot be verified</source>
+ <translation>Die Identität des OCSP-Responders konnte nicht verifiziert werden</translation>
+ </message>
+ <message>
+ <source>The identity of a certificate in an OCSP response cannot be established</source>
+ <translation>Die Identität eines Zertifikats in einer OCSP-Antwort konnte nicht bestimmt werden</translation>
+ </message>
+ <message>
+ <source>The certificate status response has expired</source>
+ <translation>Die Gültigkeit der Status-Antwort des Zertifikats ist abgelaufen</translation>
+ </message>
+ <message>
+ <source>The certificate&apos;s status is unknown</source>
+ <translation>Der Status des Zertifikats ist unbekannt</translation>
+ </message>
+ <message>
<source>Unknown error</source>
<translation>Unbekannter Fehler</translation>
</message>
@@ -6558,6 +6614,18 @@ Role of an accessible object</extracomment>
<translation>Es konnte keine SSL-Sitzung erzeugt werden: %1</translation>
</message>
<message>
+ <source>Server-side QSslSocket does not support OCSP stapling</source>
+ <translation>Der serverseitige QSslSocket unterstützt das Anheften von OCSP nicht</translation>
+ </message>
+ <message>
+ <source>Failed to enable OCSP stapling</source>
+ <translation>Das OCSP-Anheften konnte nicht aktiviert werden</translation>
+ </message>
+ <message>
+ <source>Client-side sockets do not send OCSP responses</source>
+ <translation>Die clientseitigen Sockets senden keine OCSP-Antworten</translation>
+ </message>
+ <message>
<source>Unable to init SSL Context: %1</source>
<translation>Der SSL-Kontext konnte nicht initialisiert werden: %1</translation>
</message>
@@ -6570,6 +6638,26 @@ Role of an accessible object</extracomment>
<translation>Die Daten konnten nicht entschlüsselt werden: %1</translation>
</message>
<message>
+ <source>Failed to decode OCSP response</source>
+ <translation>Die OCSP-Antworten konnten nicht dekodiert werden</translation>
+ </message>
+ <message>
+ <source>Failed to extract basic OCSP response</source>
+ <translation>Es konnte keine grundlegende OCSP-Antwort extrahiert werden</translation>
+ </message>
+ <message>
+ <source>No certificate verification store, cannot verify OCSP response</source>
+ <translation>Es ist kein Store zur Zertifikatsverifikation vorhanden; die OCSP-Antwort kann nicht überprüft werden</translation>
+ </message>
+ <message>
+ <source>Failed to decode a SingleResponse from OCSP status response</source>
+ <translation>Es konnte keine SingleResponse aus der OCSP-Status-Antwort dekodiert werden</translation>
+ </message>
+ <message>
+ <source>Failed to extract &apos;this update time&apos; from the SingleResponse</source>
+ <translation>&apos;this update time&apos; konnte nicht aus der SingleResponse extrahiert werden</translation>
+ </message>
+ <message>
<source>The TLS/SSL connection has been closed</source>
<translation>Die TLS/SSL-Verbindung wurde geschlossen</translation>
</message>
@@ -6589,6 +6677,130 @@ Role of an accessible object</extracomment>
<source>TLS initialization failed</source>
<translation>Die Initialisierung von TLS schlug fehl</translation>
</message>
+ <message>
+ <source>Attempted to use an unsupported protocol.</source>
+ <translation>Es wurde versucht, ein nicht unterstütztes Protokoll zu verwenden.</translation>
+ </message>
+ <message>
+ <source>Insufficient memory</source>
+ <translation>Zu wenig Speicher</translation>
+ </message>
+ <message>
+ <source>Internal error</source>
+ <translation>Interner Fehler</translation>
+ </message>
+ <message>
+ <source>An internal handle was invalid</source>
+ <translation>Ein interner Handle war ungültig</translation>
+ </message>
+ <message>
+ <source>An internal token was invalid</source>
+ <translation>Ein internes Token war ungültig</translation>
+ </message>
+ <message>
+ <source>Access denied</source>
+ <translation>Zugriff verweigert</translation>
+ </message>
+ <message>
+ <source>No authority could be contacted for authorization</source>
+ <translation>Es konnte keine Authentifizierungsstelle für eine Autorisierung erreicht werden</translation>
+ </message>
+ <message>
+ <source>No credentials</source>
+ <translation>Keine Zugangsdaten</translation>
+ </message>
+ <message>
+ <source>The target is unknown or unreachable</source>
+ <translation>Das Ziel ist unbekannt oder nicht erreichbar</translation>
+ </message>
+ <message>
+ <source>An unsupported function was requested</source>
+ <translation>Es wurde eine nicht unterstützte Funktion angefordert</translation>
+ </message>
+ <message>
+ <source>The hostname provided does not match the one received from the peer</source>
+ <translation>Der angegebene Hostname entspricht nicht dem der Gegenseite</translation>
+ </message>
+ <message>
+ <source>No common protocol exists between the client and the server</source>
+ <translation>Es gibt kein gemeinsames Protokoll zwischen Client und Server</translation>
+ </message>
+ <message>
+ <source>Unexpected or badly-formatted message received</source>
+ <translation>Die Nachricht ist unerwartet oder in einem fehlerhaften Format</translation>
+ </message>
+ <message>
+ <source>The data could not be encrypted</source>
+ <translation>Die Daten konnten nicht verschlüsselt werden</translation>
+ </message>
+ <message>
+ <source>No cipher suites in common</source>
+ <translation>Keine gemeinsamen Cipher Suites</translation>
+ </message>
+ <message>
+ <source>The credentials were not recognized / Invalid argument</source>
+ <translation>Die Zugangsdaten wurden nicht erkannt / Ungültiges Argument</translation>
+ </message>
+ <message>
+ <source>The message was tampered with, damaged or out of sequence.</source>
+ <translation>Die Nachricht wurde korrumpiert, beschädigt oder erscheint außerhalb der Reihenfolge.</translation>
+ </message>
+ <message>
+ <source>A message was received out of sequence.</source>
+ <translation>Die Nachricht wurde außerhalb der Reihenfolge empfangen.</translation>
+ </message>
+ <message>
+ <source>Unknown error occurred: %1</source>
+ <translation>Es ist ein unbekannter Fehler aufgetreten: %1</translation>
+ </message>
+ <message>
+ <source>Invalid protocol chosen</source>
+ <translation>Es wurde ein ungültiges Protokoll gewählt</translation>
+ </message>
+ <message>
+ <source>The certificate provided cannot be used for a client.</source>
+ <translation>Das bereitgestellte Zertifikat kann nicht für einen Client verwendet werden.</translation>
+ </message>
+ <message>
+ <source>The certificate provided cannot be used for a server.</source>
+ <translation>Das bereitgestellte Zertifikat kann nicht für einen Server verwendet werden.</translation>
+ </message>
+ <message>
+ <source>Server did not accept any certificate we could present.</source>
+ <translation>Der Server hat keines der angegebenen Zertifikate akzeptiert.</translation>
+ </message>
+ <message>
+ <source>Algorithm mismatch</source>
+ <translation>Algorithmen stimmen nicht überein</translation>
+ </message>
+ <message>
+ <source>Handshake failed: %1</source>
+ <translation>Der Handshake schlug fehl: %1</translation>
+ </message>
+ <message>
+ <source>Failed to query the TLS context: %1</source>
+ <translation>Der TLS-Kontext konnte nicht abgefragt werden: %1</translation>
+ </message>
+ <message>
+ <source>Did not get the required attributes for the connection.</source>
+ <translation>Die für die Verbindung erforderlichen Attribute konnten nicht erhalten werden.</translation>
+ </message>
+ <message>
+ <source>Unwanted protocol was negotiated</source>
+ <translation>Es wurde ein unerwünschtes Protokoll ausgehandelt</translation>
+ </message>
+ <message>
+ <source>Renegotiation was unsuccessful: %1</source>
+ <translation>Die Neuverhandlung schlug fehl: %1</translation>
+ </message>
+ <message>
+ <source>Schannel failed to encrypt data: %1</source>
+ <translation>Schannel konnte die Daten nicht verschlüsseln: %1</translation>
+ </message>
+ <message>
+ <source>Cannot provide a certificate with no key</source>
+ <translation>Es kann kein Zertifikat ohne Schlüssel bereitgestellt werden</translation>
+ </message>
</context>
<context>
<name>QStandardPaths</name>
diff --git a/translations/qtbase_ru.ts b/translations/qtbase_ru.ts
index 45dd82f..89ffa68 100644
--- a/translations/qtbase_ru.ts
+++ b/translations/qtbase_ru.ts
@@ -40,6 +40,20 @@
</message>
</context>
<context>
+ <name>Print Device Input Slot</name>
+ <message>
+ <source>Automatic</source>
+ <translation>Автоматически</translation>
+ </message>
+</context>
+<context>
+ <name>Print Device Output Bin</name>
+ <message>
+ <source>Automatic</source>
+ <translation>Автоматически</translation>
+ </message>
+</context>
+<context>
<name>QAbstractSocket</name>
<message>
<source>Socket operation timed out</source>
@@ -984,8 +998,8 @@ Press ESC to cancel</source>
<translation>Невозможно открыть %1 для ввода</translation>
</message>
<message>
- <source>Cannot open for output</source>
- <translation>Невозможно открыть для вывода</translation>
+ <source>Cannot open for output: %1</source>
+ <translation>Не удалось открыть для вывода: %1</translation>
</message>
<message>
<source>Failure to write block</source>
@@ -3730,11 +3744,6 @@ Please turn one of those options off.</source>
<source>OK</source>
<translation>OK</translation>
</message>
- <message>
- <source>Automatic</source>
- <translatorcomment>источник бумаги</translatorcomment>
- <translation>Автоматически</translation>
- </message>
</context>
<context>
<name>QPrintPreviewDialog</name>
@@ -4801,8 +4810,8 @@ Please turn one of those options off.</source>
<translation>Имя файла ссылается на каталог</translation>
</message>
<message>
- <source>QSaveFile cannot open &apos;%1&apos; without direct write fallback enabled: path contains an Alternate Data Stream specifier</source>
- <translation>QSaveFile не может открыть «%1» без включения прямой записи: путь содержит спецификатор альтернативного потока данных</translation>
+ <source>QSaveFile cannot open &apos;%1&apos; without direct write fallback enabled.</source>
+ <translation>QSaveFile не может открыть «%1» без включения прямой записи.</translation>
</message>
<message>
<source>Writing canceled by application</source>
@@ -5940,6 +5949,7 @@ Please turn one of those options off.</source>
</message>
<message>
<source>+</source>
+ <extracomment>Key separator in shortcut string</extracomment>
<translation>+</translation>
</message>
<message>
@@ -6361,6 +6371,21 @@ Role of an accessible object</extracomment>
<translation>дополнительная информация</translation>
</message>
<message>
+ <source>terminal</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>терминал</translation>
+ </message>
+ <message>
+ <source>desktop</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>рабочий стол</translation>
+ </message>
+ <message>
+ <source>notification</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>уведомление</translation>
+ </message>
+ <message>
<source>unknown</source>
<extracomment>Role of an accessible object</extracomment>
<translation>неизвестная</translation>
@@ -6476,6 +6501,50 @@ Role of an accessible object</extracomment>
<translation>Сертификат узла в чёрном списке</translation>
</message>
<message>
+ <source>No OCSP status response found</source>
+ <translation>Не найден ответ с состоянием OCSP</translation>
+ </message>
+ <message>
+ <source>The OCSP status request had invalid syntax</source>
+ <translation>Запрос состояния OCSP синтаксически неверен</translation>
+ </message>
+ <message>
+ <source>OCSP response contains an unexpected number of SingleResponse structures</source>
+ <translation>Ответ OCSP содержит неожиданное число структур SingleResponse</translation>
+ </message>
+ <message>
+ <source>OCSP responder reached an inconsistent internal state</source>
+ <translation>Ответчик OCSP вошёл в неверное внутреннее состояние</translation>
+ </message>
+ <message>
+ <source>OCSP responder was unable to return a status for the requested certificate</source>
+ <translation>Ответчик OCSP не может вернуть состояние запрошенного сертификата</translation>
+ </message>
+ <message>
+ <source>The server requires the client to sign the OCSP request in order to construct a response</source>
+ <translation>Для подготовки ответа сервер требует от клиента подписать запрос OCSP</translation>
+ </message>
+ <message>
+ <source>The client is not authorized to request OCSP status from this server</source>
+ <translation>Клиент не авторизован для запроса состояния OCSP с этого сервера</translation>
+ </message>
+ <message>
+ <source>OCSP responder&apos;s identity cannot be verified</source>
+ <translation>Невозможно проверить подлинность ответчика OCSP</translation>
+ </message>
+ <message>
+ <source>The identity of a certificate in an OCSP response cannot be established</source>
+ <translation>Невозможно установить подлинность сертификата в ответе OCSP</translation>
+ </message>
+ <message>
+ <source>The certificate status response has expired</source>
+ <translation>Ответ о состоянии сертификата просрочен</translation>
+ </message>
+ <message>
+ <source>The certificate&apos;s status is unknown</source>
+ <translation>Состояние сертификата неизвестно</translation>
+ </message>
+ <message>
<source>Unknown error</source>
<translation>Неизвестная ошибка</translation>
</message>
@@ -6568,6 +6637,18 @@ Role of an accessible object</extracomment>
<translation>Ошибка создания сессии SSL: %1</translation>
</message>
<message>
+ <source>Server-side QSslSocket does not support OCSP stapling</source>
+ <translation>Серверный QSslSocket не поддерживает сшивку OCSP</translation>
+ </message>
+ <message>
+ <source>Failed to enable OCSP stapling</source>
+ <translation>Не удалось включить сшивку OCSP</translation>
+ </message>
+ <message>
+ <source>Client-side sockets do not send OCSP responses</source>
+ <translation>Клиентские сокеты не отправляют ответы OCSP</translation>
+ </message>
+ <message>
<source>Unable to init SSL Context: %1</source>
<translation>Не удалось инициализировать контекст SSL: %1</translation>
</message>
@@ -6580,6 +6661,26 @@ Role of an accessible object</extracomment>
<translation>Не удалось расшифровать данные: %1</translation>
</message>
<message>
+ <source>Failed to decode OCSP response</source>
+ <translation>Не удалось разобрать ответ OCSP</translation>
+ </message>
+ <message>
+ <source>Failed to extract basic OCSP response</source>
+ <translation>Не удалось извлечь базовый ответ OCSP</translation>
+ </message>
+ <message>
+ <source>No certificate verification store, cannot verify OCSP response</source>
+ <translation>Невозможно проверить ответ OCSP, так как отсутствует хранилище проверок сертификатов</translation>
+ </message>
+ <message>
+ <source>Failed to decode a SingleResponse from OCSP status response</source>
+ <translation>Не удалось разобрать SingleResponse из ответа с состоянием OCSP</translation>
+ </message>
+ <message>
+ <source>Failed to extract &apos;this update time&apos; from the SingleResponse</source>
+ <translation>Не удалось извлечь «время этого обновления» из SingleResponse</translation>
+ </message>
+ <message>
<source>The TLS/SSL connection has been closed</source>
<translation>Соединение TLS/SSL было закрыто</translation>
</message>
@@ -6599,6 +6700,130 @@ Role of an accessible object</extracomment>
<source>TLS initialization failed</source>
<translation>Не удалось инициализировать TLS</translation>
</message>
+ <message>
+ <source>Attempted to use an unsupported protocol.</source>
+ <translation>Попытка использовать неподдерживаемый протокол.</translation>
+ </message>
+ <message>
+ <source>Insufficient memory</source>
+ <translation>Недостаточно памяти</translation>
+ </message>
+ <message>
+ <source>Internal error</source>
+ <translation>Внутренняя ошибка</translation>
+ </message>
+ <message>
+ <source>An internal handle was invalid</source>
+ <translation>Неверен внутренний указатель</translation>
+ </message>
+ <message>
+ <source>An internal token was invalid</source>
+ <translation>Неверен внутренний токен</translation>
+ </message>
+ <message>
+ <source>Access denied</source>
+ <translation>Доступ запрещён</translation>
+ </message>
+ <message>
+ <source>No authority could be contacted for authorization</source>
+ <translation>Отсутствует удалённый сервис авторизации</translation>
+ </message>
+ <message>
+ <source>No credentials</source>
+ <translation>Отсутствуют учётные данные</translation>
+ </message>
+ <message>
+ <source>The target is unknown or unreachable</source>
+ <translation>Цель неизвестна или недоступна</translation>
+ </message>
+ <message>
+ <source>An unsupported function was requested</source>
+ <translation>Запрошена неподдерживаемая функция</translation>
+ </message>
+ <message>
+ <source>The hostname provided does not match the one received from the peer</source>
+ <translation>Предоставленное имя узла не совпадает с полученным от пира</translation>
+ </message>
+ <message>
+ <source>No common protocol exists between the client and the server</source>
+ <translation>У клиента и сервера нет общих протоколов</translation>
+ </message>
+ <message>
+ <source>Unexpected or badly-formatted message received</source>
+ <translation>Получено неожиданное или неверно сформированное сообщение</translation>
+ </message>
+ <message>
+ <source>The data could not be encrypted</source>
+ <translation>Невозможно зашифровать данные</translation>
+ </message>
+ <message>
+ <source>No cipher suites in common</source>
+ <translation>Нет общих наборов шифров</translation>
+ </message>
+ <message>
+ <source>The credentials were not recognized / Invalid argument</source>
+ <translation>Учётные данные не распознаны / Неверный параметр</translation>
+ </message>
+ <message>
+ <source>The message was tampered with, damaged or out of sequence.</source>
+ <translation>Сообщение подделано, повреждено или вне последовательности.</translation>
+ </message>
+ <message>
+ <source>A message was received out of sequence.</source>
+ <translation>Сообщение получено вне последовательности.</translation>
+ </message>
+ <message>
+ <source>Unknown error occurred: %1</source>
+ <translation>Возникла неизвестная ошибка: %1</translation>
+ </message>
+ <message>
+ <source>Invalid protocol chosen</source>
+ <translation>Выбран неверный протокол</translation>
+ </message>
+ <message>
+ <source>The certificate provided cannot be used for a client.</source>
+ <translation>Невозможно использовать предоставленный сертификат для клиента.</translation>
+ </message>
+ <message>
+ <source>The certificate provided cannot be used for a server.</source>
+ <translation>Невозможно использовать предоставленный сертификат для сервера.</translation>
+ </message>
+ <message>
+ <source>Server did not accept any certificate we could present.</source>
+ <translation>Сервер не принимает предоставляемые нами сертификаты.</translation>
+ </message>
+ <message>
+ <source>Algorithm mismatch</source>
+ <translation>Не совпадают алгоритмы</translation>
+ </message>
+ <message>
+ <source>Handshake failed: %1</source>
+ <translation>Не удалось выполнить квитирование: %1</translation>
+ </message>
+ <message>
+ <source>Failed to query the TLS context: %1</source>
+ <translation>Не удалось запросить контекст TLS: %1</translation>
+ </message>
+ <message>
+ <source>Did not get the required attributes for the connection.</source>
+ <translation>Не удалось получить необходимые для подключения атрибуты.</translation>
+ </message>
+ <message>
+ <source>Unwanted protocol was negotiated</source>
+ <translation>Был согласован нежелательный протокол</translation>
+ </message>
+ <message>
+ <source>Renegotiation was unsuccessful: %1</source>
+ <translation>Не удалось выполнить пересогласование: %1</translation>
+ </message>
+ <message>
+ <source>Schannel failed to encrypt data: %1</source>
+ <translation>Schannel не удалось зашифровать данные: %1</translation>
+ </message>
+ <message>
+ <source>Cannot provide a certificate with no key</source>
+ <translation>Невозможно предоставить сертификат без ключа</translation>
+ </message>
</context>
<context>
<name>QStandardPaths</name>
diff --git a/translations/qtbase_zh_TW.ts b/translations/qtbase_zh_TW.ts
index 7ec2644..2d1a4b7 100644
--- a/translations/qtbase_zh_TW.ts
+++ b/translations/qtbase_zh_TW.ts
@@ -40,20 +40,6 @@
</message>
</context>
<context>
- <name>Print Device Input Slot</name>
- <message>
- <source>Automatic</source>
- <translation>自動</translation>
- </message>
-</context>
-<context>
- <name>Print Device Output Bin</name>
- <message>
- <source>Automatic</source>
- <translation>自動</translation>
- </message>
-</context>
-<context>
<name>QAbstractSocket</name>
<message>
<source>Socket operation timed out</source>
@@ -1009,8 +995,8 @@ Press ESC to cancel</source>
<translation>無法開啟 %1 供輸入</translation>
</message>
<message>
- <source>Cannot open for output: %1</source>
- <translation>無法開啟供輸出檔案:%1</translation>
+ <source>Cannot open for output</source>
+ <translation>無法開啟以供輸出</translation>
</message>
<message>
<source>Failure to write block</source>
@@ -1021,8 +1007,8 @@ Press ESC to cancel</source>
<translation>無法建立 %1 供輸出</translation>
</message>
<message>
- <source>Cannot open for output</source>
- <translation>無法開啟以供輸出</translation>
+ <source>Cannot open for output: %1</source>
+ <translation>無法開啟供輸出檔案:%1</translation>
</message>
</context>
<context>
@@ -3209,7 +3195,7 @@ Do you want to delete it anyway?</source>
</message>
<message>
<source>Ledger / ANSI B</source>
- <translation type="unfinished"></translation>
+ <translation>Ledger / ANSI B</translation>
</message>
<message>
<source>Custom</source>
@@ -3217,27 +3203,27 @@ Do you want to delete it anyway?</source>
</message>
<message>
<source>A3 Extra</source>
- <translation type="unfinished"></translation>
+ <translation>A3 Extra</translation>
</message>
<message>
<source>A4 Extra</source>
- <translation type="unfinished"></translation>
+ <translation>A4 Extra</translation>
</message>
<message>
<source>A4 Plus</source>
- <translation type="unfinished"></translation>
+ <translation>A4 Plus</translation>
</message>
<message>
<source>A4 Small</source>
- <translation type="unfinished"></translation>
+ <translation>A4 Small</translation>
</message>
<message>
<source>A5 Extra</source>
- <translation type="unfinished"></translation>
+ <translation>A5 Extra</translation>
</message>
<message>
<source>B5 Extra</source>
- <translation type="unfinished"></translation>
+ <translation>B5 Extra</translation>
</message>
<message>
<source>JIS B0</source>
@@ -3357,7 +3343,7 @@ Do you want to delete it anyway?</source>
</message>
<message>
<source>Postcard</source>
- <translation type="unfinished"></translation>
+ <translation>明信片</translation>
</message>
<message>
<source>Double Postcard</source>
@@ -6089,7 +6075,7 @@ Please turn one of those options off.</source>
<message>
<source>alert message</source>
<extracomment>Role of an accessible object</extracomment>
- <translation>提示訊息</translation>
+ <translation>警告訊息</translation>
</message>
<message>
<source>frame</source>
@@ -6196,7 +6182,7 @@ Role of an accessible object</extracomment>
<message>
<source>help balloon</source>
<extracomment>Role of an accessible object</extracomment>
- <translation>求助氣球</translation>
+ <translation>說明提示框</translation>
</message>
<message>
<source>assistant</source>
@@ -6216,12 +6202,12 @@ Role of an accessible object</extracomment>
<message>
<source>tree</source>
<extracomment>Role of an accessible object</extracomment>
- <translation>樹</translation>
+ <translation>樹狀圖</translation>
</message>
<message>
<source>tree item</source>
<extracomment>Role of an accessible object</extracomment>
- <translation>樹內項目</translation>
+ <translation>樹狀圖項目</translation>
</message>
<message>
<source>page tab</source>
@@ -6236,7 +6222,7 @@ Role of an accessible object</extracomment>
<message>
<source>indicator</source>
<extracomment>Role of an accessible object</extracomment>
- <translation>指示字元</translation>
+ <translation>指示器</translation>
</message>
<message>
<source>graphic</source>
@@ -6401,7 +6387,7 @@ Role of an accessible object</extracomment>
<message>
<source>terminal</source>
<extracomment>Role of an accessible object</extracomment>
- <translation>終端器</translation>
+ <translation>終端機</translation>
</message>
<message>
<source>desktop</source>
@@ -6409,6 +6395,11 @@ Role of an accessible object</extracomment>
<translation>桌面</translation>
</message>
<message>
+ <source>notification</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>通知</translation>
+ </message>
+ <message>
<source>unknown</source>
<extracomment>Role of an accessible object</extracomment>
<translation>未知</translation>
@@ -6608,6 +6599,46 @@ Role of an accessible object</extracomment>
<translation>該端點的憑證已被加入黑名單</translation>
</message>
<message>
+ <source>Unknown error</source>
+ <translation>未知錯誤</translation>
+ </message>
+ <message>
+ <source>TLS initialization failed</source>
+ <translation>TLS 初始化失敗</translation>
+ </message>
+ <message>
+ <source>The TLS/SSL connection has been closed</source>
+ <translation>TLS/SSL 連線已被關閉</translation>
+ </message>
+ <message>
+ <source>Error creating SSL session, %1</source>
+ <translation>建立 SSL 階段時發生錯誤,%1</translation>
+ </message>
+ <message>
+ <source>Error creating SSL session: %1</source>
+ <translation>建立 SSL 階段時發生錯誤:%1</translation>
+ </message>
+ <message>
+ <source>Unable to init SSL Context: %1</source>
+ <translation>無法初始化 SSL 內文:%1</translation>
+ </message>
+ <message>
+ <source>Unable to write data: %1</source>
+ <translation>無法寫入資料:%1</translation>
+ </message>
+ <message>
+ <source>Unable to decrypt data: %1</source>
+ <translation>無法解密資料:%1</translation>
+ </message>
+ <message>
+ <source>Error while reading: %1</source>
+ <translation>讀取時發生錯誤:%1</translation>
+ </message>
+ <message>
+ <source>Error during SSL handshake: %1</source>
+ <translation>SSL 交握時發生錯誤:%1</translation>
+ </message>
+ <message>
<source>No OCSP status response found</source>
<translation>找不到 OCSP 狀態回應</translation>
</message>
@@ -6652,30 +6683,10 @@ Role of an accessible object</extracomment>
<translation>憑證狀態未知</translation>
</message>
<message>
- <source>Unknown error</source>
- <translation>未知錯誤</translation>
- </message>
- <message>
- <source>TLS initialization failed</source>
- <translation>TLS 初始化失敗</translation>
- </message>
- <message>
<source>Attempted to use an unsupported protocol.</source>
<translation>嘗試使用不支援的通訊協定。</translation>
</message>
<message>
- <source>The TLS/SSL connection has been closed</source>
- <translation>TLS/SSL 連線已被關閉</translation>
- </message>
- <message>
- <source>Error creating SSL session, %1</source>
- <translation>建立 SSL 階段時發生錯誤,%1</translation>
- </message>
- <message>
- <source>Error creating SSL session: %1</source>
- <translation>建立 SSL 階段時發生錯誤:%1</translation>
- </message>
- <message>
<source>Server-side QSslSocket does not support OCSP stapling</source>
<translation>伺服器端的 QSslSocket 不支援 OCSP 裝訂 (stapling)</translation>
</message>
@@ -6688,26 +6699,6 @@ Role of an accessible object</extracomment>
<translation>客戶端的 socket 未傳送 OCSP 回應</translation>
</message>
<message>
- <source>Unable to init SSL Context: %1</source>
- <translation>無法初始化 SSL 內文:%1</translation>
- </message>
- <message>
- <source>Unable to write data: %1</source>
- <translation>無法寫入資料:%1</translation>
- </message>
- <message>
- <source>Unable to decrypt data: %1</source>
- <translation>無法解密資料:%1</translation>
- </message>
- <message>
- <source>Error while reading: %1</source>
- <translation>讀取時發生錯誤:%1</translation>
- </message>
- <message>
- <source>Error during SSL handshake: %1</source>
- <translation>SSL 交握時發生錯誤:%1</translation>
- </message>
- <message>
<source>Failed to decode OCSP response</source>
<translation>無法解碼 OCSP 回應</translation>
</message>
@@ -7551,4 +7542,18 @@ The minimum Direct2D version required is %1. The Direct2D version on this system
<translation>無效的字元參考。</translation>
</message>
</context>
+<context>
+ <name>Print Device Input Slot</name>
+ <message>
+ <source>Automatic</source>
+ <translation>自動</translation>
+ </message>
+</context>
+<context>
+ <name>Print Device Output Bin</name>
+ <message>
+ <source>Automatic</source>
+ <translation>自動</translation>
+ </message>
+</context>
</TS>
diff --git a/translations/qtdeclarative_de.ts b/translations/qtdeclarative_de.ts
index cc7b3df..57e3040 100644
--- a/translations/qtdeclarative_de.ts
+++ b/translations/qtdeclarative_de.ts
@@ -933,6 +933,10 @@
<translation>Falscher Zugriff auf gruppierte Eigenschaft</translation>
</message>
<message>
+ <source>Invalid grouped property access: Property &quot;%1&quot; with type &quot;%2&quot;, which is not a value type</source>
+ <translation>Falscher Zugriff auf gruppierte Eigenschaft &quot;%1&quot; des Typs &quot;%2&quot;, der kein Wert-Typ ist</translation>
+ </message>
+ <message>
<source>Cannot assign to non-existent default property</source>
<translation>Es kann keine Zuweisung an eine nicht existierende Vorgabe-Eigenschaft erfolgen</translation>
</message>
@@ -953,6 +957,10 @@
<translation>Ungültige Zuweisung bei Eigenschaft: Unbekannter Aufzählungswert</translation>
</message>
<message>
+ <source> - Assigning null to incompatible properties in QML is deprecated. This will become a compile error in future versions of Qt.</source>
+ <translation> - Die Zuweisung von null zu inkompatiblen Eigenschaften in QML ist überholt (deprecated). In zukünftigen Versionen von Qt wird dies einen Compile-Fehler verursachen.</translation>
+ </message>
+ <message>
<source>Invalid property assignment: string expected</source>
<translation>Ungültige Zuweisung bei Eigenschaft: Es wird eine Zeichenkette erwartet</translation>
</message>
@@ -1578,31 +1586,6 @@ Installieren Sie einen Treiber, der OpenGL 2.0 oder neuer bereitstellt, oder ste
</message>
</context>
<context>
- <name>QQuickXmlListModel</name>
- <message>
- <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
- <translation>&quot;%1&quot; ist bereits als Name einer Rolle vergeben und wird daher deaktiviert.</translation>
- </message>
- <message>
- <source>invalid query: &quot;%1&quot;</source>
- <translation>Ungültige Abfrage: &quot;%1&quot;</translation>
- </message>
-</context>
-<context>
- <name>QQuickXmlListModelRole</name>
- <message>
- <source>An XmlRole query must not start with &apos;/&apos;</source>
- <translation>Eine XmlRole-Abfrage darf nicht mit &apos;/&apos; beginnen</translation>
- </message>
-</context>
-<context>
- <name>QQuickXmlRoleList</name>
- <message>
- <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
- <translation>Eine XmlListModel-Abfrage muss mit &apos;/&apos; oder &quot;//&quot; beginnen</translation>
- </message>
-</context>
-<context>
<name>SignalHandlerConverter</name>
<message>
<source>Non-existent attached object</source>
diff --git a/translations/qtdeclarative_ru.ts b/translations/qtdeclarative_ru.ts
index 7c6cd75..e042e7f 100644
--- a/translations/qtdeclarative_ru.ts
+++ b/translations/qtdeclarative_ru.ts
@@ -959,6 +959,10 @@
<translation>Некорректное присваивание свойства: неизвестное перечисление</translation>
</message>
<message>
+ <source> - Assigning null to incompatible properties in QML is deprecated. This will become a compile error in future versions of Qt.</source>
+ <translation> - Присваивание null несовместимым свойствам в QML устарело. Оно станет ошибкой компиляции в будущих версиях Qt.</translation>
+ </message>
+ <message>
<source>Invalid property assignment: string expected</source>
<translation>Некорректное присваивание свойства: требуется значение типа «string»</translation>
</message>
@@ -1071,8 +1075,8 @@
<translation>Невозможно назначить объект свойству «%1» списка</translation>
</message>
<message>
- <source>Unexpected object assignment for property &quot;%1&quot;</source>
- <translation>Неожиданное присваивание объекта для свойства «%1»</translation>
+ <source>Can not assign value of type &quot;%1&quot; to property &quot;%2&quot;, expecting an object</source>
+ <translation>Невозможно присвоить значение типа «%1» свойству «%2», требуется объект</translation>
</message>
<message>
<source>Cannot assign object of type &quot;%1&quot; to property of type &quot;%2&quot; as the former is neither the same as the latter nor a sub-class of it.</source>
diff --git a/translations/qtlocation_de.ts b/translations/qtlocation_de.ts
index 34cc1c9..6a8717e 100644
--- a/translations/qtlocation_de.ts
+++ b/translations/qtlocation_de.ts
@@ -71,6 +71,17 @@ Bitte besuchen Sie https://developers.arcgis.com/authentication/accessing-arcgis
</message>
</context>
<context>
+ <name>QDeclarativeNavigator</name>
+ <message>
+ <source>Plugin does not support navigation.</source>
+ <translation>Das Plugin unterstützt keine Navigation.</translation>
+ </message>
+ <message>
+ <source>Failed to create a navigator object.</source>
+ <translation>Es konnte kein Navigator-Objekt erstellt werden.</translation>
+ </message>
+</context>
+<context>
<name>QGeoCodeReplyMapbox</name>
<message>
<source>Response parse error</source>
@@ -540,6 +551,7 @@ Bitte besuchen Sie https://developers.arcgis.com/authentication/accessing-arcgis
</message>
<message>
<source>Head %1</source>
+ <extracomment>%1 is &quot;North&quot;, &quot;South&quot;, &quot;East&quot; or &quot;West&quot;</extracomment>
<translation>Fahren Sie %1</translation>
</message>
<message>
@@ -914,6 +926,7 @@ Bitte besuchen Sie https://developers.arcgis.com/authentication/accessing-arcgis
</message>
<message>
<source> and continue straight</source>
+ <extracomment>This string will be prepended with lane instructions. E.g., &quot;Use the left or the right lane and continue straight&quot;</extracomment>
<translation> und fahren Sie geradeaus weiter</translation>
</message>
<message>
diff --git a/translations/qtlocation_ru.ts b/translations/qtlocation_ru.ts
index f3bf6b4..267927c 100644
--- a/translations/qtlocation_ru.ts
+++ b/translations/qtlocation_ru.ts
@@ -71,6 +71,17 @@ Please visit https://developers.arcgis.com/authentication/accessing-arcgis-onlin
</message>
</context>
<context>
+ <name>QDeclarativeNavigator</name>
+ <message>
+ <source>Plugin does not support navigation.</source>
+ <translation>Модуль не поддерживает навигацию.</translation>
+ </message>
+ <message>
+ <source>Failed to create a navigator object.</source>
+ <translation>Не удалось создать объект navigator.</translation>
+ </message>
+</context>
+<context>
<name>QGeoCodeReplyMapbox</name>
<message>
<source>Response parse error</source>
diff --git a/translations/qtmultimedia_ru.ts b/translations/qtmultimedia_ru.ts
index 6c399d2..6898b27 100644
--- a/translations/qtmultimedia_ru.ts
+++ b/translations/qtmultimedia_ru.ts
@@ -215,10 +215,6 @@
<context>
<name>QAndroidCameraSession</name>
<message>
- <source>Camera cannot be started without a viewfinder.</source>
- <translation>Невозможно запустить камеру без видоискателя.</translation>
- </message>
- <message>
<source>Camera not ready</source>
<translation>Камера не готова</translation>
</message>
diff --git a/translations/qtwebengine_de.ts b/translations/qtwebengine_de.ts
index 9b8c8b5..9a7844a 100644
--- a/translations/qtwebengine_de.ts
+++ b/translations/qtwebengine_de.ts
@@ -316,10 +316,6 @@
<translation>Es kann keine separate Instanz der Klasse WebEngineNewViewRequest erstellt werden</translation>
</message>
<message>
- <source>Cannot create a separate instance of WebEngineSettings</source>
- <translation>Es kann keine separate Instanz der Klasse WebEngineSettings erstellt werden</translation>
- </message>
- <message>
<source>Cannot create a separate instance of NavigationHistory</source>
<translation>Es kann keine separate Instanz der Klasse NavigationHistory erstellt werden</translation>
</message>
diff --git a/translations/qtwebengine_ru.ts b/translations/qtwebengine_ru.ts
index a38b8ee..8b1c41b 100644
--- a/translations/qtwebengine_ru.ts
+++ b/translations/qtwebengine_ru.ts
@@ -338,20 +338,31 @@
<translation>Покинуть страницу? Сделанные изменения могут быть утеряны.</translation>
</message>
<message>
- <source>&amp;Back</source>
- <translation>&amp;Назад</translation>
+ <source>Select folder to upload</source>
+ <translation>Выберите каталог для передачи</translation>
</message>
+</context>
+<context>
+ <name>QtWebEngineCore</name>
<message>
- <source>&amp;Forward</source>
- <translation>&amp;Вперёд</translation>
+ <source>Javascript Alert - %1</source>
+ <translation>Извещение Javascript - %1</translation>
</message>
<message>
- <source>&amp;Reload</source>
- <translation>&amp;Перезагрузить</translation>
+ <source>Javascript Confirm - %1</source>
+ <translation>Подтверждение Javascript - %1</translation>
</message>
<message>
- <source>Select folder to upload</source>
- <translation>Выберите каталог для передачи</translation>
+ <source>Javascript Prompt - %1</source>
+ <translation>Приглашение Javascript - %1</translation>
+ </message>
+ <message>
+ <source>Are you sure you want to leave this page?</source>
+ <translation>Покинуть страницу?</translation>
+ </message>
+ <message>
+ <source>Changes that you made may not be saved.</source>
+ <translation>Внесённые изменения могут быть утеряны.</translation>
</message>
</context>
<context>
@@ -365,10 +376,6 @@
<translation>Невозможно создать отдельный экземпляр WebEngineNewViewRequest</translation>
</message>
<message>
- <source>Cannot create a separate instance of WebEngineSettings</source>
- <translation>Невозможно создать отдельный экземпляр WebEngineSettings</translation>
- </message>
- <message>
<source>Cannot create a separate instance of NavigationHistory</source>
<translation>Невозможно создать отдельный экземпляр NavigationHistory</translation>
</message>
@@ -505,26 +512,6 @@
<source>Enter username and password for &quot;%1&quot; at %2://%3</source>
<translation>Введите имя пользователя и пароль для «%1» в %2://%3</translation>
</message>
- <message>
- <source>Javascript Alert - %1</source>
- <translation>Извещение Javascript - %1</translation>
- </message>
- <message>
- <source>Javascript Confirm - %1</source>
- <translation>Подтверждение Javascript - %1</translation>
- </message>
- <message>
- <source>Javascript Prompt - %1</source>
- <translation>Приглашение Javascript - %1</translation>
- </message>
- <message>
- <source>Are you sure you want to leave this page?</source>
- <translation>Покинуть страницу?</translation>
- </message>
- <message>
- <source>Changes that you made may not be saved.</source>
- <translation>Внесённые изменения могут быть утеряны.</translation>
- </message>
</context>
<context>
<name>WebContentsAdapter</name>
diff --git a/translations/qtxmlpatterns_ru.ts b/translations/qtxmlpatterns_ru.ts
index d8073fe..7588006 100644
--- a/translations/qtxmlpatterns_ru.ts
+++ b/translations/qtxmlpatterns_ru.ts
@@ -860,8 +860,8 @@
<translation>Виды типов элементов %1 должны быть или атомарными, или объединениями.</translation>
</message>
<message>
- <source>Variety of member types of %1 must be atomic.</source>
- <translation>Виды внутренних типов %1 должны быть атомарными.</translation>
+ <source>Variety of member types of %1 must be atomic or union.</source>
+ <translation>Виды внутренних типов %1 должны быть атомарными или объединениями.</translation>
</message>
<message>
<source>%1 is not allowed to derive from %2 by list as the latter defines it as final.</source>