summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf2
-rw-r--r--translations/assistant_da.ts30
-rw-r--r--translations/assistant_de.ts10
-rw-r--r--translations/assistant_ru.ts23
-rw-r--r--translations/designer_da.ts77
-rw-r--r--translations/designer_de.ts23
-rw-r--r--translations/designer_ru.ts205
-rw-r--r--translations/linguist_da.ts137
-rw-r--r--translations/linguist_de.ts119
-rw-r--r--translations/linguist_ru.ts261
-rw-r--r--translations/qt_help_da.ts84
-rw-r--r--translations/qt_help_de.ts80
-rw-r--r--translations/qt_help_ru.ts145
-rw-r--r--translations/qtbase_ca.ts75
-rw-r--r--translations/qtbase_da.ts193
-rw-r--r--translations/qtbase_de.ts179
-rw-r--r--translations/qtbase_fi.ts177
-rw-r--r--translations/qtbase_ru.ts845
-rw-r--r--translations/qtconnectivity_da.ts159
-rw-r--r--translations/qtconnectivity_de.ts17
-rw-r--r--translations/qtconnectivity_ru.ts81
-rw-r--r--translations/qtdeclarative_da.ts145
-rw-r--r--translations/qtdeclarative_de.ts101
-rw-r--r--translations/qtdeclarative_fi.ts95
-rw-r--r--translations/qtdeclarative_ru.ts177
-rw-r--r--translations/qtlocation_da.ts41
-rw-r--r--translations/qtlocation_de.ts43
-rw-r--r--translations/qtlocation_ru.ts838
-rw-r--r--translations/qtmultimedia_da.ts44
-rw-r--r--translations/qtmultimedia_de.ts40
-rw-r--r--translations/qtmultimedia_fi.ts40
-rw-r--r--translations/qtmultimedia_ru.ts171
-rw-r--r--translations/qtquick1_da.ts8
-rw-r--r--translations/qtquickcontrols2_da.ts36
-rw-r--r--translations/qtquickcontrols_da.ts302
-rw-r--r--translations/qtwebengine_ru.ts261
-rw-r--r--translations/qtwebsockets_de.ts4
-rw-r--r--translations/qtwebsockets_ru.ts4
-rw-r--r--translations/qtxmlpatterns_ru.ts20
39 files changed, 3856 insertions, 1436 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 8191d2f..76c202a 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.9.7
+MODULE_VERSION = 5.11.2
diff --git a/translations/assistant_da.ts b/translations/assistant_da.ts
index bcd25ce..735e274 100644
--- a/translations/assistant_da.ts
+++ b/translations/assistant_da.ts
@@ -15,10 +15,8 @@
<translation>Advarsel</translation>
</message>
<message>
- <source>Unable to launch external application.
-</source>
- <translation>Kunne ikke starte eksternt program.
-</translation>
+ <source>Unable to launch external application.</source>
+ <translation>Kunne ikke starte eksternt program.</translation>
</message>
<message>
<source>OK</source>
@@ -326,23 +324,23 @@ Reason:
</source>
<translation>Brug: assistant [valgmuligheder]
--collectionFile fil Bruger den specificerede samlingsfil
+-collectionFile fil Bruger den angivne samlingsfil
i stedet for den som er standard
-showUrl url Viser dokumentet med URL&apos;en.
-enableRemoteControl Aktiverer fjernstyring af Assistant.
--show widget Viser den specificerede dock-widget
+-show widget Viser den angivne dock-widget
som kan være &quot;contents&quot;, &quot;index&quot;,
&quot;bookmarks&quot; eller &quot;search&quot;.
--activate widget Aktiverer den specificerede dock-widget
+-activate widget Aktiverer den angivne dock-widget
som kan være &quot;contents&quot;, &quot;index&quot;,
&quot;bookmarks&quot; eller &quot;search&quot;.
--hide widget Skjuler den specificerede dock-widget
+-hide widget Skjuler den angivne dock-widget
som kan være &quot;contents&quot;, &quot;index&quot;
&quot;bookmarks&quot; eller &quot;search&quot;.
--register hjælp-Fil Registrerer den specificerede hjælp-fil
- (.qch) i den angivne samlingsfil.
--unregister hjælp-Fil Afregistrerer den specificerede hjælp-fil
- (.qch) fra den angivne samlingsfil.
+-register hjælp-Fil Registrerer den angivne hjælp-fil
+ (.qch) i den givne samlingsfil.
+-unregister hjælp-Fil Afregistrerer den angivne hjælp-fil
+ (.qch) fra den givne samlingsfil.
-setCurrentFilter filter Sæt filteret som det aktive filter.
-remove-search-index Fjerner fuldtekst-søgeindekset.
-rebuild-search-index Forældet. Brug i stedet -remove-search-index.
@@ -522,8 +520,8 @@ Reason:
<translation>Fejl 404...</translation>
</message>
<message>
- <source>The page could not be found!</source>
- <translation>Siden blev ikke fundet!</translation>
+ <source>The page could not be found</source>
+ <translation>Siden blev ikke fundet</translation>
</message>
<message>
<source>Please make sure that you have all documentation sets installed.</source>
@@ -823,7 +821,7 @@ Reason:
</message>
<message>
<source>The specified file is not a valid Qt Help File!</source>
- <translation>Den specificerede fil er ikke en gyldig Qt-hjælp-fil!</translation>
+ <translation>Den angivne fil er ikke en gyldig Qt-hjælp-fil!</translation>
</message>
<message>
<source>Remove Documentation</source>
@@ -934,7 +932,7 @@ Reason:
</message>
<message>
<source>Current Page</source>
- <translation>Aktuelle side</translation>
+ <translation>Nuværende side</translation>
</message>
<message>
<source>Blank Page</source>
diff --git a/translations/assistant_de.ts b/translations/assistant_de.ts
index a534970..eded228 100644
--- a/translations/assistant_de.ts
+++ b/translations/assistant_de.ts
@@ -15,10 +15,8 @@
<translation>Achtung</translation>
</message>
<message>
- <source>Unable to launch external application.
-</source>
- <translation>Fehler beim Starten der externen Anwendung.
-</translation>
+ <source>Unable to launch external application.</source>
+ <translation>Fehler beim Starten der externen Anwendung.</translation>
</message>
<message>
<source>OK</source>
@@ -553,8 +551,8 @@ Grund:
<translation>Fehler 404...</translation>
</message>
<message>
- <source>The page could not be found!</source>
- <translation>Die Seite konnte nicht gefunden werden!</translation>
+ <source>The page could not be found</source>
+ <translation>Die Seite konnte nicht gefunden werden</translation>
</message>
<message>
<source>Please make sure that you have all documentation sets installed.</source>
diff --git a/translations/assistant_ru.ts b/translations/assistant_ru.ts
index 7865153..3816644 100644
--- a/translations/assistant_ru.ts
+++ b/translations/assistant_ru.ts
@@ -15,10 +15,8 @@
<translation>Предупреждение</translation>
</message>
<message>
- <source>Unable to launch external application.
-</source>
- <translation>Невозможно запустить внешнее приложение.
-</translation>
+ <source>Unable to launch external application.</source>
+ <translation>Невозможно запустить внешнее приложение.</translation>
</message>
<message>
<source>OK</source>
@@ -32,10 +30,6 @@
<translation>Ошибка регистрации файла документации «%1»: %2</translation>
</message>
<message>
- <source>Error: %1</source>
- <translation>Ошибка: %1</translation>
- </message>
- <message>
<source>Could not register documentation file
%1
@@ -333,7 +327,9 @@ Reason:
file.
-setCurrentFilter filter Set the filter as the active filter.
-remove-search-index Removes the full text search index.
--rebuild-search-index Re-builds the full text search index (potentially slow).
+-rebuild-search-index Obsolete. Use -remove-search-index instead.
+ Removes the full text search index.
+ It will be rebuilt on next Assistant run.
-quiet Does not display any error or
status message.
-help Displays this help.
@@ -359,8 +355,9 @@ Reason:
справки (.qch) в данном файле коллекции.
-setCurrentFilter фильтр Активация указанного фильтра.
-remove-search-index Удаление индекса полнотекстового поиска.
--rebuild-search-index Пересоздание индекса полнотекстового поиска
- (потенциально медленно).
+-rebuild-search-index Устарело. Используйте -remove-search-index.
+ Удаление индекса полнотекстового поиска.
+ Он будет пересоздан при следующем запуске.
-quiet Не отображать сообщения об ошибках и состояниях.
-help Показать эту справку.
</translation>
@@ -551,8 +548,8 @@ Reason:
<translation>Ошибка 404...</translation>
</message>
<message>
- <source>The page could not be found!</source>
- <translation>Не удалось найти страницу!</translation>
+ <source>The page could not be found</source>
+ <translation>Не удалось найти страницу</translation>
</message>
<message>
<source>Please make sure that you have all documentation sets installed.</source>
diff --git a/translations/designer_da.ts b/translations/designer_da.ts
index e69a27e..9b950e0 100644
--- a/translations/designer_da.ts
+++ b/translations/designer_da.ts
@@ -132,7 +132,7 @@
</message>
<message>
<source>Remove current font file</source>
- <translation>Fjern aktuelle skrifttypefil</translation>
+ <translation>Fjern nuværende skrifttypefil</translation>
</message>
<message>
<source>Remove all font files</source>
@@ -958,6 +958,14 @@
<source>&amp;Author</source>
<translation>&amp;Forfatter</translation>
</message>
+ <message>
+ <source>Translations</source>
+ <translation>Oversættelser</translation>
+ </message>
+ <message>
+ <source>ID-based</source>
+ <translation>ID-baseret</translation>
+ </message>
</context>
<context>
<name>IconSelector</name>
@@ -1431,7 +1439,7 @@ Vil du erstatte den?</translation>
</message>
<message>
<source>Current Widget Help</source>
- <translation>Aktuelt widget hjælp</translation>
+ <translation>Nuværende widget hjælp</translation>
</message>
<message>
<source>About Plugins</source>
@@ -1750,7 +1758,7 @@ Vil du prøve igen?</translation>
<source>The container extension of the widget &apos;%1&apos; (%2) returned a widget not managed by Designer &apos;%3&apos; (%4) when queried for page #%5.
Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget.</source>
<translation>Beholder-udvidelsen af widget&apos;en &apos;%1&apos; (%2) returnerede en widget som ikke håndteres af Designer &apos;%3&apos; (%4) ved forespørgsel af side #%5.
-Beholder-sider bør kun tilføjes ved at specificere dem i XML returnerede af domXml()-metoden af den brugerdefineret widget.</translation>
+Beholder-sider bør kun tilføjes ved at angive dem i XML returnerede af domXml()-metoden af den brugerdefineret widget.</translation>
</message>
<message>
<source>Unexpected element &lt;%1&gt;</source>
@@ -1780,6 +1788,13 @@ Beholder-sider bør kun tilføjes ved at specificere dem i XML returnerede af do
</message>
</context>
<context>
+ <name>QDesignerTaskMenu</name>
+ <message>
+ <source>no signals available</source>
+ <translation>ingen tilgængelige signaler</translation>
+ </message>
+</context>
+<context>
<name>QDesignerToolWindow</name>
<message>
<source>Property Editor</source>
@@ -1944,11 +1959,11 @@ Beholder-sider bør kun tilføjes ved at specificere dem i XML returnerede af do
</message>
<message>
<source>Before Current Page</source>
- <translation>Før aktuelle side</translation>
+ <translation>Før nuværende side</translation>
</message>
<message>
<source>After Current Page</source>
- <translation>Efter aktuelle side</translation>
+ <translation>Efter nuværende side</translation>
</message>
<message>
<source>Change Page Order...</source>
@@ -1986,11 +2001,11 @@ Beholder-sider bør kun tilføjes ved at specificere dem i XML returnerede af do
</message>
<message>
<source>Before Current Page</source>
- <translation>Før aktuelle side</translation>
+ <translation>Før nuværende side</translation>
</message>
<message>
<source>After Current Page</source>
- <translation>Efter aktuelle side</translation>
+ <translation>Efter nuværende side</translation>
</message>
<message>
<source>Page %1 of %2</source>
@@ -2009,11 +2024,11 @@ Beholder-sider bør kun tilføjes ved at specificere dem i XML returnerede af do
</message>
<message>
<source>Before Current Page</source>
- <translation>Før aktuelle side</translation>
+ <translation>Før nuværende side</translation>
</message>
<message>
<source>After Current Page</source>
- <translation>Efter aktuelle side</translation>
+ <translation>Efter nuværende side</translation>
</message>
<message>
<source>Change Page Order...</source>
@@ -2201,7 +2216,7 @@ Beholder-sider bør kun tilføjes ved at specificere dem i XML returnerede af do
</message>
<message>
<source>Strikeout</source>
- <translation>Udstreget</translation>
+ <translation>Gennemstreget</translation>
</message>
<message>
<source>Kerning</source>
@@ -2323,7 +2338,7 @@ Beholder-sider bør kun tilføjes ved at specificere dem i XML returnerede af do
</message>
<message>
<source>Current stop&apos;s color</source>
- <translation>Aktuelle stop&apos;s farve</translation>
+ <translation>Nuværende stop&apos;s farve</translation>
</message>
<message>
<source>Show HSV specification</source>
@@ -2343,7 +2358,7 @@ Beholder-sider bør kun tilføjes ved at specificere dem i XML returnerede af do
</message>
<message>
<source>Current stop&apos;s position</source>
- <translation>Aktuelle stop&apos;s placering</translation>
+ <translation>Nuværende stop&apos;s placering</translation>
</message>
<message>
<source>%</source>
@@ -2715,11 +2730,11 @@ Vil du erstatte den?</translation>
</message>
<message>
<source>&lt;p&gt;&lt;b&gt;Warning:&lt;/b&gt; The file&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;is outside of the current resource file&apos;s parent directory.&lt;/p&gt;</source>
- <translation>&lt;p&gt;&lt;b&gt;Advarsel:&lt;/b&gt; Filen&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;er udenfor den aktuelle ressourcefils forældre mappe.&lt;/p&gt;</translation>
+ <translation>&lt;p&gt;&lt;b&gt;Advarsel:&lt;/b&gt; Filen&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;er udenfor den nuværende ressourcefils forældre mappe.&lt;/p&gt;</translation>
</message>
<message>
<source>&lt;p&gt;To resolve the issue, press:&lt;/p&gt;&lt;table&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Copy&lt;/th&gt;&lt;td&gt;to copy the file to the resource file&apos;s parent directory.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Copy As...&lt;/th&gt;&lt;td&gt;to copy the file into a subdirectory of the resource file&apos;s parent directory.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Keep&lt;/th&gt;&lt;td&gt;to use its current location.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
- <translation>&lt;p&gt;Løs problemet ved at trykke på:&lt;/p&gt;&lt;table&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Kopér&lt;/th&gt;&lt;td&gt;for at kopiere filen til ressourcefilens forældermappe.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Kopiér som...&lt;/th&gt;&lt;td&gt;for at kopiere filen ind i en undermappe af ressourcefilens forældermappe.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Behold&lt;/th&gt;&lt;td&gt;for at bruge dens aktuelle placering.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
+ <translation>&lt;p&gt;Løs problemet ved at trykke på:&lt;/p&gt;&lt;table&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Kopér&lt;/th&gt;&lt;td&gt;for at kopiere filen til ressourcefilens forældermappe.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Kopiér som...&lt;/th&gt;&lt;td&gt;for at kopiere filen ind i en undermappe af ressourcefilens forældermappe.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th align=&quot;left&quot;&gt;Behold&lt;/th&gt;&lt;td&gt;for at bruge dens nuværende placering.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
</message>
<message>
<source>Add Files</source>
@@ -2761,7 +2776,7 @@ Dette kunne f.eks. være en sprogendelse såsom &quot;_da&quot;.</translation>
</message>
<message>
<source>&lt;p&gt;The selected file:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;is outside of the current resource file&apos;s directory:&lt;/p&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Please select another path within this directory.&lt;p&gt;</source>
- <translation>&lt;p&gt;Den valgte fil:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;er udenfor den aktuelle ressourcefils mappe:&lt;/p&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Vælg venligst en anden sti inden i denne mappe.&lt;p&gt;</translation>
+ <translation>&lt;p&gt;Den valgte fil:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;er udenfor den nuværende ressourcefils mappe:&lt;/p&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Vælg venligst en anden sti inden i denne mappe.&lt;p&gt;</translation>
</message>
<message>
<source>Could not overwrite %1.</source>
@@ -3025,7 +3040,7 @@ til
</message>
<message>
<source>Current Toolbar Actions</source>
- <translation>Aktuelle værktøjslinjehandlinger</translation>
+ <translation>Nuværende værktøjslinjehandlinger</translation>
</message>
<message>
<source>Custom Toolbar</source>
@@ -3242,7 +3257,7 @@ Vil du overskrive skabelonen?</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>Filen indeholder en brugerdefineret widget &apos;%1&apos; hvis grundklasse (%2) er forskellig fra den aktuelle indtastning i widget-databasen (%3). Widget-databasen er efterladt uændret.</translation>
+ <translation>Filen indeholder en brugerdefineret widget &apos;%1&apos; hvis grundklasse (%2) er forskellig fra den nuværende indtastning i widget-databasen (%3). Widget-databasen er efterladt uændret.</translation>
</message>
</context>
<context>
@@ -3577,11 +3592,11 @@ Vil du overskrive skabelonen?</translation>
</message>
<message>
<source>Insert Page Before Current Page</source>
- <translation>Indsæt side før aktuelle side</translation>
+ <translation>Indsæt side før nuværende side</translation>
</message>
<message>
<source>Insert Page After Current Page</source>
- <translation>Indsæt side efter aktuelle side</translation>
+ <translation>Indsæt side efter nuværende side</translation>
</message>
<message>
<source>Add Subwindow</source>
@@ -3632,6 +3647,10 @@ Vil du overskrive skabelonen?</translation>
<translation>kommentar</translation>
</message>
<message>
+ <source>id</source>
+ <translation>id</translation>
+ </message>
+ <message>
<source>AlignLeft</source>
<translation>Juster til venstre</translation>
</message>
@@ -4107,7 +4126,7 @@ Vil du overskrive skabelonen?</translation>
</message>
<message>
<source>Preview current form</source>
- <translation>Forhåndsvis aktuel udformning</translation>
+ <translation>Forhåndsvis nuværende udformning</translation>
</message>
<message>
<source>Form &amp;Settings...</source>
@@ -4195,7 +4214,7 @@ Vil du overskrive skabelonen?</translation>
</message>
<message>
<source>Input icon name from the current theme:</source>
- <translation>Input ikonnavn fra det aktuelle tema:</translation>
+ <translation>Input ikonnavn fra det nuværende tema:</translation>
</message>
</context>
<context>
@@ -4393,7 +4412,7 @@ Vil du overskrive skabelonen?</translation>
<message>
<source>The current object already has a property named &apos;%1&apos;.
Please select another, unique one.</source>
- <translation>Den aktuelle objekt har allerede en egenskab med navnet &apos;%1&apos;.
+ <translation>Det nuværende objekt har allerede en egenskab med navnet &apos;%1&apos;.
Vælg venligst et andet, unikt et.</translation>
</message>
<message>
@@ -4506,7 +4525,7 @@ Vælg venligst et andet navn.</translation>
<name>qdesigner_internal::ObjectInspector</name>
<message>
<source>Change Current Page</source>
- <translation>Skift aktuelle side</translation>
+ <translation>Skift nuværende side</translation>
</message>
<message>
<source>&amp;Find in Text...</source>
@@ -4959,7 +4978,7 @@ Klasse: %2</translation>
</message>
<message>
<source>The specified qrc file &lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;could not be found. Do you want to update the file location?&lt;/p&gt;</source>
- <translation>Den specificerede QRC-fil&lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;blev ikke fundet. Vil du opdatere filens placering?&lt;/p&gt;</translation>
+ <translation>Den angivne QRC-fil&lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;blev ikke fundet. Vil du opdatere filens placering?&lt;/p&gt;</translation>
</message>
<message>
<source>New location for %1</source>
@@ -5084,10 +5103,6 @@ Klasse: %2</translation>
<source>Edit WhatsThis</source>
<translation>Rediger WhatsThis</translation>
</message>
- <message>
- <source>no signals available</source>
- <translation>ingen tilgængelige signaler</translation>
- </message>
<message numerus="yes">
<source>Set size constraint on %n widget(s)</source>
<translation>
@@ -5105,13 +5120,13 @@ Klasse: %2</translation>
<message>
<source>A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4
%5</source>
- <translation>En parse-fejl opstod på linje %1, kolonne %2 i XML-koden specificeret for widget&apos;en %3: %4
+ <translation>En parse-fejl opstod på linje %1, kolonne %2 i XML-koden angivet for widget&apos;en %3: %4
%5</translation>
</message>
<message>
<source>The XML code specified for the widget %1 does not contain any widget elements.
%2</source>
- <translation>Den specificerde XML-kode for widget&apos;en %1 indeholder ikke nogen widget-elementer.
+ <translation>Den angivne XML-kode for widget&apos;en %1 indeholder ikke nogen widget-elementer.
%2</translation>
</message>
<message>
@@ -5696,7 +5711,7 @@ Klasse: %2</translation>
</message>
<message>
<source>The current page of the container &apos;%1&apos; (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget.</source>
- <translation>Den aktuelle side af beholderen &apos;%1&apos; (%2) kunne ikke bestemmes under oprettelsen af et layout. Dette indikere en uoverensstemmelse i brugerfladefilen, sandsynligvis et layout konstrueret på en beholder-widget.</translation>
+ <translation>Den nuværende side af beholderen &apos;%1&apos; (%2) kunne ikke bestemmes under oprettelsen af et layout. Dette indikere en uoverensstemmelse i brugerfladefilen, sandsynligvis et layout konstrueret på en beholder-widget.</translation>
</message>
<message>
<source>Attempt to add a layout to a widget &apos;%1&apos; (%2) which already has an unmanaged layout of type %3.
diff --git a/translations/designer_de.ts b/translations/designer_de.ts
index 9359558..27fcd07 100644
--- a/translations/designer_de.ts
+++ b/translations/designer_de.ts
@@ -961,6 +961,14 @@
<source>Grid</source>
<translation>Raster</translation>
</message>
+ <message>
+ <source>Translations</source>
+ <translation>Übersetzungen</translation>
+ </message>
+ <message>
+ <source>ID-based</source>
+ <translation>ID-basiert</translation>
+ </message>
</context>
<context>
<name>IconSelector</name>
@@ -1782,6 +1790,13 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier
</message>
</context>
<context>
+ <name>QDesignerTaskMenu</name>
+ <message>
+ <source>no signals available</source>
+ <translation>Es sind keine Signale vorhanden</translation>
+ </message>
+</context>
+<context>
<name>QDesignerToolWindow</name>
<message>
<source>Property Editor</source>
@@ -3622,6 +3637,10 @@ Möchten Sie sie überschreiben?</translation>
<context>
<name>qdesigner_internal::DesignerPropertyManager</name>
<message>
+ <source>id</source>
+ <translation>id</translation>
+ </message>
+ <message>
<source>AlignLeft</source>
<translation>Linksbündig ausrichten</translation>
</message>
@@ -5012,10 +5031,6 @@ Klasse: %2</translation>
<source>Go to slot...</source>
<translation>Slot anzeigen...</translation>
</message>
- <message>
- <source>no signals available</source>
- <translation>Es sind keine Signale vorhanden</translation>
- </message>
<message numerus="yes">
<source>Set size constraint on %n widget(s)</source>
<translation>
diff --git a/translations/designer_ru.ts b/translations/designer_ru.ts
index 69b3968..c132af9 100644
--- a/translations/designer_ru.ts
+++ b/translations/designer_ru.ts
@@ -853,6 +853,22 @@
<source>Default Grid</source>
<translation>Сетка по умолчанию</translation>
</message>
+ <message>
+ <source>Object Naming Convention</source>
+ <translation>Правило именования объектов</translation>
+ </message>
+ <message>
+ <source>Naming convention used for generating action object names from their text</source>
+ <translation>Правило именования используется для создания имён объектов QAction по их тексту</translation>
+ </message>
+ <message>
+ <source>Camel Case</source>
+ <translation>Camel Case</translation>
+ </message>
+ <message>
+ <source>Underscore</source>
+ <translation>С подчёркиваниями</translation>
+ </message>
</context>
<context>
<name>FormLayoutRowDialog</name>
@@ -908,11 +924,11 @@
</message>
<message>
<source>&amp;Spacing:</source>
- <translation>&amp;Отступ:</translation>
+ <translation>&amp;Интервал:</translation>
</message>
<message>
<source>&amp;Margin:</source>
- <translation>&amp;Границы:</translation>
+ <translation>&amp;Отступ:</translation>
</message>
<message>
<source>&amp;Layout Function</source>
@@ -920,11 +936,11 @@
</message>
<message>
<source>Ma&amp;rgin:</source>
- <translation>Г&amp;раницы:</translation>
+ <translation>О&amp;тступ:</translation>
</message>
<message>
<source>Spa&amp;cing:</source>
- <translation>О&amp;тступ:</translation>
+ <translation>И&amp;нтервал:</translation>
</message>
<message>
<source>&amp;Author</source>
@@ -946,13 +962,93 @@
<source>Embedded Design</source>
<translation>Оформление портативных устройств</translation>
</message>
+ <message>
+ <source>Translations</source>
+ <translation>Переводы</translation>
+ </message>
+ <message>
+ <source>ID-based</source>
+ <translation>На основе ID</translation>
+ </message>
</context>
<context>
<name>IconSelector</name>
<message>
+ <source>The pixmap file &apos;%1&apos; cannot be read.</source>
+ <translation>Невозможно прочитать файл растрового изображения «%1».</translation>
+ </message>
+ <message>
+ <source>The file &apos;%1&apos; does not appear to be a valid pixmap file: %2</source>
+ <translation>Файл «%1» не похож на корректный файл растрового изображения: %2</translation>
+ </message>
+ <message>
+ <source>The file &apos;%1&apos; could not be read: %2</source>
+ <translation>Не удалось прочитать файл «%1»: %2</translation>
+ </message>
+ <message>
<source>All Pixmaps (</source>
<translation>Растровые изображения (</translation>
</message>
+ <message>
+ <source>Choose a Pixmap</source>
+ <translation>Выбор растрового изображения</translation>
+ </message>
+ <message>
+ <source>Pixmap Read Error</source>
+ <translation>Ошибка чтения растрового изображения</translation>
+ </message>
+ <message>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
+ <source>Normal Off</source>
+ <translation>Нормальный, выкл</translation>
+ </message>
+ <message>
+ <source>Normal On</source>
+ <translation>Нормальный, вкл</translation>
+ </message>
+ <message>
+ <source>Disabled Off</source>
+ <translation>Выключенный, выкл</translation>
+ </message>
+ <message>
+ <source>Disabled On</source>
+ <translation>Выключенный, вкл</translation>
+ </message>
+ <message>
+ <source>Active Off</source>
+ <translation>Активный, выкл</translation>
+ </message>
+ <message>
+ <source>Active On</source>
+ <translation>Активный, вкл</translation>
+ </message>
+ <message>
+ <source>Selected Off</source>
+ <translation>Выбранный, выкл</translation>
+ </message>
+ <message>
+ <source>Selected On</source>
+ <translation>Выбранный, вкл</translation>
+ </message>
+ <message>
+ <source>Choose Resource...</source>
+ <translation>Выбрать ресурс...</translation>
+ </message>
+ <message>
+ <source>Choose File...</source>
+ <translation>Выбрать файл...</translation>
+ </message>
+ <message>
+ <source>Reset</source>
+ <translation>Сбросить</translation>
+ </message>
+ <message>
+ <source>Reset All</source>
+ <translation>Сбросить всё</translation>
+ </message>
</context>
<context>
<name>ItemPropertyBrowser</name>
@@ -1697,6 +1793,13 @@ Container pages should only be added by specifying them in XML returned by the d
</message>
</context>
<context>
+ <name>QDesignerTaskMenu</name>
+ <message>
+ <source>no signals available</source>
+ <translation>Нет доступных сигналов</translation>
+ </message>
+</context>
+<context>
<name>QDesignerToolWindow</name>
<message>
<source>Property Editor</source>
@@ -3156,6 +3259,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>
@@ -3537,6 +3644,10 @@ Do you want overwrite the template?</source>
<context>
<name>qdesigner_internal::DesignerPropertyManager</name>
<message>
+ <source>id</source>
+ <translation>id</translation>
+ </message>
+ <message>
<source>AlignLeft</source>
<translation></translation>
</message>
@@ -4107,81 +4218,6 @@ Do you want overwrite the template?</source>
</message>
</context>
<context>
- <name>qdesigner_internal::IconSelector</name>
- <message>
- <source>The pixmap file &apos;%1&apos; cannot be read.</source>
- <translation>Невозможно прочитать файл растрового изображения «%1».</translation>
- </message>
- <message>
- <source>The file &apos;%1&apos; does not appear to be a valid pixmap file: %2</source>
- <translation>Файл «%1» не похож на корректный файл растрового изображения: %2</translation>
- </message>
- <message>
- <source>The file &apos;%1&apos; could not be read: %2</source>
- <translation>Не удалось прочитать файл «%1»: %2</translation>
- </message>
- <message>
- <source>Choose a Pixmap</source>
- <translation>Выбор растрового изображения</translation>
- </message>
- <message>
- <source>Pixmap Read Error</source>
- <translation>Ошибка чтения растрового изображения</translation>
- </message>
- <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
- <source>Normal Off</source>
- <translation>Нормальный, выкл</translation>
- </message>
- <message>
- <source>Normal On</source>
- <translation>Нормальный, вкл</translation>
- </message>
- <message>
- <source>Disabled Off</source>
- <translation>Выключенный, выкл</translation>
- </message>
- <message>
- <source>Disabled On</source>
- <translation>Выключенный, вкл</translation>
- </message>
- <message>
- <source>Active Off</source>
- <translation>Активный, выкл</translation>
- </message>
- <message>
- <source>Active On</source>
- <translation>Активный, вкл</translation>
- </message>
- <message>
- <source>Selected Off</source>
- <translation>Выбранный, выкл</translation>
- </message>
- <message>
- <source>Selected On</source>
- <translation>Выбранный, вкл</translation>
- </message>
- <message>
- <source>Choose Resource...</source>
- <translation>Выбрать ресурс...</translation>
- </message>
- <message>
- <source>Choose File...</source>
- <translation>Выбрать файл...</translation>
- </message>
- <message>
- <source>Reset</source>
- <translation>Сбросить</translation>
- </message>
- <message>
- <source>Reset All</source>
- <translation>Сбросить всё</translation>
- </message>
-</context>
-<context>
<name>qdesigner_internal::IconThemeDialog</name>
<message>
<source>Set Icon From Theme</source>
@@ -5077,10 +5113,6 @@ Class: %2</source>
<source>Edit WhatsThis</source>
<translation>Правка текста подсказки режима &quot;Что это?&quot;</translation>
</message>
- <message>
- <source>no signals available</source>
- <translation>Нет доступных сигналов</translation>
- </message>
<message numerus="yes">
<source>Set size constraint on %n widget(s)</source>
<translation>
@@ -5672,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_da.ts b/translations/linguist_da.ts
index f333a0f..a169295 100644
--- a/translations/linguist_da.ts
+++ b/translations/linguist_da.ts
@@ -119,6 +119,10 @@ Formoder en enkelt universel form.</translation>
<translation>Kan ikke oprette &apos;%2&apos;: %1</translation>
</message>
<message>
+ <source>%1 (%2)</source>
+ <translation>%1 (%2)</translation>
+ </message>
+ <message>
<source>Universal Form</source>
<translation>Universel form</translation>
</message>
@@ -325,8 +329,8 @@ Formoder en enkelt universel form.</translation>
<message numerus="yes">
<source> Ignored %n untranslated source text(s)</source>
<translation>
- <numerusform> Ignorerede %n uoversat kildetekst</numerusform>
- <numerusform> Ignorerede %n uoversatte kildetekster</numerusform>
+ <numerusform> Ignorerede %n ikke oversat kildetekst</numerusform>
+ <numerusform> Ignorerede %n ikke oversatte kildetekster</numerusform>
</translation>
</message>
</context>
@@ -442,7 +446,7 @@ Formoder en enkelt universel form.</translation>
</message>
<message>
<source>Create a Qt message file suitable for released applications from the current message file.</source>
- <translation>Opret en Qt-meddelelsesfil som er egnet til udgivne programmer, fra den aktuelle meddelelsesfil.</translation>
+ <translation>Opret en Qt-meddelelsesfil som er egnet til udgivne programmer, fra den nuværende meddelelsesfil.</translation>
</message>
<message>
<source>&amp;Print...</source>
@@ -450,7 +454,7 @@ Formoder en enkelt universel form.</translation>
</message>
<message>
<source>Print a list of all the translation units in the current translation source file.</source>
- <translation>Udskriver en liste over alle oversættelsesenhederne i den aktuelle oversættelsesfil.</translation>
+ <translation>Udskriver en liste over alle oversættelsesenhederne i den nuværende oversættelsesfil.</translation>
</message>
<message>
<source>Ctrl+P</source>
@@ -462,7 +466,7 @@ Formoder en enkelt universel form.</translation>
</message>
<message>
<source>Undo the last editing operation performed on the current translation.</source>
- <translation>Fortryd den sidste redigeringshandling udført på den aktuelle oversættelse.</translation>
+ <translation>Fortryd den sidste redigeringshandling udført på den nuværende oversættelse.</translation>
</message>
<message>
<source>Ctrl+Z</source>
@@ -649,50 +653,18 @@ Formoder en enkelt universel form.</translation>
<translation>&amp;Acceleratorer</translation>
</message>
<message>
- <source>Toggle the validity check of accelerators</source>
- <translation>Valideringstjek af acceleratorer til/fra</translation>
- </message>
- <message>
- <source>Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window.</source>
- <translation>Valideringstjek af acceleratorer til/fra, såsom hvorvidt antallet af &amp;-tegn i kilde- og oversættelsesteksten er den samme. Hvis tjekket fejler, vises en meddelelse i advarselsvinduet.</translation>
- </message>
- <message>
<source>&amp;Ending Punctuation</source>
<translation>Afsluttende &amp;tegnsætning</translation>
</message>
<message>
- <source>Toggle the validity check of ending punctuation</source>
- <translation>Valideringstjek af afsluttende tegnsætning til/fra</translation>
- </message>
- <message>
- <source>Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window.</source>
- <translation>Valideringstjek af afsluttende tegnsætning til/fra. Hvis tjekket fejler, vises en meddelelse i advarselsvinduet.</translation>
- </message>
- <message>
<source>&amp;Phrase matches</source>
<translation>&amp;Frase matcher</translation>
</message>
<message>
- <source>Toggle checking that phrase suggestions are used</source>
- <translation>Tjek at fraseforslag bruges til/fra</translation>
- </message>
- <message>
- <source>Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window.</source>
- <translation>Tjek at fraseforslag bruges til/fra. Hvis tjekket fejler, vises en meddelelse i advarselsvinduet.</translation>
- </message>
- <message>
<source>Place &amp;Marker Matches</source>
<translation>&amp;Stedmarkør matcher</translation>
</message>
<message>
- <source>Toggle the validity check of place markers</source>
- <translation>Valideringstjek af stedmarkører til/fra</translation>
- </message>
- <message>
- <source>Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window.</source>
- <translation>Valideringstjek af stedmarkører til/fra, såsom hvorvidt %1, %2, ... bruges konsekvent i kildeteksten og oversættelsesteksten. Hvis tjekket fejler, vises en meddelelse i advarselsvinduet.</translation>
- </message>
- <message>
<source>&amp;New Phrase Book...</source>
<translation>&amp;Ny frasebog...</translation>
</message>
@@ -798,7 +770,7 @@ Formoder en enkelt universel form.</translation>
</message>
<message>
<source>Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file.</source>
- <translation>Opret en Qt-meddelelsesfil som er egnet til udgivne programmer, fra den aktuelle meddelelsesfil. Filnavnet fastslås automatisk ud fra navnet på TS-filen.</translation>
+ <translation>Opret en Qt-meddelelsesfil som er egnet til udgivne programmer, fra den nuværende meddelelsesfil. Filnavnet fastslås automatisk ud fra navnet på TS-filen.</translation>
</message>
<message>
<source>File</source>
@@ -881,10 +853,6 @@ Formoder en enkelt universel form.</translation>
<translation>Synliggør blanktegn</translation>
</message>
<message>
- <source>Toggle visualize whitespace in editors</source>
- <translation>Synlighed af blanktegn i redigering til/fra</translation>
- </message>
- <message>
<source>Increase</source>
<translation>Forøg</translation>
</message>
@@ -966,7 +934,7 @@ Formoder en enkelt universel form.</translation>
<source>The file &apos;%1&apos; does not seem to be related to the currently open file(s) &apos;%2&apos;.
Close the open file(s) first?</source>
- <translation>Filen &apos;%1&apos; ser ikke ud til at være relaterede til de aktuelt åbne fil(er) &apos;%2&apos;.
+ <translation>Filen &apos;%1&apos; ser ikke ud til at være relaterede til de nuværende åbne fil(er) &apos;%2&apos;.
Luk de åbne fil(er) først?</translation>
</message>
@@ -1145,7 +1113,7 @@ Alle filer (*)</translation>
</message>
<message>
<source>No untranslated translation units left.</source>
- <translation>Ingen uoversatte oversættelsesenheder tilbage.</translation>
+ <translation>Ingen ikke oversatte oversættelsesenheder tilbage.</translation>
</message>
<message>
<source>&amp;Window</source>
@@ -1252,48 +1220,60 @@ Alle filer (*)</translation>
<translation>Alle</translation>
</message>
<message>
- <source>Surrounding &amp;Whitespace.</source>
- <translation>Omgivenende &amp;blanktegn.</translation>
+ <source>Toggles the validity check of accelerators</source>
+ <translation>Slår valideringstjek af acceleratorer til/fra</translation>
</message>
<message>
- <source>Toggle the validity check of surrounding whitespace.</source>
- <translation>Valideringstjek af omgivende blanktegn til/fra.</translation>
+ <source>Toggles the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window.</source>
+ <translation>Slår valideringstjek af acceleratorer til/fra, såsom hvorvidt antallet af &amp;-tegn i kilde- og oversættelsesteksten er den samme. Hvis tjekket fejler, vises en meddelelse i advarselsvinduet.</translation>
</message>
<message>
- <source>Toggle the validity check of surrounding whitespace. If the check fails, a message is shown in the warnings window.</source>
- <translation>Valideringstjek af omgivende blanktegn til/fra. Hvis tjekket fejler, vises en meddelelse i advarselsvinduet.</translation>
+ <source>Surrounding &amp;Whitespace</source>
+ <translation>Omgivenende &amp;blanktegn</translation>
</message>
-</context>
-<context>
- <name>MessageEditor</name>
<message>
- <source></source>
- <comment>This is the right panel of the main window.</comment>
- <translation></translation>
+ <source>Toggles the validity check of surrounding whitespace.</source>
+ <translation>Slår valideringstjek af omgivende blanktegn til/fra.</translation>
+ </message>
+ <message>
+ <source>Toggles the validity check of surrounding whitespace. If the check fails, a message is shown in the warnings window.</source>
+ <translation>Slår valideringstjek af omgivende blanktegn til/fra. Hvis tjekket fejler, vises en meddelelse i advarselsvinduet.</translation>
</message>
<message>
- <source>Russian</source>
- <translation>Russisk</translation>
+ <source>Toggles the validity check of ending punctuation</source>
+ <translation>Slår valideringstjek af afsluttende tegnsætning til/fra</translation>
</message>
<message>
- <source>German</source>
- <translation>Tysk</translation>
+ <source>Toggles the validity check of ending punctuation. If the check fails, a message is shown in the warnings window.</source>
+ <translation>Slår valideringstjek af afsluttende tegnsætning til/fra. Hvis tjekket fejler, vises en meddelelse i advarselsvinduet.</translation>
</message>
<message>
- <source>Japanese</source>
- <translation>Japansk</translation>
+ <source>Toggles checking that phrase suggestions are used</source>
+ <translation>Slår valideringstjek af at fraseforslag bruges til/fra</translation>
</message>
<message>
- <source>French</source>
- <translation>Fransk</translation>
+ <source>Toggles checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window.</source>
+ <translation>Slår valideringstjek af at fraseforslag bruges til/fra. Hvis tjekket fejler, vises en meddelelse i advarselsvinduet.</translation>
</message>
<message>
- <source>Polish</source>
- <translation>Polsk</translation>
+ <source>Toggles the validity check of place markers</source>
+ <translation>Slår valideringstjek af stedmarkører til/fra</translation>
</message>
<message>
- <source>Chinese</source>
- <translation>Kinesisk</translation>
+ <source>Toggles the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window.</source>
+ <translation>Slår valideringstjek af stedmarkører til/fra, såsom hvorvidt %1, %2, ... bruges konsekvent i kildeteksten og oversættelsesteksten. Hvis tjekket fejler, vises en meddelelse i advarselsvinduet.</translation>
+ </message>
+ <message>
+ <source>Toggles visualize whitespace in editors</source>
+ <translation>Slår synlighed af blanktegn i redigering til/fra</translation>
+ </message>
+</context>
+<context>
+ <name>MessageEditor</name>
+ <message>
+ <source></source>
+ <comment>This is the right panel of the main window.</comment>
+ <translation></translation>
</message>
<message>
<source>This whole panel allows you to view and edit the translation of some source text.</source>
@@ -1328,20 +1308,20 @@ Alle filer (*)</translation>
<translation>Her kan du indtaste kommentarer til eget brug. De har ingen indflydelse på de oversatte programmer.</translation>
</message>
<message>
- <source>%1 translation (%2)</source>
- <translation>%1 oversættelse (%2)</translation>
+ <source>Translation to %1 (%2)</source>
+ <translation>Oversættelse til %1 (%2)</translation>
</message>
<message>
- <source>This is where you can enter or modify the translation of the above source text.</source>
- <translation>Her kan du indtaste eller ændre oversættelsen af kildeteksten ovenfor.</translation>
+ <source>Translation to %1</source>
+ <translation>Oversættelse til %1</translation>
</message>
<message>
- <source>%1 translation</source>
- <translation>%1 oversættelse</translation>
+ <source>Translator comments for %1</source>
+ <translation>Oversætterkommentarer til %1</translation>
</message>
<message>
- <source>%1 translator comments</source>
- <translation>%1 oversætterkommentarer</translation>
+ <source>This is where you can enter or modify the translation of the above source text.</source>
+ <translation>Her kan du indtaste eller ændre oversættelsen af kildeteksten ovenfor.</translation>
</message>
<message>
<source>&apos;%1&apos;
@@ -1645,6 +1625,11 @@ Linje: %2</translation>
<translation>Målsprog</translation>
</message>
<message>
+ <source>%1 (%2)</source>
+ <extracomment>&lt;english&gt; (&lt;endonym&gt;) (language and country names)</extracomment>
+ <translation>%1 (%2)</translation>
+ </message>
+ <message>
<source>Settings for &apos;%1&apos; - Qt Linguist</source>
<translation>Indstillinger for &apos;%1&apos; - Qt Linguist</translation>
</message>
diff --git a/translations/linguist_de.ts b/translations/linguist_de.ts
index 6e15713..8902d1b 100644
--- a/translations/linguist_de.ts
+++ b/translations/linguist_de.ts
@@ -119,6 +119,10 @@ Es wird mit einer einfachen Universalform gearbeitet.</translation>
<translation>&apos;%2&apos; kann nicht erzeugt werden: %1</translation>
</message>
<message>
+ <source>%1 (%2)</source>
+ <translation>%1 (%2)</translation>
+ </message>
+ <message>
<source>Universal Form</source>
<translation>Universalform</translation>
</message>
@@ -441,22 +445,6 @@ Es wird mit einer einfachen Universalform gearbeitet.</translation>
<translation>Ursprungstext übernehmen</translation>
</message>
<message>
- <source>Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window.</source>
- <translation>Die Prüfung der Tastenkürzel, das heißt, die Übereinstimmung der kaufmännischen Und-Zeichen in Quelle und Übersetzung ein- bzw. ausschalten. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt.</translation>
- </message>
- <message>
- <source>Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window.</source>
- <translation>Die Prüfung der Satzendezeichen am Ende des Textes ein- bzw. ausschalten. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt.</translation>
- </message>
- <message>
- <source>Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window.</source>
- <translation>Die Prüfung der Verwendung der Wörterbuchvorschläge ein- bzw. ausschalten. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt.</translation>
- </message>
- <message>
- <source>Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window.</source>
- <translation>Die Prüfung der Platzhalter, das heißt, ob %1, %2 usw. in Ursprungstext und Übersetzung übereinstimmend verwendet werden, ein- bzw. ausschalten. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt.</translation>
- </message>
- <message>
<source>Open Read-O&amp;nly...</source>
<translation>Schr&amp;eibgeschützt öffnen ...</translation>
</message>
@@ -706,7 +694,7 @@ Es wird mit einer einfachen Universalform gearbeitet.</translation>
</message>
<message>
<source>Set whether or not to display translation guesses.</source>
- <translation>Darstellung von Übersetzungsvorschlägen aktivieren/deaktivieren.</translation>
+ <translation>Darstellung von Übersetzungsvorschlägen ein- oder ausschalten.</translation>
</message>
<message>
<source>&amp;Statistics</source>
@@ -1188,22 +1176,6 @@ Alle Dateien (*)</translation>
<translation>Kopiert den Ursprungstext in das Übersetzungsfeld</translation>
</message>
<message>
- <source>Toggle the validity check of accelerators</source>
- <translation>Prüfung der Tastenkürzel ein- bzw. ausschalten</translation>
- </message>
- <message>
- <source>Toggle the validity check of ending punctuation</source>
- <translation>Prüfung der Satzendezeichen am Ende des Textes ein- bzw. ausschalten</translation>
- </message>
- <message>
- <source>Toggle checking that phrase suggestions are used</source>
- <translation>Überprüfung, ob Wörterbucheinträge benutzt werden, aktivieren/deaktivieren</translation>
- </message>
- <message>
- <source>Toggle the validity check of place markers</source>
- <translation>Prüfung der Platzhalter ein- bzw. ausschalten&apos;</translation>
- </message>
- <message>
<source>Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file.</source>
<translation>Eine Qt-Nachrichtendatei aus der aktuellen Übersetzungsdatei erzeugen. Der Dateiname wird automatisch aus dem Namen der TS-Datei abgeleitet.</translation>
</message>
@@ -1220,10 +1192,6 @@ Alle Dateien (*)</translation>
<translation>Leerzeichen darstellen</translation>
</message>
<message>
- <source>Toggle visualize whitespace in editors</source>
- <translation>Schaltet die Darstellung der Leerzeichen in den Editoren um</translation>
- </message>
- <message>
<source>&amp;Zoom</source>
<translation>&amp;Vergrößerung</translation>
</message>
@@ -1252,48 +1220,60 @@ Alle Dateien (*)</translation>
<translation>Ctrl+0</translation>
</message>
<message>
- <source>Surrounding &amp;Whitespace.</source>
- <translation>Umgebende &amp;Leerzeichen.</translation>
+ <source>Toggles the validity check of accelerators</source>
+ <translation>Prüfung der Tastenkürzel ein- oder ausschalten</translation>
+ </message>
+ <message>
+ <source>Toggles the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window.</source>
+ <translation>Die Prüfung der Tastenkürzel, das heißt die Übereinstimmung der kaufmännischen Und-Zeichen in Quelle und Übersetzung, ein- oder ausschalten. Bei Fehlern wird eine Warnung im Hinweisfenster angezeigt.</translation>
</message>
<message>
- <source>Toggle the validity check of surrounding whitespace.</source>
+ <source>Surrounding &amp;Whitespace</source>
+ <translation>Umgebende &amp;Leerzeichen</translation>
+ </message>
+ <message>
+ <source>Toggles the validity check of surrounding whitespace.</source>
<translation>Schaltet die Prüfung der Übereinstimmung umgebender Leerzeichen um.</translation>
</message>
<message>
- <source>Toggle the validity check of surrounding whitespace. If the check fails, a message is shown in the warnings window.</source>
+ <source>Toggles the validity check of surrounding whitespace. If the check fails, a message is shown in the warnings window.</source>
<translation>Schaltet die Prüfung der Übereinstimmung umgebender Leerzeichen um. Wenn die Prüfung fehlschlägt, wird eine Meldung im Warnungsfenster angezeigt.</translation>
</message>
-</context>
-<context>
- <name>MessageEditor</name>
<message>
- <source></source>
- <comment>This is the right panel of the main window.</comment>
- <translation></translation>
+ <source>Toggles the validity check of ending punctuation</source>
+ <translation>Prüfung der Satzendezeichen am Ende des Textes ein- oder ausschalten</translation>
</message>
<message>
- <source>Russian</source>
- <translation>Russisch</translation>
+ <source>Toggles the validity check of ending punctuation. If the check fails, a message is shown in the warnings window.</source>
+ <translation>Die Prüfung der Satzendezeichen am Ende des Textes ein- oder ausschalten. Bei Fehlern wird eine Warnung im Hinweisfenster angezeigt.</translation>
</message>
<message>
- <source>German</source>
- <translation>Deutsch</translation>
+ <source>Toggles checking that phrase suggestions are used</source>
+ <translation>Überprüfung, ob Wörterbucheinträge benutzt werden, ein- oder ausschalten</translation>
</message>
<message>
- <source>Japanese</source>
- <translation>Japanisch</translation>
+ <source>Toggles checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window.</source>
+ <translation>Die Prüfung der Verwendung der Wörterbuchvorschläge ein- oder ausschalten. Bei Fehlern wird eine Warnung im Hinweisfenster angezeigt.</translation>
</message>
<message>
- <source>French</source>
- <translation>Französisch</translation>
+ <source>Toggles the validity check of place markers</source>
+ <translation>Prüfung der Platzhalter ein- oder ausschalten</translation>
</message>
<message>
- <source>Polish</source>
- <translation>Polnisch</translation>
+ <source>Toggles the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window.</source>
+ <translation>Die Prüfung der Platzhalter, das heißt, ob %1, %2 usw. in Ursprungstext und Übersetzung übereinstimmend verwendet werden, ein- oder ausschalten. Bei Fehlern wird eine Warnung im Hinweisfenster angezeigt.</translation>
</message>
<message>
- <source>Chinese</source>
- <translation>Chinesisch</translation>
+ <source>Toggles visualize whitespace in editors</source>
+ <translation>Schaltet die Darstellung der Leerzeichen in den Editoren um</translation>
+ </message>
+</context>
+<context>
+ <name>MessageEditor</name>
+ <message>
+ <source></source>
+ <comment>This is the right panel of the main window.</comment>
+ <translation></translation>
</message>
<message>
<source>This whole panel allows you to view and edit the translation of some source text.</source>
@@ -1328,20 +1308,20 @@ Alle Dateien (*)</translation>
<translation>Hier können Sie Hinweise für den eigenen Gebrauch eintragen. Diese haben keinen Einflusse auf die Übersetzung.</translation>
</message>
<message>
- <source>%1 translation (%2)</source>
- <translation>Übersetzung %1 (%2)</translation>
+ <source>Translation to %1 (%2)</source>
+ <translation>Übersetzung in %1 (%2)</translation>
</message>
<message>
- <source>This is where you can enter or modify the translation of the above source text.</source>
- <translation>Hier können Sie die Übersetzung des Ursprungstextes eingeben bzw. ändern.</translation>
+ <source>Translation to %1</source>
+ <translation>Übersetzung in %1</translation>
</message>
<message>
- <source>%1 translation</source>
- <translation>Übersetzung %1</translation>
+ <source>Translator comments for %1</source>
+ <translation>Hinweise des Übersetzers zu %1</translation>
</message>
<message>
- <source>%1 translator comments</source>
- <translation>%1 Hinweise des Übersetzers</translation>
+ <source>This is where you can enter or modify the translation of the above source text.</source>
+ <translation>Hier können Sie die Übersetzung des Ursprungstextes eingeben bzw. ändern.</translation>
</message>
<message>
<source>&apos;%1&apos;
@@ -1637,6 +1617,11 @@ Zeile: %2</translation>
<context>
<name>TranslationSettingsDialog</name>
<message>
+ <source>%1 (%2)</source>
+ <extracomment>&lt;english&gt; (&lt;endonym&gt;) (language and country names)</extracomment>
+ <translation>%1 (%2)</translation>
+ </message>
+ <message>
<source>Any Country</source>
<translation>Land</translation>
</message>
diff --git a/translations/linguist_ru.ts b/translations/linguist_ru.ts
index 47d36bd..943c04b 100644
--- a/translations/linguist_ru.ts
+++ b/translations/linguist_ru.ts
@@ -120,6 +120,10 @@ Will assume a single universal form.</source>
<translation>Не удалось создать «%2»: %1</translation>
</message>
<message>
+ <source>%1 (%2)</source>
+ <translation></translation>
+ </message>
+ <message>
<source>Universal Form</source>
<translation>Универсальная форма</translation>
</message>
@@ -128,11 +132,15 @@ Will assume a single universal form.</source>
<name>ErrorsView</name>
<message>
<source>Accelerator possibly superfluous in translation.</source>
- <translation>Возможно, лишний акселератор в переводе.</translation>
+ <translation>Возможно, лишний ускоритель в переводе.</translation>
</message>
<message>
<source>Accelerator possibly missing in translation.</source>
- <translation>Возможно, пропущен акселератор в переводе.</translation>
+ <translation>Возможно, пропущен ускоритель в переводе.</translation>
+ </message>
+ <message>
+ <source>Translation does not have same leading and trailing whitespace as the source text.</source>
+ <translation>У перевода нет начального и конечного пробелов аналогичных исходному тексту.</translation>
</message>
<message>
<source>Translation does not end with the same punctuation as the source text.</source>
@@ -147,8 +155,8 @@ Will assume a single universal form.</source>
<translation>Перевод не содержит тех же маркеров форматирования, что и исходный текст.</translation>
</message>
<message>
- <source>Translation does not contain the necessary %n place marker.</source>
- <translation>Перевод не содержит необходимого маркера форматирования %n.</translation>
+ <source>Translation does not contain the necessary %n/%Ln place marker.</source>
+ <translation>Перевод не содержит необходимого маркера форматирования %n/%Ln.</translation>
</message>
<message>
<source>Unknown error</source>
@@ -156,6 +164,33 @@ Will assume a single universal form.</source>
</message>
</context>
<context>
+ <name>FMT</name>
+ <message>
+ <source>GNU Gettext localization files</source>
+ <translation>Файлы локализации GNU Gettext</translation>
+ </message>
+ <message>
+ <source>GNU Gettext localization template files</source>
+ <translation>Файлы шаблонов локализации GNU Gettext</translation>
+ </message>
+ <message>
+ <source>Compiled Qt translations</source>
+ <translation>Скомпилированные переводы Qt</translation>
+ </message>
+ <message>
+ <source>Qt Linguist &apos;Phrase Book&apos;</source>
+ <translation>«Глоссарий» Qt Linguist</translation>
+ </message>
+ <message>
+ <source>Qt translation sources</source>
+ <translation>Исходники переводов Qt</translation>
+ </message>
+ <message>
+ <source>XLIFF localization files</source>
+ <translation>Файлы локализации XLIFF</translation>
+ </message>
+</context>
+<context>
<name>FindDialog</name>
<message>
<source></source>
@@ -216,7 +251,7 @@ Will assume a single universal form.</source>
</message>
<message>
<source>Ignore &amp;accelerators</source>
- <translation>Пропускать &amp;акселераторы</translation>
+ <translation>Пропускать у&amp;скорители</translation>
</message>
<message>
<source>Click here to find the next occurrence of the text you typed in.</source>
@@ -242,6 +277,14 @@ Will assume a single universal form.</source>
<source>Skip &amp;obsolete</source>
<translation>Пропускать &amp;устаревшие</translation>
</message>
+ <message>
+ <source>Lets you use a Perl-compatible regular expression</source>
+ <translation>Позволяет использовать Perl-совместимые регулярные выражения</translation>
+ </message>
+ <message>
+ <source>Regular &amp;expression</source>
+ <translation>&amp;Регулярное выражение</translation>
+ </message>
</context>
<context>
<name>FormMultiWidget</name>
@@ -305,33 +348,6 @@ Will assume a single universal form.</source>
</message>
</context>
<context>
- <name>Linguist</name>
- <message>
- <source>GNU Gettext localization files</source>
- <translation>Файлы локализации GNU Gettext</translation>
- </message>
- <message>
- <source>GNU Gettext localization template files</source>
- <translation>Файлы шаблонов локализации GNU Gettext</translation>
- </message>
- <message>
- <source>Compiled Qt translations</source>
- <translation>Скомпилированные переводы Qt</translation>
- </message>
- <message>
- <source>Qt Linguist &apos;Phrase Book&apos;</source>
- <translation>«Глоссарий» Qt Linguist</translation>
- </message>
- <message>
- <source>Qt translation sources</source>
- <translation>Исходники переводов Qt</translation>
- </message>
- <message>
- <source>XLIFF localization files</source>
- <translation>Файлы локализации XLIFF</translation>
- </message>
-</context>
-<context>
<name>MainWindow</name>
<message>
<source></source>
@@ -720,6 +736,14 @@ All files (*)</source>
<source>Do you want to save phrase book &apos;%1&apos;?</source>
<translation>Желаете сохранить глоссарий «%1»?</translation>
</message>
+ <message numerus="yes">
+ <source>%n unfinished message(s) left.</source>
+ <translation>
+ <numerusform>Осталось %n незавершённое сообщение.</numerusform>
+ <numerusform>Осталось %n незавершённых сообщения.</numerusform>
+ <numerusform>Осталось %n незавершённых сообщений.</numerusform>
+ </translation>
+ </message>
<message>
<source>All</source>
<translation>Все</translation>
@@ -1010,37 +1034,21 @@ All files (*)</source>
</message>
<message>
<source>&amp;Accelerators</source>
- <translation>&amp;Акселераторы</translation>
- </message>
- <message>
- <source>Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window.</source>
- <translation>Переключение проверки акселераторов, т.е. совпадает ли количество амперсандов в исходном и переведённом текстах. Если выявлено несовпадение, будет показано сообщение в окне предупреждений.</translation>
+ <translation>&amp;Ускорители</translation>
</message>
<message>
<source>&amp;Ending Punctuation</source>
<translation>&amp;Знаки препинания</translation>
</message>
<message>
- <source>Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window.</source>
- <translation>Переключение проверки знаков препинания в конце текста. Если выявлено несовпадение, будет показано сообщение в окне предупреждений.</translation>
- </message>
- <message>
<source>&amp;Phrase matches</source>
<translation>Совпадение &amp;фраз</translation>
</message>
<message>
- <source>Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window.</source>
- <translation>Переключение проверки использования предложений для фраз. Если выявлено несовпадение, будет показано сообщение в окне предупреждений.</translation>
- </message>
- <message>
<source>Place &amp;Marker Matches</source>
<translation>Совпадение &amp;маркеров</translation>
</message>
<message>
- <source>Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window.</source>
- <translation>Переключение проверки маркеров форматирования, т.е. все ли маркеры (%1, %2, ...) исходного текста присутствуют в переведённом. Если выявлено несовпадение, будет показано сообщение в окне предупреждений.</translation>
- </message>
- <message>
<source>&amp;New Phrase Book...</source>
<translation>&amp;Новый глоссарий...</translation>
</message>
@@ -1201,22 +1209,6 @@ All files (*)</source>
<translation>Скопировать исходный текст в поле перевода</translation>
</message>
<message>
- <source>Toggle the validity check of accelerators</source>
- <translation>Переключение проверки акселераторов</translation>
- </message>
- <message>
- <source>Toggle the validity check of ending punctuation</source>
- <translation>Переключение проверки знаков препинания в конце текста</translation>
- </message>
- <message>
- <source>Toggle checking that phrase suggestions are used</source>
- <translation>Переключение проверки использования предложений для фраз</translation>
- </message>
- <message>
- <source>Toggle the validity check of place markers</source>
- <translation>Переключение проверки маркеров форматирования</translation>
- </message>
- <message>
<source>Display information about the Qt toolkit by Digia.</source>
<translation>Показать информацию об инструментарии Qt от Digia.</translation>
</message>
@@ -1229,10 +1221,6 @@ All files (*)</source>
<translation>Отображать пробелы</translation>
</message>
<message>
- <source>Toggle visualize whitespace in editors</source>
- <translation>Переключение режима отображения в редакторах непечатаемых символов</translation>
- </message>
- <message>
<source>Increase</source>
<translation>Увеличить</translation>
</message>
@@ -1256,38 +1244,98 @@ All files (*)</source>
<source>Ctrl+0</source>
<translation>Ctrl+0</translation>
</message>
-</context>
-<context>
- <name>MessageEditor</name>
<message>
- <source></source>
- <comment>This is the right panel of the main window.</comment>
- <translatorcomment>Правая панель основного окна</translatorcomment>
- <translation></translation>
+ <source>Toggles the validity check of accelerators</source>
+ <translation>Переключает проверку ускорителей</translation>
+ </message>
+ <message>
+ <source>Toggles the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window.</source>
+ <translation>Переключает проверку ускорителей, т.е. совпадает ли количество амперсандов в исходном и переведённом текстах. Если выявлено несовпадение, будет показано сообщение в окне предупреждений.</translation>
+ </message>
+ <message>
+ <source>Surrounding &amp;Whitespace</source>
+ <translation>Обрамл&amp;ять пробелы</translation>
+ </message>
+ <message>
+ <source>Toggles the validity check of surrounding whitespace.</source>
+ <translation>Переключает проверку пробелов в начале и конце.</translation>
+ </message>
+ <message>
+ <source>Toggles the validity check of surrounding whitespace. If the check fails, a message is shown in the warnings window.</source>
+ <translation>Переключение проверки пробелов в начале и конце текста. Если выявлено несовпадение, будет показано сообщение в окне предупреждений.</translation>
+ </message>
+ <message>
+ <source>Toggles the validity check of ending punctuation</source>
+ <translation>Переключает проверку знаков препинания в конце текста</translation>
+ </message>
+ <message>
+ <source>Toggles the validity check of ending punctuation. If the check fails, a message is shown in the warnings window.</source>
+ <translation>Переключение проверки знаков препинания в конце текста. Если выявлено несовпадение, будет показано сообщение в окне предупреждений.</translation>
+ </message>
+ <message>
+ <source>Toggles checking that phrase suggestions are used</source>
+ <translation>Переключает проверку использования предложений для фраз</translation>
+ </message>
+ <message>
+ <source>Toggles checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window.</source>
+ <translation>Переключение проверки использования предложений для фраз. Если выявлено несовпадение, будет показано сообщение в окне предупреждений.</translation>
+ </message>
+ <message>
+ <source>Toggles the validity check of place markers</source>
+ <translation>Переключает проверку маркеров форматирования</translation>
+ </message>
+ <message>
+ <source>Toggles the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window.</source>
+ <translation>Переключение проверки маркеров форматирования, т.е. все ли маркеры (%1, %2, ...) исходного текста присутствуют в переведённом. Если выявлено несовпадение, будет показано сообщение в окне предупреждений.</translation>
+ </message>
+ <message>
+ <source>Toggles visualize whitespace in editors</source>
+ <translation>Переключает режим отображения непечатных символов в редакторах</translation>
</message>
<message>
- <source>Russian</source>
- <translation>Русский</translation>
+ <source>Guesses</source>
+ <translation>Похожие</translation>
</message>
<message>
- <source>German</source>
- <translation>Немецкий</translation>
+ <source>Show more</source>
+ <translation>Больше</translation>
</message>
<message>
- <source>Japanese</source>
- <translation>Японский</translation>
+ <source>Alt++</source>
+ <translation>Alt++</translation>
</message>
<message>
- <source>French</source>
- <translation>Французский</translation>
+ <source>Show fewer</source>
+ <translation>Меньше</translation>
</message>
<message>
- <source>Polish</source>
- <translation>Польский</translation>
+ <source>Alt+-</source>
+ <translation>Alt+-</translation>
</message>
<message>
- <source>Chinese</source>
- <translation>Китайский</translation>
+ <source>Alt+0</source>
+ <translation>Alt+0</translation>
+ </message>
+ <message>
+ <source>D&amp;one</source>
+ <translation>&amp;Готово</translation>
+ </message>
+ <message>
+ <source>Mark item as done</source>
+ <translation>Отметить элемент готовым</translation>
+ </message>
+ <message>
+ <source>Mark this item as done.</source>
+ <translation>Отметить этот элемент готовым.</translation>
+ </message>
+</context>
+<context>
+ <name>MessageEditor</name>
+ <message>
+ <source></source>
+ <comment>This is the right panel of the main window.</comment>
+ <translatorcomment>Правая панель основного окна</translatorcomment>
+ <translation></translation>
</message>
<message>
<source>This whole panel allows you to view and edit the translation of some source text.</source>
@@ -1322,20 +1370,20 @@ All files (*)</source>
<translation>Здесь вы можете оставить комментарий для собственного использования. Комментарии не влияют на перевод приложений.</translation>
</message>
<message>
- <source>%1 translation (%2)</source>
- <translation>%1 перевод (%2)</translation>
+ <source>Translation to %1 (%2)</source>
+ <translation>Перевод на %1 (%2)</translation>
</message>
<message>
- <source>This is where you can enter or modify the translation of the above source text.</source>
- <translation>Здесь вы можете ввести или изменить перевод текста, представленного выше.</translation>
+ <source>Translation to %1</source>
+ <translation>%1 перевод</translation>
</message>
<message>
- <source>%1 translation</source>
- <translation>%1 перевод</translation>
+ <source>Translator comments for %1</source>
+ <translation>Комментарий переводчика на %1</translation>
</message>
<message>
- <source>%1 translator comments</source>
- <translation>%1 перевод: комментарий переводчика</translation>
+ <source>This is where you can enter or modify the translation of the above source text.</source>
+ <translation>Здесь вы можете ввести или изменить перевод текста, представленного выше.</translation>
</message>
<message>
<source>&apos;%1&apos;
@@ -1362,6 +1410,14 @@ Line: %2</source>
<source>&lt;unnamed context&gt;</source>
<translation>&lt;безымянный контекст&gt;</translation>
</message>
+ <message numerus="yes">
+ <source>%n unfinished message(s) left.</source>
+ <translation>
+ <numerusform>Осталось %n незавершённое сообщение.</numerusform>
+ <numerusform>Осталось %n незавершённых сообщения.</numerusform>
+ <numerusform>Осталось %n незавершённых сообщений.</numerusform>
+ </translation>
+ </message>
</context>
<context>
<name>PhraseBook</name>
@@ -1488,12 +1544,12 @@ Line: %2</source>
<translation>Правка</translation>
</message>
<message>
- <source>Guess (%1)</source>
- <translation>Похожая (%1)</translation>
+ <source>Guess from &apos;%1&apos; (%2)</source>
+ <translation>Похожее из «%1» (%2)</translation>
</message>
<message>
- <source>Guess</source>
- <translation>Похожая</translation>
+ <source>Guess from &apos;%1&apos;</source>
+ <translation>Похожее из «%1»</translation>
</message>
</context>
<context>
@@ -1639,6 +1695,11 @@ Line: %2</source>
<translation>Язык перевода</translation>
</message>
<message>
+ <source>%1 (%2)</source>
+ <extracomment>&lt;english&gt; (&lt;endonym&gt;) (language and country names)</extracomment>
+ <translation>%1 (%2)</translation>
+ </message>
+ <message>
<source>Any Country</source>
<translation>Любая страна</translation>
</message>
diff --git a/translations/qt_help_da.ts b/translations/qt_help_da.ts
index 3794f21..50541e2 100644
--- a/translations/qt_help_da.ts
+++ b/translations/qt_help_da.ts
@@ -11,8 +11,8 @@
<context>
<name>QHelpCollectionHandler</name>
<message>
- <source>The collection file &apos;%1&apos; is not set up yet.</source>
- <translation>Samlingsfilen &apos;%1&apos; er ikke endnu ikke sat op.</translation>
+ <source>The collection file &quot;%1&quot; is not set up yet.</source>
+ <translation>Samlingsfilen &quot;%1&quot; er ikke endnu ikke sat op.</translation>
</message>
<message>
<source>Cannot load sqlite database driver.</source>
@@ -27,8 +27,24 @@
<translation>Kan ikke oprette tabeller i filen %1.</translation>
</message>
<message>
- <source>The collection file &apos;%1&apos; already exists.</source>
- <translation>Samlingsfilen &apos;%1&apos; findes allerede.</translation>
+ <source>The collection file &quot;%1&quot; already exists.</source>
+ <translation>Samlingsfilen &quot;%1&quot; findes allerede.</translation>
+ </message>
+ <message>
+ <source>Unknown filter &quot;%1&quot;.</source>
+ <translation>Ukendt filter &quot;%1&quot;.</translation>
+ </message>
+ <message>
+ <source>Invalid documentation file &quot;%1&quot;.</source>
+ <translation>Ugyldig dokumentationsfil &quot;%1&quot;.</translation>
+ </message>
+ <message>
+ <source>Cannot register namespace &quot;%1&quot;.</source>
+ <translation>Kan ikke registrere navnerummet &quot;%1&quot;.</translation>
+ </message>
+ <message>
+ <source>Cannot open database &quot;%1&quot; to optimize.</source>
+ <translation>Kan ikke åbne databasen &quot;%1&quot; til optimering.</translation>
</message>
<message>
<source>Cannot create directory: %1</source>
@@ -39,10 +55,6 @@
<translation>Kan ikke kopiere samlingsfilen: %1</translation>
</message>
<message>
- <source>Unknown filter &apos;%1&apos;.</source>
- <translation>Ukendt filter &apos;%1&apos;.</translation>
- </message>
- <message>
<source>Cannot register filter %1.</source>
<translation>Kan ikke registrere filteret %1.</translation>
</message>
@@ -51,10 +63,6 @@
<translation>Kan ikke åbne dokumentationsfilen %1.</translation>
</message>
<message>
- <source>Invalid documentation file &apos;%1&apos;.</source>
- <translation>Ugyldig dokumentationsfil &apos;%1&apos;.</translation>
- </message>
- <message>
<source>The namespace %1 was not registered.</source>
<translation>Navnerummet %1 blev ikke registreret.</translation>
</message>
@@ -62,21 +70,13 @@
<source>Namespace %1 already exists.</source>
<translation>Navnerummet %1 findes allerede.</translation>
</message>
- <message>
- <source>Cannot register namespace &apos;%1&apos;.</source>
- <translation>Kan ikke registrere navnerummet &apos;%1&apos;.</translation>
- </message>
- <message>
- <source>Cannot open database &apos;%1&apos; to optimize.</source>
- <translation>Kan ikke åbne databasen &apos;%1&apos; til optimering.</translation>
- </message>
</context>
<context>
<name>QHelpDBReader</name>
<message>
- <source>Cannot open database &apos;%1&apos; &apos;%2&apos;: %3</source>
+ <source>Cannot open database &quot;%1&quot; &quot;%2&quot;: %3</source>
<extracomment>The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string</extracomment>
- <translation>Kan ikke åbne databasen &apos;%1&apos; &apos;%2&apos;: %3</translation>
+ <translation>Kan ikke åbne databasen &quot;%1&quot; &quot;%2&quot;: %3</translation>
</message>
</context>
<context>
@@ -87,7 +87,7 @@
</message>
<message>
<source>The specified namespace does not exist.</source>
- <translation>Det specificerede navnerum findes ikke.</translation>
+ <translation>Det angivne navnerum findes ikke.</translation>
</message>
</context>
<context>
@@ -98,7 +98,7 @@
</message>
<message>
<source>No output file name specified.</source>
- <translation>Der er ikke specificeret et output-filnavn.</translation>
+ <translation>Der er ikke angivet et output-filnavn.</translation>
</message>
<message>
<source>The file %1 cannot be overwritten.</source>
@@ -113,8 +113,8 @@
<translation>Kan ikke åbne databasefilen %1.</translation>
</message>
<message>
- <source>Cannot register namespace %1.</source>
- <translation>Kan ikke registrere navnerummet %1.</translation>
+ <source>Cannot register namespace &quot;%1&quot;.</source>
+ <translation>Kan ikke registrere navnerummet &quot;%1&quot;.</translation>
</message>
<message>
<source>Insert custom filters...</source>
@@ -145,12 +145,24 @@
<translation>Indsæt filer...</translation>
</message>
<message>
- <source>The file %1 does not exist! Skipping it.</source>
- <translation>Filen %1 findes ikke! Springer den over.</translation>
+ <source>The file %1 does not exist, skipping it...</source>
+ <translation>Filen %1 findes ikke, springer den over...</translation>
+ </message>
+ <message>
+ <source>Cannot open file %1, skipping it...</source>
+ <translation>Kan ikke åbne filen %1, springer den over...</translation>
+ </message>
+ <message>
+ <source>File &quot;%1&quot; does not exist.</source>
+ <translation>Filen &quot;%1&quot; findes ikke.</translation>
+ </message>
+ <message>
+ <source>File &quot;%1&quot; cannot be opened.</source>
+ <translation>Filen &quot;%1&quot; kan ikke åbnes.</translation>
</message>
<message>
- <source>Cannot open file %1! Skipping it.</source>
- <translation>Kan ikke åbne filen %1! Springer den over.</translation>
+ <source>File &quot;%1&quot; contains an invalid link to file &quot;%2&quot;</source>
+ <translation>Filen &quot;%1&quot; indeholder et ugyldigt link til filen &quot;%2&quot;</translation>
</message>
<message>
<source>The filter %1 is already registered.</source>
@@ -177,18 +189,6 @@
<translation>Kan ikke registrere indhold.</translation>
</message>
<message>
- <source>File &apos;%1&apos; does not exist.</source>
- <translation>Filen &apos;%1&apos; findes ikke.</translation>
- </message>
- <message>
- <source>File &apos;%1&apos; cannot be opened.</source>
- <translation>Filen &apos;%1&apos; kan ikke åbnes.</translation>
- </message>
- <message>
- <source>File &apos;%1&apos; contains an invalid link to file &apos;%2&apos;</source>
- <translation>Filen &apos;%1&apos; indeholder et ugyldigt link til filen &apos;%2&apos;</translation>
- </message>
- <message>
<source>Invalid links in HTML files.</source>
<translation>Ugyldige links i HTML-filer.</translation>
</message>
diff --git a/translations/qt_help_de.ts b/translations/qt_help_de.ts
index 1b8f14f..c30684d 100644
--- a/translations/qt_help_de.ts
+++ b/translations/qt_help_de.ts
@@ -15,8 +15,8 @@
<translation>Katalogdatei kann nicht geöffnet werden: %1</translation>
</message>
<message>
- <source>The collection file &apos;%1&apos; is not set up yet.</source>
- <translation>Die Katalogdatei &apos;%1&apos; ist noch nicht eingerichtet.</translation>
+ <source>The collection file &quot;%1&quot; is not set up yet.</source>
+ <translation>Die Katalogdatei &quot;%1&quot; ist noch nicht eingerichtet.</translation>
</message>
<message>
<source>Cannot load sqlite database driver.</source>
@@ -27,8 +27,24 @@
<translation>In Datei %1 können keine Tabellen angelegt werden.</translation>
</message>
<message>
- <source>The collection file &apos;%1&apos; already exists.</source>
- <translation>Die Katalogdatei &apos;%1&apos; existiert bereits.</translation>
+ <source>The collection file &quot;%1&quot; already exists.</source>
+ <translation>Die Katalogdatei &quot;%1&quot; existiert bereits.</translation>
+ </message>
+ <message>
+ <source>Unknown filter &quot;%1&quot;.</source>
+ <translation>Unbekannter Filter &quot;%1&quot;.</translation>
+ </message>
+ <message>
+ <source>Invalid documentation file &quot;%1&quot;.</source>
+ <translation>Ungültige Dokumentationsdatei &quot;%1&quot;.</translation>
+ </message>
+ <message>
+ <source>Cannot register namespace &quot;%1&quot;.</source>
+ <translation>Der Namensraum &quot;%1&quot; kann nicht registriert werden.</translation>
+ </message>
+ <message>
+ <source>Cannot open database &quot;%1&quot; to optimize.</source>
+ <translation>Die Datenbank &quot;%1&quot; kann nicht zur Optimierung geöffnet werden.</translation>
</message>
<message>
<source>Cannot create directory: %1</source>
@@ -39,10 +55,6 @@
<translation>Die Katalogdatei kann nicht kopiert werden: %1</translation>
</message>
<message>
- <source>Unknown filter &apos;%1&apos;.</source>
- <translation>Unbekannter Filter &apos;%1&apos;.</translation>
- </message>
- <message>
<source>Cannot register filter %1.</source>
<translation>Der Filter %1 kann nicht registriert werden.</translation>
</message>
@@ -51,10 +63,6 @@
<translation>Die Dokumentationsdatei %1 kann nicht geöffnet werden.</translation>
</message>
<message>
- <source>Invalid documentation file &apos;%1&apos;.</source>
- <translation>Ungültige Dokumentationsdatei &apos;%1&apos;.</translation>
- </message>
- <message>
<source>The namespace %1 was not registered.</source>
<translation>Der Namensraum %1 wurde nicht registriert.</translation>
</message>
@@ -62,21 +70,13 @@
<source>Namespace %1 already exists.</source>
<translation>Der Namensraum %1 existiert bereits.</translation>
</message>
- <message>
- <source>Cannot register namespace &apos;%1&apos;.</source>
- <translation>Der Namensraum &apos;%1&apos; kann nicht registriert werden.</translation>
- </message>
- <message>
- <source>Cannot open database &apos;%1&apos; to optimize.</source>
- <translation>Die Datenbank &apos;%1&apos; kann nicht zur Optimierung geöffnet werden.</translation>
- </message>
</context>
<context>
<name>QHelpDBReader</name>
<message>
- <source>Cannot open database &apos;%1&apos; &apos;%2&apos;: %3</source>
+ <source>Cannot open database &quot;%1&quot; &quot;%2&quot;: %3</source>
<extracomment>The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string</extracomment>
- <translation>Kann Datenbank nicht öffnen: &apos;%1&apos; &apos;%2&apos;: %3</translation>
+ <translation>Kann Datenbank nicht öffnen: &quot;%1&quot; &quot;%2&quot;: %3</translation>
</message>
</context>
<context>
@@ -97,6 +97,10 @@
<translation>Dateistruktur wird erzeugt...</translation>
</message>
<message>
+ <source>Cannot register namespace &quot;%1&quot;.</source>
+ <translation>Der Namensraum &quot;%1&quot; kann nicht registriert werden.</translation>
+ </message>
+ <message>
<source>Insert custom filters...</source>
<translation>Benutzerdefinierte Filter einfügen...</translation>
</message>
@@ -113,14 +117,6 @@
<translation>Dateien einfügen...</translation>
</message>
<message>
- <source>The file %1 does not exist! Skipping it.</source>
- <translation>Die Datei %1 existiert nicht. Wird übersprungen.</translation>
- </message>
- <message>
- <source>Cannot open file %1! Skipping it.</source>
- <translation>Die Datei %1 kann nicht geöffnet werden. Wird übersprungen.</translation>
- </message>
- <message>
<source>Insert indices...</source>
<translation>Indizes einfügen...</translation>
</message>
@@ -145,10 +141,6 @@
<translation>Die Datenbank-Datei %1 kann nicht geöffnet werden.</translation>
</message>
<message>
- <source>Cannot register namespace %1.</source>
- <translation>Der Namensraum %1 kann nicht registriert werden.</translation>
- </message>
- <message>
<source>Some tables already exist.</source>
<translation>Einige Tabellen existieren bereits.</translation>
</message>
@@ -161,6 +153,14 @@
<translation>Virtueller Order kann nicht registriert werden.</translation>
</message>
<message>
+ <source>The file %1 does not exist, skipping it...</source>
+ <translation>Die Datei %1 existiert nicht und wird übersprungen...</translation>
+ </message>
+ <message>
+ <source>Cannot open file %1, skipping it...</source>
+ <translation>Die Datei %1 kann nicht geöffnet werden und wird übersprungen...</translation>
+ </message>
+ <message>
<source>The filter %1 is already registered.</source>
<translation>Der Filter %1 ist bereits registriert.</translation>
</message>
@@ -177,16 +177,16 @@
<translation>Inhalt kann nicht registriert werden.</translation>
</message>
<message>
- <source>File &apos;%1&apos; does not exist.</source>
- <translation>Die Datei &apos;%1&apos; existiert nicht.</translation>
+ <source>File &quot;%1&quot; does not exist.</source>
+ <translation>Die Datei &quot;%1&quot; existiert nicht.</translation>
</message>
<message>
- <source>File &apos;%1&apos; cannot be opened.</source>
- <translation>Die Datei &apos;%1&apos; kann nicht geöffnet werden.</translation>
+ <source>File &quot;%1&quot; cannot be opened.</source>
+ <translation>Die Datei &quot;%1&quot; kann nicht geöffnet werden.</translation>
</message>
<message>
- <source>File &apos;%1&apos; contains an invalid link to file &apos;%2&apos;</source>
- <translation>Die Datei &apos;%1&apos; enthält einen ungültigen Verweis auf die Datei &apos;%2&apos;</translation>
+ <source>File &quot;%1&quot; contains an invalid link to file &quot;%2&quot;</source>
+ <translation>Die Datei &quot;%1&quot; enthält einen ungültigen Verweis auf die Datei &quot;%2&quot;</translation>
</message>
<message>
<source>Invalid links in HTML files.</source>
diff --git a/translations/qt_help_ru.ts b/translations/qt_help_ru.ts
index 63c5dd2..cabff18 100644
--- a/translations/qt_help_ru.ts
+++ b/translations/qt_help_ru.ts
@@ -2,29 +2,6 @@
<!DOCTYPE TS>
<TS version="2.1" language="ru">
<context>
- <name>QCLuceneResultWidget</name>
- <message>
- <source>Search Results</source>
- <translation>Результат поиска</translation>
- </message>
- <message>
- <source>Note:</source>
- <translation>Примечание:</translation>
- </message>
- <message>
- <source>The search results may not be complete since the documentation is still being indexed.</source>
- <translation>Результат поиска может быть неполным, так как документация ещё индексируется.</translation>
- </message>
- <message>
- <source>Your search did not match any documents.</source>
- <translation>По вашему запросу не найдено ни одного документа.</translation>
- </message>
- <message>
- <source>(The reason for this might be that the documentation is still being indexed.)</source>
- <translation>(Причиной этого может быть то, что документация ещё индексируется.)</translation>
- </message>
-</context>
-<context>
<name>QHelp</name>
<message>
<source>Untitled</source>
@@ -38,7 +15,7 @@
<translation>Не удалось открыть файл коллекции справки: %1</translation>
</message>
<message>
- <source>The collection file &apos;%1&apos; is not set up yet.</source>
+ <source>The collection file &quot;%1&quot; is not set up yet.</source>
<translation>Файл коллекции справки «%1» ещё не установлен.</translation>
</message>
<message>
@@ -50,10 +27,26 @@
<translation>Не удалось создать таблицы в файле %1.</translation>
</message>
<message>
- <source>The collection file &apos;%1&apos; already exists.</source>
+ <source>The collection file &quot;%1&quot; already exists.</source>
<translation>Файл коллекции справки «%1» уже существует.</translation>
</message>
<message>
+ <source>Unknown filter &quot;%1&quot;.</source>
+ <translation>Неизвестный фильтр «%1».</translation>
+ </message>
+ <message>
+ <source>Invalid documentation file &quot;%1&quot;.</source>
+ <translation>Некорректный файл документации «%1».</translation>
+ </message>
+ <message>
+ <source>Cannot register namespace &quot;%1&quot;.</source>
+ <translation>Не удалось зарегистрировать пространство имён «%1».</translation>
+ </message>
+ <message>
+ <source>Cannot open database &quot;%1&quot; to optimize.</source>
+ <translation>Не удалось открыть базу данных «%1» для оптимизации.</translation>
+ </message>
+ <message>
<source>Cannot create directory: %1</source>
<translation>Не удалось создать каталог: %1</translation>
</message>
@@ -62,10 +55,6 @@
<translation>Не удалось скопировать файл коллекции справки: %1</translation>
</message>
<message>
- <source>Unknown filter &apos;%1&apos;.</source>
- <translation>Неизвестный фильтр «%1».</translation>
- </message>
- <message>
<source>Cannot register filter %1.</source>
<translation>Не удалось зарегистрировать фильтр «%1».</translation>
</message>
@@ -74,10 +63,6 @@
<translation>Не удалось открыть файл документации «%1».</translation>
</message>
<message>
- <source>Invalid documentation file &apos;%1&apos;.</source>
- <translation>Некорректный файл документации «%1».</translation>
- </message>
- <message>
<source>The namespace %1 was not registered.</source>
<translation>Пространство имён «%1» не зарегистрировано.</translation>
</message>
@@ -85,21 +70,13 @@
<source>Namespace %1 already exists.</source>
<translation>Пространство имён «%1» уже существует.</translation>
</message>
- <message>
- <source>Cannot register namespace &apos;%1&apos;.</source>
- <translation>Не удалось зарегистрировать пространство имён «%1».</translation>
- </message>
- <message>
- <source>Cannot open database &apos;%1&apos; to optimize.</source>
- <translation>Не удалось открыть базу данных «%1» для оптимизации.</translation>
- </message>
</context>
<context>
<name>QHelpDBReader</name>
<message>
- <source>Cannot open database &apos;%1&apos; &apos;%2&apos;: %3</source>
+ <source>Cannot open database &quot;%1&quot; &quot;%2&quot;: %3</source>
<extracomment>The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string</extracomment>
- <translation>Не удалось открыть базу данных &apos;%1&apos; &apos;%2&apos;: %3</translation>
+ <translation>Не удалось открыть базу данных &quot;%1&quot; &quot;%2&quot;: %3</translation>
</message>
</context>
<context>
@@ -120,6 +97,10 @@
<translation>Создание структуры файла...</translation>
</message>
<message>
+ <source>Cannot register namespace &quot;%1&quot;.</source>
+ <translation>Не удалось зарегистрировать пространство имён «%1».</translation>
+ </message>
+ <message>
<source>Insert custom filters...</source>
<translation>Добавление индивидуальных фильтров...</translation>
</message>
@@ -136,14 +117,6 @@
<translation>Добавление файлов...</translation>
</message>
<message>
- <source>The file %1 does not exist! Skipping it.</source>
- <translation>Файл «%1» не существует! Пропускаем.</translation>
- </message>
- <message>
- <source>Cannot open file %1! Skipping it.</source>
- <translation>Не удалось открыть файл «%1»! Пропускаем.</translation>
- </message>
- <message>
<source>Insert indices...</source>
<translation>Добавление указателей...</translation>
</message>
@@ -168,10 +141,6 @@
<translation>Не удалось открыть файл базы данных «%1».</translation>
</message>
<message>
- <source>Cannot register namespace %1.</source>
- <translation>Не удалось зарегистрировать пространство имён «%1».</translation>
- </message>
- <message>
<source>Some tables already exist.</source>
<translation>Некоторые таблицы уже существуют.</translation>
</message>
@@ -184,6 +153,14 @@
<translation>Не удалось зарегистрировать виртуальный каталог.</translation>
</message>
<message>
+ <source>The file %1 does not exist, skipping it...</source>
+ <translation>Файл «%1» не существует, пропускаем...</translation>
+ </message>
+ <message>
+ <source>Cannot open file %1, skipping it...</source>
+ <translation>Не удалось открыть файл «%1», пропускаем...</translation>
+ </message>
+ <message>
<source>The filter %1 is already registered.</source>
<translation>Фильтр «%1» уже зарегистрирован.</translation>
</message>
@@ -200,15 +177,15 @@
<translation>Не удалось зарегистрировать оглавление.</translation>
</message>
<message>
- <source>File &apos;%1&apos; does not exist.</source>
+ <source>File &quot;%1&quot; does not exist.</source>
<translation>Файл «%1» не существует.</translation>
</message>
<message>
- <source>File &apos;%1&apos; cannot be opened.</source>
+ <source>File &quot;%1&quot; cannot be opened.</source>
<translation>Невозможно открыть файл «%1».</translation>
</message>
<message>
- <source>File &apos;%1&apos; contains an invalid link to file &apos;%2&apos;</source>
+ <source>File &quot;%1&quot; contains an invalid link to file &quot;%2&quot;</source>
<translation>Файл «%1» содержит некорректную ссылку на файл «%2»</translation>
</message>
<message>
@@ -269,44 +246,50 @@
<source>Search</source>
<translation>Поиск</translation>
</message>
+</context>
+<context>
+ <name>QHelpSearchResultWidget</name>
+ <message numerus="yes">
+ <source>%1 - %2 of %n Hits</source>
+ <translation>
+ <numerusform>%1 - %2 из %n совпадения</numerusform>
+ <numerusform>%1 - %2 из %n совпадений</numerusform>
+ <numerusform>%1 - %2 из %n совпадений</numerusform>
+ </translation>
+ </message>
<message>
- <source>Advanced search</source>
- <translation>Расширенный поиск</translation>
+ <source>0 - 0 of 0 Hits</source>
+ <translation>0 - 0 из 0 совпадений</translation>
</message>
+</context>
+<context>
+ <name>QResultWidget</name>
<message>
- <source>words &lt;B&gt;similar&lt;/B&gt; to:</source>
- <translation>&lt;B&gt;похожие&lt;/B&gt; слова:</translation>
+ <source>Search Results</source>
+ <translation>Результат поиска</translation>
</message>
<message>
- <source>&lt;B&gt;without&lt;/B&gt; the words:</source>
- <translation>&lt;B&gt;не содержит&lt;/B&gt; слов:</translation>
+ <source>Note:</source>
+ <translation>Примечание:</translation>
</message>
<message>
- <source>with &lt;B&gt;exact phrase&lt;/B&gt;:</source>
- <translation>содержит &lt;B&gt;точную фразу&lt;/B&gt;:</translation>
+ <source>The search results may not be complete since the documentation is still being indexed.</source>
+ <translation>Результат поиска может быть неполным, так как документация ещё индексируется.</translation>
</message>
<message>
- <source>with &lt;B&gt;all&lt;/B&gt; of the words:</source>
- <translation>содержит &lt;B&gt;все&lt;/B&gt; слова:</translation>
+ <source>Your search did not match any documents.</source>
+ <translation>По вашему запросу не найдено ни одного документа.</translation>
</message>
<message>
- <source>with &lt;B&gt;at least one&lt;/B&gt; of the words:</source>
- <translation>содержит &lt;B&gt;минимум одно&lt;/B&gt; из слов:</translation>
+ <source>(The reason for this might be that the documentation is still being indexed.)</source>
+ <translation>(Причиной этого может быть то, что документация ещё индексируется.)</translation>
</message>
</context>
<context>
- <name>QHelpSearchResultWidget</name>
- <message numerus="yes">
- <source>%1 - %2 of %n Hits</source>
- <translation>
- <numerusform>%1 - %2 из %n совпадения</numerusform>
- <numerusform>%1 - %2 из %n совпадений</numerusform>
- <numerusform>%1 - %2 из %n совпадений</numerusform>
- </translation>
- </message>
+ <name>fulltextsearch::qt::QHelpSearchIndexWriter</name>
<message>
- <source>0 - 0 of 0 Hits</source>
- <translation>0 - 0 из 0 совпадений</translation>
+ <source>Cannot open database &quot;%1&quot; using connection &quot;%2&quot;: %3</source>
+ <translation>Не удалось открыть базу данных «%1» используя подключение «%2»: %3</translation>
</message>
</context>
</TS>
diff --git a/translations/qtbase_ca.ts b/translations/qtbase_ca.ts
index 8d69ef1..c08aa8e 100644
--- a/translations/qtbase_ca.ts
+++ b/translations/qtbase_ca.ts
@@ -839,7 +839,11 @@ Premeu Esc per cancel·lar</translation>
</message>
<message>
<source>Error while renaming.</source>
- <translation>Error en canviar de nom.</translation>
+ <translation type="vanished">Error en canviar de nom.</translation>
+ </message>
+ <message>
+ <source>Error while renaming: %1</source>
+ <translation>Error en canviar de nom: %1</translation>
</message>
<message>
<source>Unable to restore from %1: %2</source>
@@ -876,6 +880,10 @@ Premeu Esc per cancel·lar</translation>
<source>No file engine available or engine does not support UnMapExtension</source>
<translation>No hi ha disponible cap motor de fitxers o el motor no accepta «UnMapExtension»</translation>
</message>
+ <message>
+ <source>No file engine available</source>
+ <translation>No hi ha disponible cap motor de fitxers</translation>
+ </message>
</context>
<context>
<name>QFileDialog</name>
@@ -1126,23 +1134,23 @@ El voleu suprimir igualment?</translation>
<name>QFileSystemModel</name>
<message>
<source>%1 TB</source>
- <translation>%1 TB</translation>
+ <translation type="vanished">%1 TB</translation>
</message>
<message>
<source>%1 GB</source>
- <translation>%1 GB</translation>
+ <translation type="vanished">%1 GB</translation>
</message>
<message>
<source>%1 MB</source>
- <translation>%1 MB</translation>
+ <translation type="vanished">%1 MB</translation>
</message>
<message>
<source>%1 KB</source>
- <translation>%1 KB</translation>
+ <translation type="vanished">%1 KB</translation>
</message>
<message>
<source>%1 bytes</source>
- <translation>%1 bytes</translation>
+ <translation type="vanished">%1 bytes</translation>
</message>
<message>
<source>Invalid filename</source>
@@ -1184,7 +1192,7 @@ El voleu suprimir igualment?</translation>
</message>
<message>
<source>%1 byte(s)</source>
- <translation>%1 byte(s)</translation>
+ <translation type="vanished">%1 byte(s)</translation>
</message>
</context>
<context>
@@ -1576,7 +1584,7 @@ El voleu suprimir igualment?</translation>
</message>
<message>
<source>Unknown error</source>
- <translation>Error desconegut</translation>
+ <translation type="vanished">Error desconegut</translation>
</message>
<message>
<source>Unknown error (%1)</source>
@@ -1827,6 +1835,10 @@ El voleu suprimir igualment?</translation>
<source>Unsupported image format</source>
<translation>Format d&apos;imatge no admès</translation>
</message>
+ <message>
+ <source>Image is empty</source>
+ <translation>La imatge és buida</translation>
+ </message>
</context>
<context>
<name>QInputDialog</name>
@@ -1949,7 +1961,6 @@ El voleu suprimir igualment?</translation>
<translation>
<numerusform>s&apos;han anunciat %n secció, cada una de %1 byte, s&apos;ha excedit la mida del fitxer</numerusform>
<numerusform>s&apos;han anunciat %n seccions, cada una de %1 bytes, s&apos;ha excedit la mida del fitxer</numerusform>
- <numerusform>s&apos;han anunciat %n seccions, cada una de %1 bytes, s&apos;ha excedit la mida del fitxer</numerusform>
</translation>
</message>
<message>
@@ -4821,6 +4832,10 @@ Desactiveu una de les dues opcions.</translation>
<translation>El nom del fitxer es refereix a un directori</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 no pot obrir «%1» sense una reserva d&apos;escriptura activada: el camí conté un especificador de flux de dades alternatiu</translation>
+ </message>
+ <message>
<source>Writing canceled by application</source>
<translation>L&apos;aplicació ha cancel·lat l&apos;escriptura</translation>
</message>
@@ -6449,6 +6464,10 @@ Role of an accessible object</extracomment>
<translation>Els paràmetres del Diffie-Hellman no són vàlids</translation>
</message>
<message>
+ <source>OpenSSL version with disabled elliptic curves</source>
+ <translation>Vesió de l&apos;OpenSSL amb les corbes el·líptiques desactivades</translation>
+ </message>
+ <message>
<source>OpenSSL version too old, need at least v1.0.2</source>
<translation>La versió de l&apos;OpenSSL és massa antiga, cal com a mínim la v1.0.2</translation>
</message>
@@ -7178,16 +7197,48 @@ La versió mínima requerida del Direct2D és %1.%2.%3.%4. La versió del Direct
<translation>Document no vàlid.</translation>
</message>
<message>
+ <source>&apos;%1&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&apos;&lt;first option&gt;&apos;</extracomment>
+ <translation>«%1»</translation>
+ </message>
+ <message>
+ <source>%1 or &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;first option&gt;, &apos;&lt;second option&gt;&apos;</extracomment>
+ <translation>%1 o «%2»</translation>
+ </message>
+ <message>
+ <source>%1, &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;options so far&gt;, &apos;&lt;next option&gt;&apos;</extracomment>
+ <translation>%1, «%2»</translation>
+ </message>
+ <message>
+ <source>%1, or &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;options so far&gt;, or &apos;&lt;final option&gt;&apos;</extracomment>
+ <translation>%1, o «%2»</translation>
+ </message>
+ <message>
+ <source>Expected %1, but got &apos;%2&apos;.</source>
+ <translation>S&apos;esperava %1, però s&apos;ha obtingut «%2».</translation>
+ </message>
+ <message>
+ <source>Unexpected &apos;%1&apos;.</source>
+ <translation></translation>
+ </message>
+ <message>
<source>Expected </source>
- <translation>S&apos;esperava </translation>
+ <translation type="vanished">S&apos;esperava </translation>
</message>
<message>
<source>, but got &apos;</source>
- <translation>, però s&apos;ha trobat &apos;</translation>
+ <translation type="vanished">, però s&apos;ha trobat &apos;</translation>
</message>
<message>
<source>Unexpected &apos;</source>
- <translation>No s&apos;esperava &apos;</translation>
+ <translation type="vanished">No s&apos;esperava &apos;</translation>
</message>
<message>
<source>Expected character data.</source>
diff --git a/translations/qtbase_da.ts b/translations/qtbase_da.ts
index 2e48434..6f4db83 100644
--- a/translations/qtbase_da.ts
+++ b/translations/qtbase_da.ts
@@ -643,7 +643,7 @@ Tryk på ESC for at annullere</translation>
<name>QDnsLookupRunnable</name>
<message>
<source>IPv6 addresses for nameservers are currently not supported</source>
- <translation>IPv6-adresser for navneservere understøttes ikke aktuelt</translation>
+ <translation>IPv6-adresser for navneservere understøttes ikke på nuværende tidspunkt</translation>
</message>
<message>
<source>Invalid domain name</source>
@@ -805,8 +805,8 @@ Tryk på ESC for at annullere</translation>
<translation>Destinationsfilen findes</translation>
</message>
<message>
- <source>Error while renaming.</source>
- <translation>Fejl under omdøbning.</translation>
+ <source>Error while renaming: %1</source>
+ <translation>Fejl under omdøbning: %1</translation>
</message>
<message>
<source>Unable to restore from %1: %2</source>
@@ -821,6 +821,10 @@ Tryk på ESC for at annullere</translation>
<translation>Kan ikke fjerne kildefilen</translation>
</message>
<message>
+ <source>Cannot open destination file: %1</source>
+ <translation>Kan ikke åbne destinationsfilen: %1</translation>
+ </message>
+ <message>
<source>Cannot open %1 for input</source>
<translation>Kan ikke åbne %1 for input</translation>
</message>
@@ -843,6 +847,10 @@ Tryk på ESC for at annullere</translation>
<source>No file engine available or engine does not support UnMapExtension</source>
<translation>Ingen tilgængelig fil-motor eller motor understøtter ikke UnMapExtension</translation>
</message>
+ <message>
+ <source>No file engine available</source>
+ <translation>Ingen tilgængelig fil-motor</translation>
+ </message>
</context>
<context>
<name>QFileDialog</name>
@@ -1087,31 +1095,11 @@ Vil du slette den alligevel?</translation>
<context>
<name>QFileSystemModel</name>
<message>
- <source>%1 TB</source>
- <translation>%1 TB</translation>
- </message>
- <message>
- <source>%1 GB</source>
- <translation>%1 GB</translation>
- </message>
- <message>
- <source>%1 MB</source>
- <translation>%1 MB</translation>
- </message>
- <message>
- <source>%1 KB</source>
- <translation>%1 KB</translation>
- </message>
- <message>
- <source>%1 bytes</source>
- <translation>%1 byte</translation>
- </message>
- <message>
<source>Invalid filename</source>
<translation>Ugyldigt filnavn</translation>
</message>
<message>
- <source>&lt;b&gt;The name &quot;%1&quot; can not be used.&lt;/b&gt;&lt;p&gt;Try using another name, with fewer characters or no punctuations marks.</source>
+ <source>&lt;b&gt;The name &quot;%1&quot; cannot be used.&lt;/b&gt;&lt;p&gt;Try using another name, with fewer characters or no punctuation marks.</source>
<translation>&lt;b&gt;Navnet &quot;%1&quot; kan ikke bruges.&lt;/b&gt;&lt;p&gt;Prøv et andet navn, med færre tegn eller ingen tegnsætningstegn.</translation>
</message>
<message>
@@ -1144,10 +1132,6 @@ Vil du slette den alligevel?</translation>
<source>Computer</source>
<translation>Computer</translation>
</message>
- <message>
- <source>%1 byte(s)</source>
- <translation>%1 byte</translation>
- </message>
</context>
<context>
<name>QFontDatabase</name>
@@ -1368,7 +1352,7 @@ Vil du slette den alligevel?</translation>
</message>
<message>
<source>Stri&amp;keout</source>
- <translation>&amp;Overstreget</translation>
+ <translation>&amp;Gennemstreget</translation>
</message>
<message>
<source>&amp;Underline</source>
@@ -1533,10 +1517,6 @@ Vil du slette den alligevel?</translation>
<translation>Værten blev ikke fundet</translation>
</message>
<message>
- <source>Unknown error</source>
- <translation>Ukendt fejl</translation>
- </message>
- <message>
<source>Unknown error (%1)</source>
<translation>Ukendt fejl (%1)</translation>
</message>
@@ -1569,7 +1549,7 @@ Vil du slette den alligevel?</translation>
</message>
<message>
<source>Unknown protocol specified</source>
- <translation>Ukendt protokol specificeret</translation>
+ <translation>Ukendt protokol angivet</translation>
</message>
<message>
<source>SSL handshake failed</source>
@@ -1785,6 +1765,10 @@ Vil du slette den alligevel?</translation>
<source>Unsupported image format</source>
<translation>Billedformatet understøttes ikke</translation>
</message>
+ <message>
+ <source>Image is empty</source>
+ <translation>Billedet er tomt</translation>
+ </message>
</context>
<context>
<name>QInputDialog</name>
@@ -1930,6 +1914,10 @@ Vil du slette den alligevel?</translation>
<translation>manglende sektionsdata. Dette er ikke et bibliotek.</translation>
</message>
<message>
+ <source>Out of memory while loading plugin &apos;%1&apos;.</source>
+ <translation>Løb tør for hukommelse under indlæsning af pluginet &apos;%1&apos;.</translation>
+ </message>
+ <message>
<source>Failed to extract plugin meta data from &apos;%1&apos;</source>
<translation>Kunne ikke udtrække plugin-metadata fra &apos;%1&apos;</translation>
</message>
@@ -2279,7 +2267,7 @@ Vil du slette den alligevel?</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 three different 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 the GNU LGPL version 3.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU LGPL version 3 is appropriate for the development of Qt&amp;nbsp;applications provided you can comply with the terms and conditions of the GNU LGPL version 3.&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>
- <translation>&lt;p&gt;Qt er et C++-værktøjskit til programudvikling på tværs af platforme.&lt;/p&gt;&lt;p&gt;Qt giver enkelt-kilde portability på tværs af alle større skrivebordsstyresystemer. Det er også tilgængeligt til Embedded Linux og andre indlejrede og mobile styresystemer.&lt;/p&gt;&lt;p&gt;Qt er tilgængelig under tre forskellige licenseringsmuligheder, designet til at rumme behovene af vores forskellige brugere.&lt;/p&gt;&lt;p&gt;Qt licenseret under vores kommercielle licensaftale er passende til udvikling af proprietær/kommerciel software, hvor du ikke vil dele kildekode med tredjeparter eller på anden måde ikke kan efterleve vilkårene i GNU LGPL version 3.&lt;/p&gt;&lt;p&gt;Qt licenseret under GNU LGPL version 3 er passende til udvikling af Qt-programmer, på forudsætning af at du kan efterleve vilkårene og betingelserne i GNU LGPL version 3.&lt;/p&gt;&lt;p&gt;Se venligst &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; for en oversigt af Qt-licensering.&lt;/p&gt;&lt;p&gt;Ophavsret (C) %1 Qt Company Ltd og andre bidragydere.&lt;/p&gt;&lt;p&gt;Qt og Qt-logoet er varemærker af Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt er Qt Company Ltd-produktet, udviklet som et open source projekt. Se &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; for mere information.&lt;/p&gt;</translation>
+ <translation>&lt;p&gt;Qt er et C++-værktøjskit til programudvikling på tværs af platforme.&lt;/p&gt;&lt;p&gt;Qt giver enkelt-kilde portability på tværs af alle større skrivebordsstyresystemer. Det er også tilgængeligt til Embedded Linux og andre indlejrede og mobile styresystemer.&lt;/p&gt;&lt;p&gt;Qt er tilgængelig under tre forskellige licenseringsmuligheder, designet til at rumme behovene af vores forskellige brugere.&lt;/p&gt;&lt;p&gt;Qt licenseret under vores kommercielle licensaftale er passende til udvikling af proprietær/kommerciel software, hvor du ikke vil dele kildekode med tredjeparter eller på anden måde ikke kan efterleve vilkårene i GNU LGPL version 3.&lt;/p&gt;&lt;p&gt;Qt licenseret under GNU LGPL version 3 er passende til udvikling af Qt-programmer, på forudsætning af at du kan efterleve vilkårene og betingelserne i GNU LGPL version 3.&lt;/p&gt;&lt;p&gt;Se venligst &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; for en oversigt af Qt-licensering.&lt;/p&gt;&lt;p&gt;Ophavsret (C) %1 Qt Company Ltd og andre bidragydere.&lt;/p&gt;&lt;p&gt;Qt og Qt-logoet er varemærker tilhørende Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt er Qt Company Ltd-produktet, udviklet som et open source projekt. Se &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; for mere information.&lt;/p&gt;</translation>
</message>
<message>
<source>About Qt</source>
@@ -2555,7 +2543,7 @@ Vil du slette den alligevel?</translation>
</message>
<message>
<source>The specified configuration cannot be used.</source>
- <translation>Den specificerede konfiguration kan ikke bruges.</translation>
+ <translation>Den angivne konfiguration kan ikke bruges.</translation>
</message>
<message>
<source>Roaming was aborted or is not possible.</source>
@@ -2688,6 +2676,17 @@ Vil du slette den alligevel?</translation>
</message>
</context>
<context>
+ <name>QPPDOptionsModel</name>
+ <message>
+ <source>Name</source>
+ <translation>Navn</translation>
+ </message>
+ <message>
+ <source>Value</source>
+ <translation>Værdi</translation>
+ </message>
+</context>
+<context>
<name>QPSQLDriver</name>
<message>
<source>Unable to connect</source>
@@ -2717,10 +2716,22 @@ Vil du slette den alligevel?</translation>
<context>
<name>QPSQLResult</name>
<message>
+ <source>Query results lost - probably discarded on executing another SQL query.</source>
+ <translation>Forespørgselsresultater tabt - formodentligt forkastet ved eksekvering af en anden SQL-forespørgsel.</translation>
+ </message>
+ <message>
<source>Unable to create query</source>
<translation>Kunne ikke oprette forespørgsel</translation>
</message>
<message>
+ <source>Unable to get result</source>
+ <translation>Kunne ikke hente resultat</translation>
+ </message>
+ <message>
+ <source>Unable to send query</source>
+ <translation>Kunne ikke sende forespørgsel</translation>
+ </message>
+ <message>
<source>Unable to prepare statement</source>
<translation>Kunne ikke forberede udsagn</translation>
</message>
@@ -3513,6 +3524,14 @@ Vil du slette den alligevel?</translation>
<translation>&amp;Valgmuligheder &lt;&lt;</translation>
</message>
<message>
+ <source>Invalid Pages Definition</source>
+ <translation>Ugyldig sider-definition</translation>
+ </message>
+ <message>
+ <source>%1 does not follow the correct syntax. Please use &apos;,&apos; to separate ranges and pages, &apos;-&apos; to define ranges and make sure ranges do not intersect with each other.</source>
+ <translation>%1 følger ikke den korrekte syntaks. Brug venligst &apos;,&apos; til at separere områder og sider, &apos;-&apos; til at angive områder og sørge for at områder ikke krydser hinanden.</translation>
+ </message>
+ <message>
<source>Print to File (PDF)</source>
<translation>Udskriv til fil (PDF)</translation>
</message>
@@ -3654,6 +3673,14 @@ Slå venligst en at disse valgmuligheder fra.</translation>
<source>Job Options</source>
<translation>Job-valgmuligheder</translation>
</message>
+ <message>
+ <source>Advanced Option Conflicts</source>
+ <translation>Konflikter i avancerede valgmuligheder</translation>
+ </message>
+ <message>
+ <source>There are conflicts in some advanced options. Do you want to fix them?</source>
+ <translation>Der er konflikter i nogle avancerede valgmuligheder. Vil du rette dem?</translation>
+ </message>
</context>
<context>
<name>QPrintPropertiesWidget</name>
@@ -3665,6 +3692,14 @@ Slå venligst en at disse valgmuligheder fra.</translation>
<source>Page</source>
<translation>Side</translation>
</message>
+ <message>
+ <source>Advanced</source>
+ <translation>Avanceret</translation>
+ </message>
+ <message>
+ <source>There are conflicts in some options. Please fix them.</source>
+ <translation>Der er konflikter i nogle valgmuligheder. Ret dem venligst.</translation>
+ </message>
</context>
<context>
<name>QPrintSettingsOutput</name>
@@ -3694,7 +3729,7 @@ Slå venligst en at disse valgmuligheder fra.</translation>
</message>
<message>
<source>Current Page</source>
- <translation>Aktuelle side</translation>
+ <translation>Nuværende side</translation>
</message>
<message>
<source>Selection</source>
@@ -3752,6 +3787,14 @@ Slå venligst en at disse valgmuligheder fra.</translation>
<source>Short side</source>
<translation>Kort side</translation>
</message>
+ <message>
+ <source>Pages</source>
+ <translation>Sider</translation>
+ </message>
+ <message>
+ <source>Specify pages or ranges separated by commas. Ranges are specified by two numbers separated by a hyphen. E.g: 3,5-7,9 prints pages 3, 5, 6, 7 and 9.</source>
+ <translation>Angiv sider eller områder separeret med kommaer. Områder angives med to tal separeret med en bindestreg. F.eks.: 3,5-7,9 udskriver siderne 3, 5, 6, 7 og 9.</translation>
+ </message>
</context>
<context>
<name>QPrintWidget</name>
@@ -4595,6 +4638,10 @@ Slå venligst en at disse valgmuligheder fra.</translation>
<translation>Filnavnet refererer til en mappe</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 kan ikke åbne &apos;%1&apos; uden direkte skrive-fallback er aktiveret: stien indeholder en alternativ datastrøm-angiver</translation>
+ </message>
+ <message>
<source>Writing canceled by application</source>
<translation>Skrivning annulleret af program</translation>
</message>
@@ -6210,6 +6257,38 @@ Role of an accessible object</extracomment>
<translation>Diffie-Hellman-parametre er ikke gyldige</translation>
</message>
<message>
+ <source>OpenSSL version with disabled elliptic curves</source>
+ <translation>OpenSSL-version med deaktiveret elliptiske kurver</translation>
+ </message>
+ <message>
+ <source>Error when setting the OpenSSL configuration (%1)</source>
+ <translation>Fejl under indstilling af OpenSSL-konfigurationen (%1)</translation>
+ </message>
+ <message>
+ <source>Expecting QByteArray for %1</source>
+ <translation>Forventer QByteArray for %1</translation>
+ </message>
+ <message>
+ <source>An error occurred attempting to set %1 to %2</source>
+ <translation>Der opstod en fejl under forsøg på at sætte %1 til %2</translation>
+ </message>
+ <message>
+ <source>Wrong value for %1 (%2)</source>
+ <translation>Forkert værdi til %1 (%2)</translation>
+ </message>
+ <message>
+ <source>Unrecognized command %1 = %2</source>
+ <translation>Ikke-genkendt kommando %1 = %2</translation>
+ </message>
+ <message>
+ <source>SSL_CONF_finish() failed</source>
+ <translation>SSL_CONF_finish() fejlede</translation>
+ </message>
+ <message>
+ <source>SSL_CONF_CTX_new() failed</source>
+ <translation>SSL_CONF_CTX_new() fejlede</translation>
+ </message>
+ <message>
<source>OpenSSL version too old, need at least v1.0.2</source>
<translation>OpenSSL-version for gammel, skal mindst være v1.0.2</translation>
</message>
@@ -6287,11 +6366,11 @@ Role of an accessible object</extracomment>
</message>
<message>
<source>The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate</source>
- <translation>Det aktuelle kandidat-udstedercertifikat blev afvist fordi dets subjektnavn ikke matchede udstedernavnet på det aktuelle certifikat</translation>
+ <translation>Det nuværende kandidat-udstedercertifikat blev afvist fordi dets subjektnavn ikke matchede udstedernavnet på det nuværende certifikat</translation>
</message>
<message>
<source>The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate</source>
- <translation>Det aktuelle kandidat-udstedercertifikat blev afvist fordi dets udstedernavn og serienummer var tilstede og ikke matchede myndighedsnøgle-identifikatoren på det aktuelle certifikat</translation>
+ <translation>Det nuværende kandidat-udstedercertifikat blev afvist fordi dets udstedernavn og serienummer var tilstede og ikke matchede myndighedsnøgle-identifikatoren på det nuværende certifikat</translation>
</message>
<message>
<source>The peer did not present any certificate</source>
@@ -6708,10 +6787,10 @@ Role of an accessible object</extracomment>
<message>
<source>Qt cannot load the direct2d platform plugin because the Direct2D version on this system is too old. The minimum system requirement for this platform plugin is Windows 7 SP1 with Platform Update.
-The minimum Direct2D version required is %1.%2.%3.%4. The Direct2D version on this system is %5.%6.%7.%8.</source>
+The minimum Direct2D version required is %1. The Direct2D version on this system is %2.</source>
<translation>Qt kan ikke indlæse direct2d-platform-pluginet fordi Direct2D-versionen på dette system er for gammel. Minimum systemkrav for dette platform-plugin er Windows 7 SP1 med platformsopdatering.
-Direct2D-versionen skal minimum være %1.%2.%3.%4. Direct2D-versionen på dette system er %5.%6.%7.%8.</translation>
+Direct2D-versionen skal minimum være %1. Direct2D-versionen på dette system er %2.</translation>
</message>
<message>
<source>Cannot load direct2d platform plugin</source>
@@ -6935,16 +7014,36 @@ Direct2D-versionen skal minimum være %1.%2.%3.%4. Direct2D-versionen på dette
<translation>Ugyldigt dokument.</translation>
</message>
<message>
- <source>Expected </source>
- <translation>Ventede </translation>
+ <source>&apos;%1&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&apos;&lt;first option&gt;&apos;</extracomment>
+ <translation>&apos;%1&apos;</translation>
+ </message>
+ <message>
+ <source>%1 or &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;first option&gt;, &apos;&lt;second option&gt;&apos;</extracomment>
+ <translation>%1 eller &apos;%2&apos;</translation>
+ </message>
+ <message>
+ <source>%1, &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;options so far&gt;, &apos;&lt;next option&gt;&apos;</extracomment>
+ <translation>%1, &apos;%2&apos;</translation>
+ </message>
+ <message>
+ <source>%1, or &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;options so far&gt;, or &apos;&lt;final option&gt;&apos;</extracomment>
+ <translation>%1 eller &apos;%2&apos;</translation>
</message>
<message>
- <source>, but got &apos;</source>
- <translation>, men fik &apos;</translation>
+ <source>Expected %1, but got &apos;%2&apos;.</source>
+ <translation>Ventede %1, men fik &apos;%2&apos;.</translation>
</message>
<message>
- <source>Unexpected &apos;</source>
- <translation>Uventet &apos;</translation>
+ <source>Unexpected &apos;%1&apos;.</source>
+ <translation>Uventet &apos;%1&apos;.</translation>
</message>
<message>
<source>Expected character data.</source>
diff --git a/translations/qtbase_de.ts b/translations/qtbase_de.ts
index 4199171..ed8da7e 100644
--- a/translations/qtbase_de.ts
+++ b/translations/qtbase_de.ts
@@ -805,8 +805,8 @@ Drücken Sie ESC, um abzubrechen</translation>
<translation>Die Zieldatei existiert bereits</translation>
</message>
<message>
- <source>Error while renaming.</source>
- <translation>Fehler beim Umbenennen.</translation>
+ <source>Error while renaming: %1</source>
+ <translation>Fehler beim Umbenennen: %1</translation>
</message>
<message>
<source>Unable to restore from %1: %2</source>
@@ -821,6 +821,10 @@ Drücken Sie ESC, um abzubrechen</translation>
<translation>Die Quelldatei kann nicht entfernt werden</translation>
</message>
<message>
+ <source>Cannot open destination file: %1</source>
+ <translation>Die Zieldatei kann nicht geöffnet werden: %1</translation>
+ </message>
+ <message>
<source>Cannot open %1 for input</source>
<translation>%1 kann nicht zum Lesen geöffnet werden</translation>
</message>
@@ -841,7 +845,11 @@ Drücken Sie ESC, um abzubrechen</translation>
<name>QFileDevice</name>
<message>
<source>No file engine available or engine does not support UnMapExtension</source>
- <translation>Es ist kein Datei-Engine verfügbar oder der gegenwärtig aktive Engine unterstützt die UnMap-Erweiterung nicht</translation>
+ <translation>Es ist kein Backend verfügbar oder das gegenwärtig aktive Backend unterstützt die UnMap-Erweiterung nicht</translation>
+ </message>
+ <message>
+ <source>No file engine available</source>
+ <translation>Es ist kein Backend verfügbar</translation>
</message>
</context>
<context>
@@ -1087,31 +1095,11 @@ Möchten Sie die Datei trotzdem löschen?</translation>
<context>
<name>QFileSystemModel</name>
<message>
- <source>%1 TB</source>
- <translation>%1 TB</translation>
- </message>
- <message>
- <source>%1 GB</source>
- <translation>%1 GB</translation>
- </message>
- <message>
- <source>%1 MB</source>
- <translation>%1 MB</translation>
- </message>
- <message>
- <source>%1 KB</source>
- <translation>%1 KB</translation>
- </message>
- <message>
- <source>%1 bytes</source>
- <translation>%1 Byte</translation>
- </message>
- <message>
<source>Invalid filename</source>
<translation>Ungültiger Dateiname</translation>
</message>
<message>
- <source>&lt;b&gt;The name &quot;%1&quot; can not be used.&lt;/b&gt;&lt;p&gt;Try using another name, with fewer characters or no punctuations marks.</source>
+ <source>&lt;b&gt;The name &quot;%1&quot; cannot be used.&lt;/b&gt;&lt;p&gt;Try using another name, with fewer characters or no punctuation marks.</source>
<translation>&lt;b&gt;Der Name &quot;%1&quot; kann nicht verwendet werden.&lt;/b&gt;&lt;p&gt;Versuchen Sie, die Satzzeichen zu entfernen oder einen kürzeren Namen zu verwenden.</translation>
</message>
<message>
@@ -1144,10 +1132,6 @@ Möchten Sie die Datei trotzdem löschen?</translation>
<source>Computer</source>
<translation>Computer</translation>
</message>
- <message>
- <source>%1 byte(s)</source>
- <translation>%1 Byte</translation>
- </message>
</context>
<context>
<name>QFontDatabase</name>
@@ -1533,10 +1517,6 @@ Möchten Sie die Datei trotzdem löschen?</translation>
<translation>Host konnte nicht gefunden werden</translation>
</message>
<message>
- <source>Unknown error</source>
- <translation>Unbekannter Fehler</translation>
- </message>
- <message>
<source>Unknown error (%1)</source>
<translation>Unbekannter Fehler (%1)</translation>
</message>
@@ -1785,6 +1765,10 @@ Möchten Sie die Datei trotzdem löschen?</translation>
<source>Unsupported image format</source>
<translation>Dieser Typ von Bilddaten wird nicht unterstützt</translation>
</message>
+ <message>
+ <source>Image is empty</source>
+ <translation>Das Bild ist leer</translation>
+ </message>
</context>
<context>
<name>QInputDialog</name>
@@ -1931,6 +1915,10 @@ Möchten Sie die Datei trotzdem löschen?</translation>
<translation>Fehlende Daten der Sektion; dies scheint keine Bibliothek zu sein.</translation>
</message>
<message>
+ <source>Out of memory while loading plugin &apos;%1&apos;.</source>
+ <translation>Das Plugin &apos;%1&apos; konnte auf Grund mangelnden Speicherplatzes nicht geladen werden.</translation>
+ </message>
+ <message>
<source>Failed to extract plugin meta data from &apos;%1&apos;</source>
<translation>Die Metadaten des Plugins &apos;%1&apos; konnten nicht bestimmt werden</translation>
</message>
@@ -2689,6 +2677,17 @@ Möchten Sie die Datei trotzdem löschen?</translation>
</message>
</context>
<context>
+ <name>QPPDOptionsModel</name>
+ <message>
+ <source>Name</source>
+ <translation>Name</translation>
+ </message>
+ <message>
+ <source>Value</source>
+ <translation>Wert</translation>
+ </message>
+</context>
+<context>
<name>QPSQLDriver</name>
<message>
<source>Unable to connect</source>
@@ -2718,10 +2717,22 @@ Möchten Sie die Datei trotzdem löschen?</translation>
<context>
<name>QPSQLResult</name>
<message>
+ <source>Query results lost - probably discarded on executing another SQL query.</source>
+ <translation>Die Ergebnisse der Abfrage sind nicht länger verfügbar - wahrscheinlich wurden sie durch Ausführung einer anderen SQL-Abfrage gelöscht.</translation>
+ </message>
+ <message>
<source>Unable to create query</source>
<translation>Es konnte keine Abfrage erzeugt werden</translation>
</message>
<message>
+ <source>Unable to get result</source>
+ <translation>Es kann kein Ergebnis erhalten werden</translation>
+ </message>
+ <message>
+ <source>Unable to send query</source>
+ <translation>Die Abfrage kann nicht gesendet werden</translation>
+ </message>
+ <message>
<source>Unable to prepare statement</source>
<translation>Der Befehl konnte nicht initialisiert werden</translation>
</message>
@@ -3514,6 +3525,14 @@ Möchten Sie die Datei trotzdem löschen?</translation>
<translation>&amp;Einstellungen &lt;&lt; </translation>
</message>
<message>
+ <source>Invalid Pages Definition</source>
+ <translation>Ungültige Seitendefinition</translation>
+ </message>
+ <message>
+ <source>%1 does not follow the correct syntax. Please use &apos;,&apos; to separate ranges and pages, &apos;-&apos; to define ranges and make sure ranges do not intersect with each other.</source>
+ <translation>%1 entspricht nicht der richtigen Schreibweise. Bitte benutzen Sie &apos;,&apos; um Bereiche und Seitennummern voneinander abzugrenzen, &apos;-&apos; um Bereiche festzulegen, und stellen Sie sicher, dass sich die Bereiche nicht überschneiden.</translation>
+ </message>
+ <message>
<source>Print to File (PDF)</source>
<translation>In PDF-Datei drucken</translation>
</message>
@@ -3655,6 +3674,14 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<source>Job Options</source>
<translation>Einstellungen zum Druckauftrag</translation>
</message>
+ <message>
+ <source>Advanced Option Conflicts</source>
+ <translation>Widersprüchliche erweiterte Einstellungen</translation>
+ </message>
+ <message>
+ <source>There are conflicts in some advanced options. Do you want to fix them?</source>
+ <translation>Es liegen Widersprüche in den erweiterten Einstellung vor. Möchten Sie sie korrigieren?</translation>
+ </message>
</context>
<context>
<name>QPrintPropertiesWidget</name>
@@ -3666,6 +3693,14 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<source>Page</source>
<translation>Seite</translation>
</message>
+ <message>
+ <source>Advanced</source>
+ <translation>Erweitert</translation>
+ </message>
+ <message>
+ <source>There are conflicts in some options. Please fix them.</source>
+ <translation>Einige Einstellungen sind widersprüchlich. Bitte korrigieren Sie diese.</translation>
+ </message>
</context>
<context>
<name>QPrintSettingsOutput</name>
@@ -3753,6 +3788,14 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<source>Page Set:</source>
<translation>Seiten-Satz:</translation>
</message>
+ <message>
+ <source>Pages</source>
+ <translation>Seiten</translation>
+ </message>
+ <message>
+ <source>Specify pages or ranges separated by commas. Ranges are specified by two numbers separated by a hyphen. E.g: 3,5-7,9 prints pages 3, 5, 6, 7 and 9.</source>
+ <translation>Geben Sie die Seiten oder Bereiche durch Kommata getrennt ein. Bereiche werden durch zwei durch einen Bindestrich getrennte Zahlen festgelegt. Beispiel: 3,5-7,9 druckt die Seiten 3, 5, 6, 7 und 9.</translation>
+ </message>
</context>
<context>
<name>QPrintWidget</name>
@@ -4597,6 +4640,10 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>Dateiname bezeichnet ein Verzeichnis</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 kann &apos;%1&apos; ohne den Direct-Write-Fallback nicht öffnen; der Pfad enthält eine Alternate-Data-Stream-Angabe</translation>
+ </message>
+ <message>
<source>Writing canceled by application</source>
<translation>Das Schreiben wurde von der Anwendung abgebrochen</translation>
</message>
@@ -6304,6 +6351,38 @@ Role of an accessible object</extracomment>
<translation>Die Diffie-Hellman-Parameter sind ungültig</translation>
</message>
<message>
+ <source>OpenSSL version with disabled elliptic curves</source>
+ <translation>Elliptische Kurven sind in dieser Version von OpenSSL nicht verfügbar</translation>
+ </message>
+ <message>
+ <source>Error when setting the OpenSSL configuration (%1)</source>
+ <translation>Fehler beim Setzen der OpenSSL-Konfiguration (%1)</translation>
+ </message>
+ <message>
+ <source>Expecting QByteArray for %1</source>
+ <translation>Es wird der Typ QByteArray für %1 erwartet</translation>
+ </message>
+ <message>
+ <source>An error occurred attempting to set %1 to %2</source>
+ <translation>Beim Setzen von %1 auf %2 trat ein Fehler auf</translation>
+ </message>
+ <message>
+ <source>Wrong value for %1 (%2)</source>
+ <translation>Falscher Wert für %1 (%2)</translation>
+ </message>
+ <message>
+ <source>Unrecognized command %1 = %2</source>
+ <translation>Nicht erkanntes Kommando %1 = %2</translation>
+ </message>
+ <message>
+ <source>SSL_CONF_finish() failed</source>
+ <translation>SSL_CONF_finish() schlug fehl</translation>
+ </message>
+ <message>
+ <source>SSL_CONF_CTX_new() failed</source>
+ <translation>SSL_CONF_CTX_new() schlug fehl</translation>
+ </message>
+ <message>
<source>OpenSSL version too old, need at least v1.0.2</source>
<translation>Die verwendete Version von OpenSSL ist zu alt, es muss v1.0.2 oder neuer sein</translation>
</message>
@@ -6710,10 +6789,10 @@ Role of an accessible object</extracomment>
<message>
<source>Qt cannot load the direct2d platform plugin because the Direct2D version on this system is too old. The minimum system requirement for this platform plugin is Windows 7 SP1 with Platform Update.
-The minimum Direct2D version required is %1.%2.%3.%4. The Direct2D version on this system is %5.%6.%7.%8.</source>
+The minimum Direct2D version required is %1. The Direct2D version on this system is %2.</source>
<translation>Qt kann das Direct2D-Plattform-Plugin nicht laden, weil die auf dem System installierte Version von Direct2D veraltet ist. Dieses Plattform-Plugin erfordert mindestens Windows 7 SP1 mit Plattform Update.
-Die minimal erforderliche Version von Direct2D ist %1.%2.%3.%4. Die auf diesem System installierte Version von Direct2D ist %5.%6.%7.%8.</translation>
+Die minimal erforderliche Version von Direct2D ist %1 Die auf diesem System installierte Version von Direct2D ist %2.</translation>
</message>
<message>
<source>Cannot load direct2d platform plugin</source>
@@ -6937,16 +7016,36 @@ Die minimal erforderliche Version von Direct2D ist %1.%2.%3.%4. Die auf diesem S
<translation>Ungültiges Dokument.</translation>
</message>
<message>
- <source>Expected </source>
- <translation>Es wurde </translation>
+ <source>&apos;%1&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&apos;&lt;first option&gt;&apos;</extracomment>
+ <translation>&apos;%1&apos;</translation>
+ </message>
+ <message>
+ <source>%1 or &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;first option&gt;, &apos;&lt;second option&gt;&apos;</extracomment>
+ <translation>%1 oder &apos;%2&apos;</translation>
+ </message>
+ <message>
+ <source>%1, &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;options so far&gt;, &apos;&lt;next option&gt;&apos;</extracomment>
+ <translation>%1, &apos;%2&apos;</translation>
+ </message>
+ <message>
+ <source>%1, or &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;options so far&gt;, or &apos;&lt;final option&gt;&apos;</extracomment>
+ <translation>%1 oder &apos;%2&apos;</translation>
</message>
<message>
- <source>, but got &apos;</source>
- <translation>erwartet, stattdessen erhalten &apos;</translation>
+ <source>Expected %1, but got &apos;%2&apos;.</source>
+ <translation>%1 erwartet, jedoch &apos;%2&apos; erhalten.</translation>
</message>
<message>
- <source>Unexpected &apos;</source>
- <translation>Ungültig an dieser Stelle &apos; </translation>
+ <source>Unexpected &apos;%1&apos;.</source>
+ <translation>Unerwartet &apos;%1&apos;.</translation>
</message>
<message>
<source>Expected character data.</source>
diff --git a/translations/qtbase_fi.ts b/translations/qtbase_fi.ts
index 8372ae1..4afeb3c 100644
--- a/translations/qtbase_fi.ts
+++ b/translations/qtbase_fi.ts
@@ -805,8 +805,8 @@ Peru painamalla ESC</translation>
<translation>Kohdetiedosto on olemassa</translation>
</message>
<message>
- <source>Error while renaming.</source>
- <translation>Virhe nimeä muutettaessa.</translation>
+ <source>Error while renaming: %1</source>
+ <translation>Virhe nimeä muutettaessa: %1</translation>
</message>
<message>
<source>Unable to restore from %1: %2</source>
@@ -821,6 +821,10 @@ Peru painamalla ESC</translation>
<translation>Lähdetiedoston poistaminen epäonnistui</translation>
</message>
<message>
+ <source>Cannot open destination file: %1</source>
+ <translation>Kohdetiedostoa ei voitu avata: %1</translation>
+ </message>
+ <message>
<source>Cannot open %1 for input</source>
<translation>Tiedoston %1 avaaminen syötteeksi epäonnistui</translation>
</message>
@@ -843,6 +847,10 @@ Peru painamalla ESC</translation>
<source>No file engine available or engine does not support UnMapExtension</source>
<translation>Tiedostokone ei ole käytettävissä tai kone ei tue UnMapExtension-laajennusta</translation>
</message>
+ <message>
+ <source>No file engine available</source>
+ <translation>Tiedostokone ei ole käytettävissä</translation>
+ </message>
</context>
<context>
<name>QFileDialog</name>
@@ -1087,31 +1095,11 @@ Haluatko silti poistaa sen?</translation>
<context>
<name>QFileSystemModel</name>
<message>
- <source>%1 TB</source>
- <translation>%1 Tt</translation>
- </message>
- <message>
- <source>%1 GB</source>
- <translation>%1 Gt</translation>
- </message>
- <message>
- <source>%1 MB</source>
- <translation>%1 Mt</translation>
- </message>
- <message>
- <source>%1 KB</source>
- <translation>%1 kt</translation>
- </message>
- <message>
- <source>%1 bytes</source>
- <translation>%1 tavua</translation>
- </message>
- <message>
<source>Invalid filename</source>
<translation>Virheellinen tiedostonimi</translation>
</message>
<message>
- <source>&lt;b&gt;The name &quot;%1&quot; can not be used.&lt;/b&gt;&lt;p&gt;Try using another name, with fewer characters or no punctuations marks.</source>
+ <source>&lt;b&gt;The name &quot;%1&quot; cannot be used.&lt;/b&gt;&lt;p&gt;Try using another name, with fewer characters or no punctuation marks.</source>
<translation>&lt;b&gt;Nimeä ”%1” ei voi käyttää.&lt;/b&gt;&lt;p&gt;Kokeile jotain muuta nimeä, esim. vähemmän merkkejä tai ei välimerkkejä.</translation>
</message>
<message>
@@ -1144,10 +1132,6 @@ Haluatko silti poistaa sen?</translation>
<source>Computer</source>
<translation>Tietokone</translation>
</message>
- <message>
- <source>%1 byte(s)</source>
- <translation>%1 tavu(a)</translation>
- </message>
</context>
<context>
<name>QFontDatabase</name>
@@ -1533,10 +1517,6 @@ Haluatko silti poistaa sen?</translation>
<translation>Konetta ei löydy</translation>
</message>
<message>
- <source>Unknown error</source>
- <translation>Tuntematon virhe</translation>
- </message>
- <message>
<source>Unknown error (%1)</source>
<translation>Tuntematon virhe (%1)</translation>
</message>
@@ -1785,6 +1765,10 @@ Haluatko silti poistaa sen?</translation>
<source>Unsupported image format</source>
<translation>Kuvamuotoa ei tueta</translation>
</message>
+ <message>
+ <source>Image is empty</source>
+ <translation>Kuva on tyhjä</translation>
+ </message>
</context>
<context>
<name>QInputDialog</name>
@@ -1930,6 +1914,10 @@ Haluatko silti poistaa sen?</translation>
<translation>osiolla ei ole dataa. Tämä ei ole kirjasto.</translation>
</message>
<message>
+ <source>Out of memory while loading plugin &apos;%1&apos;.</source>
+ <translation>Muisti loppui ladattaessa liitännäistä ”%1”.</translation>
+ </message>
+ <message>
<source>Failed to extract plugin meta data from &apos;%1&apos;</source>
<translation>Liitännäismetatietojen saaminen kirjastosta ”%1” epäonnistui</translation>
</message>
@@ -2700,6 +2688,17 @@ kun GNU LGPL 3:n ehtoja voidaan noudattaa.&lt;/p&gt;
</message>
</context>
<context>
+ <name>QPPDOptionsModel</name>
+ <message>
+ <source>Name</source>
+ <translation>Nimi</translation>
+ </message>
+ <message>
+ <source>Value</source>
+ <translation>Arvo</translation>
+ </message>
+</context>
+<context>
<name>QPSQLDriver</name>
<message>
<source>Unable to connect</source>
@@ -2729,10 +2728,22 @@ kun GNU LGPL 3:n ehtoja voidaan noudattaa.&lt;/p&gt;
<context>
<name>QPSQLResult</name>
<message>
+ <source>Query results lost - probably discarded on executing another SQL query.</source>
+ <translation>Kyselyn tuloksia ei saada, koska ne on saatettu hävittää toista SQL-kyselyä suoritettaessa.</translation>
+ </message>
+ <message>
<source>Unable to create query</source>
<translation>Kyselyn luominen epäonnistui</translation>
</message>
<message>
+ <source>Unable to get result</source>
+ <translation>Tuloksen saanti epäonnistui</translation>
+ </message>
+ <message>
+ <source>Unable to send query</source>
+ <translation>Kyselyn lähettäminen epäonnistui</translation>
+ </message>
+ <message>
<source>Unable to prepare statement</source>
<translation>Lauseen valmisteleminen epäonnistui</translation>
</message>
@@ -3525,6 +3536,14 @@ kun GNU LGPL 3:n ehtoja voidaan noudattaa.&lt;/p&gt;
<translation>&amp;Asetukset &lt;&lt;</translation>
</message>
<message>
+ <source>Invalid Pages Definition</source>
+ <translation>Virheellinen sivujen määritys</translation>
+ </message>
+ <message>
+ <source>%1 does not follow the correct syntax. Please use &apos;,&apos; to separate ranges and pages, &apos;-&apos; to define ranges and make sure ranges do not intersect with each other.</source>
+ <translation>%1 ei noudata oikeaa syntaksia. Käytä pilkkua (,) sivunumeroiden ja -numeroalueiden erottamiseen. Käytä viivaa (-) sivunumeroalueiden ilmaisemiseen. Varmista, että sivunumeroalueet eivät mene päällekkäin.</translation>
+ </message>
+ <message>
<source>Print to File (PDF)</source>
<translation>Tulosta tiedostoon (PDF)</translation>
</message>
@@ -3666,6 +3685,14 @@ Poista toinen niistä käytöstä.</translation>
<source>Job Options</source>
<translation>Työn asetukset</translation>
</message>
+ <message>
+ <source>Advanced Option Conflicts</source>
+ <translation>Konflikti edistyneissä asetuksissa</translation>
+ </message>
+ <message>
+ <source>There are conflicts in some advanced options. Do you want to fix them?</source>
+ <translation>Joissakin edistyneissä asetuksissa on konflikteja. Haluatko korjata ne?</translation>
+ </message>
</context>
<context>
<name>QPrintPropertiesWidget</name>
@@ -3677,6 +3704,14 @@ Poista toinen niistä käytöstä.</translation>
<source>Page</source>
<translation>Sivu</translation>
</message>
+ <message>
+ <source>Advanced</source>
+ <translation>Edistyneet</translation>
+ </message>
+ <message>
+ <source>There are conflicts in some options. Please fix them.</source>
+ <translation>Joissakin asetuksissa on konflikteja. Ole hyvä ja korjaa ne.</translation>
+ </message>
</context>
<context>
<name>QPrintSettingsOutput</name>
@@ -3764,6 +3799,14 @@ Poista toinen niistä käytöstä.</translation>
<source>Short side</source>
<translation>Lyhyempi reuna</translation>
</message>
+ <message>
+ <source>Pages</source>
+ <translation>Sivut</translation>
+ </message>
+ <message>
+ <source>Specify pages or ranges separated by commas. Ranges are specified by two numbers separated by a hyphen. E.g: 3,5-7,9 prints pages 3, 5, 6, 7 and 9.</source>
+ <translation>Erottele sivunumerot ja -numeroalueet pilkuilla. Sivunumeroalueet merkitään kahdella numerolla, viivalla erotettuina. Esim. 3,5-7,9 tulostaa sivut 3, 5, 6, 7 ja 9.</translation>
+ </message>
</context>
<context>
<name>QPrintWidget</name>
@@ -4609,6 +4652,10 @@ Poista toinen niistä käytöstä.</translation>
<translation>Tiedostonimi viittaa kansioon</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 ei voi avata polkua ”%1” ilman suoraa kirjoitusta: polku sisältää vaihtoehtoinen tietovirta -tunnisteen</translation>
+ </message>
+ <message>
<source>Writing canceled by application</source>
<translation>Ohjelma keskeytti kirjoittamisen</translation>
</message>
@@ -6224,6 +6271,38 @@ Role of an accessible object</extracomment>
<translation>Diffie-Hellman-parametrit eivät ole kelvolliset</translation>
</message>
<message>
+ <source>OpenSSL version with disabled elliptic curves</source>
+ <translation>OpenSSL:ssä ei ole elliptisten käyrien tukea</translation>
+ </message>
+ <message>
+ <source>Error when setting the OpenSSL configuration (%1)</source>
+ <translation>Virhe asetettaessa OpenSSL:n asetuksia (%1)</translation>
+ </message>
+ <message>
+ <source>Expecting QByteArray for %1</source>
+ <translation>Asetus %1 vaatii QByteArray:n</translation>
+ </message>
+ <message>
+ <source>An error occurred attempting to set %1 to %2</source>
+ <translation>Virhe asetettaessa asetukselle %1 arvoa %2</translation>
+ </message>
+ <message>
+ <source>Wrong value for %1 (%2)</source>
+ <translation>Väärä arvo (%2) asetukselle %1</translation>
+ </message>
+ <message>
+ <source>Unrecognized command %1 = %2</source>
+ <translation>Tuntematon komento %1 = %2</translation>
+ </message>
+ <message>
+ <source>SSL_CONF_finish() failed</source>
+ <translation>SSL_CONF_finish() epäonnistui</translation>
+ </message>
+ <message>
+ <source>SSL_CONF_CTX_new() failed</source>
+ <translation>SSL_CONF_CTX_new() epäonnistui</translation>
+ </message>
+ <message>
<source>OpenSSL version too old, need at least v1.0.2</source>
<translation>OpenSSL-versio on liian vanha; tarvitaan vähintään v1.0.2</translation>
</message>
@@ -6722,10 +6801,10 @@ Role of an accessible object</extracomment>
<message>
<source>Qt cannot load the direct2d platform plugin because the Direct2D version on this system is too old. The minimum system requirement for this platform plugin is Windows 7 SP1 with Platform Update.
-The minimum Direct2D version required is %1.%2.%3.%4. The Direct2D version on this system is %5.%6.%7.%8.</source>
+The minimum Direct2D version required is %1. The Direct2D version on this system is %2.</source>
<translation>Qt ei voi ladata direct2d-alustaliitännäistä, koska järjestelmän Direct2D-versio on liian vanha. Tämä alustaliitännäinen vaatii vähintään Windows 7 SP 1:n Platform Updatella.
-Direct2D-version vähimmäisvaatimus on %1.%2.%3.%4. Järjestelmän Direct2D-versio on %5.%6.%7.%8.</translation>
+Direct2D-version vähimmäisvaatimus on %1. Järjestelmän Direct2D-versio on %2.</translation>
</message>
<message>
<source>Cannot load direct2d platform plugin</source>
@@ -6949,16 +7028,36 @@ Direct2D-version vähimmäisvaatimus on %1.%2.%3.%4. Järjestelmän Direct2D-ver
<translation>Virheellinen dokumentti.</translation>
</message>
<message>
- <source>Expected </source>
- <translation>Odotettiin </translation>
+ <source>&apos;%1&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&apos;&lt;first option&gt;&apos;</extracomment>
+ <translation>”%1”</translation>
+ </message>
+ <message>
+ <source>%1 or &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;first option&gt;, &apos;&lt;second option&gt;&apos;</extracomment>
+ <translation>%1 tai ”%2”</translation>
+ </message>
+ <message>
+ <source>%1, &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;options so far&gt;, &apos;&lt;next option&gt;&apos;</extracomment>
+ <translation>%1, ”%2”</translation>
+ </message>
+ <message>
+ <source>%1, or &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;options so far&gt;, or &apos;&lt;final option&gt;&apos;</extracomment>
+ <translation>%1 tai ”%2”</translation>
</message>
<message>
- <source>, but got &apos;</source>
- <translation>, mutta saatiin &apos;</translation>
+ <source>Expected %1, but got &apos;%2&apos;.</source>
+ <translation>Odotettiin %1, mutta saatiin ”%2”.</translation>
</message>
<message>
- <source>Unexpected &apos;</source>
- <translation>Odottamaton &apos;</translation>
+ <source>Unexpected &apos;%1&apos;.</source>
+ <translation>Odottamaton ”%1”.</translation>
</message>
<message>
<source>Expected character data.</source>
diff --git a/translations/qtbase_ru.ts b/translations/qtbase_ru.ts
index fad1c05..41333d1 100644
--- a/translations/qtbase_ru.ts
+++ b/translations/qtbase_ru.ts
@@ -780,10 +780,18 @@ Press ESC to cancel</source>
<translation>Предупреждение:</translation>
</message>
<message>
- <source>Fatal Error:</source>
+ <source>Critical Error:</source>
<translation>Критическая ошибка:</translation>
</message>
<message>
+ <source>Fatal Error:</source>
+ <translation>Фатальная ошибка:</translation>
+ </message>
+ <message>
+ <source>Information:</source>
+ <translation>Информация:</translation>
+ </message>
+ <message>
<source>&amp;Show this message again</source>
<translation>&amp;Показывать это сообщение в дальнейшем</translation>
</message>
@@ -807,8 +815,8 @@ Press ESC to cancel</source>
<translation>Файл существует</translation>
</message>
<message>
- <source>Error while renaming.</source>
- <translation>Возникла ошибка при переименовании.</translation>
+ <source>Error while renaming: %1</source>
+ <translation>Возникла ошибка при переименовании: %1</translation>
</message>
<message>
<source>Unable to restore from %1: %2</source>
@@ -823,6 +831,10 @@ Press ESC to cancel</source>
<translation>Невозможно удалить исходный файл</translation>
</message>
<message>
+ <source>Cannot open destination file: %1</source>
+ <translation>Не удалось открыть файл назначения: %1</translation>
+ </message>
+ <message>
<source>Cannot open %1 for input</source>
<translation>Невозможно открыть %1 для ввода</translation>
</message>
@@ -845,6 +857,10 @@ Press ESC to cancel</source>
<source>No file engine available or engine does not support UnMapExtension</source>
<translation>Нет файлового движка или он не поддерживает UnMapExtension</translation>
</message>
+ <message>
+ <source>No file engine available</source>
+ <translation>Файловый движок недоступен</translation>
+ </message>
</context>
<context>
<name>QFileDialog</name>
@@ -1089,31 +1105,11 @@ Do you want to delete it anyway?</source>
<context>
<name>QFileSystemModel</name>
<message>
- <source>%1 TB</source>
- <translation>%1 Тб</translation>
- </message>
- <message>
- <source>%1 GB</source>
- <translation>%1 Гб</translation>
- </message>
- <message>
- <source>%1 MB</source>
- <translation>%1 Мб</translation>
- </message>
- <message>
- <source>%1 KB</source>
- <translation>%1 Кб</translation>
- </message>
- <message>
- <source>%1 bytes</source>
- <translation>%1 байт</translation>
- </message>
- <message>
<source>Invalid filename</source>
<translation>Некорректное имя файла</translation>
</message>
<message>
- <source>&lt;b&gt;The name &quot;%1&quot; can not be used.&lt;/b&gt;&lt;p&gt;Try using another name, with fewer characters or no punctuations marks.</source>
+ <source>&lt;b&gt;The name &quot;%1&quot; cannot be used.&lt;/b&gt;&lt;p&gt;Try using another name, with fewer characters or no punctuation marks.</source>
<translation>&lt;b&gt;Имя «%1» не может быть использовано.&lt;/b&gt;&lt;p&gt;Попробуйте использовать имя меньшей длины и/или без символов пунктуации.</translation>
</message>
<message>
@@ -1146,10 +1142,6 @@ Do you want to delete it anyway?</source>
<source>Computer</source>
<translation>Компьютер</translation>
</message>
- <message>
- <source>%1 byte(s)</source>
- <translation>%1 байт</translation>
- </message>
</context>
<context>
<name>QFontDatabase</name>
@@ -1535,10 +1527,6 @@ Do you want to delete it anyway?</source>
<translation>Узел не найден</translation>
</message>
<message>
- <source>Unknown error</source>
- <translation>Неизвестная ошибка</translation>
- </message>
- <message>
<source>Unknown error (%1)</source>
<translation>Неизвестная ошибка (%1)</translation>
</message>
@@ -1776,6 +1764,10 @@ Do you want to delete it anyway?</source>
<translation>Устройство не задано</translation>
</message>
<message>
+ <source>Cannot open device for writing: %1</source>
+ <translation>Не удалось открыть устройство для записи: %1</translation>
+ </message>
+ <message>
<source>Device not writable</source>
<translation>Устройство не поддерживает запись</translation>
</message>
@@ -1783,6 +1775,10 @@ Do you want to delete it anyway?</source>
<source>Unsupported image format</source>
<translation>Неподдерживаемый формат изображения</translation>
</message>
+ <message>
+ <source>Image is empty</source>
+ <translation>Изображение пусто</translation>
+ </message>
</context>
<context>
<name>QInputDialog</name>
@@ -1881,8 +1877,60 @@ Do you want to delete it anyway?</source>
<translation>«%1» является некорректным объектом ELF (%2)</translation>
</message>
<message>
- <source>Plugin verification data mismatch in &apos;%1&apos;</source>
- <translation>Проверочная информация для модуля «%1» не совпадает</translation>
+ <source>odd cpu architecture</source>
+ <translation>странная архитектура CPU</translation>
+ </message>
+ <message>
+ <source>wrong cpu architecture</source>
+ <translation>неверная архитектура CPU</translation>
+ </message>
+ <message>
+ <source>odd endianness</source>
+ <translation>странный порядок байт</translation>
+ </message>
+ <message>
+ <source>unexpected e_shsize</source>
+ <translation>неожиданный e_shsize</translation>
+ </message>
+ <message>
+ <source>unexpected e_shentsize</source>
+ <translation>неожиданный e_shentsize</translation>
+ </message>
+ <message numerus="yes">
+ <source>announced %n section(s), each %1 byte(s), exceed file size</source>
+ <translation>
+ <numerusform>объявлена %n секция по %1 байт, что превышает размер файла</numerusform>
+ <numerusform>объявлено %n секции по %1 байт, что превышает размер файла</numerusform>
+ <numerusform>объявлено %n секций по %1 байт, что превышает размер файла</numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>shstrtab section header seems to be at %1</source>
+ <translation type="unfinished">заголовок секции shstrtab кажется должен быть с %1</translation>
+ </message>
+ <message>
+ <source>string table seems to be at %1</source>
+ <translation type="unfinished">таблица строк кажется должна быть с %1</translation>
+ </message>
+ <message>
+ <source>section name %1 of %2 behind end of file</source>
+ <translation>имя секции %1 из %2 за пределами файла</translation>
+ </message>
+ <message>
+ <source>empty .rodata. not a library.</source>
+ <translation>пустая .rodata. Это не библиотека.</translation>
+ </message>
+ <message>
+ <source>missing section data. This is not a library.</source>
+ <translation>отсутствуют данные секции. Это не библиотека.</translation>
+ </message>
+ <message>
+ <source>Out of memory while loading plugin &apos;%1&apos;.</source>
+ <translation>Недостаточно памяти для загрузки модуля «%1».</translation>
+ </message>
+ <message>
+ <source>Failed to extract plugin meta data from &apos;%1&apos;</source>
+ <translation>Не удалось извлечь мета-данные модуля из «%1»</translation>
</message>
<message>
<source>The shared library was not found.</source>
@@ -2225,22 +2273,14 @@ Do you want to delete it anyway?</source>
<translation>Скрыть подробности...</translation>
</message>
<message>
- <source>OK</source>
- <translation>Закрыть</translation>
- </message>
- <message>
- <source>Help</source>
- <translation>Справка</translation>
+ <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 three different 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 the GNU LGPL version 3.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU LGPL version 3 is appropriate for the development of Qt&amp;nbsp;applications provided you can comply with the terms and conditions of the GNU LGPL version 3.&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>
+ <translation>&lt;p&gt;Qt ― это инструментарий для разработки кроссплатформенных приложений на C++.&lt;/p&gt;&lt;p&gt;Qt предоставляет совместимость на уровне исходных текстов для всех популярных настольных операционных систем. Также Qt доступна для встраиваемого Linux и других мобильных операционных систем.&lt;/p&gt;&lt;p&gt;Qt доступна под тремя различными лицензиями, разработанными для удовлетворения различных требований.&lt;/p&gt;&lt;p&gt;Qt под нашей коммерческой лицензией предназначена для развития проприетарного/коммерческого программного обеспечения, когда Вы не желаете предоставлять исходные тексты третьим сторонам, или в случае невозможности принятия условий лицензий GNU LGPL версии 3.&lt;/p&gt;&lt;p&gt;Qt под лицензией GNU LGPL версии 3 предназначена для разработки программного обеспечения удовлетворяющего условиям лицензии GNU LGPL версии 3.&lt;/p&gt;&lt;p&gt;Подробнее с лицензированием Qt можно ознакомиться на сайте &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Copyright (C) %1 The Qt Company Ltd and other contributors.&lt;/p&gt;&lt;p&gt;Qt и логотип Qt являются товарными знаками The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt ― продукт компании Qt Company Ltd, разрабатываемый как проект с открытым исходным кодом. &lt;/p&gt;&lt;p&gt;Более подробную информацию можно найти на сайте &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
</message>
<message>
<source>&lt;h3&gt;About Qt&lt;/h3&gt;&lt;p&gt;This program uses Qt version %1.&lt;/p&gt;</source>
<translation>&lt;h3&gt;О Qt&lt;/h3&gt;&lt;p&gt;Данная программа использует Qt версии %1.&lt;/p&gt;</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 three different 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 the GNU LGPL version 3 or GNU LGPL version 2.1.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU LGPL version 3 is appropriate for the development of Qt&amp;nbsp;applications provided you can comply with the terms and conditions of the GNU LGPL version 3.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt&amp;nbsp;applications provided you can comply with the terms and conditions of the GNU LGPL version 2.1.&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>
- <translation>&lt;p&gt;Qt ― это инструментарий для разработки кроссплатформенных приложений на C++.&lt;/p&gt;&lt;p&gt;Qt предоставляет совместимость на уровне исходных текстов между для всех популярных настольных операционных систем. Также Qt доступна для встраиваемого Linux и других мобильных операционных систем.&lt;/p&gt;&lt;p&gt;Qt доступна под тремя различными лицензиями, разработанными для удовлетворения различных требований.&lt;/p&gt;&lt;p&gt;Qt под нашей коммерческой лицензией предназначена для развития проприетарного/коммерческого программного обеспечения, когда Вы не желаете предоставлять исходные тексты третьим сторонам, или в случае невозможности принятия условий лицензий GNU LGPL версии 3 или GNU LGPL версии 2.1.&lt;/p&gt;&lt;p&gt;Qt под лицензией GNU LGPL версии 3 предназначена для разработки программного обеспечения удовлетворяющего условиям лицензии GNU LGPL версии 3.&lt;/p&gt;&lt;p&gt;Qt под лицензией GNU LGPL версии 2.1 предназначена для разработки программного обеспечения удовлетворяющего условиям лицензии GNU LGPL версии 2.1.&lt;/p&gt;&lt;p&gt;Подробнее с лицензированием Qt можно ознакомиться на сайте &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Copyright (C) %1 The Qt Company Ltd and other contributors.&lt;/p&gt;&lt;p&gt;Qt и логотип Qt являются товарными знаками The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt ― продукт компании Digia, разрабатываемый как проект с открытым исходным кодом. &lt;/p&gt;&lt;p&gt;Более подробную информацию можно найти на сайте &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
- </message>
- <message>
<source>About Qt</source>
<translation>О Qt</translation>
</message>
@@ -2647,6 +2687,17 @@ Do you want to delete it anyway?</source>
</message>
</context>
<context>
+ <name>QPPDOptionsModel</name>
+ <message>
+ <source>Name</source>
+ <translation>Название</translation>
+ </message>
+ <message>
+ <source>Value</source>
+ <translation>Значение</translation>
+ </message>
+</context>
+<context>
<name>QPSQLDriver</name>
<message>
<source>Unable to connect</source>
@@ -2676,10 +2727,22 @@ Do you want to delete it anyway?</source>
<context>
<name>QPSQLResult</name>
<message>
+ <source>Query results lost - probably discarded on executing another SQL query.</source>
+ <translation>Результат запроса потерян, возможно, из-за выполнения другого запроса SQL.</translation>
+ </message>
+ <message>
<source>Unable to create query</source>
<translation>Невозможно создать запрос</translation>
</message>
<message>
+ <source>Unable to get result</source>
+ <translation>Не удалось получить результат</translation>
+ </message>
+ <message>
+ <source>Unable to send query</source>
+ <translation>Не удалось отправить запрос</translation>
+ </message>
+ <message>
<source>Unable to prepare statement</source>
<translation>Невозможно подготовить выражение</translation>
</message>
@@ -3473,6 +3536,14 @@ Do you want to delete it anyway?</source>
<translation>&amp;Параметры &lt;&lt;</translation>
</message>
<message>
+ <source>Invalid Pages Definition</source>
+ <translation>Неверное определение страницы</translation>
+ </message>
+ <message>
+ <source>%1 does not follow the correct syntax. Please use &apos;,&apos; to separate ranges and pages, &apos;-&apos; to define ranges and make sure ranges do not intersect with each other.</source>
+ <translation>%1 имеет некорректный синтаксис. Используйте «,» для разделения страниц и диапазонов, а «-» для определения диапазонов. Пересекающиеся диапазоны недопустимы.</translation>
+ </message>
+ <message>
<source>Print to File (PDF)</source>
<translation>Печать в файл (PDF)</translation>
</message>
@@ -3615,6 +3686,14 @@ Please turn one of those options off.</source>
<source>Job Options</source>
<translation>Параметры задания</translation>
</message>
+ <message>
+ <source>Advanced Option Conflicts</source>
+ <translation>Конфликт расширенных настроек</translation>
+ </message>
+ <message>
+ <source>There are conflicts in some advanced options. Do you want to fix them?</source>
+ <translation>Обнаружены противоречия в некоторых расширенных настройках. Устранить?</translation>
+ </message>
</context>
<context>
<name>QPrintPropertiesWidget</name>
@@ -3626,12 +3705,20 @@ Please turn one of those options off.</source>
<source>Page</source>
<translation>Страница</translation>
</message>
+ <message>
+ <source>Advanced</source>
+ <translation>Расширенные</translation>
+ </message>
+ <message>
+ <source>There are conflicts in some options. Please fix them.</source>
+ <translation>Обнаружены противоречия в некоторых настройках. Устраните их.</translation>
+ </message>
</context>
<context>
<name>QPrintSettingsOutput</name>
<message>
<source>Form</source>
- <translation>Форма</translation>
+ <translation></translation>
</message>
<message>
<source>Copies</source>
@@ -3713,6 +3800,14 @@ Please turn one of those options off.</source>
<source>Page Set:</source>
<translation>Список страниц:</translation>
</message>
+ <message>
+ <source>Pages</source>
+ <translation>Страницы</translation>
+ </message>
+ <message>
+ <source>Specify pages or ranges separated by commas. Ranges are specified by two numbers separated by a hyphen. E.g: 3,5-7,9 prints pages 3, 5, 6, 7 and 9.</source>
+ <translation>Укажите страницы или диапазоны разделённые запятыми. Диапазоны задаются двумя числами, разделёнными дефисом. Например: при указании 3,5-7,9 будут напечатаны страницы 3, 5, 6, 7 и 9.</translation>
+ </message>
</context>
<context>
<name>QPrintWidget</name>
@@ -3870,7 +3965,7 @@ Please turn one of those options off.</source>
</message>
<message>
<source>unrecognized character follows \</source>
- <translation>символ следующий за \ не опознан</translation>
+ <translation>не опознан символ следующий за \</translation>
</message>
<message>
<source>numbers out of order in {} quantifier</source>
@@ -3893,64 +3988,32 @@ Please turn one of those options off.</source>
<translation>некорректный диапазон в классе символов</translation>
</message>
<message>
- <source>nothing to repeat</source>
- <translation>нечего повторять</translation>
- </message>
- <message>
<source>internal error: unexpected repeat</source>
<translation>внутренняя ошибка: неожиданный повтор</translation>
</message>
<message>
<source>unrecognized character after (? or (?-</source>
- <translation>символ следующий за (? или (?- не опознан</translation>
+ <translation>не опознан символ следующий за (? или (?-</translation>
</message>
<message>
<source>POSIX named classes are supported only within a class</source>
<translation>классы именованные в стиле POSIX поддерживаются только внутри класса</translation>
</message>
<message>
- <source>missing )</source>
- <translation>отсутствует )</translation>
- </message>
- <message>
<source>reference to non-existent subpattern</source>
<translation>ссылка на несуществующий подшаблон</translation>
</message>
<message>
- <source>erroffset passed as NULL</source>
- <translation>в качестве erroffset передан NULL</translation>
- </message>
- <message>
- <source>unknown option bit(s) set</source>
- <translation>неизвестный набор флагов регулярного выражения</translation>
- </message>
- <message>
- <source>missing ) after comment</source>
- <translation>отсутствует ) после комментария</translation>
- </message>
- <message>
<source>regular expression is too large</source>
<translation>Регулярное выражение слишком велико</translation>
</message>
<message>
- <source>failed to get memory</source>
- <translation>не удалось выделить память</translation>
- </message>
- <message>
- <source>unmatched parentheses</source>
- <translation>круглые скобки не согласованы</translation>
- </message>
- <message>
<source>internal error: code overflow</source>
<translation>внутренняя ошибка: переполнение кода</translation>
</message>
<message>
- <source>unrecognized character after (?&lt;</source>
- <translation>символ после (?&lt; не опознан</translation>
- </message>
- <message>
<source>lookbehind assertion is not fixed length</source>
- <translation>проверка lookbehind имеет нефиксированную длину</translation>
+ <translation>утверждение lookbehind не фиксированной длины</translation>
</message>
<message>
<source>malformed number or name after (?(</source>
@@ -3961,10 +4024,6 @@ Please turn one of those options off.</source>
<translation>условная группа содержит более двух веток</translation>
</message>
<message>
- <source>assertion expected after (?(</source>
- <translation>после (?( требуется проверка</translation>
- </message>
- <message>
<source>(?R or (?[+-]digits must be followed by )</source>
<translation>за (?R или (?[+-]цифры должна следовать )</translation>
</message>
@@ -3977,58 +4036,22 @@ Please turn one of those options off.</source>
<translation>POSIX-сортировка элементов не поддерживается</translation>
</message>
<message>
- <source>this version of PCRE is not compiled with PCRE_UTF8 support</source>
- <translation>эта версия PCRE собрана без поддержки PCRE_UTF8</translation>
- </message>
- <message>
- <source>character value in \x{...} sequence is too large</source>
- <translation>значение символа в последовательности \x{...} слишком большое</translation>
- </message>
- <message>
<source>invalid condition (?(0)</source>
<translation>некорректное условие (?(0)</translation>
</message>
<message>
- <source>\C not allowed in lookbehind assertion</source>
- <translation>\C не допустима в проверке lookbehind</translation>
- </message>
- <message>
<source>PCRE does not support \L, \l, \N{name}, \U, or \u</source>
<translation>PCRE не поддерживает \L, \l, \N{имя}, \U и \u</translation>
</message>
<message>
- <source>number after (?C is &gt; 255</source>
- <translation>число после (?C больше 255</translation>
- </message>
- <message>
- <source>closing ) for (?C expected</source>
- <translation>требуется закрывающая ) для (?C</translation>
- </message>
- <message>
- <source>recursive call could loop indefinitely</source>
- <translation>рекурсивный вызов может зациклиться навечно</translation>
- </message>
- <message>
<source>unrecognized character after (?P</source>
- <translation>символ после (?P не опознан</translation>
+ <translation>не опознан символ после (?P</translation>
</message>
<message>
<source>syntax error in subpattern name (missing terminator)</source>
<translation>синтаксическая ошибка в имени подшаблона (отсутствует признак завершения)</translation>
</message>
<message>
- <source>two named subpatterns have the same name</source>
- <translation>два именованных подшаблона имеют одинаковое имя</translation>
- </message>
- <message>
- <source>invalid UTF-8 string</source>
- <translation>некорректная строка UTF-8</translation>
- </message>
- <message>
- <source>support for \P, \p, and \X has not been compiled</source>
- <translation>поддержка \P, \p и \X не скомпилирована</translation>
- </message>
- <message>
<source>malformed \P or \p sequence</source>
<translation>некорректно сформирована последовательность \P или \p</translation>
</message>
@@ -4037,18 +4060,6 @@ Please turn one of those options off.</source>
<translation>неизвестное имя свойства после \P или \p</translation>
</message>
<message>
- <source>subpattern name is too long (maximum 32 characters)</source>
- <translation>название подшаблона слишком велико (ограничено в 32 символа)</translation>
- </message>
- <message>
- <source>too many named subpatterns (maximum 10000)</source>
- <translation>слишком много именованых подшаблонов (ограничено 10000)</translation>
- </message>
- <message>
- <source>octal value is greater than \377 (not in UTF-8 mode)</source>
- <translation>восьмиричное число больше \377 (в режиме не UTF-8)</translation>
- </message>
- <message>
<source>internal error: overran compiling workspace</source>
<translation>внутренняя ошибка: выход за пределы области компиляции</translation>
</message>
@@ -4061,14 +4072,6 @@ Please turn one of those options off.</source>
<translation>группа DEFINE содержит более одной ветки</translation>
</message>
<message>
- <source>repeating a DEFINE group is not allowed</source>
- <translation>повтор группы DEFINE не допустим</translation>
- </message>
- <message>
- <source>inconsistent NEWLINE options</source>
- <translation>несовместимая опция NEWLINE</translation>
- </message>
- <message>
<source>\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number</source>
<translation>за \g должно следовать число или название/число заключённое в фигурные/угловые скобки или кавычки</translation>
</message>
@@ -4081,10 +4084,6 @@ Please turn one of those options off.</source>
<translation>для (*ACCEPT), (*FAIL) и (*COMMIT) аргументы не допустимы</translation>
</message>
<message>
- <source>(*VERB) not recognized</source>
- <translation>(*VERB) не опознан</translation>
- </message>
- <message>
<source>number is too big</source>
<translation>число слишком велико</translation>
</message>
@@ -4097,10 +4096,6 @@ Please turn one of those options off.</source>
<translation>после (?+ требуется цифра</translation>
</message>
<message>
- <source>] is an invalid data character in JavaScript compatibility mode</source>
- <translation>] недопустимый символ данных в режиме совместимости с JavaScript</translation>
- </message>
- <message>
<source>different names for subpatterns of the same number are not allowed</source>
<translation>отличные имена для подшаблонов с одним номером не допустимы</translation>
</message>
@@ -4109,14 +4104,6 @@ Please turn one of those options off.</source>
<translation>(*MARK) должен иметь аргумент</translation>
</message>
<message>
- <source>this version of PCRE is not compiled with PCRE_UCP support</source>
- <translation>эта версия PCRE собрана без поддержки PCRE_UCP</translation>
- </message>
- <message>
- <source>\c must be followed by an ASCII character</source>
- <translation>после \c должен следовать символ ASCII</translation>
- </message>
- <message>
<source>\k is not followed by a braced, angle-bracketed, or quoted name</source>
<translation>за \k должно следовать название заключённое в фигурные/угловые скобки или кавычки</translation>
</message>
@@ -4129,34 +4116,14 @@ Please turn one of those options off.</source>
<translation>\N не поддерживается в классе</translation>
</message>
<message>
- <source>too many forward references</source>
- <translation>слишком много опережающих ссылок</translation>
- </message>
- <message>
<source>disallowed Unicode code point (&gt;= 0xd800 &amp;&amp; &lt;= 0xdfff)</source>
<translation>недопустимая кодовая точка Unicode (&gt;= 0xd800 &amp;&amp; &lt;= 0xdfff)</translation>
</message>
<message>
- <source>invalid UTF-16 string</source>
- <translation>некорректная строка UTF-16</translation>
- </message>
- <message>
<source>name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)</source>
<translation>слишком длинное имя в (*MARK), (*PRUNE), (*SKIP) или (*THEN)</translation>
</message>
<message>
- <source>character value in \u.... sequence is too large</source>
- <translation>значение символа в последовательности \u... слишком велико</translation>
- </message>
- <message>
- <source>invalid UTF-32 string</source>
- <translation>некорректная строка UTF-32</translation>
- </message>
- <message>
- <source>setting UTF is disabled by the application</source>
- <translation>настройка UTF отключена приложением</translation>
- </message>
- <message>
<source>non-hex character in \x{} (closing brace missing?)</source>
<translation>не-шестнадцатеричный символ в \x {} (отсутствует закрывающая скобка?)</translation>
</message>
@@ -4181,12 +4148,415 @@ Please turn one of those options off.</source>
<translation>имя группы должно начинаться с нецифры</translation>
</message>
<message>
+ <source>quantifier does not follow a repeatable item</source>
+ <translation type="unfinished">квантификатор не соответствует повторяемому элементу</translation>
+ </message>
+ <message>
+ <source>missing closing parenthesis</source>
+ <translation>отсутствует закрывающая скобка</translation>
+ </message>
+ <message>
+ <source>pattern passed as NULL</source>
+ <translation>вместо шаблона передан NULL</translation>
+ </message>
+ <message>
+ <source>unrecognised compile-time option bit(s)</source>
+ <translation>не опознаны биты опций времени компиляции</translation>
+ </message>
+ <message>
+ <source>missing ) after (?# comment</source>
+ <translation>отсутствует ) после комментария (?#</translation>
+ </message>
+ <message>
+ <source>failed to allocate heap memory</source>
+ <translation>не удалось выделить память в куче</translation>
+ </message>
+ <message>
+ <source>unmatched closing parenthesis</source>
+ <translation>не соответствует закрывающая скобка</translation>
+ </message>
+ <message>
+ <source>letter or underscore expected after (?&lt; or (?&apos;</source>
+ <translation>после (?&lt; или (?&apos; требуется буква или подчеркивание</translation>
+ </message>
+ <message>
+ <source>assertion expected after (?( or (?(?C)</source>
+ <translation>после (?( или (?(?C) требуется утверждение</translation>
+ </message>
+ <message>
+ <source>internal error in pcre2_study(): should not occur</source>
+ <translation>внутренняя ошибка в pcre2_study(): не должно возникать</translation>
+ </message>
+ <message>
+ <source>this version of PCRE2 does not have Unicode support</source>
+ <translation>эта версия PCRE2 не поддерживает юникод</translation>
+ </message>
+ <message>
<source>parentheses are too deeply nested (stack check)</source>
<translation>слишком большое вложение скобок (контроль стека)</translation>
</message>
<message>
+ <source>character code point value in \x{} or \o{} is too large</source>
+ <translation>значение кодовой точки символа в \x{} или \o{} слишком большое</translation>
+ </message>
+ <message>
+ <source>\C is not allowed in a lookbehind assertion</source>
+ <translation>\C не допустимо в утверждениях lookbehind</translation>
+ </message>
+ <message>
+ <source>number after (?C is greater than 255</source>
+ <translation>число после (?C больше 255</translation>
+ </message>
+ <message>
+ <source>closing parenthesis for (?C expected</source>
+ <translation>требуется закрывающая скобка после (?C</translation>
+ </message>
+ <message>
+ <source>invalid escape sequence in (*VERB) name</source>
+ <translation type="unfinished">Неверная ESC-последовательность в имени (*VERB)</translation>
+ </message>
+ <message>
+ <source>two named subpatterns have the same name (PCRE2_DUPNAMES not set)</source>
+ <translation>два именованных подшаблона имеют одинаковое имя (PCRE2_DUPNAMES не установлен)</translation>
+ </message>
+ <message>
+ <source>this version of PCRE2 does not have support for \P, \p, or \X</source>
+ <translation>эта версия PCRE2 не поддерживает \P, \p или \X</translation>
+ </message>
+ <message>
+ <source>subpattern name is too long (maximum 10000 characters)</source>
+ <translation>название подшаблона слишком велико (ограничено в 10000 символов)</translation>
+ </message>
+ <message>
+ <source>too many named subpatterns (maximum 256)</source>
+ <translation>слишком много именованых подшаблонов (ограничено 256)</translation>
+ </message>
+ <message>
+ <source>octal value is greater than \377 in 8-bit non-UTF-8 mode</source>
+ <translation>восьмиричное число больше \377 в 8-ми битном не UTF-8 режиме</translation>
+ </message>
+ <message>
+ <source>internal error: unknown newline setting</source>
+ <translation>внутренняя ошибка: неизвестный разделитель строк</translation>
+ </message>
+ <message>
+ <source>(*VERB) not recognized or malformed</source>
+ <translation>(*VERB) не опознан или неверен</translation>
+ </message>
+ <message>
+ <source>\c must be followed by a printable ASCII character</source>
+ <translation>после \c должен идти печатаемый символ ASCII</translation>
+ </message>
+ <message>
+ <source>\c must be followed by a letter or one of [\]^_?</source>
+ <translation>после \c должна идти буква или один из [\]^_?</translation>
+ </message>
+ <message>
+ <source>SPARE ERROR</source>
+ <translation type="unfinished">ОШИБКА SPARE</translation>
+ </message>
+ <message>
+ <source>using UTF is disabled by the application</source>
+ <translation>использование UTF отключено приложением</translation>
+ </message>
+ <message>
+ <source>using UCP is disabled by the application</source>
+ <translation>использование UCP отключено приложением</translation>
+ </message>
+ <message>
+ <source>character code point value in \u.... sequence is too large</source>
+ <translation>значение кодовой точки символа в последовательности \u.... слишком большое</translation>
+ </message>
+ <message>
<source>digits missing in \x{} or \o{}</source>
- <translation>Отсутствуют цифры в \x{} или \o{}</translation>
+ <translation>отсутствуют цифры в \x{} или \o{}</translation>
+ </message>
+ <message>
+ <source>syntax error in (?(VERSION condition</source>
+ <translation>синтаксическая ошибка в условии (?(VERSION</translation>
+ </message>
+ <message>
+ <source>internal error: unknown opcode in auto_possessify()</source>
+ <translation>внутренняя ошибка: неизвестный опкод в auto_possessify()</translation>
+ </message>
+ <message>
+ <source>missing terminating delimiter for callout with string argument</source>
+ <translation>отстутствует конечный разделитель для вызова со строковым параметром</translation>
+ </message>
+ <message>
+ <source>unrecognized string delimiter follows (?C</source>
+ <translation>не опознан строковый разделитель следующий за (?C</translation>
+ </message>
+ <message>
+ <source>using \C is disabled by the application</source>
+ <translation>использование \C отключено приложением</translation>
+ </message>
+ <message>
+ <source>(?| and/or (?J: or (?x: parentheses are too deeply nested</source>
+ <translation>слишком глубокое вложение скобок (?| и/или (?J: или (?x:</translation>
+ </message>
+ <message>
+ <source>using \C is disabled in this PCRE2 library</source>
+ <translation>использование \C отключено в этой библиотеке PCRE2</translation>
+ </message>
+ <message>
+ <source>regular expression is too complicated</source>
+ <translation>слишком сложное регулярное выражение</translation>
+ </message>
+ <message>
+ <source>lookbehind assertion is too long</source>
+ <translation>утверждение lookbehind слишком большое</translation>
+ </message>
+ <message>
+ <source>pattern string is longer than the limit set by the application</source>
+ <translation>строка шаблона больше ограничения, заданного приложением</translation>
+ </message>
+ <message>
+ <source>no match</source>
+ <translation>нет соответствий</translation>
+ </message>
+ <message>
+ <source>partial match</source>
+ <translation>частичное соответствие</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: 1 byte missing at end</source>
+ <translation>ошибка UTF-8: недостаточно 1 байта в конце</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: 2 bytes missing at end</source>
+ <translation>ошибка UTF-8: недостаточно 2 байт в конце</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: 3 bytes missing at end</source>
+ <translation>ошибка UTF-8: недостаточно 3 байт в конце</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: 4 bytes missing at end</source>
+ <translation>ошибка UTF-8: недостаточно 4 байт в конце</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: 5 bytes missing at end</source>
+ <translation>ошибка UTF-8: недостаточно 5 байт в конце</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: byte 2 top bits not 0x80</source>
+ <translation>ошибка UTF-8: во 2 байте старшие биты не 0x80</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: byte 3 top bits not 0x80</source>
+ <translation>ошибка UTF-8: во 3 байте старшие биты не 0x80</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: byte 4 top bits not 0x80</source>
+ <translation>ошибка UTF-8: во 4 байте старшие биты не 0x80</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: byte 5 top bits not 0x80</source>
+ <translation>ошибка UTF-8: во 5 байте старшие биты не 0x80</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: byte 6 top bits not 0x80</source>
+ <translation>ошибка UTF-8: во 6 байте старшие биты не 0x80</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: 5-byte character is not allowed (RFC 3629)</source>
+ <translation>ошибка UTF-8: 5-ти байтовые символы недопустимы (RFC 3629)</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: 6-byte character is not allowed (RFC 3629)</source>
+ <translation>ошибка UTF-8: 6-ти байтовые символы недопустимы (RFC 3629)</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: code points greater than 0x10ffff are not defined</source>
+ <translation>ошибка UTF-8: кодовые точки больше 0x10ffff не определены</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: code points 0xd800-0xdfff are not defined</source>
+ <translation>ошибка UTF-8: кодовые точки с 0xd800 по 0xdfff не определены</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: overlong 2-byte sequence</source>
+ <translation>ошибка UTF-8: сверхдлинная двухбайтовая последовательность</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: overlong 3-byte sequence</source>
+ <translation>ошибка UTF-8: сверхдлинная трёхбайтовая последовательность</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: overlong 4-byte sequence</source>
+ <translation>ошибка UTF-8: сверхдлинная четырёхбайтовая последовательность</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: overlong 5-byte sequence</source>
+ <translation>ошибка UTF-8: сверхдлинная пятибайтовая последовательность</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: overlong 6-byte sequence</source>
+ <translation>ошибка UTF-8: сверхдлинная шестибайтовая последовательность</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: isolated byte with 0x80 bit set</source>
+ <translation>ошибка UTF-8: отдельный байт с установленным битом 0x80</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: illegal byte (0xfe or 0xff)</source>
+ <translation>ошибка UTF-8: недопустимый байт (0xfe или 0xff)</translation>
+ </message>
+ <message>
+ <source>UTF-16 error: missing low surrogate at end</source>
+ <translation>ошибка UTF-16: отсутствует нижний суррогат в конце</translation>
+ </message>
+ <message>
+ <source>UTF-16 error: invalid low surrogate</source>
+ <translation>ошибка UTF-16: неверный нижний суррогат</translation>
+ </message>
+ <message>
+ <source>UTF-16 error: isolated low surrogate</source>
+ <translation>ошибка UTF-16: отдельный нижний суррогат</translation>
+ </message>
+ <message>
+ <source>UTF-32 error: code points 0xd800-0xdfff are not defined</source>
+ <translation>ошибка UTF-32: кодовые точки с 0xd800 по 0xdfff не определены</translation>
+ </message>
+ <message>
+ <source>UTF-32 error: code points greater than 0x10ffff are not defined</source>
+ <translation>ошибка UTF-32: кодовые точки больше 0x10ffff не определены</translation>
+ </message>
+ <message>
+ <source>bad data value</source>
+ <translation>плохое значение данных</translation>
+ </message>
+ <message>
+ <source>patterns do not all use the same character tables</source>
+ <translation>не все шаблоны используют одинаковые символьные таблицы</translation>
+ </message>
+ <message>
+ <source>magic number missing</source>
+ <translation>отсутствует магическое число</translation>
+ </message>
+ <message>
+ <source>pattern compiled in wrong mode: 8/16/32-bit error</source>
+ <translation>шаблон скомпилирован в неверном режиме: ошибка 8/16/32 бит</translation>
+ </message>
+ <message>
+ <source>bad offset value</source>
+ <translation>плохое значение смещения</translation>
+ </message>
+ <message>
+ <source>bad option value</source>
+ <translation>плохое значение опции</translation>
+ </message>
+ <message>
+ <source>invalid replacement string</source>
+ <translation>неверная замещающая строка</translation>
+ </message>
+ <message>
+ <source>bad offset into UTF string</source>
+ <translation>плохое смещение в строке UTF</translation>
+ </message>
+ <message>
+ <source>callout error code</source>
+ <translation>код ошибки вызова</translation>
+ </message>
+ <message>
+ <source>invalid data in workspace for DFA restart</source>
+ <translatorcomment>Deterministic Finite Automaton - Детерминированный Конечный Автомат</translatorcomment>
+ <translation>данные в рабочей области недопустимы для перезапуска ДКА</translation>
+ </message>
+ <message>
+ <source>too much recursion for DFA matching</source>
+ <translation>слишком большая рекурсия для ДКА поиска</translation>
+ </message>
+ <message>
+ <source>backreference condition or recursion test is not supported for DFA matching</source>
+ <translation>условие обратной ссылки или рекурсивный тест не поддерживается ДКА поиска</translation>
+ </message>
+ <message>
+ <source>function is not supported for DFA matching</source>
+ <translation>функция не поддерживается ДКА поиска</translation>
+ </message>
+ <message>
+ <source>pattern contains an item that is not supported for DFA matching</source>
+ <translation>шаблон содержит элемент, неподдерживаемый ДКА поиска</translation>
+ </message>
+ <message>
+ <source>workspace size exceeded in DFA matching</source>
+ <translation>превышен размер рабочей области ДКА поиска</translation>
+ </message>
+ <message>
+ <source>internal error - pattern overwritten?</source>
+ <translation>внутренняя ошибка: шаблон перезаписан?</translation>
+ </message>
+ <message>
+ <source>bad JIT option</source>
+ <translation>неверная опция JIT</translation>
+ </message>
+ <message>
+ <source>JIT stack limit reached</source>
+ <translation>достигнут предел стека JIT</translation>
+ </message>
+ <message>
+ <source>match limit exceeded</source>
+ <translation>предел поиска превышен</translation>
+ </message>
+ <message>
+ <source>no more memory</source>
+ <translation>нет больше памяти</translation>
+ </message>
+ <message>
+ <source>unknown substring</source>
+ <translation>неизвестная подстрока</translation>
+ </message>
+ <message>
+ <source>non-unique substring name</source>
+ <translation>неуникальное имя подстроки</translation>
+ </message>
+ <message>
+ <source>NULL argument passed</source>
+ <translation>вместо аргумента передан NULL</translation>
+ </message>
+ <message>
+ <source>nested recursion at the same subject position</source>
+ <translatorcomment>х.з. что значит</translatorcomment>
+ <translation type="unfinished">вложенная рекурсия в той же позиции субъекта</translation>
+ </message>
+ <message>
+ <source>recursion limit exceeded</source>
+ <translation>предел рекурсии превышен</translation>
+ </message>
+ <message>
+ <source>requested value is not available</source>
+ <translation>запрошенное значение недоступно</translation>
+ </message>
+ <message>
+ <source>requested value is not set</source>
+ <translation>запрошенное значение не задано</translation>
+ </message>
+ <message>
+ <source>offset limit set without PCRE2_USE_OFFSET_LIMIT</source>
+ <translation>предел смещения задан без PCRE2_USE_OFFSET_LIMIT</translation>
+ </message>
+ <message>
+ <source>bad escape sequence in replacement string</source>
+ <translation>неверная ESC-последовательность в замещающей строке</translation>
+ </message>
+ <message>
+ <source>expected closing curly bracket in replacement string</source>
+ <translation>требуется закрытая фигурная скобка в замещающей строке</translation>
+ </message>
+ <message>
+ <source>bad substitution in replacement string</source>
+ <translatorcomment>бред какой-то</translatorcomment>
+ <translation type="unfinished">плохая замена в замещающей строке</translation>
+ </message>
+ <message>
+ <source>match with end before start is not supported</source>
+ <translation>поиск с концом перед началом не поддерживается</translation>
+ </message>
+ <message>
+ <source>too many replacements (more than INT_MAX)</source>
+ <translation>слишком много замен (более INT_MAX)</translation>
</message>
</context>
<context>
@@ -4284,6 +4654,10 @@ 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>
+ </message>
+ <message>
<source>Writing canceled by application</source>
<translation>Запись прервана приложением</translation>
</message>
@@ -4344,6 +4718,13 @@ Please turn one of those options off.</source>
</message>
</context>
<context>
+ <name>QSctpSocket</name>
+ <message>
+ <source>The remote host closed the connection</source>
+ <translation>Удалённый узел закрыл соединение</translation>
+ </message>
+</context>
+<context>
<name>QSharedMemory</name>
<message>
<source>%1: unable to set key on lock</source>
@@ -4901,7 +5282,7 @@ Please turn one of those options off.</source>
</message>
<message>
<source>Rotate Windows</source>
- <translation type="unfinished">Повернуть окна</translation>
+ <translation>Повернуть окна</translation>
</message>
<message>
<source>Rotation PB</source>
@@ -5839,6 +6220,21 @@ Role of an accessible object</extracomment>
</message>
</context>
<context>
+ <name>QSslDiffieHellmanParameter</name>
+ <message>
+ <source>No error</source>
+ <translation>Нет ошибки</translation>
+ </message>
+ <message>
+ <source>Invalid input data</source>
+ <translation>Неверные входные данные</translation>
+ </message>
+ <message>
+ <source>The given Diffie-Hellman parameters are deemed unsafe</source>
+ <translation>Переданные параметры Диффи-Хеллмана считаются небезопасными</translation>
+ </message>
+</context>
+<context>
<name>QSslSocket</name>
<message>
<source>No error</source>
@@ -5949,6 +6345,14 @@ Role of an accessible object</extracomment>
<translation>протокол не поддерживается</translation>
</message>
<message>
+ <source>Error while setting the minimal protocol version</source>
+ <translation>Ошибка при задании минимальной версии протокола</translation>
+ </message>
+ <message>
+ <source>Error while setting the maximum protocol version</source>
+ <translation>Ошибка при задании максимальной версии протокола</translation>
+ </message>
+ <message>
<source>Invalid or empty cipher list (%1)</source>
<translation>Некорректный или пустой список шифров (%1)</translation>
</message>
@@ -5969,6 +6373,42 @@ Role of an accessible object</extracomment>
<translation>Закрытый ключ не соответствует открытому ключу, %1</translation>
</message>
<message>
+ <source>Diffie-Hellman parameters are not valid</source>
+ <translation>Параметры Диффи-Хеллмана неверны</translation>
+ </message>
+ <message>
+ <source>OpenSSL version with disabled elliptic curves</source>
+ <translation>Версия OpenSSL с отключёнными эллиптическими кривыми</translation>
+ </message>
+ <message>
+ <source>Error when setting the OpenSSL configuration (%1)</source>
+ <translation>Ошибка при создании конфигурации OpenSSL (%1)</translation>
+ </message>
+ <message>
+ <source>Expecting QByteArray for %1</source>
+ <translation>Для %1 требуется QByteArray</translation>
+ </message>
+ <message>
+ <source>An error occurred attempting to set %1 to %2</source>
+ <translation>Возникла ошибка при попытке задать %1 значение %2</translation>
+ </message>
+ <message>
+ <source>Wrong value for %1 (%2)</source>
+ <translation>Неверное значение для %1 (%2)</translation>
+ </message>
+ <message>
+ <source>Unrecognized command %1 = %2</source>
+ <translation>Команда не распознана %1 = %2</translation>
+ </message>
+ <message>
+ <source>SSL_CONF_finish() failed</source>
+ <translation>Сбой SSL_CONF_finish()</translation>
+ </message>
+ <message>
+ <source>SSL_CONF_CTX_new() failed</source>
+ <translation>Сбой SSL_CONF_CTX_new()</translation>
+ </message>
+ <message>
<source>OpenSSL version too old, need at least v1.0.2</source>
<translation>Версия OpenSSL очень старая, требуется минимум 1.0.2</translation>
</message>
@@ -6195,6 +6635,17 @@ Role of an accessible object</extracomment>
</message>
</context>
<context>
+ <name>QUdpSocket</name>
+ <message>
+ <source>Unable to send a datagram</source>
+ <translation>Невозможно отправить датаграмму</translation>
+ </message>
+ <message>
+ <source>No datagram available for reading</source>
+ <translation>Нет доступных для чтения датаграмм</translation>
+ </message>
+</context>
+<context>
<name>QUndoGroup</name>
<message>
<source>Undo %1</source>
@@ -6360,10 +6811,10 @@ Role of an accessible object</extracomment>
<message>
<source>Qt cannot load the direct2d platform plugin because the Direct2D version on this system is too old. The minimum system requirement for this platform plugin is Windows 7 SP1 with Platform Update.
-The minimum Direct2D version required is %1.%2.%3.%4. The Direct2D version on this system is %5.%6.%7.%8.</source>
+The minimum Direct2D version required is %1. The Direct2D version on this system is %2.</source>
<translation>Qt не может загрузить модуль платформы direct2d, так как установленная версия Direct2D слишком старая. Минимальные требования этого модуля: Windows 7 SP1 с Platform Update.
-Требуется Direct2D версии не ниже %1.%2.%3.%4. Версия обнаруженного Direct2D: %5.%6.%7.%8.</translation>
+Требуется Direct2D версии не ниже %1. Версия обнаруженного Direct2D: %2.</translation>
</message>
<message>
<source>Cannot load direct2d platform plugin</source>
@@ -6587,16 +7038,36 @@ The minimum Direct2D version required is %1.%2.%3.%4. The Direct2D version on th
<translation>Некорректный документ.</translation>
</message>
<message>
- <source>Expected </source>
- <translation>Требуется </translation>
+ <source>&apos;%1&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&apos;&lt;first option&gt;&apos;</extracomment>
+ <translation>«%1»</translation>
+ </message>
+ <message>
+ <source>%1 or &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;first option&gt;, &apos;&lt;second option&gt;&apos;</extracomment>
+ <translation>%1 или «%2»</translation>
+ </message>
+ <message>
+ <source>%1, &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;options so far&gt;, &apos;&lt;next option&gt;&apos;</extracomment>
+ <translation>%1, «%2»</translation>
+ </message>
+ <message>
+ <source>%1, or &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;options so far&gt;, or &apos;&lt;final option&gt;&apos;</extracomment>
+ <translation>%1 или «%2»</translation>
</message>
<message>
- <source>, but got &apos;</source>
- <translation>, получили &apos;</translation>
+ <source>Expected %1, but got &apos;%2&apos;.</source>
+ <translation>Требуется %1, а получено «%2».</translation>
</message>
<message>
- <source>Unexpected &apos;</source>
- <translation>Неожиданное &apos;</translation>
+ <source>Unexpected &apos;%1&apos;.</source>
+ <translation>Неожиданное «%1».</translation>
</message>
<message>
<source>Expected character data.</source>
diff --git a/translations/qtconnectivity_da.ts b/translations/qtconnectivity_da.ts
index b8c0198..e654c29 100644
--- a/translations/qtconnectivity_da.ts
+++ b/translations/qtconnectivity_da.ts
@@ -52,8 +52,8 @@
<translation>Videregivet adresse er ikke en lokal enhed.</translation>
</message>
<message>
- <source>Missing Location permission. Search is not possible</source>
- <translation>Manglende placeringstilladelse. Søgning er ikke mulig</translation>
+ <source>Missing Location permission. Search is not possible.</source>
+ <translation>Manglende placeringstilladelse. Søgning er ikke mulig.</translation>
</message>
<message>
<source>Classic Discovery cannot be started</source>
@@ -152,7 +152,7 @@
</message>
<message>
<source>LAN Access Profile</source>
- <translation type="unfinished"></translation>
+ <translation>LAN-adgangsprofil</translation>
</message>
<message>
<source>Dial-Up Networking</source>
@@ -184,11 +184,11 @@
</message>
<message>
<source>Audio Sink</source>
- <translation type="unfinished"></translation>
+ <translation>Lyd-sink</translation>
</message>
<message>
<source>Audio/Video Remote Control Target</source>
- <translation type="unfinished"></translation>
+ <translation>Mål for fjernbetjening til lyd/video</translation>
</message>
<message>
<source>Advanced Audio Distribution</source>
@@ -196,11 +196,11 @@
</message>
<message>
<source>Audio/Video Remote Control</source>
- <translation type="unfinished"></translation>
+ <translation>Fjernbetjening til lyd/video</translation>
</message>
<message>
<source>Audio/Video Remote Control Controller</source>
- <translation type="unfinished"></translation>
+ <translation>Kontroller for fjernbetjening til lyd/video</translation>
</message>
<message>
<source>Headset AG</source>
@@ -220,11 +220,11 @@
</message>
<message>
<source>Basic Direct Printing (BPP)</source>
- <translation type="unfinished"></translation>
+ <translation>Grundlæggende direkte udskrivning (BPP)</translation>
</message>
<message>
<source>Basic Reference Printing (BPP)</source>
- <translation type="unfinished"></translation>
+ <translation>Grundlæggende reference udskrivning (BPP)</translation>
</message>
<message>
<source>Basic Imaging Profile</source>
@@ -368,7 +368,7 @@
</message>
<message>
<source>Video Sink</source>
- <translation type="unfinished"></translation>
+ <translation>Video-sink</translation>
</message>
<message>
<source>Video Distribution</source>
@@ -376,15 +376,15 @@
</message>
<message>
<source>Health Device</source>
- <translation type="unfinished"></translation>
+ <translation>Helbredsenhed</translation>
</message>
<message>
<source>Health Device Source</source>
- <translation type="unfinished"></translation>
+ <translation>Helbredsenhedskilde</translation>
</message>
<message>
<source>Health Device Sink</source>
- <translation type="unfinished"></translation>
+ <translation>Helbredsenhed-sink</translation>
</message>
<message>
<source>Generic Access</source>
@@ -400,7 +400,7 @@
</message>
<message>
<source>Link Loss</source>
- <translation type="unfinished"></translation>
+ <translation>Link tab</translation>
</message>
<message>
<source>Tx Power</source>
@@ -408,7 +408,7 @@
</message>
<message>
<source>Current Time Service</source>
- <translation type="unfinished"></translation>
+ <translation>Nuværende tid-tjeneste</translation>
</message>
<message>
<source>Reference Time Update Service</source>
@@ -424,7 +424,7 @@
</message>
<message>
<source>Health Thermometer</source>
- <translation type="unfinished"></translation>
+ <translation>Helbredstermometer</translation>
</message>
<message>
<source>Device Information</source>
@@ -432,7 +432,7 @@
</message>
<message>
<source>Heart Rate</source>
- <translation type="unfinished"></translation>
+ <translation>Puls</translation>
</message>
<message>
<source>Phone Alert Status Service</source>
@@ -452,31 +452,31 @@
</message>
<message>
<source>Scan Parameters</source>
- <translation type="unfinished"></translation>
+ <translation>Skan parametre</translation>
</message>
<message>
<source>Running Speed and Cadence</source>
- <translation type="unfinished"></translation>
+ <translation>Løb hastighed og kadence</translation>
</message>
<message>
<source>Cycling Speed and Cadence</source>
- <translation type="unfinished"></translation>
+ <translation>Cykling hastighed og kadence</translation>
</message>
<message>
<source>Cycling Power</source>
- <translation type="unfinished"></translation>
+ <translation>Cykling ydelse</translation>
</message>
<message>
<source>Location and Navigation</source>
- <translation type="unfinished"></translation>
+ <translation>Placering og navigation</translation>
</message>
<message>
<source>Environmental Sensing</source>
- <translation type="unfinished"></translation>
+ <translation>Miljøsansning</translation>
</message>
<message>
<source>Body Composition</source>
- <translation type="unfinished"></translation>
+ <translation>Kropssammensætning</translation>
</message>
<message>
<source>User Data</source>
@@ -634,7 +634,7 @@
</message>
<message>
<source>Date Time</source>
- <translation type="unfinished"></translation>
+ <translation>Dato klokkeslæt</translation>
</message>
<message>
<source>Day Of Week</source>
@@ -642,7 +642,7 @@
</message>
<message>
<source>Day Date Time</source>
- <translation type="unfinished"></translation>
+ <translation>Dag dato klokkeslæt</translation>
</message>
<message>
<source>Exact Time 256</source>
@@ -666,7 +666,7 @@
</message>
<message>
<source>Time Accuracy</source>
- <translation type="unfinished"></translation>
+ <translation>Tidspræcision</translation>
</message>
<message>
<source>Time Source</source>
@@ -674,11 +674,11 @@
</message>
<message>
<source>Reference Time Information</source>
- <translation type="unfinished"></translation>
+ <translation>Referencetidsinformation</translation>
</message>
<message>
<source>Time Update Control Point</source>
- <translation type="unfinished"></translation>
+ <translation>Tidsopdatering kontrolpunkt</translation>
</message>
<message>
<source>Time Update State</source>
@@ -702,11 +702,11 @@
</message>
<message>
<source>Intermediate Temperature</source>
- <translation type="unfinished"></translation>
+ <translation>Middeltemperatur</translation>
</message>
<message>
<source>Measurement Interval</source>
- <translation type="unfinished"></translation>
+ <translation>Interval for måling</translation>
</message>
<message>
<source>Boot Keyboard Input Report</source>
@@ -746,7 +746,7 @@
</message>
<message>
<source>Current Time</source>
- <translation type="unfinished"></translation>
+ <translation>Nuværende tid</translation>
</message>
<message>
<source>Scan Refresh</source>
@@ -774,15 +774,15 @@
</message>
<message>
<source>Heart Rate Measurement</source>
- <translation type="unfinished"></translation>
+ <translation>Pulsmåling</translation>
</message>
<message>
<source>Body Sensor Location</source>
- <translation type="unfinished"></translation>
+ <translation>Placering af kropssensor</translation>
</message>
<message>
<source>Heart Rate Control Point</source>
- <translation type="unfinished"></translation>
+ <translation>Puls-kontrolpunkt</translation>
</message>
<message>
<source>Alert Status</source>
@@ -790,11 +790,11 @@
</message>
<message>
<source>Ringer Control Point</source>
- <translation type="unfinished"></translation>
+ <translation>Ringer-kontrolpunkt</translation>
</message>
<message>
<source>Ringer Setting</source>
- <translation type="unfinished"></translation>
+ <translation>Ringer-indstilling</translation>
</message>
<message>
<source>Alert Category ID Bit Mask</source>
@@ -835,7 +835,7 @@
</message>
<message>
<source>Report Map</source>
- <translation type="unfinished"></translation>
+ <translation>Rapportkort</translation>
</message>
<message>
<source>HID Control Point</source>
@@ -844,7 +844,7 @@
</message>
<message>
<source>Report</source>
- <translation type="unfinished"></translation>
+ <translation>Rapport</translation>
</message>
<message>
<source>Protocol Mode</source>
@@ -856,7 +856,7 @@
</message>
<message>
<source>PnP ID</source>
- <translation type="unfinished"></translation>
+ <translation>PnP-ID</translation>
</message>
<message>
<source>Glucose Feature</source>
@@ -870,7 +870,7 @@
<message>
<source>RSC Measurement</source>
<extracomment>RSC: Running Speed and Cadence</extracomment>
- <translation type="unfinished"></translation>
+ <translation>RSC-måling</translation>
</message>
<message>
<source>RSC Feature</source>
@@ -897,23 +897,23 @@
</message>
<message>
<source>Cycling Power Measurement</source>
- <translation type="unfinished"></translation>
+ <translation>Cykling ydelse måling</translation>
</message>
<message>
<source>Cycling Power Vector</source>
- <translation type="unfinished"></translation>
+ <translation>Cykling ydelse vektor</translation>
</message>
<message>
<source>Cycling Power Feature</source>
- <translation type="unfinished"></translation>
+ <translation>Cykling ydelse funktionalitet</translation>
</message>
<message>
<source>Cycling Power Control Point</source>
- <translation type="unfinished"></translation>
+ <translation>Cykling ydelse kontrolpunkt</translation>
</message>
<message>
<source>Location And Speed</source>
- <translation type="unfinished"></translation>
+ <translation>Placering og hastighed</translation>
</message>
<message>
<source>Navigation</source>
@@ -929,7 +929,7 @@
</message>
<message>
<source>LN Control Point</source>
- <translation type="unfinished"></translation>
+ <translation>LN-kontrolpunkt</translation>
</message>
<message>
<source>Magnetic Declination</source>
@@ -939,7 +939,7 @@
<message>
<source>Elevation</source>
<extracomment>Above/below sea level</extracomment>
- <translation type="unfinished"></translation>
+ <translation>højde</translation>
</message>
<message>
<source>Pressure</source>
@@ -974,7 +974,7 @@
<message>
<source>Gust Factor</source>
<extracomment>Factor by which wind gust is stronger than average wind</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Vindstødsfaktor</translation>
</message>
<message>
<source>Pollen Concentration</source>
@@ -1002,7 +1002,7 @@
</message>
<message>
<source>Dew Point</source>
- <translation type="unfinished"></translation>
+ <translation>Dugpunkt</translation>
</message>
<message>
<source>Descriptor Value Changed</source>
@@ -1072,7 +1072,7 @@
</message>
<message>
<source>Heart Rate Maximum</source>
- <translation type="unfinished"></translation>
+ <translation>Maksimum puls</translation>
</message>
<message>
<source>Height</source>
@@ -1081,7 +1081,7 @@
</message>
<message>
<source>Hip Circumference</source>
- <translation type="unfinished"></translation>
+ <translation>Hoftevidde</translation>
</message>
<message>
<source>Last Name</source>
@@ -1089,11 +1089,11 @@
</message>
<message>
<source>Maximum Recommended Heart Rate</source>
- <translation type="unfinished"></translation>
+ <translation>Maksimum anbefalet puls</translation>
</message>
<message>
<source>Resting Heart Rate</source>
- <translation type="unfinished"></translation>
+ <translation>Hvilepuls</translation>
</message>
<message>
<source>Sport Type For Aerobic/Anaerobic Thresholds</source>
@@ -1109,11 +1109,11 @@
</message>
<message>
<source>Oxygen Uptake</source>
- <translation type="unfinished"></translation>
+ <translation>Iltoptagelse</translation>
</message>
<message>
<source>Waist Circumference</source>
- <translation type="unfinished"></translation>
+ <translation>Livvidde</translation>
</message>
<message>
<source>Weight</source>
@@ -1130,11 +1130,11 @@
</message>
<message>
<source>Body Composition Feature</source>
- <translation type="unfinished"></translation>
+ <translation>Kropssammensætning funktionalitet</translation>
</message>
<message>
<source>Body Composition Measurement</source>
- <translation type="unfinished"></translation>
+ <translation>Kropssammensætning måling</translation>
</message>
<message>
<source>Weight Measurement</source>
@@ -1142,15 +1142,15 @@
</message>
<message>
<source>User Control Point</source>
- <translation type="unfinished"></translation>
+ <translation>Bruger-kontrolpunkt</translation>
</message>
<message>
<source>Magnetic Flux Density 2D</source>
- <translation type="unfinished"></translation>
+ <translation>Tæthed af magnetisk flux 2D</translation>
</message>
<message>
<source>Magnetic Flux Density 3D</source>
- <translation type="unfinished"></translation>
+ <translation>Tæthed af magnetisk flux 3D</translation>
</message>
<message>
<source>Language</source>
@@ -1186,15 +1186,15 @@
</message>
<message>
<source>Valid Range</source>
- <translation type="unfinished"></translation>
+ <translation>Gyldigt område</translation>
</message>
<message>
<source>External Report Reference</source>
- <translation type="unfinished"></translation>
+ <translation>Ekstern rapportreference</translation>
</message>
<message>
<source>Report Reference</source>
- <translation type="unfinished"></translation>
+ <translation>Rapportreference</translation>
</message>
<message>
<source>Environmental Sensing Configuration</source>
@@ -1252,6 +1252,11 @@
<translation>Oprettelse af forbindelse til port understøttes ikke</translation>
</message>
<message>
+ <source>Cannot connect to %1</source>
+ <comment>%1 = uuid</comment>
+ <translation>Kan ikke oprette forbindelse til %1</translation>
+ </message>
+ <message>
<source>Device does not support Bluetooth</source>
<translation>Enhed understøtter ikke Bluetooth</translation>
</message>
@@ -1299,19 +1304,23 @@
</message>
<message>
<source>Network error</source>
- <translation type="unfinished"></translation>
+ <translation>Netværksfejl</translation>
+ </message>
+ <message>
+ <source>Remote host closed connection</source>
+ <translation>Fjern-vært lukkede forbindelse</translation>
</message>
<message>
<source>Connection timed out</source>
- <translation type="unfinished"></translation>
+ <translation>Forbindelse fik timeout</translation>
</message>
<message>
<source>Host not reachable</source>
- <translation type="unfinished"></translation>
+ <translation>Vært kan ikke kontaktes</translation>
</message>
<message>
<source>Host refused connection</source>
- <translation type="unfinished"></translation>
+ <translation>Vært nægtede forbindelse</translation>
</message>
</context>
<context>
@@ -1400,23 +1409,27 @@
</message>
<message>
<source>Error occurred trying to start advertising</source>
- <translation>Der opstod fejl ved forsøg på start af reklamering</translation>
+ <translation>Der opstod fejl ved forsøg på start af reklame</translation>
+ </message>
+ <message>
+ <source>Remote device closed the connection</source>
+ <translation>Fjern-enhed lukkede forbindelsen</translation>
</message>
<message>
<source>Advertisement data is larger than 31 bytes</source>
- <translation type="unfinished"></translation>
+ <translation>Reklamedata er større end 31 bytes</translation>
</message>
<message>
<source>Advertisement feature not supported on the platform</source>
- <translation type="unfinished"></translation>
+ <translation>Reklamefacilitet understøttes ikke på platformen</translation>
</message>
<message>
<source>Failed due to too many advertisers</source>
- <translation type="unfinished"></translation>
+ <translation>Fejlede pga. for mange annoncører</translation>
</message>
<message>
<source>Unknown advertisement error</source>
- <translation type="unfinished"></translation>
+ <translation>Ukendt reklamefejl</translation>
</message>
</context>
</TS>
diff --git a/translations/qtconnectivity_de.ts b/translations/qtconnectivity_de.ts
index 83f6629..72f0494 100644
--- a/translations/qtconnectivity_de.ts
+++ b/translations/qtconnectivity_de.ts
@@ -20,8 +20,8 @@
<translation>Übergebene Adresse gehört zu keinem lokalen Gerät.</translation>
</message>
<message>
- <source>Missing Location permission. Search is not possible</source>
- <translation>Die Berechtigung zur Positionsbestimmung fehlt. Es ist keine Suche möglich</translation>
+ <source>Missing Location permission. Search is not possible.</source>
+ <translation>Die Berechtigung zur Positionsbestimmung fehlt. Es ist keine Suche möglich.</translation>
</message>
<message>
<source>Classic Discovery cannot be started</source>
@@ -1266,6 +1266,11 @@
<translation>Öffnen der Eingabe- und Ausgabestreams des Dienstes fehlgeschlagen</translation>
</message>
<message>
+ <source>Cannot connect to %1</source>
+ <comment>%1 = uuid</comment>
+ <translation>Verbindung mit %1 kann nicht hergestellt werden</translation>
+ </message>
+ <message>
<source>Input stream thread cannot be started</source>
<translation>Thread des Eingabestreams konnte nicht gestartet werden</translation>
</message>
@@ -1302,6 +1307,10 @@
<translation>Netzwerkfehler</translation>
</message>
<message>
+ <source>Remote host closed connection</source>
+ <translation>Der Zielrechner hat die Verbindung geschlossen</translation>
+ </message>
+ <message>
<source>Connection timed out</source>
<translation>Bei der Verbindung ist eine Zeitüberschreitung aufgetreten</translation>
</message>
@@ -1403,6 +1412,10 @@
<translation>Bei der Ankündigung trat ein Fehler auf</translation>
</message>
<message>
+ <source>Remote device closed the connection</source>
+ <translation>Das Zielgerät hat die Verbindung geschlossen</translation>
+ </message>
+ <message>
<source>Advertisement data is larger than 31 bytes</source>
<translation>Advertisement-Daten sind größer als 31 bytes</translation>
</message>
diff --git a/translations/qtconnectivity_ru.ts b/translations/qtconnectivity_ru.ts
index 57a1bdc..471fcc1 100644
--- a/translations/qtconnectivity_ru.ts
+++ b/translations/qtconnectivity_ru.ts
@@ -8,6 +8,10 @@
<translation>Неверный адрес адаптера Bluetooth</translation>
</message>
<message>
+ <source>One or more device discovery methods are not supported on this platform</source>
+ <translation>Один или более методов обнаружения устройств не поддерживается данной платформой</translation>
+ </message>
+ <message>
<source>Device does not support Bluetooth</source>
<translation>Устройство не поддерживает Bluetooth</translation>
</message>
@@ -16,6 +20,18 @@
<translation>Передан адрес не локального устройства.</translation>
</message>
<message>
+ <source>Missing Location permission. Search is not possible.</source>
+ <translation>Отсутствует разрешение на определение местоположения. Поиск невозможен.</translation>
+ </message>
+ <message>
+ <source>Classic Discovery cannot be started</source>
+ <translation>Невозможно запустить классическое обнаружение</translation>
+ </message>
+ <message>
+ <source>Low Energy Discovery not supported</source>
+ <translation>Обнаружение в режиме низкого потребления энергии не поддерживается</translation>
+ </message>
+ <message>
<source>Device is powered off</source>
<translation>Устройство отключено</translation>
</message>
@@ -36,10 +52,6 @@
<translation>Невозможно запустить опрос спящих устройств</translation>
</message>
<message>
- <source>Discovery cannot be started</source>
- <translation>Невозможно запустить обнаружение</translation>
- </message>
- <message>
<source>Discovery cannot be stopped</source>
<translation>Невозможно остановить обнаружение</translation>
</message>
@@ -272,7 +284,7 @@
</message>
<message>
<source>Next DST Change Service</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Сервис следующей смены летнего/зимнего времени</translation>
</message>
<message>
<source>Glucose</source>
@@ -312,7 +324,7 @@
</message>
<message>
<source>Cycling Power</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Энергия велосипедиста</translation>
</message>
<message>
<source>Location and Navigation</source>
@@ -336,11 +348,11 @@
</message>
<message>
<source>Telephony Control Specification - Binary</source>
- <translation type="unfinished"></translation>
+ <translation>Спецификация управления телефоном - Двоичная</translation>
</message>
<message>
<source>Telephony Control Specification - AT</source>
- <translation type="unfinished"></translation>
+ <translation>Спецификация управления телефоном - AT</translation>
</message>
<message>
<source>Attribute Protocol</source>
@@ -498,11 +510,11 @@
</message>
<message>
<source>Day Date Time</source>
- <translation type="unfinished"></translation>
+ <translation>День Дата Время</translation>
</message>
<message>
<source>Exact Time 256</source>
- <translation type="unfinished"></translation>
+ <translation>Точное время 256</translation>
</message>
<message>
<source>DST Offset</source>
@@ -1262,6 +1274,11 @@
<translation>Не удалось получить потоки сервиса</translation>
</message>
<message>
+ <source>Cannot connect to %1</source>
+ <comment>%1 = uuid</comment>
+ <translation>Невозможно подключиться к %1</translation>
+ </message>
+ <message>
<source>Input stream thread cannot be started</source>
<translation>Не удалось запустить процесс входного потока</translation>
</message>
@@ -1289,6 +1306,30 @@
<source>Cannot set connection security level</source>
<translation>Не удалось задать уровень безопасности подключения</translation>
</message>
+ <message>
+ <source>Network Error: %1</source>
+ <translation>Ошибка сети: %1</translation>
+ </message>
+ <message>
+ <source>Network error</source>
+ <translation>Ошибка сети</translation>
+ </message>
+ <message>
+ <source>Remote host closed connection</source>
+ <translation>Удалённый узел закрыл соединение</translation>
+ </message>
+ <message>
+ <source>Connection timed out</source>
+ <translation>Время подключения истекло</translation>
+ </message>
+ <message>
+ <source>Host not reachable</source>
+ <translation>Узел недоступен</translation>
+ </message>
+ <message>
+ <source>Host refused connection</source>
+ <translation>Узел отклонил подключение</translation>
+ </message>
</context>
<context>
<name>QBluetoothTransferReply</name>
@@ -1378,5 +1419,25 @@
<source>Error occurred trying to start advertising</source>
<translation>Возникла ошибка при попытке запуска Bluetooth-маркетинга</translation>
</message>
+ <message>
+ <source>Remote device closed the connection</source>
+ <translation>Удалённое устройство закрыло подключение</translation>
+ </message>
+ <message>
+ <source>Advertisement data is larger than 31 bytes</source>
+ <translation>Данные анонса больше 31 байта</translation>
+ </message>
+ <message>
+ <source>Advertisement feature not supported on the platform</source>
+ <translation>Анонс не поддерживается на данной платформе</translation>
+ </message>
+ <message>
+ <source>Failed due to too many advertisers</source>
+ <translation>Не удалось из-за большого числа анонсов</translation>
+ </message>
+ <message>
+ <source>Unknown advertisement error</source>
+ <translation>Неизвестная ошибка анонса</translation>
+ </message>
</context>
</TS>
diff --git a/translations/qtdeclarative_da.ts b/translations/qtdeclarative_da.ts
index 0ab97e4..cc34885 100644
--- a/translations/qtdeclarative_da.ts
+++ b/translations/qtdeclarative_da.ts
@@ -16,6 +16,10 @@
<translation>Forbudt metodenavn</translation>
</message>
<message>
+ <source>Duplicate scoped enum name</source>
+ <translation>Duplikeret scoped enum-navn</translation>
+ </message>
+ <message>
<source>Duplicate signal name</source>
<translation>Duplikeret signalnavn</translation>
</message>
@@ -29,7 +33,7 @@
</message>
<message>
<source>Duplicate default property</source>
- <translation>Duplikeret standard egenskab</translation>
+ <translation>Duplikeret standardegenskab</translation>
</message>
<message>
<source>Duplicate alias name</source>
@@ -118,7 +122,7 @@
</message>
<message>
<source>Invalid alias reference. An alias reference must be specified as &lt;id&gt;, &lt;id&gt;.&lt;property&gt; or &lt;id&gt;.&lt;value property&gt;.&lt;property&gt;</source>
- <translation>Ugyldig alias-reference. En alias-reference skal specificeres som &lt;id&gt;, &lt;id&gt;.&lt;egenskab&gt; eller &lt;id&gt;.&lt;værdi egenskab&gt;.&lt;egenskab&gt;</translation>
+ <translation>Ugyldig alias-reference. En alias-reference skal angives som &lt;id&gt;, &lt;id&gt;.&lt;egenskab&gt; eller &lt;id&gt;.&lt;værdi egenskab&gt;.&lt;egenskab&gt;</translation>
</message>
<message>
<source>Invalid alias location</source>
@@ -129,6 +133,22 @@
<translation>Forbudt egenskabsnavn</translation>
</message>
<message>
+ <source>Scoped enum names must begin with an upper case letter</source>
+ <translation>Scoped enum-navne skal begynde med et stort bogstav</translation>
+ </message>
+ <message>
+ <source>Enum names must begin with an upper case letter</source>
+ <translation>Enum-navne skal begynde med et stort bogstav</translation>
+ </message>
+ <message>
+ <source>Enum value must be an integer</source>
+ <translation>Enum-værdi skal være et heltal</translation>
+ </message>
+ <message>
+ <source>Enum value out of range</source>
+ <translation>Enum-værdi udenfor område</translation>
+ </message>
+ <message>
<source>Invalid component id specification</source>
<translation>Ugyldig komponent id-specifikation</translation>
</message>
@@ -207,11 +227,11 @@
</message>
<message>
<source>&quot;file:&quot; can be used to specify the name of a file the debugger will try to connect to using a QLocalSocket. If &quot;file:&quot; is given any &quot;host:&quot; and&quot;port:&quot; arguments will be ignored.</source>
- <translation>&quot;fil:&quot; kan bruges til at specificere navnet på en fil som fejlretteren vil prøve at oprette forbindelse til ved brug af en QLocalSocket. Hvis &quot;fil:&quot; gives ignoreres eventuelle &quot;være:&quot;- og &quot;port:&quot;-argumenter.</translation>
+ <translation>&quot;fil:&quot; kan bruges til at angive navnet på en fil som fejlretteren vil prøve at oprette forbindelse til ved brug af en QLocalSocket. Hvis &quot;fil:&quot; gives ignoreres eventuelle &quot;være:&quot;- og &quot;port:&quot;-argumenter.</translation>
</message>
<message>
<source>&quot;host:&quot; and &quot;port:&quot; 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>&quot;vært:&quot; og &quot;port:&quot; kan bruges til at specificere en adresse og én port eller en række af porte som fejlretteren vil prøve at binde til med en QTcpServer.</translation>
+ <translation>&quot;vært:&quot; og &quot;port:&quot; kan bruges til at angive en adresse og én port eller en række af porte som fejlretteren vil prøve at binde til med en QTcpServer.</translation>
</message>
<message>
<source>&quot;block&quot; makes the debugger and some services wait for clients to be connected and ready before the first QML engine starts.</source>
@@ -219,7 +239,7 @@
</message>
<message>
<source>&quot;services:&quot; 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>&quot;tjenester:&quot; kan bruges til at specificere hvilke fejlretter-tjenester som fejlretteren skal indlæse. Nogle fejlretter-tjenester interagerer dårligt med andre. V4-fejlretteren bør ikke indlæses når QML-profileringen bruges da den vil tvinge eventuelle V4-motorer til at bruge JavaScript-fortolkeren i stedet for JIT&apos;en. Følgende fejlretter-tjenester er tilgængelige som standard:</translation>
+ <translation>&quot;tjenester:&quot; kan bruges til at angive hvilke fejlretter-tjenester som fejlretteren skal indlæse. Nogle fejlretter-tjenester interagerer dårligt med andre. V4-fejlretteren bør ikke indlæses når QML-profileringen bruges da den vil tvinge eventuelle V4-motorer til at bruge JavaScript-fortolkeren i stedet for JIT&apos;en. Følgende fejlretter-tjenester er tilgængelige som standard:</translation>
</message>
<message>
<source>The QML debugger</source>
@@ -257,7 +277,7 @@
</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 &quot;services&quot; argument is given, all services found this way, including the default ones, are loaded.</source>
- <translation>Andre tjenester fra qmltooling-plugins der implementere QQmlDebugServiceFactory and som kan findes i standard pluginets stier vil også være tilgængelige og kan specificeres. Hvis der ikke gives nogen &quot;tjenester&quot;-argumenter, indlæses alle tjenester fundet på denne måde, inklusiv dem som er standard.</translation>
+ <translation>Andre tjenester fra qmltooling-plugins der implementere QQmlDebugServiceFactory and som kan findes i standardpluginets stier vil også være tilgængelige og kan angives. Hvis der ikke gives nogen &quot;tjenester&quot;-argumenter, indlæses alle tjenester fundet på denne måde, inklusiv dem som er standard.</translation>
</message>
</context>
<context>
@@ -530,12 +550,12 @@
<context>
<name>QQmlListModel</name>
<message>
- <source>unable to enable dynamic roles as this model is not empty!</source>
- <translation>kan ikke aktivere dynamiske roller eftersom denne model ikke er tom!</translation>
+ <source>unable to enable dynamic roles as this model is not empty</source>
+ <translation>kan ikke aktivere dynamiske roller eftersom denne model ikke er tom</translation>
</message>
<message>
- <source>unable to enable static roles as this model is not empty!</source>
- <translation>kan ikke aktivere statiske roller eftersom denne model ikke er tom!</translation>
+ <source>unable to enable static roles as this model is not empty</source>
+ <translation>kan ikke aktivere statiske roller eftersom denne model ikke er tom</translation>
</message>
<message>
<source>dynamic role setting must be made from the main thread, before any worker scripts are created</source>
@@ -606,7 +626,7 @@
</message>
<message>
<source>Cannot assign object type %1 with no default method</source>
- <translation> %1 uden nogen standard metode</translation>
+ <translation>Kan ikke tildele objekttype %1 uden nogen standardmetode</translation>
</message>
<message>
<source>Cannot connect mismatched signal/slot %1 %vs. %2</source>
@@ -711,6 +731,10 @@
<translation>Vildfarent linjeskrift i streng-literal</translation>
</message>
<message>
+ <source>End of file reached at escape sequence</source>
+ <translation>Filens slutning nået ved undvigesekvens</translation>
+ </message>
+ <message>
<source>Illegal unicode escape sequence</source>
<translation>Forbudt unicode-undvigesekvens</translation>
</message>
@@ -836,6 +860,10 @@
<source>Invalid property type</source>
<translation>Ugyldig egenskabstype</translation>
</message>
+ <message>
+ <source>Invalid alias target</source>
+ <translation>Ugyldigt alias mål</translation>
+ </message>
</context>
<context>
<name>QQmlPropertyValidator</name>
@@ -853,7 +881,7 @@
</message>
<message>
<source>Cannot assign a value directly to a grouped property</source>
- <translation>Kan ikke tilknytte en værdi direkte til en grupperet egenskab</translation>
+ <translation>Kan ikke tildele en værdi direkte til en grupperet egenskab</translation>
</message>
<message>
<source>Invalid use of namespace</source>
@@ -873,15 +901,15 @@
</message>
<message>
<source>Cannot assign multiple values to a script property</source>
- <translation>Kan ikke tilknytte flere værdier til en script-egenskab</translation>
+ <translation>Kan ikke tildele flere værdier til en script-egenskab</translation>
</message>
<message>
<source>Cannot assign multiple values to a singular property</source>
- <translation>Kan ikke tilknytte flere værdier til en singulær-egenskab</translation>
+ <translation>Kan ikke tildele flere værdier til en singulær-egenskab</translation>
</message>
<message>
<source>Property has already been assigned a value</source>
- <translation>Egenskab er allerede blevet tilknyttet en værdi</translation>
+ <translation>Egenskab er allerede blevet tildelt en værdi</translation>
</message>
<message>
<source>Invalid grouped property access</source>
@@ -889,15 +917,19 @@
</message>
<message>
<source>Cannot assign to non-existent default property</source>
- <translation>Kan ikke tilknytte ikke-eksisterende standard egenskab</translation>
+ <translation>Kan ikke tildele ikke-eksisterende standardegenskab</translation>
</message>
<message>
<source>Cannot assign to non-existent property &quot;%1&quot;</source>
- <translation>Kan ikke tilknytte ikke-eksisterende egenskab &quot;%1&quot;</translation>
+ <translation>Kan ikke tildele ikke-eksisterende egenskab &quot;%1&quot;</translation>
+ </message>
+ <message>
+ <source>Invalid use of id property with a value type</source>
+ <translation>Ugyldig brug af id-egenskab med en værditype</translation>
</message>
<message>
<source>Cannot assign primitives to lists</source>
- <translation>Kan ikke tilknytte primitiver til lister</translation>
+ <translation>Kan ikke tildele primitiver til lister</translation>
</message>
<message>
<source>Invalid property assignment: unknown enumeration</source>
@@ -1013,7 +1045,7 @@
</message>
<message>
<source>Cannot assign object to list property &quot;%1&quot;</source>
- <translation>Kan ikke tilknytte objekt til liste-egenskab &quot;%1&quot;</translation>
+ <translation>Kan ikke tildele objekt til liste-egenskab &quot;%1&quot;</translation>
</message>
<message>
<source>Unexpected object assignment</source>
@@ -1025,7 +1057,7 @@
</message>
<message>
<source>Cannot assign object to property</source>
- <translation>Kan ikke tilknytte objekt til egenskab</translation>
+ <translation>Kan ikke tildele objekt til egenskab</translation>
</message>
</context>
<context>
@@ -1077,10 +1109,18 @@
<translation>qmldir definerer type som singleton, men ingen pragma singleton fundet i type %1.</translation>
</message>
<message>
+ <source>File was compiled ahead of time with an incompatible version of Qt and the original file cannot be found. Please recompile</source>
+ <translation>Filen blev kompileret før tid med en inkompatibel version af Qt og den originale fil kan ikke findes. Kompilér venligst igen</translation>
+ </message>
+ <message>
<source>No such file or directory</source>
<translation>Ingen sådan fil eller mappe</translation>
</message>
<message>
+ <source>File is empty</source>
+ <translation>Filen er tom</translation>
+ </message>
+ <message>
<source>module &quot;%1&quot; is not installed</source>
<translation>modul &quot;%1&quot; er ikke installeret</translation>
</message>
@@ -1154,7 +1194,7 @@
</message>
<message>
<source>Cannot specify left, right, and horizontalCenter anchors at the same time.</source>
- <translation>Kan ikke specificere venstre, højre og vandret centreret ankre på samme tid.</translation>
+ <translation>Kan ikke angive venstre, højre og vandret centreret ankre på samme tid.</translation>
</message>
<message>
<source>Cannot anchor to a null item.</source>
@@ -1170,7 +1210,7 @@
</message>
<message>
<source>Cannot specify top, bottom, and verticalCenter anchors at the same time.</source>
- <translation>Kan ikke specificere øverste, nederste og lodret centreret ankre på samme tid.</translation>
+ <translation>Kan ikke angive øverste, nederste og lodret centreret ankre på samme tid.</translation>
</message>
<message>
<source>Baseline anchor cannot be used in conjunction with top, bottom, or verticalCenter anchors.</source>
@@ -1210,6 +1250,13 @@
</message>
</context>
<context>
+ <name>QQuickDragHandler</name>
+ <message>
+ <source>DragAxis is only available as a grouped property of DragHandler</source>
+ <translation>DragAxis er kun tilgængelig som en grupperet egenskab af DragHandler</translation>
+ </message>
+</context>
+<context>
<name>QQuickEnterKeyAttached</name>
<message>
<source>EnterKey attached property only works with Items</source>
@@ -1284,6 +1331,10 @@
<context>
<name>QQuickMouseEvent</name>
<message>
+ <source>GestureEvent is only available in the context of handling the gestureStarted signal from MultiPointTouchArea</source>
+ <translation>GestureEvent er kun tilgængelig i konteksten af håndtering af gestureStarted-signalet fra MultiPointTouchArea</translation>
+ </message>
+ <message>
<source>MouseEvent is only available within handlers in MouseArea</source>
<translation>MouseEvent er kun tilgængelig inden i handlers i MouseArea</translation>
</message>
@@ -1372,11 +1423,42 @@
<translation>Kunne ikke få tekstur fra udbyder: %1</translation>
</message>
<message>
+ <source>Error decoding: %1</source>
+ <translation>Fejl ved afkodning: %1</translation>
+ </message>
+ <message>
<source>Cannot open: %1</source>
<translation>Kan ikke åbne: %1</translation>
</message>
</context>
<context>
+ <name>QQuickPointerHandler</name>
+ <message>
+ <source>PointerEvent is only available as a parameter of several signals in PointerHandler</source>
+ <translation>PointerEvent er kun tilgængelig som en parameter af adskillige signaler i PointerHandler</translation>
+ </message>
+ <message>
+ <source>EventPoint is only available as a member of PointerEvent</source>
+ <translation>EventPoint er kun tilgængelig som et medlem af PointerEvent</translation>
+ </message>
+ <message>
+ <source>EventTouchPoint is only available as a member of PointerEvent</source>
+ <translation>EventTouchPoint er kun tilgængelig som et medlem af PointerEvent</translation>
+ </message>
+ <message>
+ <source>PointerDevice is only available as a property of PointerEvent</source>
+ <translation>PointerDevice er kun tilgængelig som en egenskab af PointerEvent</translation>
+ </message>
+ <message>
+ <source>PointingDeviceUniqueId is only available as a property of PointerEvent</source>
+ <translation>PointingDeviceUniqueId er kun tilgængelig som en egenskab af PointerEvent</translation>
+ </message>
+ <message>
+ <source>PointerHandler is an abstract base class</source>
+ <translation>PointerHandler er en abstrakt grundklasse</translation>
+ </message>
+</context>
+<context>
<name>QQuickPropertyAnimation</name>
<message>
<source>Cannot set a duration of &lt; 0</source>
@@ -1391,11 +1473,11 @@
</message>
<message>
<source>Cannot assign to non-existent property &quot;%1&quot;</source>
- <translation>Kan ikke tilknytte ikke-eksisterende egenskab &quot;%1&quot;</translation>
+ <translation>Kan ikke tildele ikke-eksisterende egenskab &quot;%1&quot;</translation>
</message>
<message>
<source>Cannot assign to read-only property &quot;%1&quot;</source>
- <translation>Kan ikke tilknytte skrivebeskyttet egenskab &quot;%1&quot;</translation>
+ <translation>Kan ikke tildele skrivebeskyttet egenskab &quot;%1&quot;</translation>
</message>
</context>
<context>
@@ -1413,6 +1495,13 @@
</message>
</context>
<context>
+ <name>QQuickShapeGradient</name>
+ <message>
+ <source>ShapeGradient is an abstract base class</source>
+ <translation>ShapeGradient er en abstrakt grundklasse</translation>
+ </message>
+</context>
+<context>
<name>QQuickTextUtil</name>
<message>
<source>%1 does not support loading non-visual cursor delegates.</source>
@@ -1520,14 +1609,14 @@ Installer en driver med OpenGL 2.0 eller højere, eller, hvis det ikke er muligt
</message>
<message>
<source>Incorrectly specified signal assignment</source>
- <translation>Ukorrekt specificerede signal-tildeling</translation>
+ <translation>Ukorrekt angivet signal-tildeling</translation>
</message>
</context>
<context>
<name>SignalTransition</name>
<message>
<source>Specified signal does not exist.</source>
- <translation>Specificeret signal findes ikke.</translation>
+ <translation>Angivet signal findes ikke.</translation>
</message>
<message>
<source>Cannot assign to non-existent property &quot;%1&quot;</source>
@@ -1545,8 +1634,8 @@ Installer en driver med OpenGL 2.0 eller højere, eller, hvis det ikke er muligt
<translation>Ugyldig QML %1 navn &quot;%2&quot;</translation>
</message>
<message>
- <source>Cannot install %1 &apos;%2&apos; into unregistered namespace &apos;%3&apos;</source>
- <translation>Kan ikke installere %1 &apos;%2&apos; ind i uregistreret navnerum &apos;%3&apos;</translation>
+ <source>Invalid QML %1 name &quot;%2&quot;; type names must begin with an uppercase letter</source>
+ <translation>Ugyldig QML %1 navn &quot;%2&quot;; typenavne skal begynde med et stort bogstav</translation>
</message>
<message>
<source>Cannot install %1 &apos;%2&apos; into protected namespace &apos;%3&apos;</source>
diff --git a/translations/qtdeclarative_de.ts b/translations/qtdeclarative_de.ts
index 66cff0a..b099a0d 100644
--- a/translations/qtdeclarative_de.ts
+++ b/translations/qtdeclarative_de.ts
@@ -16,6 +16,10 @@
<translation>Ungültiger Methodenname</translation>
</message>
<message>
+ <source>Duplicate scoped enum name</source>
+ <translation>Mehrfaches Auftreten eines bereichsgebundenen Aufzählungsnamens</translation>
+ </message>
+ <message>
<source>Duplicate signal name</source>
<translation>Mehrfaches Auftreten eines Signalnamens</translation>
</message>
@@ -117,6 +121,22 @@
<translation>Ungültige Alias-Referenz. Eine Alias-Referenz muss in der Form &lt;id&gt;, &lt;id&gt;.&lt;property&gt; oder &lt;id&gt;.&lt;value property&gt;.&lt;property&gt; angegeben werden</translation>
</message>
<message>
+ <source>Scoped enum names must begin with an upper case letter</source>
+ <translation>Bereichsgebundene Aufzählungsnamen müssen mit einem Großbuchstaben beginnen</translation>
+ </message>
+ <message>
+ <source>Enum names must begin with an upper case letter</source>
+ <translation>Aufzählungsnamen müssen mit einem Großbuchstaben beginnen</translation>
+ </message>
+ <message>
+ <source>Enum value must be an integer</source>
+ <translation>Ein Aufzählungswert muss ganzzahlig sein</translation>
+ </message>
+ <message>
+ <source>Enum value out of range</source>
+ <translation>Der Aufzählungswert ist außerhalb des gültigen Bereichs</translation>
+ </message>
+ <message>
<source>Invalid component id specification</source>
<translation>Id-Wert der Komponente ungültig</translation>
</message>
@@ -532,12 +552,12 @@
<context>
<name>QQmlListModel</name>
<message>
- <source>unable to enable dynamic roles as this model is not empty!</source>
- <translation>Dynamische Rollen können nicht aktiviert werden, da das Modell nicht leer ist!</translation>
+ <source>unable to enable dynamic roles as this model is not empty</source>
+ <translation>dynamische Rollen können nicht aktiviert werden, da das Modell nicht leer ist</translation>
</message>
<message>
- <source>unable to enable static roles as this model is not empty!</source>
- <translation>Statische Rollen können nicht aktiviert werden, da das Modell nicht leer ist!</translation>
+ <source>unable to enable static roles as this model is not empty</source>
+ <translation>statische Rollen können nicht aktiviert werden, da das Modell nicht leer ist</translation>
</message>
<message>
<source>dynamic role setting must be made from the main thread, before any worker scripts are created</source>
@@ -677,6 +697,10 @@
<translation>Freistehendes Zeilenendezeichen in Zeichenkettenliteral</translation>
</message>
<message>
+ <source>End of file reached at escape sequence</source>
+ <translation>In der Escape-Sequenz wurde das Dateiende erreicht</translation>
+ </message>
+ <message>
<source>Illegal hexadecimal escape sequence</source>
<translation>Ungültige hexadezimale Escape-Sequenz</translation>
</message>
@@ -838,6 +862,10 @@
<source>Invalid property type</source>
<translation>Ungültiger Typ der Eigenschaft</translation>
</message>
+ <message>
+ <source>Invalid alias target</source>
+ <translation>Ungültiges Alias-Ziel</translation>
+ </message>
</context>
<context>
<name>QQmlPropertyValidator</name>
@@ -898,6 +926,10 @@
<translation>Es kann keine Zuweisung erfolgen, da keine Eigenschaft des Namens &quot;%1&quot; existiert</translation>
</message>
<message>
+ <source>Invalid use of id property with a value type</source>
+ <translation>Die Id-Eigenschaft kann nicht für einen Wert-Typ verwendet werden</translation>
+ </message>
+ <message>
<source>Cannot assign primitives to lists</source>
<translation>Zuweisung eines einfachen Werts (primitive) an eine Liste nicht zulässig</translation>
</message>
@@ -1079,10 +1111,18 @@
<translation>qmldir definiert den Typ als Singleton, aber der Typ %1 enthält kein pragma Singleton.</translation>
</message>
<message>
+ <source>File was compiled ahead of time with an incompatible version of Qt and the original file cannot be found. Please recompile</source>
+ <translation>Die Datei wurde mit einer inkompatiblen Qt-Version vorkompiliert und die dazugehörige Originaldatei kann nicht gefunden werden. Bitte kompilieren Sie erneut</translation>
+ </message>
+ <message>
<source>No such file or directory</source>
<translation>Die Datei oder das Verzeichnis konnte nicht gefunden werden</translation>
</message>
<message>
+ <source>File is empty</source>
+ <translation>Die Datei ist leer</translation>
+ </message>
+ <message>
<source>module &quot;%1&quot; is not installed</source>
<translation>Modul &quot;%1&quot; ist nicht installiert</translation>
</message>
@@ -1212,6 +1252,13 @@
</message>
</context>
<context>
+ <name>QQuickDragHandler</name>
+ <message>
+ <source>DragAxis is only available as a grouped property of DragHandler</source>
+ <translation>DragAxis ist nur über gruppierte Eigenschaften von DragHandler verfügbar</translation>
+ </message>
+</context>
+<context>
<name>QQuickEnterKeyAttached</name>
<message>
<source>EnterKey attached property only works with Items</source>
@@ -1286,6 +1333,10 @@
<context>
<name>QQuickMouseEvent</name>
<message>
+ <source>GestureEvent is only available in the context of handling the gestureStarted signal from MultiPointTouchArea</source>
+ <translation>GestureEvent ist nur im Kontext der Behandlung des gestureStarted-Signals von MultiPointTouchArea verfügbar</translation>
+ </message>
+ <message>
<source>MouseEvent is only available within handlers in MouseArea</source>
<translation>MouseEvent ist nur in Handler-Funktionen von MouseArea verfügbar</translation>
</message>
@@ -1374,11 +1425,42 @@
<translation>Es konnte keine Textur vom Provider %1 erhalten werden</translation>
</message>
<message>
+ <source>Error decoding: %1</source>
+ <translation>Fehler beim Dekodieren: %1</translation>
+ </message>
+ <message>
<source>Cannot open: %1</source>
<translation>Fehlschlag beim Öffnen: %1</translation>
</message>
</context>
<context>
+ <name>QQuickPointerHandler</name>
+ <message>
+ <source>PointerEvent is only available as a parameter of several signals in PointerHandler</source>
+ <translation>PointerEvent ist nur als Parameter einiger Signale von PointerHandler verfügbar</translation>
+ </message>
+ <message>
+ <source>EventPoint is only available as a member of PointerEvent</source>
+ <translation>EventPoint ist nur als Member von PointerEvent verfügbar</translation>
+ </message>
+ <message>
+ <source>EventTouchPoint is only available as a member of PointerEvent</source>
+ <translation>EventTouchPoint ist nur als Member von PointerEvent verfügbar</translation>
+ </message>
+ <message>
+ <source>PointerDevice is only available as a property of PointerEvent</source>
+ <translation>PointerDevice ist nur als Eigenschaft von PointerEvent verfügbar</translation>
+ </message>
+ <message>
+ <source>PointingDeviceUniqueId is only available as a property of PointerEvent</source>
+ <translation>PointingDeviceUniqueId ist nur als Eigenschaft von PointerEvent verfügbar</translation>
+ </message>
+ <message>
+ <source>PointerHandler is an abstract base class</source>
+ <translation>PointerHandler ist eine abstrakte Basisklasse</translation>
+ </message>
+</context>
+<context>
<name>QQuickPropertyAnimation</name>
<message>
<source>Cannot set a duration of &lt; 0</source>
@@ -1415,6 +1497,13 @@
</message>
</context>
<context>
+ <name>QQuickShapeGradient</name>
+ <message>
+ <source>ShapeGradient is an abstract base class</source>
+ <translation>ShapeGradient ist eine abstrakte Basisklasse</translation>
+ </message>
+</context>
+<context>
<name>QQuickTextUtil</name>
<message>
<source>%1 does not support loading non-visual cursor delegates.</source>
@@ -1547,8 +1636,8 @@ Installieren Sie einen Treiber, der OpenGL 2.0 oder neuer bereitstellt, oder ste
<translation>Ungültiger QML %1-Name: &quot;%2&quot;</translation>
</message>
<message>
- <source>Cannot install %1 &apos;%2&apos; into unregistered namespace &apos;%3&apos;</source>
- <translation>%1 &apos;%2&apos; kann nicht in einen nicht registrierten Namensraum &apos;%3&apos; installiert werden</translation>
+ <source>Invalid QML %1 name &quot;%2&quot;; type names must begin with an uppercase letter</source>
+ <translation>Ungültiger QML %1-Name &quot;%2&quot;; Typnamen müssen mit einem Großbuchstaben beginnen</translation>
</message>
<message>
<source>Cannot install %1 &apos;%2&apos; into protected namespace &apos;%3&apos;</source>
diff --git a/translations/qtdeclarative_fi.ts b/translations/qtdeclarative_fi.ts
index 40368b4..9a71cf7 100644
--- a/translations/qtdeclarative_fi.ts
+++ b/translations/qtdeclarative_fi.ts
@@ -17,6 +17,10 @@
<translation>Illegal method name</translation>
</message>
<message>
+ <source>Duplicate scoped enum name</source>
+ <translation>Duplicate scoped enum name</translation>
+ </message>
+ <message>
<source>Duplicate signal name</source>
<translation>Duplicate signal name</translation>
</message>
@@ -106,6 +110,22 @@
<translation>Expected type name</translation>
</message>
<message>
+ <source>Scoped enum names must begin with an upper case letter</source>
+ <translation>Scoped enum names must begin with an upper case letter</translation>
+ </message>
+ <message>
+ <source>Enum names must begin with an upper case letter</source>
+ <translation>Enum names must begin with an upper case letter</translation>
+ </message>
+ <message>
+ <source>Enum value must be an integer</source>
+ <translation>Enum value must be an integer</translation>
+ </message>
+ <message>
+ <source>Enum value out of range</source>
+ <translation>Enum value out of range</translation>
+ </message>
+ <message>
<source>Signal names cannot begin with an upper case letter</source>
<translation>Signal names cannot begin with an upper case letter</translation>
</message>
@@ -543,12 +563,12 @@
<context>
<name>QQmlListModel</name>
<message>
- <source>unable to enable dynamic roles as this model is not empty!</source>
- <translation>unable to enable dynamic roles as this model is not empty!</translation>
+ <source>unable to enable dynamic roles as this model is not empty</source>
+ <translation>unable to enable dynamic roles as this model is not empty</translation>
</message>
<message>
- <source>unable to enable static roles as this model is not empty!</source>
- <translation>unable to enable static roles as this model is not empty!</translation>
+ <source>unable to enable static roles as this model is not empty</source>
+ <translation>unable to enable static roles as this model is not empty</translation>
</message>
<message>
<source>dynamic role setting must be made from the main thread, before any worker scripts are created</source>
@@ -854,6 +874,10 @@
<source>Invalid property type</source>
<translation>Invalid property type</translation>
</message>
+ <message>
+ <source>Invalid alias target</source>
+ <translation>Invalid alias target</translation>
+ </message>
</context>
<context>
<name>QQmlPropertyValidator</name>
@@ -914,6 +938,10 @@
<translation>Cannot assign to non-existent property &quot;%1&quot;</translation>
</message>
<message>
+ <source>Invalid use of id property with a value type</source>
+ <translation>Invalid use of id property with a value type</translation>
+ </message>
+ <message>
<source>Cannot assign primitives to lists</source>
<translation>Cannot assign primitives to lists</translation>
</message>
@@ -1095,11 +1123,21 @@
<translation>qmldir defines type as singleton, but no pragma Singleton found in type %1.</translation>
</message>
<message>
+ <source>File was compiled ahead of time with an incompatible version of Qt and the original file cannot be found. Please recompile</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>Tiedosto on etukäteen käännetty epäyhteensopivalla Qt:n versiolla ja alkuperäistä tiedostoa ei löydy. Ole hyvä ja käännä uudelleen.</translation>
+ </message>
+ <message>
<source>No such file or directory</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>Tiedostoa tai kansiota ei ole olemassa</translation>
</message>
<message>
+ <source>File is empty</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>Tiedosto on tyhjä</translation>
+ </message>
+ <message>
<source>module &quot;%1&quot; is not installed</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>moduulia ”%1” ei ole asennettu</translation>
@@ -1230,6 +1268,13 @@
</message>
</context>
<context>
+ <name>QQuickDragHandler</name>
+ <message>
+ <source>DragAxis is only available as a grouped property of DragHandler</source>
+ <translation>DragAxis is only available as a grouped property of DragHandler</translation>
+ </message>
+</context>
+<context>
<name>QQuickEnterKeyAttached</name>
<message>
<source>EnterKey attached property only works with Items</source>
@@ -1396,12 +1441,43 @@
<translation>Failed to get texture from provider: %1</translation>
</message>
<message>
+ <source>Error decoding: %1</source>
+ <translation>Error decoding: %1</translation>
+ </message>
+ <message>
<source>Cannot open: %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>Ei voi avata: %1</translation>
</message>
</context>
<context>
+ <name>QQuickPointerHandler</name>
+ <message>
+ <source>PointerEvent is only available as a parameter of several signals in PointerHandler</source>
+ <translation>PointerEvent is only available as a parameter of several signals in PointerHandler</translation>
+ </message>
+ <message>
+ <source>EventPoint is only available as a member of PointerEvent</source>
+ <translation>EventPoint is only available as a member of PointerEvent</translation>
+ </message>
+ <message>
+ <source>EventTouchPoint is only available as a member of PointerEvent</source>
+ <translation>EventTouchPoint is only available as a member of PointerEvent</translation>
+ </message>
+ <message>
+ <source>PointerDevice is only available as a property of PointerEvent</source>
+ <translation>PointerDevice is only available as a property of PointerEvent</translation>
+ </message>
+ <message>
+ <source>PointingDeviceUniqueId is only available as a property of PointerEvent</source>
+ <translation>PointingDeviceUniqueId is only available as a property of PointerEvent</translation>
+ </message>
+ <message>
+ <source>PointerHandler is an abstract base class</source>
+ <translation>PointerHandler is an abstract base class</translation>
+ </message>
+</context>
+<context>
<name>QQuickPropertyAnimation</name>
<message>
<source>Cannot set a duration of &lt; 0</source>
@@ -1438,6 +1514,13 @@
</message>
</context>
<context>
+ <name>QQuickShapeGradient</name>
+ <message>
+ <source>ShapeGradient is an abstract base class</source>
+ <translation>ShapeGradient is an abstract base class</translation>
+ </message>
+</context>
+<context>
<name>QQuickTextUtil</name>
<message>
<source>%1 does not support loading non-visual cursor delegates.</source>
@@ -1572,8 +1655,8 @@ Asenna ajuri, joka tukee OpenGL 2.0:aa tai uudempaa. Mikäli sellaisen asentamin
<translation>Invalid QML %1 name &quot;%2&quot;</translation>
</message>
<message>
- <source>Cannot install %1 &apos;%2&apos; into unregistered namespace &apos;%3&apos;</source>
- <translation>Cannot install %1 &apos;%2&apos; into unregistered namespace &apos;%3&apos;</translation>
+ <source>Invalid QML %1 name &quot;%2&quot;; type names must begin with an uppercase letter</source>
+ <translation>Invalid QML %1 name &quot;%2&quot;; type names must begin with an uppercase letter</translation>
</message>
<message>
<source>Cannot install %1 &apos;%2&apos; into protected namespace &apos;%3&apos;</source>
diff --git a/translations/qtdeclarative_ru.ts b/translations/qtdeclarative_ru.ts
index 41d4d87..1c05340 100644
--- a/translations/qtdeclarative_ru.ts
+++ b/translations/qtdeclarative_ru.ts
@@ -16,6 +16,10 @@
<translation>Недопустимое имя метода</translation>
</message>
<message>
+ <source>Duplicate scoped enum name</source>
+ <translation>Дублирование имени перечисления</translation>
+ </message>
+ <message>
<source>Duplicate signal name</source>
<translation>Дублирование имени сигнала</translation>
</message>
@@ -32,6 +36,14 @@
<translation>Дублирование свойства по умолчанию</translation>
</message>
<message>
+ <source>Duplicate alias name</source>
+ <translation>Дублирование имени псевдонима</translation>
+ </message>
+ <message>
+ <source>Alias names cannot begin with an upper case letter</source>
+ <translation>Имена псевдонимов не могут начинаться с заглавной буквы</translation>
+ </message>
+ <message>
<source>Property value set multiple times</source>
<translation>Значение свойства задано несколько раз</translation>
</message>
@@ -40,7 +52,7 @@
<name>QInputMethod</name>
<message>
<source>InputMethod is an abstract class</source>
- <translation>InputMethod ― абстрактный класс</translation>
+ <translation>InputMethod ― это абстрактный класс</translation>
</message>
</context>
<context>
@@ -74,6 +86,10 @@
<translation>id не уникален</translation>
</message>
<message>
+ <source>Circular alias reference detected</source>
+ <translation>Обнаружен псевдоним с циклической ссылкой</translation>
+ </message>
+ <message>
<source>Invalid alias reference. Unable to find id &quot;%1&quot;</source>
<translation>Некорректная ссылка на псевдоним. Не удалось найти id «%1»</translation>
</message>
@@ -93,6 +109,22 @@
<translation>Ожидается название типа</translation>
</message>
<message>
+ <source>Scoped enum names must begin with an upper case letter</source>
+ <translation>Имена перечислений должны начинаться с заглавной буквы</translation>
+ </message>
+ <message>
+ <source>Enum names must begin with an upper case letter</source>
+ <translation>Имена перечислений должны начинаться с заглавной буквы</translation>
+ </message>
+ <message>
+ <source>Enum value must be an integer</source>
+ <translation>Значение перечисления должно быть целым</translation>
+ </message>
+ <message>
+ <source>Enum value out of range</source>
+ <translation>Значение перечисления вне диапазона</translation>
+ </message>
+ <message>
<source>Signal names cannot begin with an upper case letter</source>
<translation>Имена сигналов не могут начинаться с заглавной буквы</translation>
</message>
@@ -110,7 +142,7 @@
</message>
<message>
<source>Invalid alias location</source>
- <translation>Нет свойства размещения псевдонима</translation>
+ <translation>Неверное размещение псевдонима</translation>
</message>
<message>
<source>Invalid component id specification</source>
@@ -397,6 +429,10 @@
<translation>SQL: нельзя создать базу данных ― автономное хранилище отключено.</translation>
</message>
<message>
+ <source>LocalStorage: can&apos;t create path %1</source>
+ <translation>LocalStorage: не удалось создать путь %1</translation>
+ </message>
+ <message>
<source>SQL: database version mismatch</source>
<translation>Не совпадает версия базы данных SQL</translation>
</message>
@@ -471,10 +507,6 @@
<translation>модуль «%1» плагина «%2» не найден</translation>
</message>
<message>
- <source>library loading is disabled</source>
- <translation>загрузка библиотек отключена</translation>
- </message>
- <message>
<source>&quot;%1&quot; version %2.%3 is defined more than once in module &quot;%4&quot;</source>
<translation>«%1» версии %2.%3 определено более одного раза в модуле «%4»</translation>
</message>
@@ -518,12 +550,12 @@
<context>
<name>QQmlListModel</name>
<message>
- <source>unable to enable dynamic roles as this model is not empty!</source>
- <translation>не удалось включить динамические роли, так как эта модель не пуста!</translation>
+ <source>unable to enable dynamic roles as this model is not empty</source>
+ <translation>не удалось включить динамические роли, так как эта модель не пуста</translation>
</message>
<message>
- <source>unable to enable static roles as this model is not empty!</source>
- <translation>не удалось включить статические роли, так как эта модель не пуста!</translation>
+ <source>unable to enable static roles as this model is not empty</source>
+ <translation>не удалось включить статические роли, так как эта модель не пуста</translation>
</message>
<message>
<source>dynamic role setting must be made from the main thread, before any worker scripts are created</source>
@@ -663,6 +695,10 @@
<translation>Ненужный перевод строки в строковом литерале</translation>
</message>
<message>
+ <source>End of file reached at escape sequence</source>
+ <translation>ESC-последовательность прервана концом файла</translation>
+ </message>
+ <message>
<source>Illegal hexadecimal escape sequence</source>
<translation>Недопустимая шестнадцатеричная esc-последовательность</translation>
</message>
@@ -787,7 +823,7 @@
</message>
</context>
<context>
- <name>QQmlPropertyCacheCreator</name>
+ <name>QQmlPropertyCacheCreatorBase</name>
<message>
<source>Fully dynamic types cannot declare new properties.</source>
<translation>Полностью динамические типы не могут объявлять новые свойства.</translation>
@@ -824,6 +860,10 @@
<source>Invalid property type</source>
<translation>Некорректный тип свойства</translation>
</message>
+ <message>
+ <source>Invalid alias target</source>
+ <translation>Неверная цель псевдонима</translation>
+ </message>
</context>
<context>
<name>QQmlPropertyValidator</name>
@@ -884,6 +924,10 @@
<translation>Невозможно назначить несуществующему свойству «%1»</translation>
</message>
<message>
+ <source>Invalid use of id property with a value type</source>
+ <translation>Недопустимое использование свойства id с типом значения</translation>
+ </message>
+ <message>
<source>Cannot assign primitives to lists</source>
<translation>Невозможно назначить примитивы списку</translation>
</message>
@@ -952,6 +996,10 @@
<translation>Некорректное присваивание свойства: требуется значение булевого типа</translation>
</message>
<message>
+ <source>Invalid property assignment: 2D vector expected</source>
+ <translation>Некорректное присваивание свойства: требуется значение типа «двухмерный вектор»</translation>
+ </message>
+ <message>
<source>Invalid property assignment: 3D vector expected</source>
<translation>Некорректное присваивание свойства: требуется значение типа «трёхмерный вектор»</translation>
</message>
@@ -960,6 +1008,10 @@
<translation>Некорректное присваивание свойства: требуется значение типа «четырёхмерный вектор»</translation>
</message>
<message>
+ <source>Invalid property assignment: quaternion expected</source>
+ <translation>Некорректное присваивание свойства: требуется кватернион</translation>
+ </message>
+ <message>
<source>Invalid property assignment: regular expression expected; use /pattern/ syntax</source>
<translation>Некорректное присваивание свойства: требуется регулярное выражение; используйте синтаксис /pattern/</translation>
</message>
@@ -1020,14 +1072,14 @@
</message>
</context>
<context>
- <name>QQmlTypeCompiler</name>
+ <name>QQmlTypeData</name>
<message>
<source>Composite Singleton Type %1 is not creatable.</source>
- <translation>Сложный Singleton-тип %1 нельзя создать.</translation>
+ <translation>Нельзя создать сложный Singleton-тип %1.</translation>
</message>
<message>
<source>Element is not creatable.</source>
- <translation>Элемент не является создаваемым.</translation>
+ <translation>Элемент несоздаваем.</translation>
</message>
</context>
<context>
@@ -1057,6 +1109,18 @@
<translation>qmldir определяет тип как одиночный, но pragma Singleton не найдена в типе %1.</translation>
</message>
<message>
+ <source>File was compiled ahead of time with an incompatible version of Qt and the original file cannot be found. Please recompile</source>
+ <translation>Файл был предварительно собран с несовместимой версией Qt, а оригинальный файл найти не удалось. Пересоберите</translation>
+ </message>
+ <message>
+ <source>No such file or directory</source>
+ <translation>Нет такого файла или каталога</translation>
+ </message>
+ <message>
+ <source>File is empty</source>
+ <translation>Файл пуст</translation>
+ </message>
+ <message>
<source>module &quot;%1&quot; is not installed</source>
<translation>модуль «%1» не установлен</translation>
</message>
@@ -1089,7 +1153,7 @@
</message>
<message>
<source>Animator is an abstract class</source>
- <translation>Animator является абстрактным классом</translation>
+ <translation>Animator ― это абстрактный класс</translation>
</message>
</context>
<context>
@@ -1168,7 +1232,7 @@
<name>QQuickApplication</name>
<message>
<source>Application is an abstract class</source>
- <translation>Класс Application ― абстрактный</translation>
+ <translation>Application ― это абстрактный класс</translation>
</message>
</context>
<context>
@@ -1186,6 +1250,13 @@
</message>
</context>
<context>
+ <name>QQuickDragHandler</name>
+ <message>
+ <source>DragAxis is only available as a grouped property of DragHandler</source>
+ <translation>DragAxis доступен только как сгруппированное свойство DragHandler</translation>
+ </message>
+</context>
+<context>
<name>QQuickEnterKeyAttached</name>
<message>
<source>EnterKey attached property only works with Items</source>
@@ -1208,10 +1279,17 @@
</message>
</context>
<context>
+ <name>QQuickGraphicsInfo</name>
+ <message>
+ <source>GraphicsInfo is only available via attached properties</source>
+ <translation>GraphicsInfo доступен только через подключаемые свойства</translation>
+ </message>
+</context>
+<context>
<name>QQuickItemView</name>
<message>
<source>ItemView is an abstract base class</source>
- <translation>ItemView ― абстрактный базовый класс</translation>
+ <translation>ItemView ― это абстрактный базовый класс</translation>
</message>
<message>
<source>Delegate must be of Item type</source>
@@ -1235,13 +1313,13 @@
<context>
<name>QQuickLayoutMirroringAttached</name>
<message>
- <source>LayoutDirection attached property only works with Items</source>
- <translation>Подключённое свойство LayoutDirection работает только с элементами</translation>
- </message>
- <message>
<source>LayoutMirroring is only available via attached properties</source>
<translation>LayoutMirroring доступно только через подключаемые свойства</translation>
</message>
+ <message>
+ <source>LayoutDirection attached property only works with Items and Windows</source>
+ <translation>Подключённое свойство LayoutDirection работает только с элементами и окнами</translation>
+ </message>
</context>
<context>
<name>QQuickLoader</name>
@@ -1253,6 +1331,10 @@
<context>
<name>QQuickMouseEvent</name>
<message>
+ <source>GestureEvent is only available in the context of handling the gestureStarted signal from MultiPointTouchArea</source>
+ <translation>GestureEvent доступен только в контексте обработки сигнала gestureStarted от MultiPointTouchArea</translation>
+ </message>
+ <message>
<source>MouseEvent is only available within handlers in MouseArea</source>
<translation>MouseEvent доступен только внутри обработчиков в MouseArea</translation>
</message>
@@ -1341,11 +1423,42 @@
<translation>Не удалось получить текстуру от поставщика: %1</translation>
</message>
<message>
+ <source>Error decoding: %1</source>
+ <translation>Ошибка декодирования: %1</translation>
+ </message>
+ <message>
<source>Cannot open: %1</source>
<translation>Не удалось открыть: %1</translation>
</message>
</context>
<context>
+ <name>QQuickPointerHandler</name>
+ <message>
+ <source>PointerEvent is only available as a parameter of several signals in PointerHandler</source>
+ <translation>PointerEvent доступен только, как параметр ряда сигналов PointerHandler</translation>
+ </message>
+ <message>
+ <source>EventPoint is only available as a member of PointerEvent</source>
+ <translation>EventPoint доступен только, как член PointerEvent</translation>
+ </message>
+ <message>
+ <source>EventTouchPoint is only available as a member of PointerEvent</source>
+ <translation>EventTouchPoint доступен только, как член PointerEvent</translation>
+ </message>
+ <message>
+ <source>PointerDevice is only available as a property of PointerEvent</source>
+ <translation>PointerDevice доступен только, как свойство PointerEvent</translation>
+ </message>
+ <message>
+ <source>PointingDeviceUniqueId is only available as a property of PointerEvent</source>
+ <translation>PointingDeviceUniqueId доступен только, как свойство PointerEvent</translation>
+ </message>
+ <message>
+ <source>PointerHandler is an abstract base class</source>
+ <translation>PointerHandler — абстрактный базовый класс</translation>
+ </message>
+</context>
+<context>
<name>QQuickPropertyAnimation</name>
<message>
<source>Cannot set a duration of &lt; 0</source>
@@ -1382,6 +1495,13 @@
</message>
</context>
<context>
+ <name>QQuickShapeGradient</name>
+ <message>
+ <source>ShapeGradient is an abstract base class</source>
+ <translation>ShapeGradient ― это абстрактный базовый класс</translation>
+ </message>
+</context>
+<context>
<name>QQuickTextUtil</name>
<message>
<source>%1 does not support loading non-visual cursor delegates.</source>
@@ -1393,6 +1513,13 @@
</message>
</context>
<context>
+ <name>QQuickTouchPoint</name>
+ <message>
+ <source>PointingDeviceUniqueId is only available via read-only properties</source>
+ <translation>PointingDeviceUniqueId доступен только через только читаемые свойства</translation>
+ </message>
+</context>
+<context>
<name>QQuickViewTransitionAttached</name>
<message>
<source>ViewTransition is only available via attached properties</source>
@@ -1488,6 +1615,10 @@ Install a driver providing OpenGL 2.0 or higher, or, if this is not possible, ma
<context>
<name>SignalTransition</name>
<message>
+ <source>Specified signal does not exist.</source>
+ <translation>Указанный сигнал отсутствует.</translation>
+ </message>
+ <message>
<source>Cannot assign to non-existent property &quot;%1&quot;</source>
<translation>Невозможно назначить несуществующему свойству «%1»</translation>
</message>
@@ -1503,8 +1634,8 @@ Install a driver providing OpenGL 2.0 or higher, or, if this is not possible, ma
<translation>Некорректное имя «%2» для QML %1</translation>
</message>
<message>
- <source>Cannot install %1 &apos;%2&apos; into unregistered namespace &apos;%3&apos;</source>
- <translation>Нельзя устанавливать %1 «%2» в незарегистрированное пространство имён «%3»</translation>
+ <source>Invalid QML %1 name &quot;%2&quot;; type names must begin with an uppercase letter</source>
+ <translation>Имя «%2» недопустимо для QML %1, имена типов должны начинаться с заглавной буквы</translation>
</message>
<message>
<source>Cannot install %1 &apos;%2&apos; into protected namespace &apos;%3&apos;</source>
diff --git a/translations/qtlocation_da.ts b/translations/qtlocation_da.ts
index 6ee43f1..132dba1 100644
--- a/translations/qtlocation_da.ts
+++ b/translations/qtlocation_da.ts
@@ -64,10 +64,17 @@ Besøg venligst https://developers.arcgis.com/authentication/accessing-arcgis-on
</message>
</context>
<context>
+ <name>QGeoCodeReplyMapbox</name>
+ <message>
+ <source>Response parse error</source>
+ <translation>Fejl ved parsing af svar</translation>
+ </message>
+</context>
+<context>
<name>QGeoMapMapboxGL</name>
<message>
- <source>Development access token, do not use in production!</source>
- <translation>Udviklingsadgangstoken, brug ikke i produktion!</translation>
+ <source>Development access token, do not use in production.</source>
+ <translation>Udviklingsadgangstoken, brug ikke i produktion.</translation>
</message>
</context>
<context>
@@ -112,12 +119,20 @@ Besøg venligst https://developers.arcgis.com/authentication/accessing-arcgis-on
<translation>Mørkt</translation>
</message>
<message>
- <source>Streets Traffic Day</source>
- <translation>Gader-trafik dag</translation>
+ <source>Navigation Preview Day</source>
+ <translation>Navigationsforhåndsvisning dag</translation>
</message>
<message>
- <source>Streets Traffic Night</source>
- <translation>Gader-trafik nat</translation>
+ <source>Navigation Preview Night</source>
+ <translation>Navigationsforhåndsvisning nat</translation>
+ </message>
+ <message>
+ <source>Navigation Guidance Day</source>
+ <translation>Navigationsguidning dag</translation>
+ </message>
+ <message>
+ <source>Navigation Guidance Night</source>
+ <translation>Navigationsguidning nat</translation>
</message>
<message>
<source>User provided style</source>
@@ -1330,6 +1345,13 @@ Besøg venligst https://www.mapbox.com</translation>
</message>
</context>
<context>
+ <name>QPlaceSearchReplyMapbox</name>
+ <message>
+ <source>Response parse error</source>
+ <translation>Fejl ved parsing af svar</translation>
+ </message>
+</context>
+<context>
<name>QPlaceSearchReplyOsm</name>
<message>
<source>Response parse error</source>
@@ -1337,6 +1359,13 @@ Besøg venligst https://www.mapbox.com</translation>
</message>
</context>
<context>
+ <name>QPlaceSearchSuggestionReplyMapbox</name>
+ <message>
+ <source>Response parse error</source>
+ <translation>Fejl ved parsing af svar</translation>
+ </message>
+</context>
+<context>
<name>QtLocationQML</name>
<message>
<source>Plugin property is not set.</source>
diff --git a/translations/qtlocation_de.ts b/translations/qtlocation_de.ts
index 2fae35d..dd0f24a 100644
--- a/translations/qtlocation_de.ts
+++ b/translations/qtlocation_de.ts
@@ -64,10 +64,17 @@ Bitte besuchen Sie https://developers.arcgis.com/authentication/accessing-arcgis
</message>
</context>
<context>
+ <name>QGeoCodeReplyMapbox</name>
+ <message>
+ <source>Response parse error</source>
+ <translation>Fehler beim Auswerten der Antwort</translation>
+ </message>
+</context>
+<context>
<name>QGeoMapMapboxGL</name>
<message>
- <source>Development access token, do not use in production!</source>
- <translation>Dieses Access-Token ist nur zur Entwicklung vorgesehen; es darf nicht in der Produktion verwendet werden!</translation>
+ <source>Development access token, do not use in production.</source>
+ <translation>Dieses Access-Token ist nur zur Entwicklung vorgesehen; es darf nicht in der Produktion verwendet werden.</translation>
</message>
</context>
<context>
@@ -112,12 +119,20 @@ Bitte besuchen Sie https://developers.arcgis.com/authentication/accessing-arcgis
<translation>Dunkel</translation>
</message>
<message>
- <source>Streets Traffic Day</source>
- <translation>Verkehrskarte Tag</translation>
+ <source>Navigation Preview Day</source>
+ <translation>Navigationsvorschau Tag</translation>
</message>
<message>
- <source>Streets Traffic Night</source>
- <translation>Verkehrskarte Nacht</translation>
+ <source>Navigation Preview Night</source>
+ <translation>Navigationsvorschau Nacht</translation>
+ </message>
+ <message>
+ <source>Navigation Guidance Day</source>
+ <translation>Navigationsanleitung Tag</translation>
+ </message>
+ <message>
+ <source>Navigation Guidance Night</source>
+ <translation>Navigationsanleitung Nacht</translation>
</message>
<message>
<source>User provided style</source>
@@ -1330,10 +1345,24 @@ Bitte besuchen Sie https://www.mapbox.com</translation>
</message>
</context>
<context>
+ <name>QPlaceSearchReplyMapbox</name>
+ <message>
+ <source>Response parse error</source>
+ <translation>Fehler beim Auswerten der Antwort</translation>
+ </message>
+</context>
+<context>
<name>QPlaceSearchReplyOsm</name>
<message>
<source>Response parse error</source>
- <translation>Fehler beim Parsen der Antwort</translation>
+ <translation>Fehler beim Auswerten der Antwort</translation>
+ </message>
+</context>
+<context>
+ <name>QPlaceSearchSuggestionReplyMapbox</name>
+ <message>
+ <source>Response parse error</source>
+ <translation>Fehler beim Auswerten der Antwort</translation>
</message>
</context>
<context>
diff --git a/translations/qtlocation_ru.ts b/translations/qtlocation_ru.ts
index f0f3cf9..7bac53c 100644
--- a/translations/qtlocation_ru.ts
+++ b/translations/qtlocation_ru.ts
@@ -2,6 +2,15 @@
<!DOCTYPE TS>
<TS version="2.1" language="ru">
<context>
+ <name>GeoServiceProviderFactoryEsri</name>
+ <message>
+ <source>Esri plugin requires a &apos;esri.token&apos; parameter.
+Please visit https://developers.arcgis.com/authentication/accessing-arcgis-online-services/</source>
+ <translation>Модуль Esri требует параметр «esri.token».
+Посетите https://developers.arcgis.com/authentication/accessing-arcgis-online-services/</translation>
+ </message>
+</context>
+<context>
<name>QDeclarativeGeoMap</name>
<message>
<source>No Map</source>
@@ -27,6 +36,10 @@
<translation>Навигация невозможна, навигатор не задан.</translation>
</message>
<message>
+ <source>Cannot route, valid query not set.</source>
+ <translation>Навигация невозможна, верный запрос не задан.</translation>
+ </message>
+ <message>
<source>Not enough waypoints for routing.</source>
<translation>Недостаточно контрольных точек для навигации.</translation>
</message>
@@ -51,7 +64,83 @@
</message>
</context>
<context>
- <name>QGeoRouteReplyOsm</name>
+ <name>QGeoCodeReplyMapbox</name>
+ <message>
+ <source>Response parse error</source>
+ <translation>Ошибка разбора ответа</translation>
+ </message>
+</context>
+<context>
+ <name>QGeoMapMapboxGL</name>
+ <message>
+ <source>Development access token, do not use in production.</source>
+ <translation>Токен доступа разработчика, не использовать в релизе.</translation>
+ </message>
+</context>
+<context>
+ <name>QGeoMappingManagerEngineItemsOverlay</name>
+ <message>
+ <source>Empty Map</source>
+ <translation>Пустая карта</translation>
+ </message>
+</context>
+<context>
+ <name>QGeoMappingManagerEngineMapboxGL</name>
+ <message>
+ <source>Streets</source>
+ <translation>Схема</translation>
+ </message>
+ <message>
+ <source>Basic</source>
+ <translation>Базовый</translation>
+ </message>
+ <message>
+ <source>Bright</source>
+ <translation>Яркий</translation>
+ </message>
+ <message>
+ <source>Outdoors</source>
+ <translation>На улице</translation>
+ </message>
+ <message>
+ <source>Satellite</source>
+ <translation>Спутник</translation>
+ </message>
+ <message>
+ <source>Satellite Streets</source>
+ <translation>Спутник+Схема</translation>
+ </message>
+ <message>
+ <source>Light</source>
+ <translation>Светлый</translation>
+ </message>
+ <message>
+ <source>Dark</source>
+ <translation>Темный</translation>
+ </message>
+ <message>
+ <source>Navigation Preview Day</source>
+ <translation>Предпросмотр навигации днём</translation>
+ </message>
+ <message>
+ <source>Navigation Preview Night</source>
+ <translation>Предпросмотр навигации ночью</translation>
+ </message>
+ <message>
+ <source>Navigation Guidance Day</source>
+ <translation>Подсказки навигации днём</translation>
+ </message>
+ <message>
+ <source>Navigation Guidance Night</source>
+ <translation>Подсказки навигации ночью</translation>
+ </message>
+ <message>
+ <source>User provided style</source>
+ <translation>Стиль пользователя</translation>
+ </message>
+</context>
+<context>
+ <name>QGeoRouteParserOsrmV4</name>
<message>
<source>Go straight.</source>
<translation>Следуйте прямо.</translation>
@@ -118,11 +207,11 @@
</message>
<message>
<source>Head on.</source>
- <translation type="unfinished">Продолжайте движение.</translation>
+ <translation>Продолжайте движение.</translation>
</message>
<message>
<source>Head onto %1.</source>
- <translation type="unfinished">Продолжайте движение на %1.</translation>
+ <translation>Продолжайте движение на %1.</translation>
</message>
<message>
<source>Enter the roundabout.</source>
@@ -214,11 +303,11 @@
</message>
<message>
<source>Start at the end of the street.</source>
- <translation type="unfinished">Начало в конце улицы.</translation>
+ <translation>Начало в конце улицы.</translation>
</message>
<message>
<source>Start at the end of %1.</source>
- <translation type="unfinished">Начало в конце %1.</translation>
+ <translation>Начало в конце %1.</translation>
</message>
<message>
<source>You have reached your destination.</source>
@@ -230,11 +319,652 @@
</message>
</context>
<context>
+ <name>QGeoRouteParserOsrmV5</name>
+ <message>
+ <source>North</source>
+ <extracomment>Translations exist at https://github.com/Project-OSRM/osrm-text-instructions. Always used in &quot;Head %1 [onto &lt;street name&gt;]&quot;</extracomment>
+ <translation>Север</translation>
+ </message>
+ <message>
+ <source>East</source>
+ <translation>Восток</translation>
+ </message>
+ <message>
+ <source>South</source>
+ <translation>Юг</translation>
+ </message>
+ <message>
+ <source>West</source>
+ <translation>Запад</translation>
+ </message>
+ <message>
+ <source>first</source>
+ <comment>roundabout exit</comment>
+ <extracomment>always used in &quot; and take the %1 exit [onto &lt;street name&gt;]&quot;</extracomment>
+ <translation>первый</translation>
+ </message>
+ <message>
+ <source>second</source>
+ <comment>roundabout exit</comment>
+ <translation>второй</translation>
+ </message>
+ <message>
+ <source>third</source>
+ <comment>roundabout exit</comment>
+ <translation>третий</translation>
+ </message>
+ <message>
+ <source>fourth</source>
+ <comment>roundabout exit</comment>
+ <translation>четвёртый</translation>
+ </message>
+ <message>
+ <source>fifth</source>
+ <comment>roundabout exit</comment>
+ <translation>пятый</translation>
+ </message>
+ <message>
+ <source>sixth</source>
+ <comment>roundabout exit</comment>
+ <translation>шестой</translation>
+ </message>
+ <message>
+ <source>seventh</source>
+ <comment>roundabout exit</comment>
+ <translation>седьмой</translation>
+ </message>
+ <message>
+ <source>eighth</source>
+ <comment>roundabout exit</comment>
+ <translation>восьмой</translation>
+ </message>
+ <message>
+ <source>ninth</source>
+ <comment>roundabout exit</comment>
+ <translation>девятый</translation>
+ </message>
+ <message>
+ <source>tenth</source>
+ <comment>roundabout exit</comment>
+ <translation>десятый</translation>
+ </message>
+ <message>
+ <source>eleventh</source>
+ <comment>roundabout exit</comment>
+ <translation>одиннадцатый</translation>
+ </message>
+ <message>
+ <source>twelfth</source>
+ <comment>roundabout exit</comment>
+ <translation>двенадцатый</translation>
+ </message>
+ <message>
+ <source>thirteenth</source>
+ <comment>roundabout exit</comment>
+ <translation>тринадцатый</translation>
+ </message>
+ <message>
+ <source>fourteenth</source>
+ <comment>roundabout exit</comment>
+ <translation>четырнадцатый</translation>
+ </message>
+ <message>
+ <source>fifteenth</source>
+ <comment>roundabout exit</comment>
+ <translation>пятнадцатый</translation>
+ </message>
+ <message>
+ <source>sixteenth</source>
+ <comment>roundabout exit</comment>
+ <translation>шестнадцатый</translation>
+ </message>
+ <message>
+ <source>seventeenth</source>
+ <comment>roundabout exit</comment>
+ <translation>семнадцатый</translation>
+ </message>
+ <message>
+ <source>eighteenth</source>
+ <comment>roundabout exit</comment>
+ <translation>восемнадцатый</translation>
+ </message>
+ <message>
+ <source>nineteenth</source>
+ <comment>roundabout exit</comment>
+ <translation>девятнадцатый</translation>
+ </message>
+ <message>
+ <source>twentieth</source>
+ <comment>roundabout exit</comment>
+ <translation>двадцатый</translation>
+ </message>
+ <message>
+ <source> and take the %1 exit</source>
+ <extracomment>Always appended to one of the following strings: - &quot;Enter the roundabout&quot; - &quot;Enter the rotary&quot; - &quot;Enter the rotary &lt;rotaryname&gt;&quot;</extracomment>
+ <translation> %1 съезд с кольца</translation>
+ </message>
+ <message>
+ <source> and take the %1 exit onto %2</source>
+ <translation> %1 съезд с кольца на %2</translation>
+ </message>
+ <message>
+ <source>You have arrived at your destination, straight ahead</source>
+ <translation>Вы прибыли в пункт назначения, он перед вами</translation>
+ </message>
+ <message>
+ <source>You have arrived at your destination, on the left</source>
+ <translation>Вы прибыли в пункт назначения, он слева</translation>
+ </message>
+ <message>
+ <source>You have arrived at your destination, on the right</source>
+ <translation>Вы прибыли в пункт назначения, он справа</translation>
+ </message>
+ <message>
+ <source>You have arrived at your destination</source>
+ <translation>Вы прибыли в пункт назначения</translation>
+ </message>
+ <message>
+ <source>Continue straight</source>
+ <translation>Продолжайте движение прямо</translation>
+ </message>
+ <message>
+ <source>Continue straight on %1</source>
+ <translation>Продолжайте движение прямо по %1</translation>
+ </message>
+ <message>
+ <source>Continue left</source>
+ <translation>Продолжайте движение налево</translation>
+ </message>
+ <message>
+ <source>Continue left onto %1</source>
+ <translation>Продолжайте движение налево на %1</translation>
+ </message>
+ <message>
+ <source>Continue slightly left</source>
+ <translation>Продолжайте движение левее</translation>
+ </message>
+ <message>
+ <source>Continue slightly left on %1</source>
+ <translation>Продолжайте движение левее по %1</translation>
+ </message>
+ <message>
+ <source>Continue right</source>
+ <translation>Продолжайте движение направо</translation>
+ </message>
+ <message>
+ <source>Continue right onto %1</source>
+ <translation>Продолжайте движение направо на %1</translation>
+ </message>
+ <message>
+ <source>Continue slightly right</source>
+ <translation>Продолжайте движение правее</translation>
+ </message>
+ <message>
+ <source>Continue slightly right on %1</source>
+ <translation>Продолжайте движение правее по %1</translation>
+ </message>
+ <message>
+ <source>Make a U-turn</source>
+ <translation>Развернитесь</translation>
+ </message>
+ <message>
+ <source>Make a U-turn onto %1</source>
+ <translation>Развернитесь на %1</translation>
+ </message>
+ <message>
+ <source>Continue</source>
+ <translation>Продолжайте движение</translation>
+ </message>
+ <message>
+ <source>Continue on %1</source>
+ <translation>Продолжайте движение по %1</translation>
+ </message>
+ <message>
+ <source>Head %1</source>
+ <translation>Направляйтесь на %1</translation>
+ </message>
+ <message>
+ <source>Head %1 onto %2</source>
+ <translation>Направляйтесь на %1 на %2</translation>
+ </message>
+ <message>
+ <source>Depart</source>
+ <translation>Отправляйтесь</translation>
+ </message>
+ <message>
+ <source>Depart onto %1</source>
+ <translation>Отправляйтесь по %1</translation>
+ </message>
+ <message>
+ <source>At the end of the road, turn left</source>
+ <translation>В конце дороги поверните налево</translation>
+ </message>
+ <message>
+ <source>At the end of the road, turn left onto %1</source>
+ <translation>В конце дороги поверните налево на %1</translation>
+ </message>
+ <message>
+ <source>At the end of the road, turn right</source>
+ <translation>В конце дороги поверните направо</translation>
+ </message>
+ <message>
+ <source>At the end of the road, turn right onto %1</source>
+ <translation>В конце дороги поверните направо на %1</translation>
+ </message>
+ <message>
+ <source>At the end of the road, make a U-turn</source>
+ <translation>Развернитесь в конце дороги</translation>
+ </message>
+ <message>
+ <source>At the end of the road, make a U-turn onto %1</source>
+ <translation>Развернитесь в конце дороги на %1</translation>
+ </message>
+ <message>
+ <source>At the end of the road, continue straight</source>
+ <translation>В конце дороги продолжайте движение прямо</translation>
+ </message>
+ <message>
+ <source>At the end of the road, continue straight onto %1</source>
+ <translation>В конце дороги продолжайте движение прямо на %1</translation>
+ </message>
+ <message>
+ <source>At the end of the road, continue</source>
+ <translation>В конце дороги продолжайте движение</translation>
+ </message>
+ <message>
+ <source>At the end of the road, continue onto %1</source>
+ <translation>В конце дороги продолжайте движение на %1</translation>
+ </message>
+ <message>
+ <source>Take the ferry</source>
+ <translation>Погрузитесь на паром</translation>
+ </message>
+ <message>
+ <source>At the fork, take a sharp left</source>
+ <translation>На развилке резко поверните налево</translation>
+ </message>
+ <message>
+ <source>At the fork, take a sharp left onto %1</source>
+ <translation>На развилке резко поверните налево на %1</translation>
+ </message>
+ <message>
+ <source>At the fork, turn left</source>
+ <translation>На развилке поверните налево</translation>
+ </message>
+ <message>
+ <source>At the fork, turn left onto %1</source>
+ <translation>На развилке поверните налево на %1</translation>
+ </message>
+ <message>
+ <source>At the fork, keep left</source>
+ <translation>На развилке держитесь левее</translation>
+ </message>
+ <message>
+ <source>At the fork, keep left onto %1</source>
+ <translation>На развилке держитесь левее на %1</translation>
+ </message>
+ <message>
+ <source>At the fork, take a sharp right</source>
+ <translation>На развилке резко поверните направо</translation>
+ </message>
+ <message>
+ <source>At the fork, take a sharp right onto %1</source>
+ <translation>На развилке резко поверните направо на %1</translation>
+ </message>
+ <message>
+ <source>At the fork, turn right</source>
+ <translation>На развилке поверните направо</translation>
+ </message>
+ <message>
+ <source>At the fork, turn right onto %1</source>
+ <translation>На развилке поверните направо на %1</translation>
+ </message>
+ <message>
+ <source>At the fork, keep right</source>
+ <translation>На развилке держитесь правее</translation>
+ </message>
+ <message>
+ <source>At the fork, keep right onto %1</source>
+ <translation>На развилке держитесь правее на %1</translation>
+ </message>
+ <message>
+ <source>At the fork, continue straight ahead</source>
+ <translation>На развилке продолжайте движение прямо</translation>
+ </message>
+ <message>
+ <source>At the fork, continue straight ahead onto %1</source>
+ <translation>На развилке продолжайте движение прямо на %1</translation>
+ </message>
+ <message>
+ <source>At the fork, continue</source>
+ <translation>На развилке продолжайте движение</translation>
+ </message>
+ <message>
+ <source>At the fork, continue onto %1</source>
+ <translation>На развилке продолжайте движение на %1</translation>
+ </message>
+ <message>
+ <source>Merge sharply left</source>
+ <translation>Быстро перестройтесь налево</translation>
+ </message>
+ <message>
+ <source>Merge sharply left onto %1</source>
+ <translation>Быстро перестройтесь налево на %1</translation>
+ </message>
+ <message>
+ <source>Merge left</source>
+ <translation>Перестройтесь левее</translation>
+ </message>
+ <message>
+ <source>Merge left onto %1</source>
+ <translation>Перестройтесь левее на %1</translation>
+ </message>
+ <message>
+ <source>Merge slightly left</source>
+ <translation>Перестройтесь немного левее</translation>
+ </message>
+ <message>
+ <source>Merge slightly left on %1</source>
+ <translation>Перестройтесь немного левее на %1</translation>
+ </message>
+ <message>
+ <source>Merge sharply right</source>
+ <translation>Быстро перестройтесь направо</translation>
+ </message>
+ <message>
+ <source>Merge sharply right onto %1</source>
+ <translation>Быстро перестройтесь направо на %1</translation>
+ </message>
+ <message>
+ <source>Merge right</source>
+ <translation>Перестройтесь правее</translation>
+ </message>
+ <message>
+ <source>Merge right onto %1</source>
+ <translation>Перестройтесь правее на %1</translation>
+ </message>
+ <message>
+ <source>Merge slightly right</source>
+ <translation>Перестройтесь немного правее</translation>
+ </message>
+ <message>
+ <source>Merge slightly right on %1</source>
+ <translation>Перестройтесь немного правее на %1</translation>
+ </message>
+ <message>
+ <source>Merge straight</source>
+ <translatorcomment>Бред какой-то</translatorcomment>
+ <translation>Перестройтесь прямо</translation>
+ </message>
+ <message>
+ <source>Merge straight on %1</source>
+ <translation>Перестройтесь прямо на %1</translation>
+ </message>
+ <message>
+ <source>Merge</source>
+ <translation>Перестройтесь</translation>
+ </message>
+ <message>
+ <source>Merge onto %1</source>
+ <translation>Перестройтесь на %1</translation>
+ </message>
+ <message>
+ <source>Take a sharp left</source>
+ <translation>Крутой поворот налево</translation>
+ </message>
+ <message>
+ <source>Take a sharp left onto %1</source>
+ <translation>Крутой поворот налево на %1</translation>
+ </message>
+ <message>
+ <source>Turn left</source>
+ <translation>Поверните налево</translation>
+ </message>
+ <message>
+ <source>Turn left onto %1</source>
+ <translation>Поверните налево на %1</translation>
+ </message>
+ <message>
+ <source>Continue slightly left onto %1</source>
+ <translation>Продолжайте движение левее на %1</translation>
+ </message>
+ <message>
+ <source>Take a sharp right</source>
+ <translation>Крутой поворот направо</translation>
+ </message>
+ <message>
+ <source>Take a sharp right onto %1</source>
+ <translation>Крутой поворот направо на %1</translation>
+ </message>
+ <message>
+ <source>Turn right</source>
+ <translation>Поверните направо</translation>
+ </message>
+ <message>
+ <source>Turn right onto %1</source>
+ <translation>Поверните направо на %1</translation>
+ </message>
+ <message>
+ <source>Continue slightly right onto %1</source>
+ <translation>Продолжайте движение правее на %1</translation>
+ </message>
+ <message>
+ <source>Continue straight onto %1</source>
+ <translation>Продолжайте движение прямо на %1</translation>
+ </message>
+ <message>
+ <source>Continue onto %1</source>
+ <translation>Продолжайте движение на %1</translation>
+ </message>
+ <message>
+ <source>Continue on the left</source>
+ <translation>Продолжайте движение налево</translation>
+ </message>
+ <message>
+ <source>Continue on the left on %1</source>
+ <translation>Продолжайте движение налево на %1</translation>
+ </message>
+ <message>
+ <source>Continue on the right</source>
+ <translation>Продолжайте движение направо</translation>
+ </message>
+ <message>
+ <source>Continue on the right on %1</source>
+ <translation>Продолжайте движение направо на %1</translation>
+ </message>
+ <message>
+ <source>Take the ramp on the left</source>
+ <translation>Сверните на левый съезд</translation>
+ </message>
+ <message>
+ <source>Take the ramp on the left onto %1</source>
+ <translation>Сверните на левый съезд на %1</translation>
+ </message>
+ <message>
+ <source>Take the ramp on the right</source>
+ <translation>Сверните на правый съезд</translation>
+ </message>
+ <message>
+ <source>Take the ramp on the right onto %1</source>
+ <translation>Сверните на правый съезд на %1</translation>
+ </message>
+ <message>
+ <source>Take the ramp</source>
+ <translation>Сверните на съезд</translation>
+ </message>
+ <message>
+ <source>Take the ramp onto %1</source>
+ <translation>Сверните на съезд на %1</translation>
+ </message>
+ <message>
+ <source>Get off the bike and push</source>
+ <translation>Слезьте с велосипеда и толкайте его</translation>
+ </message>
+ <message>
+ <source>Get off the bike and push onto %1</source>
+ <translation>Слезьте с велосипеда и толкайте его на %1</translation>
+ </message>
+ <message>
+ <source>Enter the rotary</source>
+ <extracomment>This string will be prepended to &quot; and take the &lt;nth&gt; exit [onto &lt;streetname&gt;]</extracomment>
+ <translation>Въезжайте на круговую развязку</translation>
+ </message>
+ <message>
+ <source>Enter the roundabout</source>
+ <extracomment>This string will be prepended to &quot; and take the &lt;nth&gt; exit [onto &lt;streetname&gt;]</extracomment>
+ <translation>Въезжайте на круг</translation>
+ </message>
+ <message>
+ <source>At the roundabout, continue straight</source>
+ <translation>На круге продолжайте движение прямо</translation>
+ </message>
+ <message>
+ <source>At the roundabout, continue straight on %1</source>
+ <translation>На круге продолжайте движение прямо по %1</translation>
+ </message>
+ <message>
+ <source>At the roundabout, turn left</source>
+ <translation>На круге поверните налево</translation>
+ </message>
+ <message>
+ <source>At the roundabout, turn left onto %1</source>
+ <translation>На круге поверните налево на %1</translation>
+ </message>
+ <message>
+ <source>At the roundabout, turn right</source>
+ <translation>На круге поверните направо</translation>
+ </message>
+ <message>
+ <source>At the roundabout, turn right onto %1</source>
+ <translation>На круге поверните направо на %1</translation>
+ </message>
+ <message>
+ <source>At the roundabout, turn around</source>
+ <translation>Развернитесь на круге</translation>
+ </message>
+ <message>
+ <source>At the roundabout, turn around onto %1</source>
+ <translation>Развернитесь на круге на %1</translation>
+ </message>
+ <message>
+ <source>At the roundabout, continue</source>
+ <translation>Продолжайте движение по кругу</translation>
+ </message>
+ <message>
+ <source>At the roundabout, continue onto %1</source>
+ <translation>Продолжайте движение по кругу на %1</translation>
+ </message>
+ <message>
+ <source>Take the train</source>
+ <translation>Сядьте в поезд</translation>
+ </message>
+ <message>
+ <source>Take the train [%1]</source>
+ <translation>Сядьте в поезд [%1]</translation>
+ </message>
+ <message>
+ <source>Go straight</source>
+ <translation>Следуйте прямо</translation>
+ </message>
+ <message>
+ <source>Go straight onto %1</source>
+ <translation>Следуйте прямо на %1</translation>
+ </message>
+ <message>
+ <source>Turn slightly left</source>
+ <translation>Возьмите левее</translation>
+ </message>
+ <message>
+ <source>Turn slightly left onto %1</source>
+ <translation>Возьмите левее на %1</translation>
+ </message>
+ <message>
+ <source>Turn slightly right</source>
+ <translation>Возьмите правее</translation>
+ </message>
+ <message>
+ <source>Turn slightly right onto %1</source>
+ <translation>Возьмите правее на %1</translation>
+ </message>
+ <message>
+ <source>Turn</source>
+ <translation>Поверните</translation>
+ </message>
+ <message>
+ <source>Turn onto %1</source>
+ <translation>Поверните на %1</translation>
+ </message>
+ <message>
+ <source> and continue straight</source>
+ <translation> и продолжайте движение прямо</translation>
+ </message>
+ <message>
+ <source> and continue straight onto %1</source>
+ <translation> и продолжайте движение прямо на %1</translation>
+ </message>
+ <message>
+ <source> and make a sharp left</source>
+ <translation> и резко поверните налево</translation>
+ </message>
+ <message>
+ <source> and make a sharp left onto %1</source>
+ <translation> и резко поверните налево на %1</translation>
+ </message>
+ <message>
+ <source> and turn left</source>
+ <translation> и поверните налево</translation>
+ </message>
+ <message>
+ <source> and turn left onto %1</source>
+ <translation> и поверните налево на %1</translation>
+ </message>
+ <message>
+ <source> and make a slight left</source>
+ <translation> и возьмите левее</translation>
+ </message>
+ <message>
+ <source> and make a slight left onto %1</source>
+ <translation> и возьмите левее на %1</translation>
+ </message>
+ <message>
+ <source> and make a sharp right</source>
+ <translation> и резко поверните направо</translation>
+ </message>
+ <message>
+ <source> and make a sharp right onto %1</source>
+ <translation> и резко поверните направо на %1</translation>
+ </message>
+ <message>
+ <source> and turn right</source>
+ <translation> и поверните направо</translation>
+ </message>
+ <message>
+ <source> and turn right onto %1</source>
+ <translation> и поверните направо на %1</translation>
+ </message>
+ <message>
+ <source> and make a slight right</source>
+ <translation> и возьмите правее</translation>
+ </message>
+ <message>
+ <source> and make a slight right onto %1</source>
+ <translation> и возьмите правее на %1</translation>
+ </message>
+ <message>
+ <source> and make a U-turn</source>
+ <translation> и развернитесь</translation>
+ </message>
+ <message>
+ <source> and make a U-turn onto %1</source>
+ <translation> и развернитесь на %1</translation>
+ </message>
+</context>
+<context>
<name>QGeoServiceProviderFactoryMapbox</name>
<message>
- <source>Mapbox plugin requires &apos;mapbox.map_id&apos; and &apos;mapbox.access_token&apos; parameters.
+ <source>Mapbox plugin requires a &apos;mapbox.access_token&apos; parameter.
Please visit https://www.mapbox.com</source>
- <translation>Модулю Mapbox требуются параметры «mapbox.map_id» и «mapbox.access_token».
+ <translation>Модулю Mapbox требуется параметр «mapbox.access_token».
Посетите https://www.mapbox.com</translation>
</message>
</context>
@@ -246,29 +976,77 @@ Please visit https://www.mapbox.com</source>
</message>
</context>
<context>
- <name>QGeoTiledMapOsm</name>
+ <name>QGeoTiledMappingManagerEngineMapbox</name>
<message>
- <source>Tiles Courtesy of &lt;a href=&apos;http://www.mapquest.com/&apos;&gt;MapQuest&lt;/a&gt;&lt;br/&gt;Data &amp;copy; &lt;a href=&apos;http://www.openstreetmap.org/copyright&apos;&gt;OpenStreetMap&lt;/a&gt; contributors</source>
- <translation type="unfinished">Сегменты предоставлены &lt;a href=&apos;http://www.mapquest.com/&apos;&gt;MapQuest&lt;/a&gt;&lt;br/&gt;Данные &amp;copy; участники &lt;a href=&apos;http://www.openstreetmap.org/copyright&apos;&gt;OpenStreetMap&lt;/a&gt;</translation>
+ <source>Street</source>
+ <extracomment>Noun describing map type &apos;Street map&apos;</extracomment>
+ <translation>Схема</translation>
</message>
<message>
- <source>Maps &amp;copy; &lt;a href=&apos;http://www.thunderforest.com/&apos;&gt;Thunderforest&lt;/a&gt;&lt;br/&gt;Data &amp;copy; &lt;a href=&apos;http://www.openstreetmap.org/copyright&apos;&gt;OpenStreetMap&lt;/a&gt; contributors</source>
- <translation type="unfinished">Карты &amp;copy; &lt;a href=&apos;http://www.thunderforest.com/&apos;&gt;Thunderforest&lt;/a&gt;&lt;br/&gt;Данные &amp;copy; участники &lt;a href=&apos;http://www.openstreetmap.org/copyright&apos;&gt;OpenStreetMap&lt;/a&gt;</translation>
+ <source>Light</source>
+ <extracomment>Noun describing type of a map using light colors (weak contrast)</extracomment>
+ <translation>Светлая</translation>
</message>
<message>
- <source>&amp;copy; &lt;a href=&apos;http://www.openstreetmap.org/copyright&apos;&gt;OpenStreetMap&lt;/a&gt; contributors</source>
- <translation type="unfinished">&amp;copy; участники &lt;a href=&apos;http://www.openstreetmap.org/copyright&apos;&gt;OpenStreetMap&lt;/a&gt;</translation>
+ <source>Dark</source>
+ <extracomment>Noun describing type of a map using dark colors</extracomment>
+ <translation>Темная</translation>
+ </message>
+ <message>
+ <source>Satellite</source>
+ <extracomment>Noun describing type of a map created by satellite</extracomment>
+ <translation>Спутниковая</translation>
+ </message>
+ <message>
+ <source>Streets Satellite</source>
+ <extracomment>Noun describing type of a street map created by satellite</extracomment>
+ <translation>Спутник+Схема</translation>
</message>
-</context>
-<context>
- <name>QGeoTiledMappingManagerEngineMapbox</name>
<message>
- <source>Custom</source>
- <translation>Особая</translation>
+ <source>Wheatpaste</source>
+ <extracomment>Noun describing type of a map using wheat paste colors</extracomment>
+ <translatorcomment>Как перевести не знаю. Буквальный перевод &quot;Клейстер&quot;.</translatorcomment>
+ <translation>Wheatpaste</translation>
</message>
<message>
- <source>Mapbox custom map</source>
- <translation>Особая карта Mapbox</translation>
+ <source>Streets Basic</source>
+ <extracomment>Noun describing type of a basic street map</extracomment>
+ <translation>Стандартная</translation>
+ </message>
+ <message>
+ <source>Comic</source>
+ <extracomment>Noun describing type of a map using cartoon-style fonts</extracomment>
+ <translation>Комическая</translation>
+ </message>
+ <message>
+ <source>Outdoors</source>
+ <extracomment>Noun describing type of a map for outdoor activities</extracomment>
+ <translation>Уличная</translation>
+ </message>
+ <message>
+ <source>Run Bike Hike</source>
+ <extracomment>Noun describing type of a map for sports</extracomment>
+ <translation>Спортивная</translation>
+ </message>
+ <message>
+ <source>Pencil</source>
+ <extracomment>Noun describing type of a map drawn by pencil</extracomment>
+ <translation>В карандаше</translation>
+ </message>
+ <message>
+ <source>Pirates</source>
+ <extracomment>Noun describing type of a treasure map with pirate boat watermark</extracomment>
+ <translation>Пиратская</translation>
+ </message>
+ <message>
+ <source>Emerald</source>
+ <extracomment>Noun describing type of a map using emerald colors</extracomment>
+ <translation>Изумрудная</translation>
+ </message>
+ <message>
+ <source>High Contrast</source>
+ <extracomment>Noun describing type of a map with high contrast</extracomment>
+ <translation>Высококонтрастная</translation>
</message>
</context>
<context>
@@ -525,11 +1303,11 @@ Please visit https://www.mapbox.com</source>
</message>
<message>
<source>Historic</source>
- <translation type="unfinished">Историческое</translation>
+ <translation>Историческое</translation>
</message>
<message>
<source>Land use</source>
- <translation type="unfinished">Использование</translation>
+ <translation>Использование</translation>
</message>
<message>
<source>Leisure</source>
@@ -569,11 +1347,21 @@ Please visit https://www.mapbox.com</source>
</message>
</context>
<context>
+ <name>QPlaceSearchReplyMapbox</name>
+ <message>
+ <source>Response parse error</source>
+ <translation>Ошибка разбора ответа</translation>
+ </message>
+</context>
+<context>
<name>QPlaceSearchReplyOsm</name>
<message>
- <source>Communication error</source>
- <translation>Ошибка связи</translation>
+ <source>Response parse error</source>
+ <translation>Ошибка разбора ответа</translation>
</message>
+</context>
+<context>
+ <name>QPlaceSearchSuggestionReplyMapbox</name>
<message>
<source>Response parse error</source>
<translation>Ошибка разбора ответа</translation>
diff --git a/translations/qtmultimedia_da.ts b/translations/qtmultimedia_da.ts
index 45fc5f2..4f98c14 100644
--- a/translations/qtmultimedia_da.ts
+++ b/translations/qtmultimedia_da.ts
@@ -58,6 +58,26 @@
<context>
<name>DSCameraSession</name>
<message>
+ <source>Failed to configure preview format</source>
+ <translation>Kunne ikke konfigurere forhåndsvisningsformat</translation>
+ </message>
+ <message>
+ <source>Failed to connect graph</source>
+ <translation>Kunne ikke tilslutte graf</translation>
+ </message>
+ <message>
+ <source>Failed to get stream control</source>
+ <translation>Kunne ikke få strømkontrol</translation>
+ </message>
+ <message>
+ <source>Failed to start</source>
+ <translation>Kunne ikke starte</translation>
+ </message>
+ <message>
+ <source>Failed to stop</source>
+ <translation>Kunne ikke stoppe</translation>
+ </message>
+ <message>
<source>Camera not ready for capture</source>
<translation>Kameraet er ikke klar til optagelse</translation>
</message>
@@ -65,6 +85,26 @@
<source>Could not save image to file.</source>
<translation>Kunne ikke gemme billede til fil.</translation>
</message>
+ <message>
+ <source>Failed to create filter graph</source>
+ <translation>Kunne ikke oprette filtergraf</translation>
+ </message>
+ <message>
+ <source>Failed to create graph builder</source>
+ <translation>Kunne ikke oprette grafbygger</translation>
+ </message>
+ <message>
+ <source>Failed to connect capture graph and filter graph</source>
+ <translation>Kunne ikke tilslutte optagelsesgraf og filtergraf</translation>
+ </message>
+ <message>
+ <source>No capture device found</source>
+ <translation>Ingen optagelsesenhed fundet</translation>
+ </message>
+ <message>
+ <source>Failed to create null renderer</source>
+ <translation>Kunne ikke oprette null-gengiver</translation>
+ </message>
</context>
<context>
<name>MFPlayerSession</name>
@@ -78,11 +118,11 @@
</message>
<message>
<source>The system cannot find the file specified.</source>
- <translation>Systemet kan ikke finde den specificerede fil.</translation>
+ <translation>Systemet kan ikke finde den angivne fil.</translation>
</message>
<message>
<source>The specified server could not be found.</source>
- <translation>Den specificerede server kunne ikke findes.</translation>
+ <translation>Den angivne server kunne ikke findes.</translation>
</message>
<message>
<source>Unsupported media type.</source>
diff --git a/translations/qtmultimedia_de.ts b/translations/qtmultimedia_de.ts
index 69cc784..3428003 100644
--- a/translations/qtmultimedia_de.ts
+++ b/translations/qtmultimedia_de.ts
@@ -58,6 +58,26 @@
<context>
<name>DSCameraSession</name>
<message>
+ <source>Failed to configure preview format</source>
+ <translation>Das Vorschauformat konnte nicht konfiguriert werden</translation>
+ </message>
+ <message>
+ <source>Failed to connect graph</source>
+ <translation>Es konnte keine Verbindung zum Graphen hergestellt werden</translation>
+ </message>
+ <message>
+ <source>Failed to get stream control</source>
+ <translation>Es konnte kein Kontrollobjekt für den Stream erhalten werden</translation>
+ </message>
+ <message>
+ <source>Failed to start</source>
+ <translation>Fehlschlag beim Starten</translation>
+ </message>
+ <message>
+ <source>Failed to stop</source>
+ <translation>Fehlschlag beim Anhalten</translation>
+ </message>
+ <message>
<source>Camera not ready for capture</source>
<translation>Die Kamera ist nicht aufnahmebereit</translation>
</message>
@@ -65,6 +85,26 @@
<source>Could not save image to file.</source>
<translation>Das Bild konnte nicht in eine Datei gespeichert werden.</translation>
</message>
+ <message>
+ <source>Failed to create filter graph</source>
+ <translation>Es konnte kein Filtergraph erstellt werden</translation>
+ </message>
+ <message>
+ <source>Failed to create graph builder</source>
+ <translation>Es konnte kein Graph-Builder-Objekt erstellt werden</translation>
+ </message>
+ <message>
+ <source>Failed to connect capture graph and filter graph</source>
+ <translation>Aufnahme- und Filtergraph konnten nicht verbunden werden</translation>
+ </message>
+ <message>
+ <source>No capture device found</source>
+ <translation>Es konnte keine Kamera gefunden werden</translation>
+ </message>
+ <message>
+ <source>Failed to create null renderer</source>
+ <translation>Es konnte kein Null-Renderer erstellt werden</translation>
+ </message>
</context>
<context>
<name>MFPlayerSession</name>
diff --git a/translations/qtmultimedia_fi.ts b/translations/qtmultimedia_fi.ts
index f43f731..3855be9 100644
--- a/translations/qtmultimedia_fi.ts
+++ b/translations/qtmultimedia_fi.ts
@@ -58,6 +58,26 @@
<context>
<name>DSCameraSession</name>
<message>
+ <source>Failed to configure preview format</source>
+ <translation>Esikatselun kuvamuodon asettaminen epäonnistui</translation>
+ </message>
+ <message>
+ <source>Failed to connect graph</source>
+ <translation>Graafin yhdistäminen epäonnistui</translation>
+ </message>
+ <message>
+ <source>Failed to get stream control</source>
+ <translation>Virran hallinnan saanti epäonnistui</translation>
+ </message>
+ <message>
+ <source>Failed to start</source>
+ <translation>Käynnistäminen epäonnistui</translation>
+ </message>
+ <message>
+ <source>Failed to stop</source>
+ <translation>Pysäyttäminen epäonnistui</translation>
+ </message>
+ <message>
<source>Camera not ready for capture</source>
<translation>Kamera ei ole valmiina kaappaamaan</translation>
</message>
@@ -65,6 +85,26 @@
<source>Could not save image to file.</source>
<translation>Kuvan tallentaminen tiedostoon epäonnistui.</translation>
</message>
+ <message>
+ <source>Failed to create filter graph</source>
+ <translation>Suodatingraafin luonti epäonnistui</translation>
+ </message>
+ <message>
+ <source>Failed to create graph builder</source>
+ <translation>Graafin rakentajan luonti epäonnistui</translation>
+ </message>
+ <message>
+ <source>Failed to connect capture graph and filter graph</source>
+ <translation>Kaappaus- ja suodatingraafien yhdistäminen epäonnistui</translation>
+ </message>
+ <message>
+ <source>No capture device found</source>
+ <translation>Kaappauslaitetta ei löydy</translation>
+ </message>
+ <message>
+ <source>Failed to create null renderer</source>
+ <translation>Tyhjän piirtäjän luonti epäonnistui</translation>
+ </message>
</context>
<context>
<name>MFPlayerSession</name>
diff --git a/translations/qtmultimedia_ru.ts b/translations/qtmultimedia_ru.ts
index daadc24..876cab5 100644
--- a/translations/qtmultimedia_ru.ts
+++ b/translations/qtmultimedia_ru.ts
@@ -20,122 +20,6 @@
</message>
</context>
<context>
- <name>BbCameraAudioEncoderSettingsControl</name>
- <message>
- <source>No compression</source>
- <translation>Без сжатия</translation>
- </message>
- <message>
- <source>AAC compression</source>
- <translation>Сжатие AAC</translation>
- </message>
- <message>
- <source>PCM uncompressed</source>
- <translation>PCM без сжатия</translation>
- </message>
-</context>
-<context>
- <name>BbCameraMediaRecorderControl</name>
- <message>
- <source>Unable to retrieve mute status</source>
- <translation>Не удалось определить включён ли звук</translation>
- </message>
- <message>
- <source>Unable to retrieve audio input volume</source>
- <translation>Не удалось определить громкость входного звука</translation>
- </message>
- <message>
- <source>Unable to set mute status</source>
- <translation>Не удалось включить/выключить звук</translation>
- </message>
- <message>
- <source>Unable to set audio input volume</source>
- <translation>Не удалось установить громкость входного звука</translation>
- </message>
-</context>
-<context>
- <name>BbCameraSession</name>
- <message>
- <source>Camera provides image in unsupported format</source>
- <translation>Камера выдаёт изображение в неподдерживаемом формате</translation>
- </message>
- <message>
- <source>Could not load JPEG data from frame</source>
- <translation>Не удалось загрузить данные JPEG из кадра</translation>
- </message>
- <message>
- <source>Camera not ready</source>
- <translation>Камера не готова</translation>
- </message>
- <message>
- <source>Unable to apply video settings</source>
- <translation>Не удалось применить настройки видео</translation>
- </message>
- <message>
- <source>Could not open destination file:
-%1</source>
- <translation>Не удалось открыть выходной файл:
-%1</translation>
- </message>
- <message>
- <source>Unable to open camera</source>
- <translation>Не удалось открыть камеру</translation>
- </message>
- <message>
- <source>Unable to retrieve native camera orientation</source>
- <translation>Не удалось получить исходное положение камеры</translation>
- </message>
- <message>
- <source>Unable to close camera</source>
- <translation>Не удалось закрыть камеру</translation>
- </message>
- <message>
- <source>Unable to start video recording</source>
- <translation>Не удалось начать запись видео</translation>
- </message>
- <message>
- <source>Unable to stop video recording</source>
- <translation>Не удалось остановить запись видео</translation>
- </message>
-</context>
-<context>
- <name>BbCameraVideoEncoderSettingsControl</name>
- <message>
- <source>No compression</source>
- <translation>Без сжатия</translation>
- </message>
- <message>
- <source>AVC1 compression</source>
- <translation>Сжатие AVC1</translation>
- </message>
- <message>
- <source>H264 compression</source>
- <translation>Сжатие H264</translation>
- </message>
-</context>
-<context>
- <name>BbImageEncoderControl</name>
- <message>
- <source>JPEG image</source>
- <translation>Изображение JPEG</translation>
- </message>
-</context>
-<context>
- <name>BbVideoDeviceSelectorControl</name>
- <message>
- <source>Front Camera</source>
- <translation>Передняя камера</translation>
- </message>
- <message>
- <source>Rear Camera</source>
- <translation>Задняя камера</translation>
- </message>
- <message>
- <source>Desktop Camera</source>
- <translation>Виртуальная камера: рабочий стол</translation>
- </message>
-</context>
-<context>
<name>CameraBinImageCapture</name>
<message>
<source>Camera not ready</source>
@@ -174,6 +58,26 @@
<context>
<name>DSCameraSession</name>
<message>
+ <source>Failed to configure preview format</source>
+ <translation>Не удалось настроить формат предпросмотра</translation>
+ </message>
+ <message>
+ <source>Failed to connect graph</source>
+ <translation>Не удалось соединить граф</translation>
+ </message>
+ <message>
+ <source>Failed to get stream control</source>
+ <translation>Не удалось получить управление потоком</translation>
+ </message>
+ <message>
+ <source>Failed to start</source>
+ <translation>Не удалось запустить</translation>
+ </message>
+ <message>
+ <source>Failed to stop</source>
+ <translation>Не удалось остановить</translation>
+ </message>
+ <message>
<source>Camera not ready for capture</source>
<translation>Камера не готова к захвату</translation>
</message>
@@ -181,6 +85,26 @@
<source>Could not save image to file.</source>
<translation>Не удалось сохранить изображение в файл.</translation>
</message>
+ <message>
+ <source>Failed to create filter graph</source>
+ <translation>Не удалось создать граф фильтров</translation>
+ </message>
+ <message>
+ <source>Failed to create graph builder</source>
+ <translation>Не удалось создать сборщих графов</translation>
+ </message>
+ <message>
+ <source>Failed to connect capture graph and filter graph</source>
+ <translation>Не удалось соединить графы захвата и фильтрации</translation>
+ </message>
+ <message>
+ <source>No capture device found</source>
+ <translation>Устройтсво захвата не обнаружено</translation>
+ </message>
+ <message>
+ <source>Failed to create null renderer</source>
+ <translation>Не удалось создать пустой рендер</translation>
+ </message>
</context>
<context>
<name>MFPlayerSession</name>
@@ -393,13 +317,6 @@
</message>
</context>
<context>
- <name>QGstreamerAudioEncode</name>
- <message>
- <source>Raw PCM audio</source>
- <translation>Необработанное PCM-аудио</translation>
- </message>
-</context>
-<context>
<name>QGstreamerAudioInputSelector</name>
<message>
<source>System default device</source>
@@ -455,10 +372,6 @@
<source>UDP source timeout</source>
<translation>Истекло время источника UDP</translation>
</message>
- <message>
- <source>Media is loaded as a playlist</source>
- <translation>Медиа-данные загружены в виде списка проигрывания</translation>
- </message>
</context>
<context>
<name>QGstreamerRecorderControl</name>
@@ -554,6 +467,10 @@
<translation>неверная строка в файле списка воспроизведения</translation>
</message>
<message>
+ <source>Invalid stream</source>
+ <translation>Неверный поток</translation>
+ </message>
+ <message>
<source>Empty file provided</source>
<translation>Предоставлен пустой файл</translation>
</message>
diff --git a/translations/qtquick1_da.ts b/translations/qtquick1_da.ts
index 797fdb2..e552dbd 100644
--- a/translations/qtquick1_da.ts
+++ b/translations/qtquick1_da.ts
@@ -58,7 +58,7 @@
</message>
<message>
<source>Cannot specify left, right, and hcenter anchors.</source>
- <translation>Kan ikke specificere venstre, højre og vandret centreret ankre.</translation>
+ <translation>Kan ikke angive venstre, højre og vandret centreret ankre.</translation>
</message>
<message>
<source>Cannot anchor to a null item.</source>
@@ -74,7 +74,7 @@
</message>
<message>
<source>Cannot specify top, bottom, and vcenter anchors.</source>
- <translation>Kan ikke specificere øverste, nederste og lodret centreret ankre.</translation>
+ <translation>Kan ikke angive øverste, nederste og lodret centreret ankre.</translation>
</message>
<message>
<source>Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors.</source>
@@ -236,7 +236,7 @@
</message>
<message>
<source>Incorrectly specified signal assignment</source>
- <translation>Ukorrekt specificerede signal-tildeling</translation>
+ <translation>Ukorrekt angivet signal-tildeling</translation>
</message>
<message>
<source>Cannot assign a value to a signal (expecting a script to be run)</source>
@@ -428,7 +428,7 @@
</message>
<message>
<source>Invalid alias reference. An alias reference must be specified as &lt;id&gt;, &lt;id&gt;.&lt;property&gt; or &lt;id&gt;.&lt;value property&gt;.&lt;property&gt;</source>
- <translation>Ugyldig alias-reference. En alias-reference skal specificeres som &lt;id&gt;, &lt;id&gt;.&lt;egenskab&gt; eller &lt;id&gt;.&lt;værdi egenskab&gt;.&lt;egenskab&gt;</translation>
+ <translation>Ugyldig alias-reference. En alias-reference skal angives som &lt;id&gt;, &lt;id&gt;.&lt;egenskab&gt; eller &lt;id&gt;.&lt;værdi egenskab&gt;.&lt;egenskab&gt;</translation>
</message>
<message>
<source>Invalid alias reference. Unable to find id &quot;%1&quot;</source>
diff --git a/translations/qtquickcontrols2_da.ts b/translations/qtquickcontrols2_da.ts
new file mode 100644
index 0000000..52453f6
--- /dev/null
+++ b/translations/qtquickcontrols2_da.ts
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="da">
+<context>
+ <name>QQuickPlatformDialog</name>
+ <message>
+ <source>Dialog is an abstract base class</source>
+ <translation>Dialog er en abstrakt grundklasse</translation>
+ </message>
+ <message>
+ <source>Cannot create an instance of StandardButton</source>
+ <translation>Kan ikke oprette en instans af StandardButton</translation>
+ </message>
+</context>
+<context>
+ <name>QtQuickControls2ImagineStylePlugin</name>
+ <message>
+ <source>Imagine is an attached property</source>
+ <translation>Imagine er en tilkoblet egenskab</translation>
+ </message>
+</context>
+<context>
+ <name>QtQuickControls2MaterialStylePlugin</name>
+ <message>
+ <source>Material is an attached property</source>
+ <translation>Material er en tilkoblet egenskab</translation>
+ </message>
+</context>
+<context>
+ <name>QtQuickControls2UniversalStylePlugin</name>
+ <message>
+ <source>Universal is an attached property</source>
+ <translation>Universal er en tilkoblet egenskab</translation>
+ </message>
+</context>
+</TS>
diff --git a/translations/qtquickcontrols_da.ts b/translations/qtquickcontrols_da.ts
new file mode 100644
index 0000000..1e4542e
--- /dev/null
+++ b/translations/qtquickcontrols_da.ts
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="da">
+<context>
+ <name>DefaultColorDialog</name>
+ <message>
+ <source>Hue</source>
+ <translation>Farvetone</translation>
+ </message>
+ <message>
+ <source>Saturation</source>
+ <translation>Farvemætning</translation>
+ </message>
+ <message>
+ <source>Luminosity</source>
+ <translation>Lysstyrke</translation>
+ </message>
+ <message>
+ <source>Alpha</source>
+ <translation>Alfa</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>Annuller</translation>
+ </message>
+ <message>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+</context>
+<context>
+ <name>DefaultDialogWrapper</name>
+ <message>
+ <source>Show Details...</source>
+ <translation>Vis detaljer...</translation>
+ </message>
+</context>
+<context>
+ <name>DefaultFileDialog</name>
+ <message>
+ <source>Go up to the folder containing this one</source>
+ <translation>Gå op til mappen som indeholder denne</translation>
+ </message>
+ <message>
+ <source>Remove favorite</source>
+ <translation>Fjern favorit</translation>
+ </message>
+ <message>
+ <source>Add the current directory as a favorite</source>
+ <translation>Tilføj den nuværende mappe som en favorit</translation>
+ </message>
+ <message>
+ <source>Filename</source>
+ <translation>Filnavn</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <comment>file type (extension)</comment>
+ <translation>Type</translation>
+ </message>
+ <message>
+ <source>Size</source>
+ <comment>file size</comment>
+ <translation>Størrelse</translation>
+ </message>
+ <message>
+ <source>Modified</source>
+ <comment>last-modified time</comment>
+ <translation>Ændret</translation>
+ </message>
+ <message>
+ <source>Accessed</source>
+ <comment>last-accessed time</comment>
+ <translation>Tilgået</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>Annuller</translation>
+ </message>
+ <message>
+ <source>Choose</source>
+ <translation>Vælg</translation>
+ </message>
+ <message>
+ <source>Open</source>
+ <translation>Åbn</translation>
+ </message>
+ <message>
+ <source>Save</source>
+ <translation>Gem</translation>
+ </message>
+</context>
+<context>
+ <name>DefaultFontDialog</name>
+ <message>
+ <source>Font</source>
+ <translation>Skrifttype</translation>
+ </message>
+ <message>
+ <source>Weight</source>
+ <translation>Tykkelse</translation>
+ </message>
+ <message>
+ <source>Size</source>
+ <translation>Størrelse</translation>
+ </message>
+ <message>
+ <source>Font Family</source>
+ <translation>Skrifttypefamilje</translation>
+ </message>
+ <message>
+ <source>Thin</source>
+ <translation>Tynd</translation>
+ </message>
+ <message>
+ <source>ExtraLight</source>
+ <translation>Ekstra let</translation>
+ </message>
+ <message>
+ <source>Light</source>
+ <translation>Let</translation>
+ </message>
+ <message>
+ <source>Normal</source>
+ <translation>Normal</translation>
+ </message>
+ <message>
+ <source>Medium</source>
+ <translation>Medium</translation>
+ </message>
+ <message>
+ <source>DemiBold</source>
+ <translation>Semi fed</translation>
+ </message>
+ <message>
+ <source>Bold</source>
+ <translation>Fed</translation>
+ </message>
+ <message>
+ <source>ExtraBold</source>
+ <translation>Ekstra fed</translation>
+ </message>
+ <message>
+ <source>Black</source>
+ <translation>Sort</translation>
+ </message>
+ <message>
+ <source>Style</source>
+ <translation>Stil</translation>
+ </message>
+ <message>
+ <source>Italic</source>
+ <translation>Kursiv</translation>
+ </message>
+ <message>
+ <source>Underline</source>
+ <translation>Understreget</translation>
+ </message>
+ <message>
+ <source>Overline</source>
+ <translation>Topstreget</translation>
+ </message>
+ <message>
+ <source>Strikeout</source>
+ <translation>Gennemstreget</translation>
+ </message>
+ <message>
+ <source>Writing System</source>
+ <translation>Skrivesystem</translation>
+ </message>
+ <message>
+ <source>Sample</source>
+ <translation>Eksempel</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>Annuller</translation>
+ </message>
+ <message>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+</context>
+<context>
+ <name>DefaultMessageDialog</name>
+ <message>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <source>Open</source>
+ <translation>Åbn</translation>
+ </message>
+ <message>
+ <source>Save</source>
+ <translation>Gem</translation>
+ </message>
+ <message>
+ <source>Save All</source>
+ <translation>Gem alle</translation>
+ </message>
+ <message>
+ <source>Retry</source>
+ <translation>Prøv igen</translation>
+ </message>
+ <message>
+ <source>Ignore</source>
+ <translation>Ignorer</translation>
+ </message>
+ <message>
+ <source>Apply</source>
+ <translation>Anvend</translation>
+ </message>
+ <message>
+ <source>Yes</source>
+ <translation>Ja</translation>
+ </message>
+ <message>
+ <source>Yes to All</source>
+ <translation>Ja til alle</translation>
+ </message>
+ <message>
+ <source>No</source>
+ <translation>Nej</translation>
+ </message>
+ <message>
+ <source>No to All</source>
+ <translation>Nej til alle</translation>
+ </message>
+ <message>
+ <source>Discard</source>
+ <translation>Forkast</translation>
+ </message>
+ <message>
+ <source>Reset</source>
+ <translation>Nulstil</translation>
+ </message>
+ <message>
+ <source>Restore Defaults</source>
+ <translation>Gendan standarder</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>Annuller</translation>
+ </message>
+ <message>
+ <source>Abort</source>
+ <translation>Afbryd</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>Luk</translation>
+ </message>
+ <message>
+ <source>Show Details...</source>
+ <translation>Vis detaljer...</translation>
+ </message>
+ <message>
+ <source>Help</source>
+ <translation>Hjælp</translation>
+ </message>
+ <message>
+ <source>Hide Details</source>
+ <translation>Skjul detaljer</translation>
+ </message>
+</context>
+<context>
+ <name>EditMenu_base</name>
+ <message>
+ <source>&amp;Undo</source>
+ <translation>&amp;Fortryd</translation>
+ </message>
+ <message>
+ <source>&amp;Redo</source>
+ <translation>&amp;Omgør</translation>
+ </message>
+ <message>
+ <source>Cu&amp;t</source>
+ <translation>K&amp;lip</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>&amp;Kopiér</translation>
+ </message>
+ <message>
+ <source>&amp;Paste</source>
+ <translation>&amp;Indsæt</translation>
+ </message>
+ <message>
+ <source>Delete</source>
+ <translation>Slet</translation>
+ </message>
+ <message>
+ <source>Clear</source>
+ <translation>Ryd</translation>
+ </message>
+ <message>
+ <source>Select All</source>
+ <translation>Markér alt</translation>
+ </message>
+</context>
+</TS>
diff --git a/translations/qtwebengine_ru.ts b/translations/qtwebengine_ru.ts
index 5ba8304..02648a6 100644
--- a/translations/qtwebengine_ru.ts
+++ b/translations/qtwebengine_ru.ts
@@ -2,244 +2,90 @@
<!DOCTYPE TS>
<TS version="2.1" language="ru">
<context>
- <name>AuthenticationDialog</name>
- <message>
- <source>Authentication Required</source>
- <translation>Требуется авторизация</translation>
- </message>
- <message>
- <source>Username:</source>
- <translation>Имя пользователя:</translation>
- </message>
- <message>
- <source>Password:</source>
- <translation>Пароль:</translation>
- </message>
- <message>
- <source>&amp;Cancel</source>
- <translation>&amp;Отмена</translation>
- </message>
- <message>
- <source>&amp;Log In</source>
- <translation>&amp;Войти</translation>
- </message>
-</context>
-<context>
- <name>QQuickWebEngineView</name>
- <message>
- <source>Follow Link</source>
- <translation>Перейти по ссылке</translation>
- </message>
- <message>
- <source>Back</source>
- <translation>Назад</translation>
- </message>
- <message>
- <source>Forward</source>
- <translation>Впeрёд</translation>
- </message>
- <message>
- <source>Reload</source>
- <translation>Перезагрузить</translation>
- </message>
- <message>
- <source>Copy</source>
- <translation>Скопировать</translation>
- </message>
- <message>
- <source>Unselect</source>
- <translation>Снять выделение</translation>
- </message>
- <message>
- <source>Copy Link URL</source>
- <translation>Скопировать адрес ссылки</translation>
- </message>
- <message>
- <source>Save Link</source>
- <translation>Сохранить ссылку</translation>
- </message>
- <message>
- <source>Copy Image URL</source>
- <translation>Скопировать адрес изображения</translation>
- </message>
- <message>
- <source>Copy Image</source>
- <translation>Скопировать изображение</translation>
- </message>
- <message>
- <source>Save Image</source>
- <translation>Сохранить изображение</translation>
- </message>
- <message>
- <source>Copy Media URL</source>
- <translation>Скопировать адрес ресурса</translation>
- </message>
- <message>
- <source>Save Media</source>
- <translation>Сохранить ресурс</translation>
- </message>
- <message>
- <source>Toggle Play/Pause</source>
- <translation>Воспроизвести/приостановить</translation>
- </message>
- <message>
- <source>Toggle Looping</source>
- <translation>Зациклено</translation>
- </message>
- <message>
- <source>Toggle Mute</source>
- <translation>Выключить звук</translation>
- </message>
- <message>
- <source>Toggle Media Controls</source>
- <translation>Управление воспроизведением</translation>
- </message>
- <message>
- <source>Inspect Element</source>
- <translation>Исследовать элемент</translation>
- </message>
- <message>
- <source>Exit Full Screen Mode</source>
- <translation>Выйти из полноэкранного режима</translation>
- </message>
-</context>
-<context>
<name>QWebEnginePage</name>
<message>
- <source>Back</source>
- <translation>Назад</translation>
- </message>
- <message>
- <source>Forward</source>
- <translation>Вперёд</translation>
- </message>
- <message>
<source>Stop</source>
<translation>Стоп</translation>
</message>
<message>
- <source>Reload</source>
- <translation>Перезагрузить</translation>
- </message>
- <message>
<source>Reload and Bypass Cache</source>
<translation>Перезагрузить без кэша</translation>
</message>
<message>
- <source>Cut</source>
- <translation>Вырезать</translation>
- </message>
- <message>
- <source>Copy</source>
- <translation>Скопировать</translation>
- </message>
- <message>
- <source>Paste</source>
- <translation>Вставить</translation>
- </message>
- <message>
- <source>Undo</source>
- <translation>Отменить</translation>
+ <source>Toggle Play/Pause</source>
+ <translation>Воспроизвести/приостановить</translation>
</message>
<message>
- <source>Redo</source>
- <translation>Повторить</translation>
+ <source>Toggle Mute</source>
+ <translation>Выключить звук</translation>
</message>
<message>
- <source>Select All</source>
- <translation>Выделить всё</translation>
+ <source>Close Page</source>
+ <translation>Закрыть страницу</translation>
</message>
<message>
- <source>Paste and Match Style</source>
- <translation>Вставить со стилем</translation>
+ <source>Unselect</source>
+ <translation>Снять выделение</translation>
</message>
<message>
- <source>Open Link in This Window</source>
+ <source>Open link in this window</source>
<translation>Открыть ссылку в этом окне</translation>
</message>
<message>
- <source>Open Link in New Window</source>
- <translation>Открыть ссылку в новом окне</translation>
- </message>
- <message>
- <source>Open Link in New Tab</source>
- <translation>Открыть ссылку в новой вкладке</translation>
- </message>
- <message>
- <source>Open Link in New Background Tab</source>
+ <source>Open link in new background tab</source>
<translation>Открыть ссылку в новой фоновой вкладке</translation>
</message>
<message>
- <source>Copy Link URL</source>
- <translation>Скопировать адрес ссылки</translation>
+ <source>&amp;Bold</source>
+ <translation>&amp;Жирный</translation>
</message>
<message>
- <source>Save Link</source>
- <translation>Сохранить ссылку</translation>
+ <source>&amp;Italic</source>
+ <translation>&amp;Наклонный</translation>
</message>
<message>
- <source>Copy Image</source>
- <translation>Скопировать изображение</translation>
+ <source>&amp;Underline</source>
+ <translation>&amp;Подчёркнутый</translation>
</message>
<message>
- <source>Copy Image URL</source>
- <translation>Скопировать адрес изображения</translation>
+ <source>&amp;Strikethrough</source>
+ <translation>&amp;Зачёркнутый</translation>
</message>
<message>
- <source>Save Image</source>
- <translation>Сохранить изображение</translation>
+ <source>Align &amp;Left</source>
+ <translation>По &amp;левому краю</translation>
</message>
<message>
- <source>Copy Media URL</source>
- <translation>Скопировать адрес ресурса</translation>
+ <source>Align &amp;Center</source>
+ <translation>По &amp;середине</translation>
</message>
<message>
- <source>Toggle Media Controls</source>
- <translation>Управление воспроизведением</translation>
+ <source>Align &amp;Right</source>
+ <translation>По &amp;правому краю</translation>
</message>
<message>
- <source>Toggle Looping</source>
- <translation>Зациклено</translation>
+ <source>Align &amp;Justified</source>
+ <translation>По &amp;ширине</translation>
</message>
<message>
- <source>Toggle Play/Pause</source>
- <translation>Воспроизвести/приостановить</translation>
+ <source>&amp;Indent</source>
+ <translation>Увеличить &amp;отступить</translation>
</message>
<message>
- <source>Toggle Mute</source>
- <translation>Выключить звук</translation>
+ <source>&amp;Outdent</source>
+ <translation>Уменьшить о&amp;тступ</translation>
</message>
<message>
- <source>Save Media</source>
- <translation>Сохранить ресурс</translation>
+ <source>Insert &amp;Ordered List</source>
+ <translation>&amp;Нумерованный список</translation>
</message>
<message>
- <source>Inspect Element</source>
- <translation>Исследовать элемент</translation>
+ <source>Insert &amp;Unordered List</source>
+ <translation>&amp;Маркированный список</translation>
</message>
<message>
- <source>Exit Full Screen Mode</source>
- <translation>Выйти из полноэкранного режима</translation>
- </message>
- <message>
- <source>Close Page</source>
- <translation>Закрыть страницу</translation>
- </message>
- <message>
- <source>Unselect</source>
- <translation>Снять выделение</translation>
- </message>
- <message>
- <source>Save &amp;Page</source>
- <translation>Сохранить страни&amp;цу</translation>
- </message>
- <message>
- <source>Are you sure you want to leave this page?</source>
- <translation>Закрыть страницу?</translation>
- </message>
- <message>
- <source>Follow Link</source>
- <translation>Перейти по ссылке</translation>
+ <source>Are you sure you want to leave this page? Changes that you made may not be saved.</source>
+ <translation>Покинуть страницу? Сделанные изменения могут быть утеряны.</translation>
</message>
<message>
<source>&amp;Back</source>
@@ -276,37 +122,14 @@
<source>Are you sure you want to leave this page?</source>
<translation>Закрыть страницу?</translation>
</message>
-</context>
-<context>
- <name>QtWebEngineExperimentalPlugin</name>
<message>
- <source>Cannot create a separate instance of WebEngineViewExperimental</source>
- <translation>Невозможно создать отдельный экземпляр WebEngineViewExperimental</translation>
- </message>
- <message>
- <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>
+ <source>Changes that you made may not be saved.</source>
+ <translation>Сделанные изменения могут быть утеряны.</translation>
</message>
</context>
<context>
<name>QtWebEnginePlugin</name>
<message>
- <source>Cannot create separate instance of WebEngineLoadRequest</source>
- <translation>Невозможно создать отдельный экземпляр WebEngineLoadRequest</translation>
- </message>
- <message>
- <source>Cannot create separate instance of WebEngineNavigationRequest</source>
- <translation>Невозможно создать отдельный экземпляр WebEngineNavigationRequest</translation>
- </message>
- <message>
- <source>Cannot create separate instance of WebEngineCertificateError</source>
- <translation>Невозможно создать отдельный экземпляр WebEngineCertificateError</translation>
- </message>
- <message>
<source>Cannot create a separate instance of WebEngineDownloadItem</source>
<translation>Невозможно создать отдельный экземпляр WebEngineDownloadItem</translation>
</message>
@@ -326,6 +149,10 @@
<source>Cannot create a separate instance of FullScreenRequest</source>
<translation>Невозможно создать отдельный экземпляр FullScreenRequest</translation>
</message>
+ <message>
+ <source>Cannot create separate instance of %1</source>
+ <translation>Невозможно создать отдельный экземпляр %1</translation>
+ </message>
</context>
<context>
<name>QtWebEngineTestSupportPlugin</name>
@@ -333,6 +160,10 @@
<source>Cannot create a separate instance of WebEngineErrorPage</source>
<translation>Невозможно создать отдельный экземпляр WebEngineErrorPage</translation>
</message>
+ <message>
+ <source>Cannot create a separate instance of WebEngineTestEvent</source>
+ <translation>Невозможно создать отдельный экземпляр WebEngineTestEvent</translation>
+ </message>
</context>
<context>
<name>UIDelegatesManager</name>
diff --git a/translations/qtwebsockets_de.ts b/translations/qtwebsockets_de.ts
index f7ae219..193ca70 100644
--- a/translations/qtwebsockets_de.ts
+++ b/translations/qtwebsockets_de.ts
@@ -58,6 +58,10 @@
<translation>Ungültige Statuszeile in Antwort: %1.</translation>
</message>
<message>
+ <source>Malformed header in response: %1.</source>
+ <translation>Die Antwort enthält einen ungültigen Header: %1.</translation>
+ </message>
+ <message>
<source>QWebSocketPrivate::processHandshake: Connection closed while reading header.</source>
<translation>QWebSocketPrivate::processHandshake: Verbindung während des Auslesens des Headers geschlossen.</translation>
</message>
diff --git a/translations/qtwebsockets_ru.ts b/translations/qtwebsockets_ru.ts
index 0991e3e..430f179 100644
--- a/translations/qtwebsockets_ru.ts
+++ b/translations/qtwebsockets_ru.ts
@@ -58,6 +58,10 @@
<translation>Неверная строка состояния ответа: %1.</translation>
</message>
<message>
+ <source>Malformed header in response: %1.</source>
+ <translation>Неверный заголовок в ответе: %1.</translation>
+ </message>
+ <message>
<source>QWebSocketPrivate::processHandshake: Connection closed while reading header.</source>
<translation>QWebSocketPrivate::processHandshake: Подключение закрыто при чтения заголовка.</translation>
</message>
diff --git a/translations/qtxmlpatterns_ru.ts b/translations/qtxmlpatterns_ru.ts
index 3465aff..e0ddac4 100644
--- a/translations/qtxmlpatterns_ru.ts
+++ b/translations/qtxmlpatterns_ru.ts
@@ -1164,27 +1164,27 @@
</message>
<message>
<source>Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema.</source>
- <translation type="unfinished"></translation>
+ <translation>Целевое пространство имён %1 включённой схемы отличается от оного (%2) включающей.</translation>
</message>
<message>
<source>Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema.</source>
- <translation type="unfinished"></translation>
+ <translation>Целевое пространство имён %1 импортируемой схемы отличается от оного (%2) импортирующей.</translation>
</message>
<message>
<source>%1 element is not allowed to have the same %2 attribute value as the target namespace %3.</source>
- <translation type="unfinished"></translation>
+ <translation>Элемент %1 не может иметь такое же значение атрибута %2, как и целевое пространство имён %3.</translation>
</message>
<message>
<source>%1 element without %2 attribute is not allowed inside schema without target namespace.</source>
- <translation type="unfinished"></translation>
+ <translation>Элемент %1 без атрибута %2 не допустим в схеме без целевого пространства имён.</translation>
</message>
<message>
<source>%1 element is not allowed inside %2 element if %3 attribute is present.</source>
- <translation type="unfinished"></translation>
+ <translation>Элемент %1 недрпустим внутри элемента %2, если указан атрибут %3.</translation>
</message>
<message>
<source>%1 element has neither %2 attribute nor %3 child element.</source>
- <translation type="unfinished"></translation>
+ <translation>Элемент %1 не может иметь ни атрибут %2, ни дочерний элемент %3.</translation>
</message>
<message>
<source>%1 element with %2 child element must not have a %3 attribute.</source>
@@ -1300,11 +1300,11 @@
</message>
<message>
<source>%1 references identity constraint %2 that is no %3 or %4 element.</source>
- <translation type="unfinished"></translation>
+ <translation>%1 ссылается на ограничение идентичности %2, которое не имеет элементов %3 или %4.</translation>
</message>
<message>
<source>%1 has a different number of fields from the identity constraint %2 that it references.</source>
- <translation type="unfinished"></translation>
+ <translation>У %1 число полей отличается от оного у ограничения идентичности %2, на которое ссылается.</translation>
</message>
<message>
<source>Base type %1 of %2 element cannot be resolved.</source>
@@ -1332,11 +1332,11 @@
</message>
<message>
<source>Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type.</source>
- <translation type="unfinished"></translation>
+ <translation>Модель содержимого сложного типа %1 содержит элемент %2, поэтому она не может быть унаследована расширением из непустого типа.</translation>
</message>
<message>
<source>Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model.</source>
- <translation type="unfinished"></translation>
+ <translation>Сложный тип %1 не может наследоваться расширением из %2, так как последнее содержит элемент %3 в своей модели содержимого.</translation>
</message>
<message>
<source>Type of %1 element must be a simple type, %2 is not.</source>