summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf2
-rw-r--r--translations/assistant_de.ts140
-rw-r--r--translations/assistant_ko.ts823
-rw-r--r--translations/assistant_ru.ts140
-rw-r--r--translations/designer_de.ts166
-rw-r--r--translations/designer_ko.ts722
-rw-r--r--translations/designer_ru.ts207
-rw-r--r--translations/linguist_ko.ts1203
-rw-r--r--translations/linguist_ru.ts1
-rw-r--r--translations/qt_help_ca.ts276
-rw-r--r--translations/qt_help_de.ts97
-rw-r--r--translations/qt_help_ko.ts287
-rw-r--r--translations/qt_help_ru.ts97
-rw-r--r--translations/qtbase_ca.ts896
-rw-r--r--translations/qtbase_de.ts375
-rw-r--r--translations/qtbase_ko.ts1676
-rw-r--r--translations/qtbase_ru.ts363
-rw-r--r--translations/qtconnectivity_ca.ts231
-rw-r--r--translations/qtconnectivity_de.ts4
-rw-r--r--translations/qtconnectivity_ko.ts189
-rw-r--r--translations/qtconnectivity_ru.ts4
-rw-r--r--translations/qtdeclarative_de.ts210
-rw-r--r--translations/qtdeclarative_ko.ts460
-rw-r--r--translations/qtdeclarative_ru.ts232
-rw-r--r--translations/qtlocation_ca.ts1077
-rw-r--r--translations/qtlocation_ko.ts419
-rw-r--r--translations/qtlocation_ru.ts2
-rw-r--r--translations/qtmultimedia_ca.ts14
-rw-r--r--translations/qtmultimedia_ko.ts206
-rw-r--r--translations/qtmultimedia_ru.ts4
-rw-r--r--translations/qtquickcontrols2_ko.ts9
-rw-r--r--translations/qtquickcontrols_ko.ts302
-rw-r--r--translations/qtscript_ca.ts2
-rw-r--r--translations/qtscript_ko.ts2
-rw-r--r--translations/qtserialport_ko.ts2
-rw-r--r--translations/qtwebengine_de.ts43
-rw-r--r--translations/qtwebengine_ko.ts6
-rw-r--r--translations/qtwebengine_ru.ts98
-rw-r--r--translations/qtwebsockets_de.ts8
-rw-r--r--translations/qtwebsockets_ko.ts4
-rw-r--r--translations/qtwebsockets_ru.ts12
-rw-r--r--translations/qtxmlpatterns_ca.ts45
-rw-r--r--translations/qtxmlpatterns_de.ts4
-rw-r--r--translations/qtxmlpatterns_ko.ts62
-rw-r--r--translations/qtxmlpatterns_ru.ts8
45 files changed, 6345 insertions, 4785 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 59006e8..37ebce4 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.14.2
+MODULE_VERSION = 5.15.0
diff --git a/translations/assistant_de.ts b/translations/assistant_de.ts
index 1b02c89..c9701d3 100644
--- a/translations/assistant_de.ts
+++ b/translations/assistant_de.ts
@@ -414,17 +414,6 @@ Grund:
</message>
</context>
<context>
- <name>FilterNameDialogClass</name>
- <message>
- <source>Filter Name:</source>
- <translation>Filtername:</translation>
- </message>
- <message>
- <source>Add Filter</source>
- <translation>Filter hinzufügen</translation>
- </message>
-</context>
-<context>
<name>FindWidget</name>
<message>
<source>Previous</source>
@@ -510,6 +499,40 @@ Grund:
</message>
</context>
<context>
+ <name>HelpDocSettingsWidget</name>
+ <message>
+ <source>Form</source>
+ <translation>Form</translation>
+ </message>
+ <message>
+ <source>Registered Documentation</source>
+ <translation>Registrierte Dokumentationen</translation>
+ </message>
+ <message>
+ <source>&lt;Filter&gt;</source>
+ <translation>&lt;Filter&gt;</translation>
+ </message>
+ <message>
+ <source>Add...</source>
+ <translation>Hinzufügen...</translation>
+ </message>
+ <message>
+ <source>Remove</source>
+ <translation>Entfernen</translation>
+ </message>
+</context>
+<context>
+ <name>HelpDocSettingsWidgetPrivate</name>
+ <message>
+ <source>Add Documentation</source>
+ <translation>Dokumentation hinzufügen</translation>
+ </message>
+ <message>
+ <source>Qt Compressed Help Files (*.qch)</source>
+ <translation>Komprimierte Qt-Hilfedateien (*.qch)</translation>
+ </message>
+</context>
+<context>
<name>HelpViewer</name>
<message>
<source>&lt;title&gt;about:blank&lt;/title&gt;</source>
@@ -806,71 +829,8 @@ Grund:
</message>
</context>
<context>
- <name>OptionsWidget</name>
- <message>
- <source>No Option</source>
- <translation>Keine Option</translation>
- </message>
- <message>
- <source>Invalid Option</source>
- <translation>Ungültige Option</translation>
- </message>
-</context>
-<context>
<name>PreferencesDialog</name>
<message>
- <source>No Component</source>
- <translation>Keine Komponente</translation>
- </message>
- <message>
- <source>Invalid Component</source>
- <translation>Ungültige Komponente</translation>
- </message>
- <message>
- <source>No Version</source>
- <translation>Keine Version</translation>
- </message>
- <message>
- <source>Invalid Version</source>
- <translation>Ungültige Version</translation>
- </message>
- <message>
- <source>Filter Exists</source>
- <translation>Filter existiert bereits</translation>
- </message>
- <message>
- <source>The filter &quot;%1&quot; already exists.</source>
- <translation>Der Filter &quot;%1&quot; existiert bereits.</translation>
- </message>
- <message>
- <source>Add Filter</source>
- <translation>Filter hinzufügen</translation>
- </message>
- <message>
- <source>New Filter</source>
- <translation>Neuer Filter</translation>
- </message>
- <message>
- <source>Rename Filter</source>
- <translation>Filter umbenennen</translation>
- </message>
- <message>
- <source>Remove Filter</source>
- <translation>Filter löschen</translation>
- </message>
- <message>
- <source>Are you sure you want to remove the &quot;%1&quot; filter?</source>
- <translation>Möchten Sie den Filter &quot;%1&quot; wirklich löschen?</translation>
- </message>
- <message>
- <source>Add Documentation</source>
- <translation>Dokumentation hinzufügen</translation>
- </message>
- <message>
- <source>Qt Compressed Help Files (*.qch)</source>
- <translation>Komprimierte Hilfedateien (*.qch)</translation>
- </message>
- <message>
<source>Use custom settings</source>
<translation>Benutzerdefinierte Einstellungen verwenden</translation>
</message>
@@ -902,26 +862,10 @@ Grund:
<translation>Filter</translation>
</message>
<message>
- <source>Filter:</source>
- <translation>Filter:</translation>
- </message>
- <message>
- <source>Remove</source>
- <translation>Entfernen</translation>
- </message>
- <message>
<source>Documentation</source>
<translation>Dokumentation</translation>
</message>
<message>
- <source>Registered Documentation:</source>
- <translation>Registrierte Dokumentation:</translation>
- </message>
- <message>
- <source>Add...</source>
- <translation>Hinzufügen ...</translation>
- </message>
- <message>
<source>Options</source>
<translation>Einstellungen</translation>
</message>
@@ -965,22 +909,6 @@ Grund:
<source>Show tabs for each individual page</source>
<translation>Reiter für jede einzelne Seite anzeigen</translation>
</message>
- <message>
- <source>&lt;Filter&gt;</source>
- <translation>&lt;Filter&gt;</translation>
- </message>
- <message>
- <source>Components:</source>
- <translation>Komponenten:</translation>
- </message>
- <message>
- <source>Rename...</source>
- <translation>Umbenennen...</translation>
- </message>
- <message>
- <source>Versions:</source>
- <translation>Versionen:</translation>
- </message>
</context>
<context>
<name>RemoteControl</name>
diff --git a/translations/assistant_ko.ts b/translations/assistant_ko.ts
index 1c5722b..2d9d82b 100644
--- a/translations/assistant_ko.ts
+++ b/translations/assistant_ko.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="ko_KR">
+<TS version="2.1" language="ko">
<context>
<name>AboutDialog</name>
<message>
@@ -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>문서 파일 &apos;%1&apos;을(를) 등록하는 중 오류 발생: %2</translation>
</message>
<message>
- <source>Error: %1</source>
- <translation>오류: %1</translation>
- </message>
- <message>
<source>Could not register documentation file
%1
@@ -49,7 +43,7 @@ Reason:
</message>
<message>
<source>Documentation successfully registered.</source>
- <translation>문서를 성공적으로 등록하였습니다.</translation>
+ <translation>문서를 성공적으로 등록했습니다.</translation>
</message>
<message>
<source>Could not unregister documentation file
@@ -65,7 +59,7 @@ Reason:
</message>
<message>
<source>Documentation successfully unregistered.</source>
- <translation>문서 파일의 등록을 해제하였습니다.</translation>
+ <translation>문서 파일의 등록을 해제했습니다.</translation>
</message>
<message>
<source>Error reading collection file &apos;%1&apos;: %2.</source>
@@ -130,7 +124,7 @@ Reason:
</message>
<message>
<source>You are going to delete a Folder, this will also&lt;br&gt;remove it&apos;s content. Are you sure to continue?</source>
- <translation>폴더를 삭제하면 내용도 제거됩니다.&lt;br&gt;계속 진행하시겠습니까?</translation>
+ <translation>폴더를 삭제하면 내용도 삭제됩니다.&lt;br&gt;계속 진행하시겠습니까?</translation>
</message>
<message>
<source>Manage Bookmarks...</source>
@@ -221,7 +215,7 @@ Reason:
</message>
<message>
<source>You are goingto delete a Folder, this will also&lt;br&gt; remove it&apos;s content. Are you sure to continue?</source>
- <translation>폴더를 삭제하면 내용도 제거됩니다.&lt;br&gt;계속 진행하시겠습니까?</translation>
+ <translation>폴더를 삭제하면 내용도 삭제됩니다.&lt;br&gt;계속 진행하시겠습니까?</translation>
</message>
<message>
<source>Delete Folder</source>
@@ -263,10 +257,6 @@ Reason:
<translation>책갈피 도구 모음</translation>
</message>
<message>
- <source>Toolbar Menu</source>
- <translation>도구 모음 메뉴</translation>
- </message>
- <message>
<source>Bookmarks Menu</source>
<translation>책갈피 메뉴</translation>
</message>
@@ -293,41 +283,9 @@ Reason:
<context>
<name>CentralWidget</name>
<message>
- <source>Add new page</source>
- <translation type="obsolete">새 쪽 추가</translation>
- </message>
- <message>
- <source>Close current page</source>
- <translation type="obsolete">현재 쪽 닫기</translation>
- </message>
- <message>
<source>Print Document</source>
<translation>문서 인쇄</translation>
</message>
- <message>
- <source>unknown</source>
- <translation type="obsolete">알 수 없음</translation>
- </message>
- <message>
- <source>Add New Page</source>
- <translation type="obsolete">새 쪽 추가</translation>
- </message>
- <message>
- <source>Close This Page</source>
- <translation type="obsolete">이 쪽 닫기</translation>
- </message>
- <message>
- <source>Close Other Pages</source>
- <translation type="obsolete">다른 쪽 닫기</translation>
- </message>
- <message>
- <source>Add Bookmark for this Page...</source>
- <translation type="obsolete">이 쪽을 책갈피에 추가...</translation>
- </message>
- <message>
- <source>Search</source>
- <translation type="obsolete">찾기</translation>
- </message>
</context>
<context>
<name>CmdLineParser</name>
@@ -357,7 +315,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.
@@ -384,8 +344,10 @@ Reason:
지정한 도움말 파일 (.qch)의
등록을 해제합니다.
-setCurrentFilter filter 지정한 필터를 활성 필터로 지정합니다.
--remove-search-index 전문 검색 인덱스를 삭제합니다.
--rebuild-search-index 전문 검색 인덱스를 다시 생성합니다 (느릴 수도 있음).
+-remove-search-index 전문 검색 색인을 삭제합니다.
+-rebuild-search-index 오래되었습니다. -remove-search-index 옵션을 사용하십시오.
+ 전문 검색 색인을 삭제합니다.
+ 다음에 Assistant를 실행할 때 다시 생성합니다.
-quiet 오류 및 상태 메시지를
표시하지 않습니다.
-help 이 도움말을 표시합니다.
@@ -452,127 +414,6 @@ Reason:
</message>
</context>
<context>
- <name>ConversionWizard</name>
- <message>
- <source>Help Conversion Wizard</source>
- <translation>도움말 변환 마법사</translation>
- </message>
- <message>
- <source>Converting %1...</source>
- <translation>%1 변환 중...</translation>
- </message>
- <message>
- <source>Writing help collection file...</source>
- <translation>도움말 모음집 파일에 쓰는 중...</translation>
- </message>
- <message>
- <source>Done.</source>
- <translation>완료.</translation>
- </message>
-</context>
-<context>
- <name>FilesPage</name>
- <message>
- <source>Form</source>
- <translation>폼</translation>
- </message>
- <message>
- <source>Files:</source>
- <translation>파일:</translation>
- </message>
- <message>
- <source>Remove</source>
- <translation>삭제</translation>
- </message>
- <message>
- <source>Remove All</source>
- <translation>모두 삭제</translation>
- </message>
- <message>
- <source>Unreferenced Files</source>
- <translation>참조되지 않은 파일</translation>
- </message>
- <message>
- <source>Remove files which are neither referenced by a keyword nor by the TOC.</source>
- <translation>키워드나 목차에서 참조하지 않는 파일을 삭제합니다.</translation>
- </message>
- <message>
- <source>&lt;p&gt;&lt;b&gt;Warning:&lt;/b&gt; When removing images or stylesheets, be aware that those files are not directly referenced by the .adp or .dcf file.&lt;/p&gt;</source>
- <translation>&lt;p&gt;&lt;b&gt;경고:&lt;/b&gt; 그림이나 스타일 시트를 삭제한다면, .adp 파일이나 .dcf 파일에서 직접 참조하는지 여부를 확인하십시오.&lt;/p&gt;</translation>
- </message>
-</context>
-<context>
- <name>FilterNameDialogClass</name>
- <message>
- <source>Add Filter Name</source>
- <translation>필터 이름 추가</translation>
- </message>
- <message>
- <source>Filter Name:</source>
- <translation>필터 이름:</translation>
- </message>
-</context>
-<context>
- <name>FilterPage</name>
- <message>
- <source>Form</source>
- <translation>폼</translation>
- </message>
- <message>
- <source>Filter attributes for current documentation (comma separated list):</source>
- <translation>현재 문서의 필터 속성 (쉼표로 구분된 목록):</translation>
- </message>
- <message>
- <source>Custom Filters</source>
- <translation>사용자 정의 필터</translation>
- </message>
- <message>
- <source>1</source>
- <translation>1</translation>
- </message>
- <message>
- <source>2</source>
- <translation>2</translation>
- </message>
- <message>
- <source>Add</source>
- <translation>추가</translation>
- </message>
- <message>
- <source>Remove</source>
- <translation>삭제</translation>
- </message>
- <message>
- <source>Filter Settings</source>
- <translation>필터 설정</translation>
- </message>
- <message>
- <source>Specify the filter attributes for the documentation. If filter attributes are used, also define a custom filter for it. Both the filter attributes and the custom filters are optional.</source>
- <translation>문서의 필터 속성을 지정합니다. 필터 속성이 사용된다면 연관된 사용자 정의 필터도 정의해야 합니다. 필터 속성과 사용자 정의 필터는 선택 사항입니다.</translation>
- </message>
- <message>
- <source>Filter Name</source>
- <translation>필터 이름</translation>
- </message>
- <message>
- <source>Filter Attributes</source>
- <translation>필터 속성</translation>
- </message>
- <message>
- <source>The custom filter &apos;%1&apos; is defined multiple times.</source>
- <translation>사용자 정의 필터 &apos;%1&apos;이(가) 여러 번 정의되었습니다.</translation>
- </message>
- <message>
- <source>The attributes for custom filter &apos;%1&apos; are defined multiple times.</source>
- <translation>사용자 정의 필터의 속성 &apos;%1&apos;이(가) 여러 번 정의되었습니다.</translation>
- </message>
- <message>
- <source>unfiltered</source>
- <comment>list of available documentation</comment>
- <translation>필터되지 않음</translation>
- </message>
-</context>
-<context>
<name>FindWidget</name>
<message>
<source>Previous</source>
@@ -590,21 +431,6 @@ Reason:
<source>&lt;img src=&quot;:/qt-project.org/assistant/images/wrap.png&quot;&gt;&amp;nbsp;Search wrapped</source>
<translation>&lt;img src=&quot;:/qt-project.org/assistant/images/wrap.png&quot;&gt;&amp;nbsp;검색 다시 시작됨</translation>
</message>
- <message>
- <source>&lt;img src=&quot;:/trolltech/assistant/images/wrap.png&quot;&gt;&amp;nbsp;Search wrapped</source>
- <translation>&lt;img src=&quot;:/trolltech/assistant/images/wrap.png&quot;&gt;&amp;nbsp;검색 다시 시작됨</translation>
- </message>
-</context>
-<context>
- <name>FinishPage</name>
- <message>
- <source>Converting File</source>
- <translation>파일 변환 중</translation>
- </message>
- <message>
- <source>Creating the new Qt help files from the old ADP file.</source>
- <translation>이전 ADP 파일에서 새 Qt 도움말 파일을 만들고 있습니다.</translation>
- </message>
</context>
<context>
<name>FontPanel</name>
@@ -630,45 +456,6 @@ Reason:
</message>
</context>
<context>
- <name>GeneralPage</name>
- <message>
- <source>Form</source>
- <translation>폼</translation>
- </message>
- <message>
- <source>Namespace:</source>
- <translation>네임스페이스:</translation>
- </message>
- <message>
- <source>Virtual Folder:</source>
- <translation>가상 폴더:</translation>
- </message>
- <message>
- <source>General Settings</source>
- <translation>일반 설정</translation>
- </message>
- <message>
- <source>Specify the namespace and the virtual folder for the documentation.</source>
- <translation>문서의 네임스페이스와 가상 폴더를 설정합니다.</translation>
- </message>
- <message>
- <source>Namespace Error</source>
- <translation>네임스페이스 오류</translation>
- </message>
- <message>
- <source>The namespace contains some invalid characters.</source>
- <translation>네임스페이스 이름에 올바르지 않은 문자가 포함되어 있습니다.</translation>
- </message>
- <message>
- <source>Virtual Folder Error</source>
- <translation>가상 폴더 에러</translation>
- </message>
- <message>
- <source>The virtual folder contains some invalid characters.</source>
- <translation>가상 폴더 이름에 올바르지 않은 문자가 포함되어 있습니다.</translation>
- </message>
-</context>
-<context>
<name>GlobalActions</name>
<message>
<source>&amp;Back</source>
@@ -712,17 +499,37 @@ Reason:
</message>
</context>
<context>
- <name>HelpEngineWrapper</name>
+ <name>HelpDocSettingsWidget</name>
<message>
- <source>Unfiltered</source>
- <translation>필터되지 않음</translation>
+ <source>Form</source>
+ <translation>폼</translation>
+ </message>
+ <message>
+ <source>Registered Documentation</source>
+ <translation>등록된 문서</translation>
+ </message>
+ <message>
+ <source>&lt;Filter&gt;</source>
+ <translation>&lt;필터&gt;</translation>
+ </message>
+ <message>
+ <source>Add...</source>
+ <translation>추가...</translation>
+ </message>
+ <message>
+ <source>Remove</source>
+ <translation>삭제</translation>
</message>
</context>
<context>
- <name>HelpGenerator</name>
+ <name>HelpDocSettingsWidgetPrivate</name>
+ <message>
+ <source>Add Documentation</source>
+ <translation>문서 추가</translation>
+ </message>
<message>
- <source>Warning: %1</source>
- <translation>경고: %1</translation>
+ <source>Qt Compressed Help Files (*.qch)</source>
+ <translation>압축된 Qt 도움말 파일 (*.qch)</translation>
</message>
</context>
<context>
@@ -736,10 +543,6 @@ Reason:
<translation>&lt;title&gt;404 오류...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;페이지를 찾을 수 없습니다.&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</translation>
</message>
<message>
- <source>&lt;title&gt;Error 404...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;The page could not be found&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</source>
- <translation>&lt;title&gt;404 오류...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;페이지를 찾을 수 없음&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</translation>
- </message>
- <message>
<source>Open Link</source>
<translation>링크 열기</translation>
</message>
@@ -760,10 +563,6 @@ Reason:
<translation>새 탭으로 링크 열기 Ctrl+LMB</translation>
</message>
<message>
- <source>Open Link in New Tab</source>
- <translation type="obsolete">새 탭으로 링크 열기</translation>
- </message>
- <message>
<source>Open Link in New Page</source>
<translation>새 쪽으로 링크 열기</translation>
</message>
@@ -772,8 +571,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>
@@ -785,40 +584,6 @@ Reason:
</message>
</context>
<context>
- <name>HelpWindow</name>
- <message>
- <source>&lt;center&gt;&lt;b&gt;Wizard Assistant&lt;/b&gt;&lt;/center&gt;</source>
- <translation>&lt;center&gt;&lt;b&gt;마법사 도우미&lt;/b&gt;&lt;/center&gt;</translation>
- </message>
-</context>
-<context>
- <name>IdentifierPage</name>
- <message>
- <source>Form</source>
- <translation>폼</translation>
- </message>
- <message>
- <source>Create identifiers</source>
- <translation>식별자 만들기</translation>
- </message>
- <message>
- <source>Global prefix:</source>
- <translation>전역 접두사:</translation>
- </message>
- <message>
- <source>Inherit prefix from file names</source>
- <translation>파일 이름에서 접두사 상속받기</translation>
- </message>
- <message>
- <source>Identifiers</source>
- <translation>식별자</translation>
- </message>
- <message>
- <source>This page allows you to create identifiers from the keywords found in the .adp or .dcf file.</source>
- <translation>이 페이지에서는 .adp 및 .dcf 파일에서 찾은 키워드에서 식별자를 만들 수 있습니다.</translation>
- </message>
-</context>
-<context>
<name>IndexWindow</name>
<message>
<source>&amp;Look for:</source>
@@ -834,130 +599,6 @@ Reason:
</message>
</context>
<context>
- <name>InputPage</name>
- <message>
- <source>Form</source>
- <translation>폼</translation>
- </message>
- <message>
- <source>File name:</source>
- <translation>파일 이름:</translation>
- </message>
- <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
- <source>Input File</source>
- <translation>입력 파일</translation>
- </message>
- <message>
- <source>Specify the .adp or .dcf file you want to convert to the new Qt help project format and/or collection format.</source>
- <translation>새로운 Qt 도움말 프로젝트 및 모음집 형식으로 변환할 .adp나 .dcp 파일을 지정하십시오.</translation>
- </message>
- <message>
- <source>Open file</source>
- <translation>파일 열기</translation>
- </message>
- <message>
- <source>Qt Help Files (*.adp *.dcf)</source>
- <translation>Qt 도움말 파일 (*.adp *.dcf)</translation>
- </message>
- <message>
- <source>File Open Error</source>
- <translation>파일 열기 오류</translation>
- </message>
- <message>
- <source>The specified file could not be opened!</source>
- <translation>지정한 파일을 열 수 없습니다!</translation>
- </message>
- <message>
- <source>File Parsing Error</source>
- <translation>파일 처리 오류</translation>
- </message>
- <message>
- <source>Parsing error in line %1!</source>
- <translation>%1번째 줄에서 처리 오류 발생!</translation>
- </message>
-</context>
-<context>
- <name>InstallDialog</name>
- <message>
- <source>Install Documentation</source>
- <translation>문서 설치</translation>
- </message>
- <message>
- <source>Available Documentation:</source>
- <translation>사용 가능한 문서:</translation>
- </message>
- <message>
- <source>Install</source>
- <translation>설치</translation>
- </message>
- <message>
- <source>Cancel</source>
- <translation>취소</translation>
- </message>
- <message>
- <source>Close</source>
- <translation>닫기</translation>
- </message>
- <message>
- <source>Installation Path:</source>
- <translation>설치 경로:</translation>
- </message>
- <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
- <source>Downloading documentation info...</source>
- <translation>문서 정보 다운로드 중...</translation>
- </message>
- <message>
- <source>Download canceled.</source>
- <translation>다운로드가 취소되었습니다.</translation>
- </message>
- <message>
- <source>Done.</source>
- <translation>완료.</translation>
- </message>
- <message>
- <source>The file %1 already exists. Do you want to overwrite it?</source>
- <translation>파일 %1이(가) 이미 존재합니다. 겹쳐 쓰시겠습니까?</translation>
- </message>
- <message>
- <source>Unable to save the file %1: %2.</source>
- <translation>파일 %1을(를) 저장할 수 없음: %2.</translation>
- </message>
- <message>
- <source>Downloading %1...</source>
- <translation>%1 다운로드 중...</translation>
- </message>
- <message>
- <source>Download failed: %1.</source>
- <translation>다운로드 실패: %1.</translation>
- </message>
- <message>
- <source>Documentation info file is corrupt!</source>
- <translation>문서 정보 파일이 손상되었습니다!</translation>
- </message>
- <message>
- <source>Download failed: Downloaded file is corrupted.</source>
- <translation>다운로드 실패: 다운로드 받은 파일이 손상되었습니다.</translation>
- </message>
- <message>
- <source>Installing documentation %1...</source>
- <translation>문서 %1 설치 중...</translation>
- </message>
- <message>
- <source>Error while installing documentation:
-%1</source>
- <translation>문서를 설치하는 중 오류 발생:
-%1</translation>
- </message>
-</context>
-<context>
<name>MainWindow</name>
<message>
<source>Index</source>
@@ -1004,10 +645,6 @@ Reason:
<translation>인쇄 미리 보기...</translation>
</message>
<message>
- <source>&amp;Print...</source>
- <translation type="obsolete">인쇄(&amp;P)...</translation>
- </message>
- <message>
<source>&amp;Close Tab</source>
<translation>탭 닫기(&amp;C)</translation>
</message>
@@ -1024,18 +661,6 @@ Reason:
<translation>편집(&amp;E)</translation>
</message>
<message>
- <source>&amp;Copy selected Text</source>
- <translation type="obsolete">선택한 텍스트 복사(&amp;C)</translation>
- </message>
- <message>
- <source>&amp;Find in Text...</source>
- <translation type="obsolete">텍스트에서 찾기(&amp;F)...</translation>
- </message>
- <message>
- <source>&amp;Find</source>
- <translation type="obsolete">찾기(&amp;F)</translation>
- </message>
- <message>
<source>Find &amp;Next</source>
<translation>다음 찾기(&amp;N)</translation>
</message>
@@ -1052,14 +677,6 @@ Reason:
<translation>보기(&amp;V)</translation>
</message>
<message>
- <source>Zoom &amp;in</source>
- <translation type="obsolete">확대(&amp;I)</translation>
- </message>
- <message>
- <source>Zoom &amp;out</source>
- <translation type="obsolete">축소(&amp;O)</translation>
- </message>
- <message>
<source>Normal &amp;Size</source>
<translation>원래 크기(&amp;S)</translation>
</message>
@@ -1100,22 +717,6 @@ Reason:
<translation>이동(&amp;G)</translation>
</message>
<message>
- <source>&amp;Home</source>
- <translation type="obsolete">홈 페이지(&amp;H)</translation>
- </message>
- <message>
- <source>ALT+Home</source>
- <translation type="obsolete">ALT+Home</translation>
- </message>
- <message>
- <source>&amp;Back</source>
- <translation type="obsolete">뒤로(&amp;B)</translation>
- </message>
- <message>
- <source>&amp;Forward</source>
- <translation type="obsolete">앞으로(&amp;F)</translation>
- </message>
- <message>
<source>Sync with Table of Contents</source>
<translation>목차와 동기화</translation>
</message>
@@ -1197,19 +798,19 @@ Reason:
</message>
<message>
<source>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;Version %2&lt;/p&gt;&lt;p&gt;Browser: %3&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) %4 The Qt Company Ltd.&lt;/p&gt;</source>
- <translation>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;버전 %2&lt;/p&gt;&lt;p&gt;브라우저: %3&lt;/p&gt;&lt;/center&gt;&lt;p&gt;저작권자 (C) %4 The Qt Company Ltd.&lt;/p&gt;</translation>
- </message>
- <message>
- <source>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;Version %2&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;</source>
- <translation>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;버전 %2&lt;/p&gt;&lt;/center&gt;&lt;p&gt;저작권자 (C) 2012 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;</translation>
+ <translation>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;버전 %2&lt;/p&gt;&lt;p&gt;브라우저: %3&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) %4 The Qt Company Ltd.&lt;/p&gt;</translation>
</message>
<message>
<source>About %1</source>
<translation>%1 정보</translation>
</message>
<message>
+ <source>Unfiltered</source>
+ <translation>필터되지 않음</translation>
+ </message>
+ <message>
<source>Updating search index</source>
- <translation>검색 인덱스 업데이트 중</translation>
+ <translation>검색 색인 업데이트 중</translation>
</message>
<message>
<source>Could not register file &apos;%1&apos;: %2</source>
@@ -1228,126 +829,8 @@ Reason:
</message>
</context>
<context>
- <name>OutputPage</name>
- <message>
- <source>Form</source>
- <translation>폼</translation>
- </message>
- <message>
- <source>Project file name:</source>
- <translation>프로젝트 파일 이름:</translation>
- </message>
- <message>
- <source>Collection file name:</source>
- <translation>모음집 파일 이름:</translation>
- </message>
- <message>
- <source>Output File Names</source>
- <translation>출력 파일 이름</translation>
- </message>
- <message>
- <source>Specify the file names for the output files.</source>
- <translation>출력 파일의 이름을 지정합니다.</translation>
- </message>
- <message>
- <source>Convert...</source>
- <translation>변환...</translation>
- </message>
- <message>
- <source>Qt Help Project File</source>
- <translation>Qt 도움말 프로젝트 파일</translation>
- </message>
- <message>
- <source>Qt Help Collection Project File</source>
- <translation>Qt 도움말 모음집 프로젝트 파일</translation>
- </message>
- <message>
- <source>The specified file %1 already exist.
-
-Do you want to remove it?</source>
- <translation>지정한 파일 %1이(가) 이미 존재합니다.
-
-삭제하시겠습니까?</translation>
- </message>
- <message>
- <source>Remove</source>
- <translation>삭제</translation>
- </message>
- <message>
- <source>Cancel</source>
- <translation>취소</translation>
- </message>
-</context>
-<context>
- <name>PathPage</name>
- <message>
- <source>Form</source>
- <translation>폼</translation>
- </message>
- <message>
- <source>File filters:</source>
- <translation>파일 필터:</translation>
- </message>
- <message>
- <source>Documentation source file paths:</source>
- <translation>문서 원본 파일 경로:</translation>
- </message>
- <message>
- <source>Add</source>
- <translation>추가</translation>
- </message>
- <message>
- <source>Remove</source>
- <translation>삭제</translation>
- </message>
- <message>
- <source>Source File Paths</source>
- <translation>원본 파일 경로</translation>
- </message>
- <message>
- <source>Specify the paths where the sources files are located. By default, all files in those directories matched by the file filter will be included.</source>
- <translation>원본 파일이 있는 경로를 지정하십시오. 기본적으로 필터와 일치하는 디렉터리에 있는 모든 파일이 포함됩니다.</translation>
- </message>
- <message>
- <source>Source File Path</source>
- <translation>원본 파일 경로</translation>
- </message>
-</context>
-<context>
<name>PreferencesDialog</name>
<message>
- <source>Add Documentation</source>
- <translation>문서 추가</translation>
- </message>
- <message>
- <source>Qt Compressed Help Files (*.qch)</source>
- <translation>압축된 Qt 도움말 파일 (*.qch)</translation>
- </message>
- <message>
- <source>The namespace %1 is already registered!</source>
- <translation>네임스페이스 %1이(가) 이미 등록되어 있습니다!</translation>
- </message>
- <message>
- <source>The specified file is not a valid Qt Help File!</source>
- <translation>지정한 파일은 올바른 Qt 도움말 파일이 아닙니다!</translation>
- </message>
- <message>
- <source>Remove Documentation</source>
- <translation>문서 삭제</translation>
- </message>
- <message>
- <source>Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents.</source>
- <translation>삭제하려고 하는 문서 중 일부는 현재 Assistant에 열려 있습니다. 문서를 삭제하면 삭제한 문서를 닫을 것입니다.</translation>
- </message>
- <message>
- <source>Cancel</source>
- <translation>취소</translation>
- </message>
- <message>
- <source>OK</source>
- <translation>확인</translation>
- </message>
- <message>
<source>Use custom settings</source>
<translation>사용자 정의 설정 사용</translation>
</message>
@@ -1379,38 +862,10 @@ Do you want to remove it?</source>
<translation>필터</translation>
</message>
<message>
- <source>Filter:</source>
- <translation>필터:</translation>
- </message>
- <message>
- <source>Attributes:</source>
- <translation>속성:</translation>
- </message>
- <message>
- <source>1</source>
- <translation>1</translation>
- </message>
- <message>
- <source>Add</source>
- <translation>추가</translation>
- </message>
- <message>
- <source>Remove</source>
- <translation>삭제</translation>
- </message>
- <message>
<source>Documentation</source>
<translation>문서</translation>
</message>
<message>
- <source>Registered Documentation:</source>
- <translation>등록된 문서:</translation>
- </message>
- <message>
- <source>Add...</source>
- <translation>추가...</translation>
- </message>
- <message>
<source>Options</source>
<translation>옵션</translation>
</message>
@@ -1420,15 +875,15 @@ Do you want to remove it?</source>
</message>
<message>
<source>Show my home page</source>
- <translation>내 홈 페이지 보이기</translation>
+ <translation>내 홈 페이지 표시</translation>
</message>
<message>
<source>Show a blank page</source>
- <translation>빈 페이지 보이기</translation>
+ <translation>빈 페이지 표시</translation>
</message>
<message>
<source>Show my tabs from last session</source>
- <translation>마지막 세션에서 연 탭 보이기</translation>
+ <translation>마지막 세션에서 연 탭 표시</translation>
</message>
<message>
<source>Homepage</source>
@@ -1452,181 +907,7 @@ Do you want to remove it?</source>
</message>
<message>
<source>Show tabs for each individual page</source>
- <translation>각각 쪽마다 탭 보이기</translation>
- </message>
- <message>
- <source>&lt;Filter&gt;</source>
- <translation>&lt;필터&gt;</translation>
- </message>
-</context>
-<context>
- <name>QCollectionGenerator</name>
- <message>
- <source>Unknown token at line %1.</source>
- <translation>%1번째 줄에 알 수 없는 토큰이 있습니다.</translation>
- </message>
- <message>
- <source>Unknown token at line %1. Expected &quot;QtHelpCollectionProject&quot;.</source>
- <translation>%1번째 줄에 알 수 없는 토큰이 있습니다. 예상한 토큰: &quot;QtHelpCollectionProject&quot;.</translation>
- </message>
- <message>
- <source>Missing end tags.</source>
- <translation>끝맺는 태그가 없습니다.</translation>
- </message>
- <message>
- <source>Missing input or output file for help file generation.</source>
- <translation>도움말 파일을 생성하기 위한 입력 및 출력 파일이 없습니다.</translation>
- </message>
- <message>
- <source>Missing output file name.</source>
- <translation>출력 파일 이름이 없습니다.</translation>
- </message>
- <message>
- <source>Qt Collection Generator version 1.0 (Qt %1)
-</source>
- <translation>Qt 모음집 생성기 버전 1.0 (Qt %1)
-</translation>
- </message>
- <message>
- <source>Missing collection config file.</source>
- <translation>모음집 설정 파일이 없습니다.</translation>
- </message>
- <message>
- <source>
-Usage:
-
-qcollectiongenerator &lt;collection-config-file&gt; [options]
-
- -o &lt;collection-file&gt; Generates a collection file
- called &lt;collection-file&gt;. If
- this option is not specified
- a default name will be used.
- -v Displays the version of
- qcollectiongenerator.
-
-</source>
- <translation>
-사용 방법:
-
-qcollectiongenerator &lt;collection-config-file&gt; [옵션]
-
- -o &lt;collection-file&gt; 모음집 파일 &lt;collection-file&gt;을
- 생성합니다. 이 옵션이 지정되지
- 않으면 기본 이름을 사용합니다.
- -v qcollectiongenerator의
- 버전을 표시합니다.
-
-</translation>
- </message>
- <message>
- <source>Could not open %1.
-</source>
- <translation>%1을(를) 열 수 없습니다.
-</translation>
- </message>
- <message>
- <source>Reading collection config file...
-</source>
- <translation>모음집 설정 파일을 읽는 중...
-</translation>
- </message>
- <message>
- <source>Collection config file error: %1
-</source>
- <translation>모음집 설정 파일 오류: %1
-</translation>
- </message>
- <message>
- <source>Generating help for %1...
-</source>
- <translation>%1의 도움말 생성 중...
-</translation>
- </message>
- <message>
- <source>Creating collection file...
-</source>
- <translation>모음집 파일 생성 중...
-</translation>
- </message>
- <message>
- <source>The file %1 cannot be overwritten.
-</source>
- <translation>파일 %1에 겹쳐 쓸 수 없습니다.
-</translation>
- </message>
- <message>
- <source>Cannot open %1.
-</source>
- <translation>%1을(를) 열 수 없습니다.
-</translation>
- </message>
- <message>
- <source>Cannot open referenced image file %1.
-</source>
- <translation>참조하는 그림 파일 %1을(를) 열 수 없습니다.
-</translation>
- </message>
-</context>
-<context>
- <name>QHelpGenerator</name>
- <message>
- <source>Missing output file name.</source>
- <translation>출력 파일 이름이 없습니다.</translation>
- </message>
- <message>
- <source>Qt Help Generator version 1.0 (Qt %1)
-</source>
- <translation>Qt 도움말 생성기 버전 1.0 (Qt %1)
-</translation>
- </message>
- <message>
- <source>Missing Qt help project file.</source>
- <translation>Qt 도움말 프로젝트 파일이 없습니다.</translation>
- </message>
- <message>
- <source>
-Usage:
-
-qhelpgenerator &lt;help-project-file&gt; [options]
-
- -o &lt;compressed-file&gt; Generates a Qt compressed help
- file called &lt;compressed-file&gt;.
- If this option is not specified
- a default name will be used.
- -c Checks whether all links in HTML files
- point to files in this help project.
- -v Displays the version of
- qhelpgenerator.
-
-</source>
- <translation>
-사용 방법:
-
-qhelpgenerator &lt;help-project-file&gt; [옵션]
-
- -o &lt;compressed-file&gt; Qt 압축된 도움말 파일
- &lt;compressed-file&gt;을 생성합니다.
- 이 옵션을 지정하지 않으면
- 기본 이름을 사용합니다.
- -c HTML 파일에 있는 모든 링크가
- 이 프로젝트에 있는 파일을
- 가리키는지 확인합니다.
- -v qhelpgenerator의 버전을
- 표시합니다.
-
-</translation>
- </message>
- <message>
- <source>Could not open %1.
-</source>
- <translation>%1을(를) 열 수 없습니다.
-</translation>
- </message>
- <message>
- <source>Could not create output directory: %1
-</source>
- <translation>출력 디렉터리를 만들 수 없습니다: %1
-</translation>
+ <translation>각각 쪽마다 탭 표시</translation>
</message>
</context>
<context>
diff --git a/translations/assistant_ru.ts b/translations/assistant_ru.ts
index 5c5664c..bc9c9ba 100644
--- a/translations/assistant_ru.ts
+++ b/translations/assistant_ru.ts
@@ -411,17 +411,6 @@ Reason:
</message>
</context>
<context>
- <name>FilterNameDialogClass</name>
- <message>
- <source>Filter Name:</source>
- <translation>Название фильтра:</translation>
- </message>
- <message>
- <source>Add Filter</source>
- <translation>Добавить фильтр</translation>
- </message>
-</context>
-<context>
<name>FindWidget</name>
<message>
<source>Previous</source>
@@ -507,6 +496,40 @@ Reason:
</message>
</context>
<context>
+ <name>HelpDocSettingsWidget</name>
+ <message>
+ <source>Form</source>
+ <translation></translation>
+ </message>
+ <message>
+ <source>Registered Documentation</source>
+ <translation>Зарегистрированная документация</translation>
+ </message>
+ <message>
+ <source>&lt;Filter&gt;</source>
+ <translation>&lt;Фильтр&gt;</translation>
+ </message>
+ <message>
+ <source>Add...</source>
+ <translation>Добавить...</translation>
+ </message>
+ <message>
+ <source>Remove</source>
+ <translation>Удалить</translation>
+ </message>
+</context>
+<context>
+ <name>HelpDocSettingsWidgetPrivate</name>
+ <message>
+ <source>Add Documentation</source>
+ <translation>Добавить документацию</translation>
+ </message>
+ <message>
+ <source>Qt Compressed Help Files (*.qch)</source>
+ <translation>Сжатые файлы справки Qt (*.qch)</translation>
+ </message>
+</context>
+<context>
<name>HelpViewer</name>
<message>
<source>&lt;title&gt;about:blank&lt;/title&gt;</source>
@@ -803,71 +826,8 @@ Reason:
</message>
</context>
<context>
- <name>OptionsWidget</name>
- <message>
- <source>No Option</source>
- <translation>Нет параметра</translation>
- </message>
- <message>
- <source>Invalid Option</source>
- <translation>Неверный параметр</translation>
- </message>
-</context>
-<context>
<name>PreferencesDialog</name>
<message>
- <source>No Component</source>
- <translation>Нет компонента</translation>
- </message>
- <message>
- <source>Invalid Component</source>
- <translation>Неверный компонент</translation>
- </message>
- <message>
- <source>No Version</source>
- <translation>Нет версии</translation>
- </message>
- <message>
- <source>Invalid Version</source>
- <translation>Неверная версия</translation>
- </message>
- <message>
- <source>Filter Exists</source>
- <translation>Фильтр уже существует</translation>
- </message>
- <message>
- <source>The filter &quot;%1&quot; already exists.</source>
- <translation>Фильтр «%1» уже существует.</translation>
- </message>
- <message>
- <source>Add Filter</source>
- <translation>Добавить фильтр</translation>
- </message>
- <message>
- <source>New Filter</source>
- <translation>Новый фильтр</translation>
- </message>
- <message>
- <source>Rename Filter</source>
- <translation>Переименовать фильтр</translation>
- </message>
- <message>
- <source>Remove Filter</source>
- <translation>Удалить фильтр</translation>
- </message>
- <message>
- <source>Are you sure you want to remove the &quot;%1&quot; filter?</source>
- <translation>Удалить фильтр «%1»?</translation>
- </message>
- <message>
- <source>Add Documentation</source>
- <translation>Добавить документацию</translation>
- </message>
- <message>
- <source>Qt Compressed Help Files (*.qch)</source>
- <translation>Сжатые файлы справки Qt (*.qch)</translation>
- </message>
- <message>
<source>Use custom settings</source>
<translation>Использовать индивидуальные настройки</translation>
</message>
@@ -899,26 +859,10 @@ Reason:
<translation>Фильтры</translation>
</message>
<message>
- <source>Filter:</source>
- <translation>Фильтр:</translation>
- </message>
- <message>
- <source>Remove</source>
- <translation>Удалить</translation>
- </message>
- <message>
<source>Documentation</source>
<translation>Документация</translation>
</message>
<message>
- <source>Registered Documentation:</source>
- <translation>Зарегистрированная документация:</translation>
- </message>
- <message>
- <source>Add...</source>
- <translation>Добавить...</translation>
- </message>
- <message>
<source>Options</source>
<translation>Параметры</translation>
</message>
@@ -962,22 +906,6 @@ Reason:
<source>Show tabs for each individual page</source>
<translation>Показывать вкладки для каждой страницы</translation>
</message>
- <message>
- <source>&lt;Filter&gt;</source>
- <translation>&lt;Фильтр&gt;</translation>
- </message>
- <message>
- <source>Components:</source>
- <translation>Компоненты:</translation>
- </message>
- <message>
- <source>Versions:</source>
- <translation>Версии:</translation>
- </message>
- <message>
- <source>Rename...</source>
- <translation>Переименовать...</translation>
- </message>
</context>
<context>
<name>RemoteControl</name>
diff --git a/translations/designer_de.ts b/translations/designer_de.ts
index 3bff7cf..baf121f 100644
--- a/translations/designer_de.ts
+++ b/translations/designer_de.ts
@@ -4597,6 +4597,66 @@ Please select another name.</source>
<source>Active</source>
<translation>Aktiv</translation>
</message>
+ <message>
+ <source>Save...</source>
+ <translation>Speichern...</translation>
+ </message>
+ <message>
+ <source>Load...</source>
+ <translation>Laden...</translation>
+ </message>
+ <message>
+ <source>Lighter</source>
+ <translation>Heller</translation>
+ </message>
+ <message>
+ <source>Darker</source>
+ <translation>Dunkler</translation>
+ </message>
+ <message>
+ <source>Copy color %1</source>
+ <translation>Farbe %1 kopieren</translation>
+ </message>
+ <message>
+ <source>QPalette UI file (*.xml)</source>
+ <translation>QPalette-UI-Datei (*.xml)</translation>
+ </message>
+ <message>
+ <source>Cannot open %1 for writing: %2</source>
+ <translation>Die Datei &apos;%1&apos; konnte nicht zum Schreiben geöffnet werden: %2</translation>
+ </message>
+ <message>
+ <source>Cannot write %1: %2</source>
+ <translation>%1 konnte nicht geschrieben werden: %2</translation>
+ </message>
+ <message>
+ <source>Cannot read palette from %1:%2:%3</source>
+ <translation>Es konnte keine Palette gelesen werden %1:%2:%3</translation>
+ </message>
+ <message>
+ <source>Cannot open %1 for reading: %2</source>
+ <translation>Die Datei &apos;%1&apos; konnte nicht zum Lesen geöffnet werden: %2</translation>
+ </message>
+ <message>
+ <source>Invalid element &quot;%1&quot;, expected &quot;palette&quot;.</source>
+ <translation>Ungültiges Element &quot;%1&quot;, es wird &quot;palette&quot; erwartet.</translation>
+ </message>
+ <message>
+ <source>Save Palette</source>
+ <translation>Palette speichern</translation>
+ </message>
+ <message>
+ <source>Error Writing Palette</source>
+ <translation>Fehler beim Schreiben der Palette</translation>
+ </message>
+ <message>
+ <source>Load Palette</source>
+ <translation>Palette laden</translation>
+ </message>
+ <message>
+ <source>Error Reading Palette</source>
+ <translation>Fehler beim Lesen der Palette</translation>
+ </message>
</context>
<context>
<name>qdesigner_internal::PaletteEditorButton</name>
@@ -4810,39 +4870,117 @@ ate the goose who was loose.</translation>
<translation>PushButton</translation>
</message>
<message>
- <source>ButtonGroup2</source>
+ <source>CheckBox1</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>ButtonGroup2</translation>
+ <translation>CheckBox1</translation>
</message>
<message>
- <source>CheckBox1</source>
+ <source>RadioButton1</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>CheckBox1</translation>
+ <translation>RadioButton1</translation>
</message>
<message>
- <source>CheckBox2</source>
+ <source>RadioButton2</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>CheckBox2</translation>
+ <translation>RadioButton2</translation>
</message>
<message>
- <source>ButtonGroup</source>
+ <source>RadioButton3</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>ButtonGroup</translation>
+ <translation>RadioButton3</translation>
</message>
<message>
- <source>RadioButton1</source>
+ <source>Buttons</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>RadioButton1</translation>
+ <translation>Buttons</translation>
</message>
<message>
- <source>RadioButton2</source>
+ <source>Tristate CheckBox</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>RadioButton2</translation>
+ <translation>Tristate CheckBox</translation>
</message>
<message>
- <source>RadioButton3</source>
+ <source>ToggleButton</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>RadioButton3</translation>
+ <translation>ToggleButton</translation>
+ </message>
+ <message>
+ <source>ToolButton</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>ToolButton</translation>
+ </message>
+ <message>
+ <source>Menu</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Menü</translation>
+ </message>
+ <message>
+ <source>Item Views</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Item Views</translation>
+ </message>
+ <message>
+ <source>Column 1</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Column 1</translation>
+ </message>
+ <message>
+ <source>Top Level 1</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Top Level 1</translation>
+ </message>
+ <message>
+ <source>Nested Item 1</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Nested Item 1</translation>
+ </message>
+ <message>
+ <source>Nested Item 2</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Nested Item 2</translation>
+ </message>
+ <message>
+ <source>Nested Item 3</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Nested Item 3</translation>
+ </message>
+ <message>
+ <source>Simple Input Widgets</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Simple Input Widgets</translation>
+ </message>
+ <message>
+ <source>Item1</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Item1</translation>
+ </message>
+ <message>
+ <source>Item2</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Item2</translation>
+ </message>
+ <message>
+ <source>Display Widgets</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Display Widgets</translation>
+ </message>
+ <message>
+ <source>QLabel</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>QLabel</translation>
+ </message>
+ <message>
+ <source>QLabel with frame</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>QLabel with frame</translation>
+ </message>
+ <message>
+ <source>Option 1</source>
+ <translation>Option 1</translation>
+ </message>
+ <message>
+ <source>Checkable</source>
+ <translation>Checkable</translation>
</message>
</context>
<context>
diff --git a/translations/designer_ko.ts b/translations/designer_ko.ts
index 0648dbe..ec307a7 100644
--- a/translations/designer_ko.ts
+++ b/translations/designer_ko.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="ko_KR">
+<TS version="2.1" language="ko">
<context>
<name>AbstractFindWidget</name>
<message>
@@ -24,8 +24,8 @@
<translation>&lt;img src=&quot;:/qt-project.org/shared/images/wrap.png&quot;&gt;&amp;nbsp;검색 다시 시작됨</translation>
</message>
<message>
- <source>&lt;img src=&quot;:/trolltech/shared/images/wrap.png&quot;&gt;&amp;nbsp;Search wrapped</source>
- <translation>&lt;img src=&quot;:/trolltech/shared/images/wrap.png&quot;&gt;&amp;nbsp;검색 다시 시작됨</translation>
+ <source>&amp;Find in Text...</source>
+ <translation>텍스트에서 찾기(&amp;F)...</translation>
</message>
</context>
<context>
@@ -121,7 +121,7 @@
</message>
<message>
<source>The font &apos;%1&apos; (%2) could not be unloaded.</source>
- <translation>글꼴 &apos;%1&apos; (%2)을(를) 닫을 수 없습니다.</translation>
+ <translation>글꼴 &apos;%1&apos;(%2)을(를) 닫을 수 없습니다.</translation>
</message>
</context>
<context>
@@ -245,11 +245,11 @@
</message>
<message>
<source>Backward diagonal</source>
- <translation>대각선 (오른쪽 아래로)</translation>
+ <translation>대각선(오른쪽 아래로)</translation>
</message>
<message>
<source>Forward diagonal</source>
- <translation>대각선 (오른쪽 위로)</translation>
+ <translation>대각선(오른쪽 위로)</translation>
</message>
<message>
<source>Crossing diagonal</source>
@@ -413,18 +413,10 @@
<translation>하위 창 삭제</translation>
</message>
<message>
- <source>page</source>
- <translation type="obsolete">쪽</translation>
- </message>
- <message>
<source>Insert Subwindow</source>
<translation>하위 창 삽입</translation>
</message>
<message>
- <source>subwindow</source>
- <translation type="obsolete">subwindow</translation>
- </message>
- <message>
<source>Subwindow</source>
<translation>하위 창</translation>
</message>
@@ -529,10 +521,6 @@
</translation>
</message>
<message>
- <source>Change script</source>
- <translation>스크립트 변경</translation>
- </message>
- <message>
<source>Change signals/slots</source>
<translation>시그널/슬롯 변경</translation>
</message>
@@ -598,7 +586,7 @@
</message>
<message>
<source>Show signals and slots inherited from QWidget</source>
- <translation>QWidget에서 상속받은 시그널과 슬롯 보이기</translation>
+ <translation>QWidget에서 상속받은 시그널과 슬롯 표시</translation>
</message>
</context>
<context>
@@ -621,24 +609,24 @@
<message>
<source>Standard (96 x 96)</source>
<extracomment>Embedded device standard screen resolution</extracomment>
- <translation>표준 (96 x 96)</translation>
+ <translation>표준(96 x 96)</translation>
</message>
<message>
<source>Greenphone (179 x 185)</source>
<extracomment>Embedded device screen resolution</extracomment>
- <translation>Greenphone (179 x 185)</translation>
+ <translation>Greenphone(179 x 185)</translation>
</message>
<message>
<source>High (192 x 192)</source>
<extracomment>Embedded device high definition screen resolution</extracomment>
- <translation>고해상도 (192 x 192)</translation>
+ <translation>고해상도(192 x 192)</translation>
</message>
</context>
<context>
<name>Designer</name>
<message>
- <source>Unable to launch %1.</source>
- <translation>%1을(를) 실행할 수 없습니다.</translation>
+ <source>Unable to launch %1: %2</source>
+ <translation>%1을(를) 실행할 수 없음: %2</translation>
</message>
<message>
<source>%1 timed out.</source>
@@ -657,52 +645,6 @@
<translation>Qt Designer</translation>
</message>
<message>
- <source>This file contains top level spacers.&lt;br&gt;They have &lt;b&gt;NOT&lt;/b&gt; been saved into the form.</source>
- <translation>이 파일에는 최상위 단계 스페이서가 포함되어 있습니다.&lt;br&gt;이들은 폼에 저장되지 &lt;b&gt;않았습니다&lt;/b&gt;.</translation>
- </message>
- <message>
- <source>Perhaps you forgot to create a layout?</source>
- <translation>레이아웃을 만들지 않았습니까?</translation>
- </message>
- <message>
- <source>Invalid UI file: The root element &lt;ui&gt; is missing.</source>
- <translation>잘못된 UI 파일: 최상위 원소 &lt;ui&gt;가 없습니다.</translation>
- </message>
- <message>
- <source>An error has occurred while reading the UI file at line %1, column %2: %3</source>
- <translation>UI 파일의 %1번째 줄, %2번째 칸을 읽는 중 오류가 발생하였습니다: %3</translation>
- </message>
- <message>
- <source>This file cannot be read because it was created using %1.</source>
- <translation>이 파일은 %1을(를) 사용하여 만들었기 때문에 읽을 수 없습니다.</translation>
- </message>
- <message>
- <source>This file was created using Designer from Qt-%1 and cannot be read.</source>
- <translation>이 파일은 Qt %1의 Designer로 만들었기 때문에 읽을 수 없습니다.</translation>
- </message>
- <message>
- <source>The converted file could not be read.</source>
- <translation>변환된 파일을 읽을 수 없습니다.</translation>
- </message>
- <message>
- <source>This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer.</source>
- <translation>이 파일은 Qt %1의 Designer로 만들었으며, Qt Designer에서 새로운 폼으로 변환할 것입니다.</translation>
- </message>
- <message>
- <source>The old form has not been touched, but you will have to save the form under a new name.</source>
- <translation>이전 폼 파일은 변경되지 않았습니다. 새로운 폼을 저장하려면 다른 이름으로 저장하십시오.</translation>
- </message>
- <message>
- <source>This file was created using Designer from Qt-%1 and could not be read:
-%2</source>
- <translation>이 파일은 Qt %1의 Designer로 만들어졌으며 읽을 수 없습니다:
-%2</translation>
- </message>
- <message>
- <source>Please run it through &lt;b&gt;uic3&amp;nbsp;-convert&lt;/b&gt; to convert it to Qt-4&apos;s ui format.</source>
- <translation>&lt;b&gt;uic3&amp;nbsp;-convert&lt;/b&gt; 명령을 실행하여 Qt 4의 UI 형식으로 변환하십시오.</translation>
- </message>
- <message>
<source>This file cannot be read because the extra info extension failed to load.</source>
<translation>추가 정보 확장을 불러올 수 없으므로 이 파일을 읽을 수 없습니다.</translation>
</message>
@@ -776,7 +718,7 @@
</message>
<message>
<source>The skin configuration file &apos;%1&apos; could not be read: %2</source>
- <translation>스킨 설정 파일 &apos;%1&apos;을(를) 읽을 수 없습니다: %2</translation>
+ <translation>스킨 설정 파일 &apos;%1&apos;을(를) 읽을 수 없음: %2</translation>
</message>
<message>
<source>Syntax error: %1</source>
@@ -804,7 +746,7 @@
</message>
<message>
<source>Mismatch in number of areas, expected %1, got %2.</source>
- <translation>영역 개수가 일치하지 않습니다: %1개를 예상하였지만 %2개 정의되었습니다.</translation>
+ <translation>영역 개수가 일치하지 않습니다: %1개를 예상했지만 %2개 정의되었습니다.</translation>
</message>
</context>
<context>
@@ -888,7 +830,7 @@
<message>
<source>%1 %</source>
<extracomment>Zoom percentage</extracomment>
- <translation>%1 %</translation>
+ <translation>%1%</translation>
</message>
<message>
<source>Preview Zoom</source>
@@ -928,7 +870,7 @@
<name>FormLayoutRowDialog</name>
<message>
<source>Add Form Layout Row</source>
- <translation>폼 레이아웃 행 추가하기</translation>
+ <translation>폼 레이아웃 행 추가</translation>
</message>
<message>
<source>&amp;Label text:</source>
@@ -1016,6 +958,22 @@
<source>&amp;Author</source>
<translation>작성자(&amp;A)</translation>
</message>
+ <message>
+ <source>Translations</source>
+ <translation>번역</translation>
+ </message>
+ <message>
+ <source>ID-based</source>
+ <translation>ID 기반</translation>
+ </message>
+ <message>
+ <source>Connections</source>
+ <translation>연결</translation>
+ </message>
+ <message>
+ <source>Connect slots by name</source>
+ <translation>이름으로 슬롯 연결</translation>
+ </message>
</context>
<context>
<name>IconSelector</name>
@@ -1025,11 +983,11 @@
</message>
<message>
<source>The file &apos;%1&apos; does not appear to be a valid pixmap file: %2</source>
- <translation>파일 &apos;%1&apos;은(는) 올바른 픽스맵 파일 같지 않습니다: %2</translation>
+ <translation>파일 &apos;%1&apos;이(가) 올바른 픽스맵 파일 같지 않음: %2</translation>
</message>
<message>
<source>The file &apos;%1&apos; could not be read: %2</source>
- <translation>파일 &apos;%1&apos;을(를) 읽을 수 없습니다: %2</translation>
+ <translation>파일 &apos;%1&apos;을(를) 읽을 수 없음: %2</translation>
</message>
<message>
<source>All Pixmaps (</source>
@@ -1136,7 +1094,7 @@
<name>NewForm</name>
<message>
<source>Show this Dialog on Startup</source>
- <translation>시작할 때 이 대화상자 보이기</translation>
+ <translation>시작할 때 이 대화 상자 표시</translation>
</message>
<message>
<source>C&amp;reate</source>
@@ -1167,12 +1125,12 @@
<translation>읽기 오류</translation>
</message>
<message>
- <source>A temporary form file could not be created in %1.</source>
- <translation>%1에 임시 폼 파일을 만들 수 없습니다.</translation>
+ <source>A temporary form file could not be created in %1: %2</source>
+ <translation>%1에 임시 폼 파일을 만들 수 없습니다: %2</translation>
</message>
<message>
- <source>The temporary form file %1 could not be written.</source>
- <translation>임시 폼 파일 %1에 쓸 수 없습니다.</translation>
+ <source>The temporary form file %1 could not be written: %2</source>
+ <translation>임시 폼 파일 %1에 쓸 수 없습니다: %2</translation>
</message>
</context>
<context>
@@ -1231,7 +1189,7 @@
</message>
<message>
<source>Print/Preview Configuration</source>
- <translation>인쇄/미리보기 설정</translation>
+ <translation>인쇄/미리 보기 설정</translation>
</message>
<message>
<source>Style</source>
@@ -1259,21 +1217,10 @@
</message>
</context>
<context>
- <name>Q3WizardContainer</name>
- <message>
- <source>Page</source>
- <translation>쪽</translation>
- </message>
-</context>
-<context>
<name>QAbstractFormBuilder</name>
<message>
- <source>Unexpected element &lt;%1&gt;</source>
- <translation>예상하지 못한 원소 &lt;%1&gt;</translation>
- </message>
- <message>
<source>An error has occurred while reading the UI file at line %1, column %2: %3</source>
- <translation>UI 파일의 %1번째 줄, %2번째 칸을 읽는 중 오류가 발생하였습니다: %3</translation>
+ <translation>UI 파일의 %1번째 줄, %2번째 칸을 읽는 중 오류가 발생했습니다: %3</translation>
</message>
<message>
<source>This file was created using Designer from Qt-%1 and cannot be read.</source>
@@ -1321,10 +1268,6 @@ UI 파일의 일관성이 깨졌을 수도 있습니다.</translation>
<source>Invalid QButtonGroup reference &apos;%1&apos; referenced by &apos;%2&apos;.</source>
<translation>&apos;%2&apos;에서 잘못된 QButtonGroup 참조 &apos;%1&apos;을(를) 참조하고 있습니다.</translation>
</message>
- <message>
- <source>This version of the uitools library is linked without script support.</source>
- <translation>이 버전의 uitools 라이브러리는 스크립트를 지원하지 않습니다.</translation>
- </message>
</context>
<context>
<name>QAxWidgetPlugin</name>
@@ -1353,26 +1296,12 @@ UI 파일의 일관성이 깨졌을 수도 있습니다.</translation>
</message>
<message>
<source>The control requires a design-time license</source>
- <translation>이 컨트롤을 사용하려면 라이선스가 필요합니다</translation>
+ <translation>이 컨트롤을 사용하려면 디자인 시간 라이선스가 필요합니다</translation>
</message>
</context>
<context>
<name>QCoreApplication</name>
<message>
- <source>Exception at line %1: %2</source>
- <translation>%1번째 줄에서 예외 발생: %2</translation>
- </message>
- <message>
- <source>Unknown error</source>
- <translation>알 수 없는 오류</translation>
- </message>
- <message>
- <source>An error occurred while running the script for %1: %2
-Script: %3</source>
- <translation>%1의 스크립트를 실행하는 중 오류 발생: %2
-스크립트: %3</translation>
- </message>
- <message>
<source>%1 is not a promoted class.</source>
<translation>%1은(는) 승격된 클래스가 아닙니다.</translation>
</message>
@@ -1419,26 +1348,12 @@ Script: %3</source>
<source>%1 - warning</source>
<translation>%1 - 경고</translation>
</message>
- <message>
- <source>Qt Designer</source>
- <translation>Qt Designer</translation>
- </message>
- <message>
- <source>This application cannot be used for the Console edition of Qt</source>
- <translation>이 프로그램은 Qt 콘솔 에디션에서 사용할 수 없습니다</translation>
- </message>
</context>
<context>
<name>QDesignerActions</name>
<message>
<source>Saved %1.</source>
- <translation>%1을(를) 저장하였습니다.</translation>
- </message>
- <message>
- <source>%1 already exists.
-Do you want to replace it?</source>
- <translation>%1이(가) 이미 존재합니다.
-겹쳐 쓰시겠습니까?</translation>
+ <translation>%1을(를) 저장했습니다.</translation>
</message>
<message>
<source>Edit Widgets</source>
@@ -1485,10 +1400,6 @@ Do you want to replace it?</source>
<translation>끝내기(&amp;Q)</translation>
</message>
<message>
- <source>View &amp;Code...</source>
- <translation>코드 보기(&amp;C)...</translation>
- </message>
- <message>
<source>&amp;Minimize</source>
<translation>최소화(&amp;M)</translation>
</message>
@@ -1529,10 +1440,6 @@ Do you want to replace it?</source>
<translation>현재 위젯 도움말</translation>
</message>
<message>
- <source>What&apos;s New in Qt Designer?</source>
- <translation>Qt Designer의 새로운 기능</translation>
- </message>
- <message>
<source>About Plugins</source>
<translation>플러그인 정보</translation>
</message>
@@ -1565,6 +1472,14 @@ Do you want to replace it?</source>
<translation>다른 이름으로 폼 저장</translation>
</message>
<message>
+ <source>View &amp;C++ Code...</source>
+ <translation>C++ 코드 보기(&amp;C)...</translation>
+ </message>
+ <message>
+ <source>View &amp;Python Code...</source>
+ <translation>Python 코드 보기(&amp;P)...</translation>
+ </message>
+ <message>
<source>Designer</source>
<translation>Designer</translation>
</message>
@@ -1592,7 +1507,7 @@ Do you want to update the file location or generate a new form?</source>
</message>
<message>
<source>&amp;New Form</source>
- <translation>새 폼 생성(&amp;N)</translation>
+ <translation>새 폼 만들기(&amp;N)</translation>
</message>
<message>
<source>Qt Designer</source>
@@ -1619,16 +1534,18 @@ Would you like to retry or select a different file?</source>
<translation>새 파일 선택</translation>
</message>
<message>
+ <source>Save Form</source>
+ <translation>폼 저장</translation>
+ </message>
+ <message>
<source>Could not write file</source>
<translation>파일에 쓸 수 없음</translation>
</message>
<message>
- <source>It was not possible to write the entire file %1 to disk.
-Reason:%2
-Would you like to retry?</source>
- <translation>파일 %1을(를) 디스크에 완전히 기록할 수 없었습니다.
-이유: %2
-다시 시도하시겠습니까?</translation>
+ <source>It was not possible to write the file %1 to disk.
+Reason: %2</source>
+ <translation>파일 %1을(를) 디스크에 기록할 수 없었습니다.
+이유: %2</translation>
</message>
<message>
<source>Assistant</source>
@@ -1664,7 +1581,7 @@ Would you like to retry?</source>
</message>
<message>
<source>Saved image %1.</source>
- <translation>그림 %1을(를) 저장하였습니다.</translation>
+ <translation>그림 %1을(를) 저장했습니다.</translation>
</message>
<message>
<source>The file %1 could not be written.</source>
@@ -1676,7 +1593,7 @@ Would you like to retry?</source>
</message>
<message>
<source>Printed %1.</source>
- <translation>%1을(를) 인쇄하였습니다.</translation>
+ <translation>%1을(를) 인쇄했습니다.</translation>
</message>
</context>
<context>
@@ -1718,16 +1635,12 @@ Would you like to retry?</source>
</message>
<message>
<source>A COM exception occurred when executing a meta call of type %1, index %2 of &quot;%3&quot;.</source>
- <translation>&quot;%3&quot;의 메타 호출(형식 %1, 인덱스 %2)을 실행하는 중 COM 오류가 발생하였습니다.</translation>
+ <translation>&quot;%3&quot;의 메타 호출(형식 %1, 인덱스 %2)을 실행하는 중 COM 오류가 발생했습니다.</translation>
</message>
</context>
<context>
<name>QDesignerFormBuilder</name>
<message>
- <source>Script errors occurred:</source>
- <translation>발생한 스크립트 오류:</translation>
- </message>
- <message>
<source>The preview failed to build.</source>
<translation>미리 보기를 빌드할 수 없습니다.</translation>
</message>
@@ -1809,7 +1722,7 @@ Would you like to retry?</source>
<name>QDesignerPluginManager</name>
<message>
<source>An XML error was encountered when parsing the XML of the custom widget %1: %2</source>
- <translation>사용자 정의 위젯 %1의 XML을 처리하는 중 XML 오류가 발생하였습니다: %2</translation>
+ <translation>사용자 정의 위젯 %1의 XML을 처리하는 중 XML 오류가 발생했습니다: %2</translation>
</message>
<message>
<source>A required attribute (&apos;%1&apos;) is missing.</source>
@@ -1852,8 +1765,8 @@ Would you like to retry?</source>
<message>
<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>위젯 &apos;%1&apos; (%2)의 컨테이너 확장에 쪽 #%5을(를) 조회하였을 때 Designer에서 관리되지 않는 위젯 &apos;%3&apos;(%4)을(를) 반환하였습니다.
-컨테이너 쪽은 사용자 정의 위젯의 domXml() 메서드에서 반환하는 XML에 정의하여야 합니다.</translation>
+ <translation>위젯 &apos;%1&apos; (%2)의 컨테이너 확장에 쪽 #%5을(를) 조회했을 때 Designer에서 관리되지 않는 위젯 &apos;%3&apos;(%4)을(를) 반환했습니다.
+컨테이너 쪽은 사용자 정의 위젯의 domXml() 메서드에서 반환하는 XML에 정의해야 합니다.</translation>
</message>
<message>
<source>Unexpected element &lt;%1&gt;</source>
@@ -1883,6 +1796,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>
@@ -1916,10 +1836,6 @@ Container pages should only be added by specifying them in XML returned by the d
<translation>파일(&amp;F)</translation>
</message>
<message>
- <source>Edit</source>
- <translation type="obsolete">편집</translation>
- </message>
- <message>
<source>&amp;Edit</source>
<translation>편집(&amp;E)</translation>
</message>
@@ -1983,19 +1899,11 @@ Container pages should only be added by specifying them in XML returned by the d
</message>
<message>
<source>The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them?</source>
- <translation>Designer가 마지막으로 실행되었을 때 올바르게 종료되지 않았으며, 백업 파일이 생성되었습니다. 백업 파일을 불러오시겠습니까?</translation>
+ <translation>Designer를 마지막으로 실행했을 때 올바르게 종료되지 않았으며, 백업 파일이 생성되었습니다. 백업 파일을 불러오시겠습니까?</translation>
</message>
<message>
<source>The file &lt;b&gt;%1&lt;/b&gt; could not be opened: %2</source>
- <translation>파일 &lt;b&gt;%1&lt;/b&gt;을(를) 열 수 없습니다: %2</translation>
- </message>
- <message>
- <source>The file &lt;b&gt;%1&lt;/b&gt; could not be opened.</source>
- <translation>파일 &lt;b&gt;%1&lt;/b&gt;을(를) 열 수 없습니다.</translation>
- </message>
- <message>
- <source>The file &lt;b&gt;%1&lt;/b&gt; is not a valid Designer UI file.</source>
- <translation>파일 &lt;b&gt;%1&lt;/b&gt;은(는) 올바른 Designer UI 파일이 아닙니다.</translation>
+ <translation>파일 &lt;b&gt;%1&lt;/b&gt;을(를) 열 수 없음: %2</translation>
</message>
</context>
<context>
@@ -2085,11 +1993,11 @@ Container pages should only be added by specifying them in XML returned by the d
<name>QStackedWidgetPreviewEventFilter</name>
<message>
<source>Go to previous page of %1 &apos;%2&apos; (%3/%4).</source>
- <translation>%1 &apos;%2&apos;의 이전 쪽으로 이동합니다 (%3/%4).</translation>
+ <translation>%1 &apos;%2&apos;의 이전 쪽으로 이동합니다(%3/%4).</translation>
</message>
<message>
<source>Go to next page of %1 &apos;%2&apos; (%3/%4).</source>
- <translation>%1 &apos;%2&apos;의 다음 쪽으로 이동합니다 (%3/%4).</translation>
+ <translation>%1 &apos;%2&apos;의 다음 쪽으로 이동합니다(%3/%4).</translation>
</message>
</context>
<context>
@@ -2473,7 +2381,7 @@ Container pages should only be added by specifying them in XML returned by the d
</message>
<message>
<source>Toggle details extension</source>
- <translation>자세한 정보 보이기/숨기기</translation>
+ <translation>자세한 정보 표시/숨기기</translation>
</message>
<message>
<source>&gt;</source>
@@ -2646,13 +2554,6 @@ Container pages should only be added by specifying them in XML returned by the d
</message>
</context>
<context>
- <name>QtKeySequenceEdit</name>
- <message>
- <source>Clear Shortcut</source>
- <translation>단축키 삭제</translation>
- </message>
-</context>
-<context>
<name>QtLocalePropertyManager</name>
<message>
<source>&lt;Invalid&gt;</source>
@@ -2804,7 +2705,7 @@ Do you want to replace it?</source>
</message>
<message>
<source>The file does not appear to be a resource file; element &apos;%1&apos; was found where &apos;%2&apos; was expected.</source>
- <translation>이 파일은 리소스 파일이 아닌 것 같습니다. 원소 &apos;%2&apos;을(를) 예상하였지만 &apos;%1&apos;이(가) 나왔습니다.</translation>
+ <translation>이 파일은 리소스 파일이 아닌 것 같습니다. 원소 &apos;%2&apos;을(를) 예상했지만 &apos;%1&apos;이(가) 나왔습니다.</translation>
</message>
<message>
<source>%1 [read-only]</source>
@@ -2901,7 +2802,7 @@ to
<message>
<source>A parse error occurred at line %1, column %2 of %3:
%4</source>
- <translation>%3의 %1번째 줄, %2번째 칸에서 처리 오류가 발생하였습니다:
+ <translation>%3의 %1번째 줄, %2번째 칸에서 처리 오류가 발생했습니다:
%4</translation>
</message>
<message>
@@ -2974,7 +2875,7 @@ to
</message>
<message>
<source>&lt;html&gt;&lt;p&gt;&lt;b&gt;Warning:&lt;/b&gt; There have been problems while reloading the resources:&lt;/p&gt;&lt;pre&gt;%1&lt;/pre&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;p&gt;&lt;b&gt;경고:&lt;/b&gt; 다음 리소스을 다시 불러오는 중 오류가 발생하였습니다:&lt;/p&gt;&lt;pre&gt;%1&lt;/pre&gt;&lt;/html&gt;</translation>
+ <translation>&lt;html&gt;&lt;p&gt;&lt;b&gt;경고:&lt;/b&gt; 다음 리소스를 다시 불러오는 중 오류가 발생했습니다:&lt;/p&gt;&lt;pre&gt;%1&lt;/pre&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>Resource Warning</source>
@@ -3214,7 +3115,7 @@ Do you want overwrite the template?</source>
</message>
<message>
<source>There was an error writing the template %1 to disk. Reason: %2</source>
- <translation>템플릿 %1을(를) 디스크에 쓰는 중 오류가 발생하였습니다. 이유: %2</translation>
+ <translation>템플릿 %1을(를) 디스크에 쓰는 중 오류가 발생했습니다. 이유: %2</translation>
</message>
<message>
<source>Pick a directory to save templates in</source>
@@ -3222,15 +3123,6 @@ Do you want overwrite the template?</source>
</message>
</context>
<context>
- <name>ScriptErrorDialog</name>
- <message>
- <source>An error occurred while running the scripts for &quot;%1&quot;:
-</source>
- <translation>&quot;%1&quot;의 스크립트를 실행하는 중 오류 발생:
-</translation>
- </message>
-</context>
-<context>
<name>SelectSignalDialog</name>
<message>
<source>Go to slot</source>
@@ -3361,59 +3253,12 @@ Do you want overwrite the template?</source>
</message>
<message>
<source>%1&lt;br/&gt;Copyright (C) %2 The Qt Company Ltd.</source>
- <translation>%1&lt;br/&gt;저작권자 (C) %2 The Qt Company Ltd.</translation>
- </message>
- <message>
- <source>%1&lt;br/&gt;Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).</source>
- <translation>%1&lt;br/&gt;저작권자 (C) 2012 Nokia Corporation and/or its subsidiary(-ies).</translation>
- </message>
-</context>
-<context>
- <name>VideoPlayerTaskMenu</name>
- <message>
- <source>Available Mime Types</source>
- <translation>사용 가능한 MIME 형식</translation>
- </message>
- <message>
- <source>Display supported mime types...</source>
- <translation>지원하는 MIME 형식 표시...</translation>
- </message>
- <message>
- <source>Load...</source>
- <translation>불러오기...</translation>
- </message>
- <message>
- <source>Play</source>
- <translation>재생</translation>
- </message>
- <message>
- <source>Pause</source>
- <translation>일시 정지</translation>
- </message>
- <message>
- <source>Stop</source>
- <translation>정지</translation>
- </message>
- <message>
- <source>Choose Video Player Media Source</source>
- <translation>비디오 재생기 미디어 원본 선택</translation>
- </message>
- <message>
- <source>An error has occurred in &apos;%1&apos;: %2</source>
- <translation>&apos;%1&apos;에서 오류 발생: %2</translation>
- </message>
- <message>
- <source>Video Player Error</source>
- <translation>비디오 재생기 오류</translation>
+ <translation>%1&lt;br/&gt;Copyright (C) %2 The Qt Company Ltd.</translation>
</message>
</context>
<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>이 파일에는 사용자 정의 위젯 &apos;%1&apos;이(가) 포함되어 있으며, 정의된 기본 클래스(%2)가 위젯 데이터베이스의 항목(%3)에 정의된 것과 다릅니다. 위젯 데이터베이스는 변경되지 않았습니다.</translation>
</message>
@@ -3528,29 +3373,6 @@ Do you want overwrite the template?</source>
</message>
</context>
<context>
- <name>qdesigner_internal::BrushManagerProxy</name>
- <message>
- <source>The element &apos;%1&apos; is missing the required attribute &apos;%2&apos;.</source>
- <translation>원소 &apos;%1&apos;에 필요한 속성 &apos;%2&apos;이(가) 없습니다.</translation>
- </message>
- <message>
- <source>Empty brush name encountered.</source>
- <translation>브러시 이름이 비어 있습니다.</translation>
- </message>
- <message>
- <source>An unexpected element &apos;%1&apos; was encountered.</source>
- <translation>예상하지 못한 원소 &apos;%1&apos;이(가) 있습니다.</translation>
- </message>
- <message>
- <source>An error occurred when reading the brush definition file &apos;%1&apos; at line line %2, column %3: %4</source>
- <translation>브러시 정의 파일 &apos;%1&apos;의 %2번째 줄, %3번째 칸을 읽는 중 오류 발생: %4</translation>
- </message>
- <message>
- <source>An error occurred when reading the resource file &apos;%1&apos; at line %2, column %3: %4</source>
- <translation>리소스 파일 &apos;%1&apos;의 %2번째 줄, %3번째 칸을 읽는 중 오류 발생: %4</translation>
- </message>
-</context>
-<context>
<name>qdesigner_internal::BuddyEditor</name>
<message>
<source>Add buddy</source>
@@ -3640,10 +3462,6 @@ Do you want overwrite the template?</source>
<translation>모두 복사</translation>
</message>
<message>
- <source>&amp;Find in Text...</source>
- <translation>텍스트에서 찾기(&amp;F)...</translation>
- </message>
- <message>
<source>A temporary form file could not be created in %1.</source>
<translation>%1에 임시 폼 파일을 만들 수 없습니다.</translation>
</message>
@@ -3652,16 +3470,12 @@ Do you want overwrite the template?</source>
<translation>임시 폼 파일 %1에 쓸 수 없습니다.</translation>
</message>
<message>
- <source>%1 - [Code]</source>
- <translation>%1 - [코드]</translation>
- </message>
- <message>
<source>Save Code</source>
<translation>코드 저장</translation>
</message>
<message>
- <source>Header Files (*.%1)</source>
- <translation>헤더 파일 (*.%1)</translation>
+ <source>%1 - [%2 Code]</source>
+ <translation>%1 - [%2 코드]</translation>
</message>
<message>
<source>The file %1 could not be opened: %2</source>
@@ -3814,6 +3628,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>
@@ -3848,7 +3666,7 @@ Do you want overwrite the template?</source>
<message numerus="yes">
<source>Customized (%n roles)</source>
<translation>
- <numerusform>사용자 정의 (역할 %n개)</numerusform>
+ <numerusform>사용자 정의(역할 %n개)</numerusform>
</translation>
</message>
<message>
@@ -3936,7 +3754,7 @@ Do you want overwrite the template?</source>
</message>
<message>
<source>Unable to open the file &apos;%1&apos; for writing: %2</source>
- <translation>파일 %1에 쓰기 위해 열 수 없습니다: %2</translation>
+ <translation>파일 %1에 쓰려고 열 수 없음: %2</translation>
</message>
<message>
<source>Open profile</source>
@@ -3948,11 +3766,11 @@ Do you want overwrite the template?</source>
</message>
<message>
<source>Unable to open the file &apos;%1&apos; for reading: %2</source>
- <translation>파일 %1에서 읽기 위해 열 수 없습니다: %2</translation>
+ <translation>파일 %1에서 읽으려고 열 수 없음: %2</translation>
</message>
<message>
<source>&apos;%1&apos; is not a valid profile: %2</source>
- <translation>&apos;%1&apos;은(는) 올바른 프로필이 아닙니다: %2</translation>
+ <translation>&apos;%1&apos;은(는) 올바른 프로필이 아님: %2</translation>
</message>
</context>
<context>
@@ -4046,17 +3864,6 @@ Do you want overwrite the template?</source>
</message>
</context>
<context>
- <name>qdesigner_internal::FilterWidget</name>
- <message>
- <source>Filter</source>
- <translation>필터</translation>
- </message>
- <message>
- <source>Clear text</source>
- <translation>텍스트 삭제</translation>
- </message>
-</context>
-<context>
<name>qdesigner_internal::FormEditor</name>
<message>
<source>Resource File Changed</source>
@@ -4114,7 +3921,7 @@ Do you want overwrite the template?</source>
</message>
<message>
<source>Paste (%1 widgets, %2 actions)</source>
- <translation>붙여넣기 (위젯 %1개, 동작 %2개)</translation>
+ <translation>붙여넣기(위젯 %1개, 동작 %2개)</translation>
</message>
<message>
<source>Cannot paste widgets. Designer could not find a container without a layout to paste into.</source>
@@ -4325,7 +4132,7 @@ Do you want overwrite the template?</source>
<message>
<source>Could not create form preview</source>
<comment>Title of warning message box</comment>
- <translation>폼을 미리볼 수 없음</translation>
+ <translation>폼을 미리 볼 수 없음</translation>
</message>
<message>
<source>Form Settings - %1</source>
@@ -4355,7 +4162,7 @@ Do you want overwrite the template?</source>
</message>
<message>
<source>Visible</source>
- <translation>보이기</translation>
+ <translation>표시됨</translation>
</message>
<message>
<source>Grid &amp;X</source>
@@ -4389,81 +4196,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>픽스맵 파일 &apos;%1&apos;을(를) 읽을 수 없습니다.</translation>
- </message>
- <message>
- <source>The file &apos;%1&apos; does not appear to be a valid pixmap file: %2</source>
- <translation>파일 &apos;%1&apos;은(는) 올바른 픽스맵 파일 같지 않습니다: %2</translation>
- </message>
- <message>
- <source>The file &apos;%1&apos; could not be read: %2</source>
- <translation>파일 &apos;%1&apos;을(를) 읽을 수 없습니다: %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>
@@ -4525,7 +4257,7 @@ Do you want overwrite the template?</source>
<name>qdesigner_internal::LabelTaskMenu</name>
<message>
<source>Change rich text...</source>
- <translation>서식있는 텍스트 바꾸기...</translation>
+ <translation>서식 있는 텍스트 바꾸기...</translation>
</message>
<message>
<source>Change plain text...</source>
@@ -4624,18 +4356,6 @@ Do you want overwrite the template?</source>
<translation>아이콘(&amp;I):</translation>
</message>
<message>
- <source>Shortcut:</source>
- <translation type="obsolete">단축키:</translation>
- </message>
- <message>
- <source>Checkable:</source>
- <translation type="obsolete">선택 가능:</translation>
- </message>
- <message>
- <source>ToolTip:</source>
- <translation type="obsolete">풍선 도움말:</translation>
- </message>
- <message>
<source>...</source>
<translation>...</translation>
</message>
@@ -4687,7 +4407,7 @@ Please select another, unique one.</source>
<message>
<source>The &apos;_q_&apos; prefix is reserved for the Qt library.
Please select another name.</source>
- <translation>&apos;_q_&apos; 접두사는 Qt 라이브러리에서 사용하기 위해 예약되어 있습니다.
+ <translation>&apos;_q_&apos; 접두사는 Qt 라이브러리에서 사용하려고 예약되어 있습니다.
다른 이름을 사용하십시오.</translation>
</message>
</context>
@@ -4719,19 +4439,19 @@ Please select another name.</source>
</message>
<message>
<source>QVGA portrait (240x320)</source>
- <translation>QVGA 세로 (240x320)</translation>
+ <translation>QVGA 세로(240x320)</translation>
</message>
<message>
<source>QVGA landscape (320x240)</source>
- <translation>QVGA 가로 (320x240)</translation>
+ <translation>QVGA 가로(320x240)</translation>
</message>
<message>
<source>VGA portrait (480x640)</source>
- <translation>VGA 세로 (480x640)</translation>
+ <translation>VGA 세로(480x640)</translation>
</message>
<message>
<source>VGA landscape (640x480)</source>
- <translation>VGA 가로 (640x480)</translation>
+ <translation>VGA 가로(640x480)</translation>
</message>
<message>
<source>Widgets</source>
@@ -4756,7 +4476,7 @@ Please select another name.</source>
</message>
<message>
<source>Internal error: No template selected.</source>
- <translation>내부 오류: 템플릿이 선택되지 않았습니다.</translation>
+ <translation>내부 오류: 템플릿을 선택하지 않았습니다.</translation>
</message>
</context>
<context>
@@ -4793,12 +4513,12 @@ Please select another name.</source>
<context>
<name>qdesigner_internal::ObjectInspector</name>
<message>
- <source>Change Current Page</source>
- <translation>현재 쪽 변경</translation>
+ <source>Filter</source>
+ <translation>필터</translation>
</message>
<message>
- <source>&amp;Find in Text...</source>
- <translation>텍스트에서 찾기(&amp;F)...</translation>
+ <source>Change Current Page</source>
+ <translation>현재 쪽 변경</translation>
</message>
</context>
<context>
@@ -4821,7 +4541,7 @@ Please select another name.</source>
</message>
<message>
<source>Index %1 (%2)</source>
- <translation>인덱스 %1 (%2)</translation>
+ <translation>인덱스 %1(%2)</translation>
</message>
<message>
<source>%1 %2</source>
@@ -4866,6 +4586,66 @@ Please select another name.</source>
<source>Active</source>
<translation>활성</translation>
</message>
+ <message>
+ <source>Save...</source>
+ <translation>저장...</translation>
+ </message>
+ <message>
+ <source>Load...</source>
+ <translation>불러오기...</translation>
+ </message>
+ <message>
+ <source>Lighter</source>
+ <translation>밝게</translation>
+ </message>
+ <message>
+ <source>Darker</source>
+ <translation>어둡게</translation>
+ </message>
+ <message>
+ <source>Copy color %1</source>
+ <translation>색 %1 복사</translation>
+ </message>
+ <message>
+ <source>QPalette UI file (*.xml)</source>
+ <translation>QPalette UI 파일 (*xml)</translation>
+ </message>
+ <message>
+ <source>Cannot open %1 for writing: %2</source>
+ <translation>파일 %1에 쓰려고 열 수 없음: %2</translation>
+ </message>
+ <message>
+ <source>Cannot write %1: %2</source>
+ <translation>%1에 쓸 수 없음: %2</translation>
+ </message>
+ <message>
+ <source>Cannot read palette from %1:%2:%3</source>
+ <translation>%1에서 팔레트를 읽을 수 없음:%2:%3</translation>
+ </message>
+ <message>
+ <source>Cannot open %1 for reading: %2</source>
+ <translation>파일 %1에서 읽으려고 열 수 없음: %2</translation>
+ </message>
+ <message>
+ <source>Invalid element &quot;%1&quot;, expected &quot;palette&quot;.</source>
+ <translation>잘못된 원소 &quot;%1&quot;, &quot;palette&quot;를 예상했습니다.</translation>
+ </message>
+ <message>
+ <source>Save Palette</source>
+ <translation>팔레트 저장</translation>
+ </message>
+ <message>
+ <source>Error Writing Palette</source>
+ <translation>팔레트 쓰기 오류</translation>
+ </message>
+ <message>
+ <source>Load Palette</source>
+ <translation>팔레트 불러오기</translation>
+ </message>
+ <message>
+ <source>Error Reading Palette</source>
+ <translation>팔레트 읽기 오류</translation>
+ </message>
</context>
<context>
<name>qdesigner_internal::PaletteEditorButton</name>
@@ -5027,12 +4807,12 @@ Please select another name.</source>
<message>
<source>Landscape (&amp;CCW)</source>
<extracomment>Rotate form preview counter-clockwise</extracomment>
- <translation>가로 (반시계방향)(&amp;C)</translation>
+ <translation>가로(반시계 방향)(&amp;C)</translation>
</message>
<message>
<source>&amp;Landscape (CW)</source>
<extracomment>Rotate form preview clockwise</extracomment>
- <translation>가로 (시계방향)(&amp;L)</translation>
+ <translation>가로(시계 방향)(&amp;L)</translation>
</message>
<message>
<source>&amp;Close</source>
@@ -5079,39 +4859,117 @@ ate the goose who was loose.</source>
<translation>누름 단추</translation>
</message>
<message>
- <source>ButtonGroup2</source>
+ <source>CheckBox1</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>단추 그룹 2</translation>
+ <translation>체크 상자 1</translation>
</message>
<message>
- <source>CheckBox1</source>
+ <source>RadioButton1</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>체크 상자 1</translation>
+ <translation>라디오 단추 1</translation>
+ </message>
+ <message>
+ <source>RadioButton2</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>라디오 단추 2</translation>
</message>
<message>
- <source>CheckBox2</source>
+ <source>RadioButton3</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>체크 상자 2</translation>
+ <translation>라디오 단추 3</translation>
</message>
<message>
- <source>ButtonGroup</source>
+ <source>Buttons</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>단추 그룹</translation>
+ <translation>단추</translation>
</message>
<message>
- <source>RadioButton1</source>
+ <source>Tristate CheckBox</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>라디오 단추 1</translation>
+ <translation>삼중상태 체크 상자</translation>
</message>
<message>
- <source>RadioButton2</source>
+ <source>ToggleButton</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>라디오 단추 2</translation>
+ <translation>전환 단추</translation>
</message>
<message>
- <source>RadioButton3</source>
+ <source>ToolButton</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>라디오 단추 3</translation>
+ <translation>도구 단추</translation>
+ </message>
+ <message>
+ <source>Menu</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>메뉴</translation>
+ </message>
+ <message>
+ <source>Item Views</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>항목 보기</translation>
+ </message>
+ <message>
+ <source>Column 1</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>행 1</translation>
+ </message>
+ <message>
+ <source>Top Level 1</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>최상위 단계 1</translation>
+ </message>
+ <message>
+ <source>Nested Item 1</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>하위 항목 1</translation>
+ </message>
+ <message>
+ <source>Nested Item 2</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>하위 항목 2</translation>
+ </message>
+ <message>
+ <source>Nested Item 3</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>하위 항목 3</translation>
+ </message>
+ <message>
+ <source>Simple Input Widgets</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>간단한 입력 위젯</translation>
+ </message>
+ <message>
+ <source>Item1</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>항목1</translation>
+ </message>
+ <message>
+ <source>Item2</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>항목2</translation>
+ </message>
+ <message>
+ <source>Display Widgets</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>표시 위젯</translation>
+ </message>
+ <message>
+ <source>QLabel</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>QLabel</translation>
+ </message>
+ <message>
+ <source>QLabel with frame</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>프레임 있는 QLabel</translation>
+ </message>
+ <message>
+ <source>Option 1</source>
+ <translation>옵션 1</translation>
+ </message>
+ <message>
+ <source>Checkable</source>
+ <translation>선택 가능</translation>
</message>
</context>
<context>
@@ -5321,6 +5179,10 @@ Class: %2</source>
<translation>도구 모음 추가</translation>
</message>
<message>
+ <source>Add Tool Bar to Other Area</source>
+ <translation>다른 영역에 도구 모음 추가</translation>
+ </message>
+ <message>
<source>Create Status Bar</source>
<translation>상태 표시줄 생성</translation>
</message>
@@ -5329,10 +5191,6 @@ Class: %2</source>
<translation>상태 표시줄 삭제</translation>
</message>
<message>
- <source>Change script...</source>
- <translation>스크립트 변경...</translation>
- </message>
- <message>
<source>Change signals/slots...</source>
<translation>시그널/슬롯 변경...</translation>
</message>
@@ -5374,11 +5232,7 @@ Class: %2</source>
</message>
<message>
<source>Edit WhatsThis</source>
- <translation>컨텍스트 도움말 편집</translation>
- </message>
- <message>
- <source>no signals available</source>
- <translation>사용 가능한 시그널 없음</translation>
+ <translation>콘텍스트 도움말 편집</translation>
</message>
<message numerus="yes">
<source>Set size constraint on %n widget(s)</source>
@@ -5489,7 +5343,7 @@ Class: %2</source>
</message>
<message>
<source>Rich Text</source>
- <translation>서식있는 텍스트</translation>
+ <translation>서식 있는 텍스트</translation>
</message>
<message>
<source>Source</source>
@@ -5568,29 +5422,7 @@ Class: %2</source>
</message>
<message>
<source>Simplify Rich Text</source>
- <translation>서식있는 텍스트 단순화</translation>
- </message>
-</context>
-<context>
- <name>qdesigner_internal::ScriptDialog</name>
- <message>
- <source>Edit script</source>
- <translation>스크립트 편집</translation>
- </message>
- <message>
- <source>&lt;html&gt;Enter a Qt Script snippet to be executed while loading the form.&lt;br&gt;The widget and its children are accessible via the variables &lt;i&gt;widget&lt;/i&gt; and &lt;i&gt;childWidgets&lt;/i&gt;, respectively.</source>
- <translation>&lt;html&gt;폼을 불러오는 동안 실행할 Qt 스크립트를 입력하십시오.&lt;br&gt;위젯과 자식 위젯은 각각 &lt;i&gt;widget&lt;/i&gt;과 &lt;i&gt;childWidgets&lt;/i&gt; 변수로 접근할 수 있습니다.</translation>
- </message>
- <message>
- <source>Syntax error</source>
- <translation>문법 오류</translation>
- </message>
-</context>
-<context>
- <name>qdesigner_internal::ScriptErrorDialog</name>
- <message>
- <source>Script errors</source>
- <translation>스크립트 오류</translation>
+ <translation>서식 있는 텍스트 단순화</translation>
</message>
</context>
<context>
@@ -5882,7 +5714,7 @@ Class: %2</source>
</message>
<message>
<source>Move Item Left (before Parent Item)</source>
- <translation>항목 왼쪽으로 이동 (부모 항목 이전)</translation>
+ <translation>항목 왼쪽으로 이동(부모 항목 이전)</translation>
</message>
<message>
<source>L</source>
@@ -5890,7 +5722,7 @@ Class: %2</source>
</message>
<message>
<source>Move Item Right (as a First Subitem of the Next Sibling Item)</source>
- <translation>항목 오른쪽으로 이동 (다음 자식 항목의 첫 하위 항목으로)</translation>
+ <translation>항목 오른쪽으로 이동(다음 자식 항목의 첫 하위 항목으로)</translation>
</message>
<message>
<source>R</source>
@@ -6008,15 +5840,11 @@ Class: %2</source>
<name>qdesigner_internal::WidgetFactory</name>
<message>
<source>The custom widget factory registered for widgets of class %1 returned 0.</source>
- <translation>클래스 %1인 위젯의 사용자 정의 위젯 팩터리에서 0을 반환하였습니다.</translation>
+ <translation>클래스 %1인 위젯의 사용자 정의 위젯 팩터리에서 0을 반환했습니다.</translation>
</message>
<message>
<source>A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2.</source>
- <translation>클래스 %1인 위젯에 등록된 사용자 정의 위젯 팩터리를 사용하여 위젯을 만드는 중 클래스 이름이 일치하지 않았습니다. 클래스 %2인 위젯을 반환하였습니다.</translation>
- </message>
- <message>
- <source>%1 Widget</source>
- <translation>%1 위젯</translation>
+ <translation>클래스 %1인 위젯에 등록된 사용자 정의 위젯 팩터리를 사용하여 위젯을 만드는 중 클래스 이름이 일치하지 않았습니다. 클래스 %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>
@@ -6026,7 +5854,7 @@ Class: %2</source>
<source>Attempt to add a layout to a widget &apos;%1&apos; (%2) which already has an unmanaged layout of type %3.
This indicates an inconsistency in the ui-file.</source>
<translation>관리되지 않은 %3 형식의 레이아웃이 있는 위젯 &apos;%1&apos; (%2)에 레이아웃을 추가할 수 없습니다.
-UI 파일 내부에 불일치가 발생하였습니다.</translation>
+UI 파일 내부에 불일치가 발생했습니다.</translation>
</message>
<message>
<source>Cannot create style &apos;%1&apos;.</source>
@@ -6049,7 +5877,7 @@ UI 파일 내부에 불일치가 발생하였습니다.</translation>
<message>
<source>%1 %</source>
<extracomment>Zoom factor</extracomment>
- <translation>%1 %</translation>
+ <translation>%1%</translation>
</message>
</context>
<context>
diff --git a/translations/designer_ru.ts b/translations/designer_ru.ts
index 87d52ae..3bd0d75 100644
--- a/translations/designer_ru.ts
+++ b/translations/designer_ru.ts
@@ -649,10 +649,6 @@
<translation>Преобразованные виджеты</translation>
</message>
<message>
- <source>Unable to launch %1.</source>
- <translation>Невозможно запустить %1.</translation>
- </message>
- <message>
<source>Unable to launch %1: %2</source>
<translation>Невозможно запустить %1: %2</translation>
</message>
@@ -1441,12 +1437,6 @@ This indicates an inconsistency in the ui-file.</source>
<translation>UI файлы Qt Designer (*.%1);;Все файлы (*)</translation>
</message>
<message>
- <source>%1 already exists.
-Do you want to replace it?</source>
- <translation>%1 уже существует.
-Хотите заменить его?</translation>
- </message>
- <message>
<source>Additional Fonts...</source>
<translation>Дополнительные шрифты...</translation>
</message>
@@ -1551,10 +1541,6 @@ Reason: %2</source>
<translation>&amp;Печать...</translation>
</message>
<message>
- <source>View &amp;Code...</source>
- <translation>Показать &amp;код...</translation>
- </message>
- <message>
<source>ALT+CTRL+S</source>
<translation>ALT+CTRL+S</translation>
</message>
@@ -1579,14 +1565,6 @@ Would you like to retry or select a different file?</source>
Вы хотите повторить или выбрать другой файл?</translation>
</message>
<message>
- <source>It was not possible to write the entire file %1 to disk.
-Reason:%2
-Would you like to retry?</source>
- <translation>Не удалось полностью записать файл %1 на диск.
-Причина: %2
-Желаете повторить?</translation>
- </message>
- <message>
<source>Assistant</source>
<translation>Qt Assistant</translation>
</message>
@@ -3293,10 +3271,6 @@ 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>
@@ -3512,18 +3486,10 @@ Do you want overwrite the template?</source>
<translation>Не удалось записать временный файл формы %1.</translation>
</message>
<message>
- <source>%1 - [Code]</source>
- <translation>%1 - [код]</translation>
- </message>
- <message>
<source>Save Code</source>
<translation>Сохранить код</translation>
</message>
<message>
- <source>Header Files (*.%1)</source>
- <translation>Заголовочные файлы (*.%1)</translation>
- </message>
- <message>
<source>%1 - [%2 Code]</source>
<translation>%1 - [Код %2]</translation>
</message>
@@ -4642,6 +4608,66 @@ Please select another name.</source>
<source>Active</source>
<translation>Активная</translation>
</message>
+ <message>
+ <source>Save...</source>
+ <translation>Сохранить...</translation>
+ </message>
+ <message>
+ <source>Load...</source>
+ <translation>Загрузить...</translation>
+ </message>
+ <message>
+ <source>Lighter</source>
+ <translation>Осветлить</translation>
+ </message>
+ <message>
+ <source>Darker</source>
+ <translation>Затемнить</translation>
+ </message>
+ <message>
+ <source>Copy color %1</source>
+ <translation>Скопировать цвет %1</translation>
+ </message>
+ <message>
+ <source>QPalette UI file (*.xml)</source>
+ <translation>Файл QPalette UI (*.xml)</translation>
+ </message>
+ <message>
+ <source>Cannot open %1 for writing: %2</source>
+ <translation>Не удалось открыть %1 для записи: %2</translation>
+ </message>
+ <message>
+ <source>Cannot write %1: %2</source>
+ <translation>Не удалось записать %1: %2</translation>
+ </message>
+ <message>
+ <source>Cannot read palette from %1:%2:%3</source>
+ <translation>Не удалось прочитать палитру из файла %1: %2: %3</translation>
+ </message>
+ <message>
+ <source>Cannot open %1 for reading: %2</source>
+ <translation>Не удалось открыть %1 для чтения: %2</translation>
+ </message>
+ <message>
+ <source>Invalid element &quot;%1&quot;, expected &quot;palette&quot;.</source>
+ <translation>Неверный элемент «%1», ожидался «palette».</translation>
+ </message>
+ <message>
+ <source>Save Palette</source>
+ <translation>Сохранение палитры</translation>
+ </message>
+ <message>
+ <source>Error Writing Palette</source>
+ <translation>Ошибка записи палитры</translation>
+ </message>
+ <message>
+ <source>Load Palette</source>
+ <translation>Загрузка палитры</translation>
+ </message>
+ <message>
+ <source>Error Reading Palette</source>
+ <translation>Ошибка чтения палитры</translation>
+ </message>
</context>
<context>
<name>qdesigner_internal::PaletteEditorButton</name>
@@ -4854,39 +4880,117 @@ ate the goose who was loose.</source>
<translation>PushButton</translation>
</message>
<message>
- <source>ButtonGroup2</source>
+ <source>CheckBox1</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>ButtonGroup2</translation>
+ <translation>CheckBox1</translation>
</message>
<message>
- <source>CheckBox1</source>
+ <source>RadioButton1</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>CheckBox1</translation>
+ <translation>RadioButton1</translation>
+ </message>
+ <message>
+ <source>RadioButton2</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>RadioButton2</translation>
</message>
<message>
- <source>CheckBox2</source>
+ <source>RadioButton3</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>CheckBox2</translation>
+ <translation>RadioButton3</translation>
</message>
<message>
- <source>ButtonGroup</source>
+ <source>Buttons</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>ButtonGroup</translation>
+ <translation>Кнопки</translation>
</message>
<message>
- <source>RadioButton1</source>
+ <source>Tristate CheckBox</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>RadioButton1</translation>
+ <translation>CheckBox с тремя состояниями</translation>
</message>
<message>
- <source>RadioButton2</source>
+ <source>ToggleButton</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>RadioButton2</translation>
+ <translation>ToggleButton</translation>
</message>
<message>
- <source>RadioButton3</source>
+ <source>ToolButton</source>
<extracomment>Palette Editor Preview Widget</extracomment>
- <translation>RadioButton3</translation>
+ <translation>ToolButton</translation>
+ </message>
+ <message>
+ <source>Menu</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Меню</translation>
+ </message>
+ <message>
+ <source>Item Views</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Обзоры элементов</translation>
+ </message>
+ <message>
+ <source>Column 1</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Столбец 1</translation>
+ </message>
+ <message>
+ <source>Top Level 1</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Верхний уровень 1</translation>
+ </message>
+ <message>
+ <source>Nested Item 1</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Вложенный элемент 1</translation>
+ </message>
+ <message>
+ <source>Nested Item 2</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Вложенный элемент 2</translation>
+ </message>
+ <message>
+ <source>Nested Item 3</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Вложенный элемент 3</translation>
+ </message>
+ <message>
+ <source>Simple Input Widgets</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Примитивный виджет ввода</translation>
+ </message>
+ <message>
+ <source>Item1</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Элемент 1</translation>
+ </message>
+ <message>
+ <source>Item2</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Элемент 2</translation>
+ </message>
+ <message>
+ <source>Display Widgets</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>Виджеты отображения</translation>
+ </message>
+ <message>
+ <source>QLabel</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>QLabel</translation>
+ </message>
+ <message>
+ <source>QLabel with frame</source>
+ <extracomment>Palette Editor Preview Widget</extracomment>
+ <translation>QLabel с рамкой</translation>
+ </message>
+ <message>
+ <source>Option 1</source>
+ <translation>Опция 1</translation>
+ </message>
+ <message>
+ <source>Checkable</source>
+ <translation>Триггерное</translation>
</message>
</context>
<context>
@@ -5742,6 +5846,13 @@ 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_ko.ts b/translations/linguist_ko.ts
index 250f0cf..a87c161 100644
--- a/translations/linguist_ko.ts
+++ b/translations/linguist_ko.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="ko_KR">
+<TS version="2.1" language="ko">
<context>
<name>AboutDialog</name>
<message>
@@ -77,7 +77,7 @@
<message numerus="yes">
<source>Batch translated %n entries</source>
<translation>
- <numerusform>항목 %n개를 일괄 번역하였습니다</numerusform>
+ <numerusform>항목 %n개를 일괄 번역했습니다</numerusform>
</translation>
</message>
</context>
@@ -101,7 +101,7 @@
</message>
<message>
<source>&lt;p&gt;* Context: %1&lt;br&gt;* Source: %2</source>
- <translation>&lt;p&gt;* 컨텍스트: %1&lt;br&gt;* 원본: %2</translation>
+ <translation>&lt;p&gt;* 콘텍스트: %1&lt;br&gt;* 원본: %2</translation>
</message>
<message>
<source>&lt;br&gt;* Comment: %3</source>
@@ -118,6 +118,11 @@ Will assume a single universal form.</source>
<translation>&apos;%2&apos;을(를) 만들 수 없음: %1</translation>
</message>
<message>
+ <source>%1 (%2)</source>
+ <extracomment>&lt;language&gt; (&lt;country&gt;)</extracomment>
+ <translation>%1(%2)</translation>
+ </message>
+ <message>
<source>Universal Form</source>
<translation>단일 형태</translation>
</message>
@@ -133,12 +138,16 @@ Will assume a single universal form.</source>
<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>
<translation>번역된 메시지가 원본 메시지와 같은 문장 부호로 끝나지 않았습니다.</translation>
</message>
<message>
<source>A phrase book suggestion for &apos;%1&apos; was ignored.</source>
- <translation>단어장에서 제안한 &apos;%1&apos;을(를) 무시하였습니다.</translation>
+ <translation>단어장에서 제안한 &apos;%1&apos;을(를) 무시했습니다.</translation>
</message>
<message>
<source>Translation does not refer to the same place markers as in the source text.</source>
@@ -149,10 +158,6 @@ Will assume a single universal form.</source>
<translation>필요한 %n/%Ln개의 자리 표시자가 번역된 메시지에 포함되지 않았습니다.</translation>
</message>
<message>
- <source>Translation does not contain the necessary %n place marker.</source>
- <translation>필요한 %n개의 자리 표시자가 번역된 메시지에 포함되지 않았습니다.</translation>
- </message>
- <message>
<source>Unknown error</source>
<translation>알 수 없는 오류</translation>
</message>
@@ -232,11 +237,11 @@ Will assume a single universal form.</source>
</message>
<message>
<source>Comments and contexts are searched when checked.</source>
- <translation>선택하면 설명과 컨텍스트에서 찾습니다.</translation>
+ <translation>선택하면 주석과 콘텍스트에서 찾습니다.</translation>
</message>
<message>
<source>&amp;Comments</source>
- <translation>설명(&amp;C)</translation>
+ <translation>주석(&amp;C)</translation>
</message>
<message>
<source>Ignore &amp;accelerators</source>
@@ -271,6 +276,14 @@ Will assume a single universal form.</source>
<source>Skip &amp;obsolete</source>
<translation>오래된 항목 건너뛰기(&amp;O)</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;E)</translation>
+ </message>
</context>
<context>
<name>FormMultiWidget</name>
@@ -299,306 +312,23 @@ Will assume a single universal form.</source>
</message>
</context>
<context>
- <name>LConvert</name>
- <message>
- <source>
-Usage:
- lconvert [options] &lt;infile&gt; [&lt;infile&gt;...]
-
-lconvert is part of Qt&apos;s Linguist tool chain. It can be used as a
-stand-alone tool to convert and filter translation data files.
-The following file formats are supported:
-
-%1
-If multiple input files are specified, they are merged with
-translations from later files taking precedence.
-
-Options:
- -h
- --help Display this information and exit.
-
- -i &lt;infile&gt;
- --input-file &lt;infile&gt;
- Specify input file. Use if &lt;infile&gt; might start with a dash.
- This option can be used several times to merge inputs.
- May be &apos;-&apos; (standard input) for use in a pipe.
-
- -o &lt;outfile&gt;
- --output-file &lt;outfile&gt;
- Specify output file. Default is &apos;-&apos; (standard output).
-
- -if &lt;informat&gt;
- --input-format &lt;format&gt;
- Specify input format for subsequent &lt;infile&gt;s.
- The format is auto-detected from the file name and defaults to &apos;ts&apos;.
-
- -of &lt;outformat&gt;
- --output-format &lt;outformat&gt;
- Specify output format. See -if.
-
- --input-codec &lt;codec&gt;
- Specify encoding for QM and PO input files. Default is &apos;Latin1&apos;
- for QM and &apos;UTF-8&apos; for PO files. UTF-8 is always tried as well for
- QM, corresponding to the possible use of the trUtf8() function.
-
- --output-codec &lt;codec&gt;
- Specify encoding for PO output files. Default is &apos;UTF-8&apos;.
-
- --drop-tags &lt;regexp&gt;
- Drop named extra tags when writing TS or XLIFF files.
- May be specified repeatedly.
-
- --drop-translations
- Drop existing translations and reset the status to &apos;unfinished&apos;.
- Note: this implies --no-obsolete.
-
- --source-language &lt;language&gt;[_&lt;region&gt;]
- Specify/override the language of the source strings. Defaults to
- POSIX if not specified and the file does not name it yet.
-
- --target-language &lt;language&gt;[_&lt;region&gt;]
- Specify/override the language of the translation.
- The target language is guessed from the file name if this option
- is not specified and the file contents name no language yet.
-
- --no-obsolete
- Drop obsolete messages.
-
- --no-finished
- Drop finished messages.
-
- --sort-contexts
- Sort contexts in output TS file alphabetically.
-
- --locations {absolute|relative|none}
- Override how source code references are saved in TS files.
- Default is absolute.
-
- --no-ui-lines
- Drop line numbers from references to UI files.
-
- --verbose
- be a bit more verbose
-
-Long options can be specified with only one leading dash, too.
-
-Return value:
- 0 on success
- 1 on command line parse failures
- 2 on read failures
- 3 on write failures
-</source>
- <translation>
-사용 방법:
- lconvert [옵션] &lt;infile&gt; [&lt;infile&gt;...]
-
-lconvert는 Qt Linguist 도구 모음의 일부입니다. 번역 데이터
-파일을 변환하고 처리하는 데 사용할 수 있습니다.
-다음 파일 형식을 지원합니다:
-
-%1
-여러 개의 입력 파일을 지정하면, 나중에 지정한 파일에
-있는 내용을 우선으로 합칩니다.
-
-옵션:
- -h
- --help 이 정보를 표시하고 끝냅니다.
-
- -i &lt;infile&gt;
- --input-file &lt;infile&gt;
- 입력 파일을 지정합니다. &lt;infile&gt;이 이음표(-)로 시작한다면
- 사용하십시오. 여러 입력 파일을 합치려면 여러 번 사용할
- 수 있습니다. 파이프 내부에서 사용하려면 &apos;-&apos;를 사용하십시오.
-
- -o &lt;outfile&gt;
- --output-file &lt;outfile&gt;
- 출력 파일을 지정합니다. 기본값은 &apos;-&apos;(표준 출력)입니다.
-
- -if &lt;informat&gt;
- --input-format &lt;format&gt;
- 입력 파일 &lt;infile&gt; 바로 앞에 붙이며, 입력 파일의 형식을 지정합니다.
- 파일 이름에서 형식을 자동으로 식별하며, 기본값은 &apos;ts&apos;입니다.
-
- -of &lt;outformat&gt;
- --output-format &lt;outformat&gt;
- 출력 형식을 지정합니다. -if를 참고하십시오.
-
- --input-codec &lt;codec&gt;
- QM과 PO 입력 파일의 인코딩을 지정합니다. QM 파일의 기본값은
- &apos;Latin1&apos;이며, PO 파일의 기본값은 &apos;UTF-8&apos;입니다. trUtf8() 함수를
- 사용했을 수도 있기 때문에 QM 파일에서도 UTF-8을 시도합니다.
-
- --output-codec &lt;codec&gt;
- PO 출력 파일의 인코딩을 지정합니다. 기본값은 &apos;UTF-8&apos;입니다.
-
- --drop-tags &lt;regexp&gt;
- TS나 XLIFF 파일을 쓸 때 추가 태그를 기록하지 않습니다.
- 여러 번 사용할 수 있습니다.
-
- --drop-translations
- 이미 있는 번역을 삭제하며 상태를 &apos;완료되지 않음&apos;으로 초기화합니다.
- 알림: --no-obsolete 옵션을 암시적으로 지정합니다.
-
- --source-language &lt;language&gt;[_&lt;region&gt;]
- 원본 문자열의 언어를 (재)지정합니다. 파일 이름에서 언어를 알 수
- 없거나 지정되지 않았을 때의 기본값은 POSIX입니다.
-
- --target-language &lt;language&gt;[_&lt;region&gt;]
- 번역물의 언어를 (재)지정합니다. 이 옵션을 지정하지 않았고
- 파일 내용에 언어를 지정하지 않았으면 파일 이름에서
- 대상 언어를 추정합니다.
-
- --no-obsolete
- 오래된 메시지를 삭제합니다.
-
- --no-finished
- 완료되지 않은 메시지를 삭제합니다.
-
- --sort-contexts
- 출력 TS 파일의 컨텍스트를 가나다순으로 정렬합니다.
-
- --locations {absolute|relative|none}
- 원본 코드 참조를 TS 파일에 저장할 법을 지정합니다.
- 기본값은 absolute입니다.
-
- --no-ui-lines
- UI 파일 참조에서 줄 번호를 삭제합니다.
-
- --verbose
- 더 자세한 메시지를 출력합니다.
-
-긴 옵션을 지정할 때에는 이음표 하나만 사용할 수 있습니다.
-
-반환값:
- 0: 성공
- 1: 명령행 인자 처리 오류
- 2: 읽기 오류
- 3: 쓰기 오류
-</translation>
- </message>
-</context>
-<context>
<name>LRelease</name>
- <message>
- <source>Usage:
- lrelease [options] project-file
- lrelease [options] ts-files [-qm qm-file]
-
-lrelease is part of Qt&apos;s Linguist tool chain. It can be used as a
-stand-alone tool to convert XML-based translations files in the TS
-format into the &apos;compiled&apos; QM format used by QTranslator objects.
-
-Options:
- -help Display this information and exit
- -idbased
- Use IDs instead of source strings for message keying
- -compress
- Compress the QM files
- -nounfinished
- Do not include unfinished translations
- -removeidentical
- If the translated text is the same as
- the source text, do not include the message
- -markuntranslated &lt;prefix&gt;
- If a message has no real translation, use the source text
- prefixed with the given string instead
- -silent
- Do not explain what is being done
- -version
- Display the version of lrelease and exit
-</source>
- <translation>사용 방법:
- lrelease [옵션] project-file
- lrelease [옵션] ts-files [-qm qm-file]
-
-lrelease는 Qt Linguist 도구 모음의 일부입니다. TS 형식으로 되어 있는
-XML 기반 번역물은 QTranslator에서 사용할 수 있는 &apos;컴파일된&apos; QM
-형식으로 변환하는 독립 실행 가능한 도구입니다.
-
-옵션:
- -help 이 정보를 표시하고 끝냅니다.
- -idbased
- 메시지 키로 원본 문자열 대신 ID를 사용합니다.
- -compress
- QM 파일을 압축합니다.
- -nounfinished
- 완료되지 않은 번역을 포함하지 않습니다.
- -removeidentical
- 원문과 번역문이 같으면 메시지를 포함하지 않습니다.
- -markuntranslated &lt;prefix&gt;
- 메시지가 번역되지 않았으면 원본 문자열 앞에
- &lt;prefix&gt;를 붙인 것을 번역문 대신 사용합니다.
- -silent
- 진행 상황을 표시하지 않습니다.
- -version
- lrelease 버전을 표시하고 끝냅니다
-</translation>
- </message>
- <message>
- <source>lrelease error: %1</source>
- <translation>lrelease 오류: %1</translation>
- </message>
- <message>
- <source>Updating &apos;%1&apos;...
-</source>
- <translation>&apos;%1&apos; 업데이트 중...
-</translation>
- </message>
- <message>
- <source>Removing translations equal to source text in &apos;%1&apos;...
-</source>
- <translation>&apos;%1&apos;의 원문과 동일한 번역문 삭제 중...
-</translation>
- </message>
- <message>
- <source>lrelease error: cannot create &apos;%1&apos;: %2
-</source>
- <translation>lrelease 오류: &apos;%1&apos;을(를) 만들 수 없음: %2
-</translation>
- </message>
- <message>
- <source>lrelease error: cannot save &apos;%1&apos;: %2</source>
- <translation>lrelease 오류: &apos;%1&apos;을(를) 저장할 수 없음: %2</translation>
- </message>
- <message>
- <source>lrelease version %1
-</source>
- <translation>lrelease 버전 %1
-</translation>
- </message>
- <message>
- <source>lrelease error: cannot read project file &apos;%1&apos;.
-</source>
- <translation>lrelease 오류: 프로젝트 파일 &apos;%1&apos;을(를) 읽을 수 없습니다.</translation>
- </message>
- <message>
- <source>lrelease error: cannot process project file &apos;%1&apos;.
-</source>
- <translation>lrelease 오류: 프로젝트 파일 &apos;%1&apos;을(를) 처리할 수 없습니다.
-</translation>
- </message>
- <message>
- <source>lrelease warning: Met no &apos;TRANSLATIONS&apos; entry in project file &apos;%1&apos;
-</source>
- <translation>lrelease 경고: 프로젝트 파일 &apos;%1&apos;에 &apos;TRANSLATIONS&apos; 항목이 없음
-</translation>
- </message>
<message numerus="yes">
<source>Dropped %n message(s) which had no ID.</source>
<translation>
- <numerusform>ID가 없는 메시지 %n개를 삭제하였습니다.</numerusform>
+ <numerusform>ID가 없는 메시지 %n개를 삭제했습니다.</numerusform>
</translation>
</message>
<message numerus="yes">
<source>Excess context/disambiguation dropped from %n message(s).</source>
<translation>
- <numerusform>메시지 %n개에서 불필요한 컨텍스트/동음이의 정보를 삭제하였습니다.</numerusform>
+ <numerusform>메시지 %n개에서 불필요한 콘텍스트/동음이의 정보를 삭제했습니다.</numerusform>
</translation>
</message>
<message numerus="yes">
<source> Generated %n translation(s) (%1 finished and %2 unfinished)</source>
<translation>
- <numerusform> %n개의 번역 생성됨 (%1개 완료됨, %2개 완료되지 않음)</numerusform>
+ <numerusform> %n개의 번역 생성됨(%1개 완료됨, %2개 완료되지 않음)</numerusform>
</translation>
</message>
<message numerus="yes">
@@ -609,632 +339,6 @@ XML 기반 번역물은 QTranslator에서 사용할 수 있는 &apos;컴파일
</message>
</context>
<context>
- <name>LUpdate</name>
- <message>
- <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
-</source>
- <translation>#if와 #else 분기 사이에서 소/중/대괄호가 일치하지 않음. #if 분기를 사용함
-</translation>
- </message>
- <message>
- <source>Parenthesis/brace mismatch between #if and #else branches; using #if branch
-</source>
- <translation>#if와 #else 분기 사이에서 소/중괄호가 일치하지 않음. #if 분기를 사용함
-</translation>
- </message>
- <message>
- <source>Unterminated C++ comment
-</source>
- <translation>C++ 주석이 종료되지 않음
-</translation>
- </message>
- <message>
- <source>Unterminated C++ string
-</source>
- <translation>C++ 문자열이 종료되지 않음
-</translation>
- </message>
- <message>
- <source>Excess closing brace in C++ code (or abuse of the C++ preprocessor)
-</source>
- <translation>C++ 코드에 불필요한 닫는 중괄호가 있음(또는 C++ 전처리기의 잘못된 사용)
-</translation>
- </message>
- <message>
- <source>Excess closing parenthesis in C++ code (or abuse of the C++ preprocessor)
-</source>
- <translation>C++ 코드에 불필요한 닫는 소괄호가 있음(또는 C++ 전처리기의 잘못된 사용)
-</translation>
- </message>
- <message>
- <source>Excess closing bracket in C++ code (or abuse of the C++ preprocessor)
-</source>
- <translation>C++ 코드에 불필요한 닫는 대괄호가 있음(또는 C++ 전처리기의 잘못된 사용)
-</translation>
- </message>
- <message>
- <source>circular inclusion of %1
-</source>
- <translation>%1이(가) 재귀적으로 포함됨
-</translation>
- </message>
- <message>
- <source>Cannot open %1: %2
-</source>
- <translation>%1을(를) 열 수 없음: %2
-</translation>
- </message>
- <message>
- <source>//% cannot be used with tr() / QT_TR_NOOP(). Ignoring
-</source>
- <translation>//%는 tr()/QT_TR_NOOP()와 같이 사용할 수 없음. 무시함
-</translation>
- </message>
- <message>
- <source>Qualifying with unknown namespace/class %1::%2
-</source>
- <translation>알 수 없는 네임스페이스/클래스 %1::%2와(과) 일치함</translation>
- </message>
- <message>
- <source>tr() cannot be called without context
-</source>
- <translation>tr()은 컨텍스트 없이 호출될 수 없음
-</translation>
- </message>
- <message>
- <source>Class &apos;%1&apos; lacks Q_OBJECT macro
-</source>
- <translation>클래스 &apos;%1&apos;에 Q_OBJECT 매크로가 없음
-</translation>
- </message>
- <message>
- <source>It is not recommended to call tr() from within a constructor &apos;%1::%2&apos;
-</source>
- <translation>생성자 &apos;%1::%2&apos;에서 tr()을 호출하는 것은 권장하지 않음
-</translation>
- </message>
- <message>
- <source>//% cannot be used with translate() / QT_TRANSLATE_NOOP(). Ignoring
-</source>
- <translation>//%는 translate()/QT_TR_NOOP()와 같이 사용할 수 없음. 무시함
-</translation>
- </message>
- <message>
- <source>//= cannot be used with qtTrId() / QT_TRID_NOOP(). Ignoring
-</source>
- <translation>//=은 qtTrId()/QT_TRID_NOOP()와 같이 사용할 수 없음. 무시함
-</translation>
- </message>
- <message>
- <source>Unexpected character in meta string
-</source>
- <translation>메타 문자열에 예상하지 못한 글자가 있음
-</translation>
- </message>
- <message>
- <source>Unterminated meta string
-</source>
- <translation>메타 문자열이 종료되지 않음
-</translation>
- </message>
- <message>
- <source>Cannot invoke tr() like this
-</source>
- <translation>tr()을 이렇게 호출할 수 없음
-</translation>
- </message>
- <message>
- <source>Discarding unconsumed meta data
-</source>
- <translation>사용되지 않은 메타데이터를 무시함
-</translation>
- </message>
- <message>
- <source>Unbalanced opening brace in C++ code (or abuse of the C++ preprocessor)
-</source>
- <translation>C++ 코드의 여는 중괄호 쌍이 맞지 않음(또는 C++ 전처리기의 잘못된 사용)
-</translation>
- </message>
- <message>
- <source>Unbalanced opening parenthesis in C++ code (or abuse of the C++ preprocessor)
-</source>
- <translation>C++ 코드의 여는 소괄호 쌍이 맞지 않음(또는 C++ 전처리기의 잘못된 사용)
-</translation>
- </message>
- <message>
- <source>Unbalanced opening bracket in C++ code (or abuse of the C++ preprocessor)
-</source>
- <translation>C++ 코드의 여는 대괄호 쌍이 맞지 않음(또는 C++ 전처리기의 잘못된 사용)
-</translation>
- </message>
- <message>
- <source>Cannot open %1: %2</source>
- <translation>%1을(를) 열 수 없음: %2</translation>
- </message>
- <message>
- <source>Unterminated Java comment.
-</source>
- <translation>Java 주석이 종료되지 않았습니다.
-</translation>
- </message>
- <message>
- <source>Invalid Unicode value.
-</source>
- <translation>유니코드 값이 잘못되었습니다.
-</translation>
- </message>
- <message>
- <source>Unterminated string.
-</source>
- <translation>문자열이 종료되지 않았습니다.
-</translation>
- </message>
- <message>
- <source>String used in translation can contain only literals concatenated with other literals, not expressions or numbers.
-</source>
- <translation>번역에 사용하는 문자열은 서로 다른 문자열끼리만 연결되어 있어야 하며, 표현식이나 숫자와는 연결할 수 없습니다.
-</translation>
- </message>
- <message>
- <source>&apos;class&apos; must be followed by a class name.
-</source>
- <translation>&apos;class&apos; 다음에는 클래스 이름이 와야 합니다.
-</translation>
- </message>
- <message>
- <source>Excess closing brace.
-</source>
- <translation>불필요한 닫는 중괄호가 있습니다.</translation>
- </message>
- <message>
- <source>&apos;package&apos; must be followed by package name.
-</source>
- <translation>&apos;package&apos; 다음에는 패키지 이름이 와야 합니다.
-</translation>
- </message>
- <message>
- <source>Unbalanced opening brace.
-</source>
- <translation>여는 중괄호의 쌍이 맞지 않습니다.
-</translation>
- </message>
- <message>
- <source>Unbalanced opening parenthesis.
-</source>
- <translation>여는 소괄호의 쌍이 맞지 않습니다.
-</translation>
- </message>
- <message>
- <source>Usage:
- lupdate [options] [project-file]...
- lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
-
-lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
-messages from Qt UI files, C++, Java and JavaScript/QtScript source code.
-Extracted messages are stored in textual translation source files (typically
-Qt TS XML). New and modified messages can be merged into existing TS files.
-
-Options:
- -help Display this information and exit.
- -no-obsolete
- Drop all obsolete strings.
- -extensions &lt;ext&gt;[,&lt;ext&gt;]...
- Process files with the given extensions only.
- The extension list must be separated with commas, not with whitespace.
- Default: &apos;%1&apos;.
- -pluralonly
- Only include plural form messages.
- -silent
- Do not explain what is being done.
- -no-sort
- Do not sort contexts in TS files.
- -no-recursive
- Do not recursively scan the following directories.
- -recursive
- Recursively scan the following directories (default).
- -I &lt;includepath&gt; or -I&lt;includepath&gt;
- Additional location to look for include files.
- May be specified multiple times.
- -locations {absolute|relative|none}
- Specify/override how source code references are saved in TS files.
- Default is absolute.
- -no-ui-lines
- Do not record line numbers in references to UI files.
- -disable-heuristic {sametext|similartext|number}
- Disable the named merge heuristic. Can be specified multiple times.
- -pro &lt;filename&gt;
- Name of a .pro file. Useful for files with .pro file syntax but
- different file suffix. Projects are recursed into and merged.
- -source-language &lt;language&gt;[_&lt;region&gt;]
- Specify the language of the source strings for new files.
- Defaults to POSIX if not specified.
- -target-language &lt;language&gt;[_&lt;region&gt;]
- Specify the language of the translations for new files.
- Guessed from the file name if not specified.
- -ts &lt;ts-file&gt;...
- Specify the output file(s). This will override the TRANSLATIONS
- and nullify the CODECFORTR from possibly specified project files.
- -codecfortr &lt;codec&gt;
- Specify the codec assumed for tr() calls. Effective only with -ts.
- -version
- Display the version of lupdate and exit.
- @lst-file
- Read additional file names (one per line) from lst-file.
-</source>
- <translation>사용 방법:
- lupdate [옵션] [project-file]...
- lupdate [옵션] [source-file|path|@lst-file]... -ts ts-files|@lst-file
-
-lupdate는 Qt Linguist 도구 모음의 일부입니다. Qt UI 파일, C++,
-Java, JavaScript/QtScript 원본 코드에서 번역 가능한 문자열을 추출합니다.
-추출한 메시지는 번역 원본 파일(대개의 경우 Qt TS XML)에 저장됩니다.
-기존 TS 파일에 새로 추가되었거나 수정된 메시지를 추가할 수 있습니다.
-
-옵션:
- -help 이 정보를 표시하고 끝냅니다.
- -no-obsolete
- 모든 오래된 문자열을 삭제합니다.
- -extensions &lt;ext&gt;[,&lt;ext&gt;]...
- 주어진 확장자를 가진 파일만 처리합니다.
- 확장자 목록은 쉼표로 구분하며, 공백을 사용하면 안 됩니다.
- 기본값: &apos;%1&apos;.
- -pluralonly
- 복수형 메시지만 포함합니다.
- -silent
- 진행 상황을 표시하지 않습니다.
- -no-sort
- TS 파일의 컨텍스트를 정렬하지 않습니다.
- -no-recursive
- 하위 디렉터리를 재귀적으로 탐색하지 않습니다.
- -recursive
- 하위 디렉터리를 재귀적으로 탐색합니다. (기본값)
- -I &lt;includepath&gt; 또는 -I&lt;includepath&gt;
- 포함할 파일을 찾을 추가 경로입니다.
- 여러 번 사용할 수 있습니다.
- -locations {absolute|relative|none}
- TS 파일에 원본 코드 위치를 저장할 방법을 (재)지정합니다.
- 기본값은 absolute(절대 위치)입니다.
- -no-ui-lines
- UI 파일을 참조할 때 줄 번호를 기록하지 않습니다.
- -disable-heuristic {sametext|similartext|number}
- 지정한 메시지 휴리스틱을 사용하지 않습니다.
- 여러 번 사용할 수 있습니다.
- -pro &lt;filename&gt;
- .pro 파일 이름입니다. .pro 파일 문법을 사용하지만 확장자가
- .pro가 아닌 경우에 사용하십시오. 재귀적으로 프로젝트를
- 탐색하며 합칩니다.
- -source-language &lt;language&gt;[_&lt;region&gt;]
- 새 파일의 원문 언어를 지정합니다.
- 지정하지 않으면 POSIX를 사용합니다.
- -target-language &lt;language&gt;[_&lt;region&gt;]
- 새 파일의 번역문 언어를 지정합니다.
- 지정하지 않으면 파일 이름에서 추측합니다.
- -ts &lt;ts-file&gt;...
- 출력 파일을 지정합니다. TRANSLATIONS를 다시 지정하며
- 프로젝트 파일에서 지정했을 수도 있는 CODECFORTR을
- 무효화합니다.
- -codecfortr &lt;codec&gt;
- tr() 함수에 사용하는 코덱을 지정합니다.
- -ts 옵션과 같이 사용할 때만 유효합니다.
- -version
- lupdate 버전을 표시하고 끝냅니다.
- @lst-file
- lst-file에서 추가 파일 목록(한 줄에 하나)을 읽습니다.
-</translation>
- </message>
- <message>
- <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
-</source>
- <translation>lupdate 경고: tr()의 코덱 &apos;%1&apos;이(가) 파일의 코덱 &apos;%2&apos;와(과) 일치하지 않습니다. 내보낼 때 문제가 생길 수 있습니다.
-</translation>
- </message>
- <message>
- <source>lupdate warning: Specified target language &apos;%1&apos; disagrees with existing file&apos;s language &apos;%2&apos;. Ignoring.
-</source>
- <translation>lupdate 경고: 지정한 대상 언어 &apos;%1&apos;이(가) 파일의 언어 &apos;%2&apos;와(과) 다릅니다. 무시합니다.
-</translation>
- </message>
- <message>
- <source>lupdate warning: Specified source language &apos;%1&apos; disagrees with existing file&apos;s language &apos;%2&apos;. Ignoring.
-</source>
- <translation>lupdate 경고: 지정한 원본 언어 &apos;%1&apos;이(가) 파일의 언어 &apos;%2&apos;와(과) 다릅니다. 무시합니다.
-</translation>
- </message>
- <message>
- <source>Updating &apos;%1&apos;...
-</source>
- <translation>&apos;%1&apos; 업데이트 중...
-</translation>
- </message>
- <message>
- <source>Stripping non plural forms in &apos;%1&apos;...
-</source>
- <translation>&apos;%1&apos;의 단수형 삭제하는 중...
-</translation>
- </message>
- <message>
- <source>lupdate warning: Codec for source &apos;%1&apos; is invalid. Falling back to codec for tr().
-</source>
- <translation>lupdate 경고: 원본 코덱 &apos;%1&apos;이(가) 올바르지 않습니다. tr()의 코덱을 사용합니다.
-</translation>
- </message>
- <message>
- <source>lupdate warning: TS files from command line will override TRANSLATIONS in %1.
-</source>
- <translation>lupdate 경고: 명령행으로 지정한 TS 파일이 %1의 TRANSLATIONS를 재정의합니다.
-</translation>
- </message>
- <message>
- <source>lupdate warning: TS files from command line prevent recursing into %1.
-</source>
- <translation>lupdate 경고: 명령행으로 지정한 TS 파일이 %1(으)로 재귀하는 것을 방지합니다.
-</translation>
- </message>
- <message>
- <source>lupdate warning: no TS files specified. Only diagnostics will be produced for &apos;%1&apos;.
-</source>
- <translation>lupdate 경고: TS 파일이 지정되지 않았습니다. &apos;%1&apos;의 검사만 진행됩니다.
-</translation>
- </message>
- <message>
- <source>The option -target-language requires a parameter.
-</source>
- <translation>--target-language 옵션에는 인자가 필요합니다.
-</translation>
- </message>
- <message>
- <source>The option -source-language requires a parameter.
-</source>
- <translation>--source-language 옵션에는 인자가 필요합니다.
-</translation>
- </message>
- <message>
- <source>The option -disable-heuristic requires a parameter.
-</source>
- <translation>--disable-heuristic 옵션에는 인자가 필요합니다.
-</translation>
- </message>
- <message>
- <source>Invalid heuristic name passed to -disable-heuristic.
-</source>
- <translation>--disable-heuristic에 잘못된 휴리스틱 이름이 전달되었습니다.</translation>
- </message>
- <message>
- <source>The option -locations requires a parameter.
-</source>
- <translation>-locations 옵션에는 인자가 필요합니다.
-</translation>
- </message>
- <message>
- <source>Invalid parameter passed to -locations.
-</source>
- <translation>-locations 옵션에 잘못된 인자가 전달되었습니다.
-</translation>
- </message>
- <message>
- <source>The -codecfortr option should be followed by a codec name.
-</source>
- <translation>-codecfortr 옵션 다음에는 코덱 이름이 와야 합니다.
-</translation>
- </message>
- <message>
- <source>The -extensions option should be followed by an extension list.
-</source>
- <translation>-extensions 옵션 다음에는 확장자 목록이 와야 합니다.
-</translation>
- </message>
- <message>
- <source>The -pro option should be followed by a filename of .pro file.
-</source>
- <translation>-pro 옵션 다음에는 .pro 파일이 와야 합니다.
-</translation>
- </message>
- <message>
- <source>The -I option should be followed by a path.
-</source>
- <translation>-I 옵션 다음에는 경로가 와야 합니다.
-</translation>
- </message>
- <message>
- <source>Unrecognized option &apos;%1&apos;.
-</source>
- <translation>알 수 없는 옵션 &apos;%1&apos;.
-</translation>
- </message>
- <message>
- <source>lupdate error: List file &apos;%1&apos; is not readable.
-</source>
- <translation>lupdate 오류: 목록 파일 &apos;%1&apos;을(를) 읽을 수 없습니다.
-</translation>
- </message>
- <message>
- <source>lupdate warning: For some reason, &apos;%1&apos; is not writable.
-</source>
- <translation>lupdate 경고: 파일 &apos;%1&apos;에 쓸 수 없습니다.</translation>
- </message>
- <message>
- <source>lupdate error: File &apos;%1&apos; has no recognized extension.
-</source>
- <translation>lupdate 오류: 파일 &apos;%1&apos;의 확장자는 알려져 있지 않습니다.
-</translation>
- </message>
- <message>
- <source>lupdate error: File &apos;%1&apos; does not exist.
-</source>
- <translation>lupdate 오류: 파일 &apos;%1&apos;이(가) 없습니다.
-</translation>
- </message>
- <message>
- <source>Scanning directory &apos;%1&apos;...
-</source>
- <translation>디렉터리 &apos;%1&apos; 검사 중...
-</translation>
- </message>
- <message>
- <source>lupdate warning: -target-language usually only makes sense with exactly one TS file.
-</source>
- <translation>lupdate 경고: -target-language는 TS 파일을 하나만 지정했을 때 적용됩니다.
-</translation>
- </message>
- <message>
- <source>lupdate warning: -codecfortr has no effect without -ts.
-</source>
- <translation>lupdate 경고: --codecfortr 옵션은 -ts 옵션을 지정해야 적용됩니다.
-</translation>
- </message>
- <message>
- <source>lupdate warning: no TS files specified. Only diagnostics will be produced.
-</source>
- <translation>lupdate 경고: TS 파일이 지정되지 않았습니다. 검사만 진행됩니다.
-</translation>
- </message>
- <message>
- <source>lupdate error: Both project and source files / include paths specified.
-</source>
- <translation>lupdate 오류: 프로젝트 파일과 원본 파일/포함 경로 둘 다를 지정하였습니다.
-</translation>
- </message>
- <message numerus="yes">
- <source> Found %n source text(s) (%1 new and %2 already existing)
-</source>
- <translation>
- <numerusform> 원본 문자열 %n개 찾음 (새 문자열 %1개, 기존 문자열 %2개)
-</numerusform>
- </translation>
- </message>
- <message numerus="yes">
- <source> Removed %n obsolete entries
-</source>
- <translation>
- <numerusform> 오래된 항목 %n개 삭제됨
-</numerusform>
- </translation>
- </message>
- <message numerus="yes">
- <source> Kept %n obsolete entries
-</source>
- <translation>
- <numerusform> 오래된 항목 %n개 보존됨
-</numerusform>
- </translation>
- </message>
- <message numerus="yes">
- <source> Number heuristic provided %n translation(s)
-</source>
- <translation>
- <numerusform> 숫자 휴리스틱으로 %n개 번역됨
-</numerusform>
- </translation>
- </message>
- <message numerus="yes">
- <source> Same-text heuristic provided %n translation(s)
-</source>
- <translation>
- <numerusform> 동일 텍스트 휴리스틱으로 %n개 번역됨
-</numerusform>
- </translation>
- </message>
- <message numerus="yes">
- <source> Similar-text heuristic provided %n translation(s)
-</source>
- <translation>
- <numerusform> 비슷한 텍스트 휴리스틱으로 %n개 번역됨
-</numerusform>
- </translation>
- </message>
- <message>
- <source>Illegal character</source>
- <translation>잘못된 문자</translation>
- </message>
- <message>
- <source>Unclosed string at end of line</source>
- <translation>줄 끝에서 문자열이 닫히지 않았음</translation>
- </message>
- <message>
- <source>Illegal escape squence</source>
- <translation type="obsolete">잘못된 탈출 문자</translation>
- </message>
- <message>
- <source>Illegal escape sequence</source>
- <translation>잘못된 탈출 시퀀스</translation>
- </message>
- <message>
- <source>Illegal unicode escape sequence</source>
- <translation>잘못된 유니코드 탈출 문자</translation>
- </message>
- <message>
- <source>Unclosed comment at end of file</source>
- <translation>파일 끝에서 주석이 닫히지 않았음</translation>
- </message>
- <message>
- <source>Illegal syntax for exponential number</source>
- <translation>지수 표기법이 잘못됨</translation>
- </message>
- <message>
- <source>Identifier cannot start with numeric literal</source>
- <translation>식별자는 숫자 리터럴로 시작할 수 없음</translation>
- </message>
- <message>
- <source>Unterminated regular expression literal</source>
- <translation>종료되지 않은 정규 표현식 리터럴</translation>
- </message>
- <message>
- <source>//% cannot be used with %1(). Ignoring
-</source>
- <translation>//%는 %1()와(과) 사용될 수 없음. 무시함
-</translation>
- </message>
- <message>
- <source>%1() requires at least two arguments.
-</source>
- <translation>%1()에는 최소 2개의 인자가 필요합니다.
-</translation>
- </message>
- <message>
- <source>%1(): both arguments must be literal strings.
-</source>
- <translation>%1(): 두 인자는 문자열 리터럴이어야 합니다.
-</translation>
- </message>
- <message>
- <source>%1() requires at least one argument.
-</source>
- <translation>%1()에는 최소 1개의 인자가 필요합니다.
-</translation>
- </message>
- <message>
- <source>%1(): text to translate must be a literal string.
-</source>
- <translation>%1(): 번역할 텍스트는 문자열 리터럴이어야 합니다.
-</translation>
- </message>
- <message>
- <source>//= cannot be used with %1(). Ignoring
-</source>
- <translation>//=은 %1()와(과) 같이 사용할 수 없음. 무시함
-</translation>
- </message>
- <message>
- <source>%1(): identifier must be a literal string.
-</source>
- <translation>%1(): 식별자는 문자열 리터럴이어야 합니다.
-</translation>
- </message>
- <message>
- <source>Expected </source>
- <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
- <translation>예상한 토큰</translation>
- </message>
- <message>
- <source>XML error: Parse error at line %1, column %2 (%3).</source>
- <translation>XML 오류: %1번째 줄, %2번째 칸에서 처리 오류 발생(%3).</translation>
- </message>
- <message>
- <source>Parse error in UI file</source>
- <translation>UI 파일 처리 오류</translation>
- </message>
-</context>
-<context>
<name>MainWindow</name>
<message>
<source>MainWindow</source>
@@ -1549,50 +653,18 @@ Java, JavaScript/QtScript 원본 코드에서 번역 가능한 문자열을 추
<translation>가속기(&amp;A)</translation>
</message>
<message>
- <source>Toggle the validity check of accelerators</source>
- <translation>가속기 키 유효성 검사 활성화/비활성화</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>가속기 키 검사를 켜거나 끕니다. 검사가 켜져 있으면 원문과 번역문의 &amp; 기호 개수가 똑같은 지 검사합니다. 검사가 실패하면 경고 창에 메시지를 표시합니다.</translation>
- </message>
- <message>
<source>&amp;Ending Punctuation</source>
<translation>끝맺는 문장 부호(&amp;E)</translation>
</message>
<message>
- <source>Toggle the validity check of ending punctuation</source>
- <translation>끝맺는 문장 부호 유효성 검사 활성화/비활성화</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;P)</translation>
</message>
<message>
- <source>Toggle checking that phrase suggestions are used</source>
- <translation>단어장에서 제안한 단어 사용 여부 검사 활성화/비활성화</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;M)</translation>
</message>
<message>
- <source>Toggle the validity check of place markers</source>
- <translation>자리 표시자 일치 검사 활성화/비활성화</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;N)...</translation>
</message>
@@ -1657,10 +729,6 @@ Java, JavaScript/QtScript 원본 코드에서 번역 가능한 문자열을 추
<translation>Qt 정보</translation>
</message>
<message>
- <source>Display information about the Qt toolkit by Nokia.</source>
- <translation>Qt 툴킷의 정보를 표시합니다.</translation>
- </message>
- <message>
<source>&amp;What&apos;s This?</source>
<translation>이것에 대한 설명(&amp;W)</translation>
</message>
@@ -1722,11 +790,11 @@ Java, JavaScript/QtScript 원본 코드에서 번역 가능한 문자열을 추
</message>
<message>
<source>Open/Refresh Form &amp;Preview</source>
- <translation>폼 미리보기 열기/새로 고침(&amp;P)</translation>
+ <translation>폼 미리 보기 열기/새로 고침(&amp;P)</translation>
</message>
<message>
<source>Form Preview Tool</source>
- <translation>폼 미리보기 도구</translation>
+ <translation>폼 미리 보기 도구</translation>
</message>
<message>
<source>F5</source>
@@ -1791,7 +859,7 @@ Java, JavaScript/QtScript 원본 코드에서 번역 가능한 문자열을 추
</message>
<message>
<source>Context</source>
- <translation>컨텍스트</translation>
+ <translation>콘텍스트</translation>
</message>
<message>
<source>Items</source>
@@ -1799,7 +867,7 @@ Java, JavaScript/QtScript 원본 코드에서 번역 가능한 문자열을 추
</message>
<message>
<source>This panel lists the source contexts.</source>
- <translation>이 패널은 원본 컨텍스트 목록입니다.</translation>
+ <translation>이 패널은 원본 콘텍스트 목록입니다.</translation>
</message>
<message>
<source>Strings</source>
@@ -1862,17 +930,17 @@ Skip loading the first named file?</source>
</message>
<message>
<source>File saved.</source>
- <translation>파일이 저장되었습니다.</translation>
+ <translation>파일을 저장했습니다.</translation>
</message>
<message>
<source>Qt message files for released applications (*.qm)
All files (*)</source>
- <translation>배포된 프로그램을 위한 Qt 메시지 파일 (*.qm)
+ <translation>배포된 프로그램용 Qt 메시지 파일 (*.qm)
모든 파일 (*)</translation>
</message>
<message>
<source>File created.</source>
- <translation>파일을 생성하였습니다.</translation>
+ <translation>파일을 생성했습니다.</translation>
</message>
<message>
<source>Printing...</source>
@@ -1880,7 +948,7 @@ All files (*)</source>
</message>
<message>
<source>Context: %1</source>
- <translation>컨텍스트: %1</translation>
+ <translation>콘텍스트: %1</translation>
</message>
<message>
<source>finished</source>
@@ -1896,7 +964,7 @@ All files (*)</source>
</message>
<message>
<source>Printing... (page %1)</source>
- <translation>인쇄 중... (%1쪽)</translation>
+ <translation>인쇄 중...(%1쪽)</translation>
</message>
<message>
<source>Printing completed</source>
@@ -1929,7 +997,7 @@ All files (*)</source>
<message numerus="yes">
<source>Translated %n entry(s)</source>
<translation>
- <numerusform>항목 %n개를 번역하였습니다</numerusform>
+ <numerusform>항목 %n개를 번역했습니다</numerusform>
</translation>
</message>
<message>
@@ -1982,19 +1050,19 @@ All files (*)</source>
</message>
<message>
<source>Unable to launch Qt Assistant (%1)</source>
- <translation>Qt Assistant (%1)를 실행할 수 없습니다</translation>
+ <translation>Qt Assistant(%1)를 실행할 수 없습니다</translation>
</message>
<message>
<source>Version %1</source>
<translation>버전 %1</translation>
</message>
<message>
- <source>&lt;center&gt;&lt;img src=&quot;:/images/splash.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist is a tool for adding translations to Qt applications.&lt;/p&gt;&lt;p&gt;Copyright (C) %2 The Qt Company Ltd.</source>
- <translation>&lt;center&gt;&lt;img src=&quot;:/images/splash.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist는 Qt 프로그램을 번역하는 도구입니다.&lt;/p&gt;&lt;p&gt;저작권자 (C) %2 The Qt Company Ltd.</translation>
+ <source>Qt Linguist is a tool for adding translations to Qt applications.</source>
+ <translation>Qt Linguist는 Qt 프로그램을 번역하는 도구입니다.</translation>
</message>
<message>
- <source>&lt;center&gt;&lt;img src=&quot;:/images/splash.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist is a tool for adding translations to Qt applications.&lt;/p&gt;&lt;p&gt;Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).</source>
- <translation>&lt;center&gt;&lt;img src=&quot;:/images/splash.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist는 Qt 프로그램을 번역하는 도구입니다.&lt;/p&gt;&lt;p&gt;저작권자 (C) 2012 Nokia Corporation and/or its subsidiary(-ies).</translation>
+ <source>Copyright (C) %1 The Qt Company Ltd.</source>
+ <translation>Copyright (C) %1 The Qt Company Ltd.</translation>
</message>
<message>
<source>Do you want to save the modified files?</source>
@@ -2116,6 +1184,12 @@ All files (*)</source>
<source>Do you want to save phrase book &apos;%1&apos;?</source>
<translation>단어장 &apos;%1&apos;을(를) 저장하시겠습니까?</translation>
</message>
+ <message numerus="yes">
+ <source>%n unfinished message(s) left.</source>
+ <translation>
+ <numerusform>미완료 항목 %n개가 남아 있습니다.</numerusform>
+ </translation>
+ </message>
<message>
<source>All</source>
<translation>모두</translation>
@@ -2133,10 +1207,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>
@@ -2160,37 +1230,97 @@ 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>
- <translation></translation>
+ <source>Guesses</source>
+ <translation>추측</translation>
</message>
<message>
- <source>Russian</source>
- <translation>러시아어</translation>
+ <source>Toggles the validity check of accelerators</source>
+ <translation>가속기 키 유효성 검사 활성화/비활성화</translation>
</message>
<message>
- <source>German</source>
- <translation>독일어</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>가속기 키 검사를 켜거나 끕니다. 검사가 켜져 있으면 원문과 번역문의 &amp; 기호 개수가 똑같은지 검사합니다. 검사가 실패하면 경고 창에 메시지를 표시합니다.</translation>
</message>
<message>
- <source>Japanese</source>
- <translation>일본어</translation>
+ <source>Surrounding &amp;Whitespace</source>
+ <translation>둘러싸는 공백 문자(&amp;W)</translation>
</message>
<message>
- <source>French</source>
- <translation>프랑스어</translation>
+ <source>Toggles the validity check of surrounding whitespace.</source>
+ <translation>둘러싸는 공백 문자 검사를 켜거나 끕니다.</translation>
</message>
<message>
- <source>Polish</source>
- <translation>폴란드어</translation>
+ <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>Chinese</source>
- <translation>중국어</translation>
+ <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>Show more</source>
+ <translation>더 보기</translation>
+ </message>
+ <message>
+ <source>Alt++</source>
+ <translation>Alt++</translation>
+ </message>
+ <message>
+ <source>Show fewer</source>
+ <translation>덜 보기</translation>
+ </message>
+ <message>
+ <source>Alt+-</source>
+ <translation>Alt+-</translation>
+ </message>
+ <message>
+ <source>Alt+0</source>
+ <translation>Alt+0</translation>
+ </message>
+ <message>
+ <source>D&amp;one</source>
+ <translation>완료 표시(&amp;O)</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>
+ <translation></translation>
</message>
<message>
<source>This whole panel allows you to view and edit the translation of some source text.</source>
@@ -2206,7 +1336,7 @@ All files (*)</source>
</message>
<message>
<source>Source text (Plural)</source>
- <translation>원본 텍스트 (복수형)</translation>
+ <translation>원본 텍스트(복수형)</translation>
</message>
<message>
<source>This area shows the plural form of the source text.</source>
@@ -2225,22 +1355,22 @@ 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>
- </message>
- <message>
- <source>%1 translation</source>
+ <source>Translation to %1</source>
<translation>%1 번역</translation>
</message>
<message>
- <source>%1 translator comments</source>
+ <source>Translator comments for %1</source>
<translation>%1 역자주</translation>
</message>
<message>
+ <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;
Line: %2</source>
<translation>&apos;%1&apos;
@@ -2259,11 +1389,17 @@ Line: %2</source>
</message>
<message>
<source>&lt;context comment&gt;</source>
- <translation>&lt;컨텍스트 주석&gt;</translation>
+ <translation>&lt;콘텍스트 주석&gt;</translation>
</message>
<message>
<source>&lt;unnamed context&gt;</source>
- <translation>&lt;이름 없는 컨텍스트&gt;</translation>
+ <translation>&lt;이름 없는 콘텍스트&gt;</translation>
+ </message>
+ <message numerus="yes">
+ <source>%n unfinished message(s) left.</source>
+ <translation>
+ <numerusform>미완료 항목 %n개가 남아 있습니다.</numerusform>
+ </translation>
</message>
</context>
<context>
@@ -2391,55 +1527,21 @@ Line: %2</source>
<translation>편집</translation>
</message>
<message>
- <source>Guess (%1)</source>
- <translation>추측 (%1)</translation>
+ <source>Go to</source>
+ <translation>다음으로 이동</translation>
</message>
<message>
- <source>Guess</source>
- <translation>추측</translation>
+ <source>Guess from &apos;%1&apos; (%2)</source>
+ <translation>&apos;%1&apos;에서 추측함(%2)</translation>
+ </message>
+ <message>
+ <source>Guess from &apos;%1&apos;</source>
+ <translation>&apos;%1&apos;에서 추측함</translation>
</message>
</context>
<context>
<name>QObject</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 &apos;단어장&apos;</translation>
- </message>
- <message>
- <source>Qt translation sources (format 1.1)</source>
- <translation>Qt 번역 원본 파일 (1.1 형식)</translation>
- </message>
- <message>
- <source>Qt translation sources (format 2.0)</source>
- <translation>Qt 번역 원본 파일 (2.0 형식)</translation>
- </message>
- <message>
- <source>Qt translation sources (latest format)</source>
- <translation>Qt 번역 원본 파일 (최신 형식)</translation>
- </message>
- <message>
- <source>XLIFF localization files</source>
- <translation>XLIFF 번역 파일</translation>
- </message>
- <message>
- <source>lupdate version %1
-</source>
- <translation>lupdate 버전 %1
-</translation>
- </message>
- <message>
<source>Translation files (%1);;</source>
<translation>번역 파일 (%1);;</translation>
</message>
@@ -2580,6 +1682,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>Settings for &apos;%1&apos; - Qt Linguist</source>
<translation>&apos;%1&apos; 설정 - Qt Linguist</translation>
</message>
diff --git a/translations/linguist_ru.ts b/translations/linguist_ru.ts
index e964ffe..a6f7c9b 100644
--- a/translations/linguist_ru.ts
+++ b/translations/linguist_ru.ts
@@ -121,6 +121,7 @@ Will assume a single universal form.</source>
</message>
<message>
<source>%1 (%2)</source>
+ <extracomment>&lt;language&gt; (&lt;country&gt;)</extracomment>
<translation></translation>
</message>
<message>
diff --git a/translations/qt_help_ca.ts b/translations/qt_help_ca.ts
index 59032ed..8c55393 100644
--- a/translations/qt_help_ca.ts
+++ b/translations/qt_help_ca.ts
@@ -2,26 +2,37 @@
<!DOCTYPE TS>
<TS version="2.1" language="ca">
<context>
+ <name>FilterNameDialogClass</name>
+ <message>
+ <source>Add Filter</source>
+ <translation>Afegeix un filtre</translation>
+ </message>
+ <message>
+ <source>Filter Name:</source>
+ <translation>Nom del filtre:</translation>
+ </message>
+</context>
+<context>
<name>QCLuceneResultWidget</name>
<message>
<source>Search Results</source>
- <translation>Resultat de la cerca</translation>
+ <translation type="vanished">Resultat de la cerca</translation>
</message>
<message>
<source>Note:</source>
- <translation>Nota:</translation>
+ <translation type="vanished">Nota:</translation>
</message>
<message>
<source>The search results may not be complete since the documentation is still being indexed.</source>
- <translation>És possible que els resultats de la cerca no estiguin complets ja que la documentació encara s&apos;està indexant.</translation>
+ <translation type="vanished">És possible que els resultats de la cerca no estiguin complets ja que la documentació encara s&apos;està indexant.</translation>
</message>
<message>
<source>Your search did not match any documents.</source>
- <translation>La cerca no coincideix amb cap document.</translation>
+ <translation type="vanished">La cerca no coincideix amb cap document.</translation>
</message>
<message>
<source>(The reason for this might be that the documentation is still being indexed.)</source>
- <translation>(La raó d&apos;això podria ser que la documentació encara s&apos;està indexant)</translation>
+ <translation type="vanished">(La raó d&apos;això podria ser que la documentació encara s&apos;està indexant)</translation>
</message>
</context>
<context>
@@ -35,11 +46,15 @@
<name>QHelpCollectionHandler</name>
<message>
<source>The collection file &apos;%1&apos; is not set up yet.</source>
+ <translation type="vanished">El fitxer de col·lecció «%1» encara no està configurat.</translation>
+ </message>
+ <message>
+ <source>The collection file &quot;%1&quot; is not set up yet.</source>
<translation>El fitxer de col·lecció «%1» encara no està configurat.</translation>
</message>
<message>
<source>Cannot load sqlite database driver.</source>
- <translation>No s&apos;ha pogut carregar el controlador per a base de dades SQLite.</translation>
+ <translation>No s&apos;ha pogut carregar el controlador per a la base de dades SQLite.</translation>
</message>
<message>
<source>Cannot open collection file: %1</source>
@@ -50,10 +65,46 @@
<translation>No s&apos;han pogut crear les taules al fitxer %1.</translation>
</message>
<message>
- <source>The collection file &apos;%1&apos; already exists.</source>
+ <source>Cannot create index tables in file %1.</source>
+ <translation>No s&apos;han pogut crear les taules d&apos;índex al fitxer %1.</translation>
+ </message>
+ <message>
+ <source>Cannot register index tables in file %1.</source>
+ <translation>No s&apos;han pogut registrar les taules d&apos;índex al fitxer %1.</translation>
+ </message>
+ <message>
+ <source>Cannot unregister index tables in file %1.</source>
+ <translation>No s&apos;han pogut desregistrar les taules d&apos;índex al fitxer %1.</translation>
+ </message>
+ <message>
+ <source>The collection file &quot;%1&quot; already exists.</source>
<translation>El fitxer de col·lecció «%1» ja existeix.</translation>
</message>
<message>
+ <source>Unknown filter &quot;%1&quot;.</source>
+ <translation>Filtre «%1» desconegut.</translation>
+ </message>
+ <message>
+ <source>Invalid documentation file &quot;%1&quot;.</source>
+ <translation>Fitxer de documentació «%1» no vàlid.</translation>
+ </message>
+ <message>
+ <source>Cannot register namespace &quot;%1&quot;.</source>
+ <translation>No s&apos;ha pogut registrar l&apos;espai de noms «%1».</translation>
+ </message>
+ <message>
+ <source>Cannot register virtual folder &apos;%1&apos;.</source>
+ <translation>No s&apos;ha pogut registrar la carpeta virtual «%1».</translation>
+ </message>
+ <message>
+ <source>Version %1</source>
+ <translation>Versió %1</translation>
+ </message>
+ <message>
+ <source>The collection file &apos;%1&apos; already exists.</source>
+ <translation type="vanished">El fitxer de col·lecció «%1» ja existeix.</translation>
+ </message>
+ <message>
<source>Cannot create directory: %1</source>
<translation>No s&apos;ha pogut crear el directori: %1</translation>
</message>
@@ -63,7 +114,7 @@
</message>
<message>
<source>Unknown filter &apos;%1&apos;.</source>
- <translation>Filtre «%1» desconegut.</translation>
+ <translation type="vanished">Filtre «%1» desconegut.</translation>
</message>
<message>
<source>Cannot register filter %1.</source>
@@ -75,7 +126,7 @@
</message>
<message>
<source>Invalid documentation file &apos;%1&apos;.</source>
- <translation>Fitxer de documentació «%1» no vàlid.</translation>
+ <translation type="vanished">Fitxer de documentació «%1» no vàlid.</translation>
</message>
<message>
<source>The namespace %1 was not registered.</source>
@@ -87,11 +138,11 @@
</message>
<message>
<source>Cannot register namespace &apos;%1&apos;.</source>
- <translation>No s&apos;ha pogut registrar l&apos;espai de noms «%1».</translation>
+ <translation type="vanished">No s&apos;ha pogut registrar l&apos;espai de noms «%1».</translation>
</message>
<message>
<source>Cannot open database &apos;%1&apos; to optimize.</source>
- <translation>No s&apos;ha pogut obrir la base de dades «%1» per a optimització.</translation>
+ <translation type="vanished">No s&apos;ha pogut obrir la base de dades «%1» per a optimització.</translation>
</message>
</context>
<context>
@@ -100,6 +151,11 @@
<source>Cannot open database &apos;%1&apos; &apos;%2&apos;: %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 type="vanished">No s&apos;ha pogut obrir la base de dades «%1» «%2»: %3</translation>
+ </message>
+ <message>
+ <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>No s&apos;ha pogut obrir la base de dades «%1» «%2»: %3</translation>
</message>
</context>
@@ -107,149 +163,224 @@
<name>QHelpEngineCore</name>
<message>
<source>Cannot open documentation file %1: %2.</source>
- <translation>No s&apos;ha pogut obrir el fitxer de documentació %1: %2.</translation>
+ <translation type="vanished">No s&apos;ha pogut obrir el fitxer de documentació %1: %2.</translation>
</message>
<message>
<source>The specified namespace does not exist.</source>
- <translation>L&apos;espai de noms especificat no existeix.</translation>
+ <translation type="vanished">L&apos;espai de noms especificat no existeix.</translation>
+ </message>
+</context>
+<context>
+ <name>QHelpFilterSettingsWidget</name>
+ <message>
+ <source>Form</source>
+ <translation>Formulari</translation>
+ </message>
+ <message>
+ <source>Filter</source>
+ <translation>Filtre</translation>
+ </message>
+ <message>
+ <source>Components</source>
+ <translation>Components</translation>
+ </message>
+ <message>
+ <source>Versions</source>
+ <translation>Versions</translation>
+ </message>
+ <message>
+ <source>Add...</source>
+ <translation>Afegeix...</translation>
+ </message>
+ <message>
+ <source>Rename...</source>
+ <translation>Reanomena...</translation>
+ </message>
+ <message>
+ <source>Remove</source>
+ <translation>Elimina</translation>
+ </message>
+ <message>
+ <source>Add Filter</source>
+ <translation>Afegeix un filtre</translation>
+ </message>
+ <message>
+ <source>New Filter</source>
+ <translation>Filtre nou</translation>
+ </message>
+ <message>
+ <source>Rename Filter</source>
+ <translation>Reanomena el filtre</translation>
+ </message>
+ <message>
+ <source>Remove Filter</source>
+ <translation>Elimina el filtre</translation>
+ </message>
+ <message>
+ <source>Are you sure you want to remove the &quot;%1&quot; filter?</source>
+ <translation>Esteu segur que voleu eliminar el filtre «%1»?</translation>
+ </message>
+ <message>
+ <source>Filter Exists</source>
+ <translation>El filtre existeix</translation>
+ </message>
+ <message>
+ <source>The filter &quot;%1&quot; already exists.</source>
+ <translation>El filtre «%1» ja existeix.</translation>
+ </message>
+ <message>
+ <source>No Component</source>
+ <translation>Sense component</translation>
+ </message>
+ <message>
+ <source>Invalid Component</source>
+ <translation>Component no vàlid</translation>
+ </message>
+ <message>
+ <source>No Version</source>
+ <translation>Sense versió</translation>
+ </message>
+ <message>
+ <source>Invalid Version</source>
+ <translation>Versió no vàlida</translation>
</message>
</context>
<context>
<name>QHelpGenerator</name>
<message>
<source>Invalid help data.</source>
- <translation>Dades d&apos;ajuda no vàlides.</translation>
+ <translation type="vanished">Dades d&apos;ajuda no vàlides.</translation>
</message>
<message>
<source>No output file name specified.</source>
- <translation>No s&apos;ha especificat cap nom de fitxer per a la sortida.</translation>
+ <translation type="vanished">No s&apos;ha especificat cap nom de fitxer per a la sortida.</translation>
</message>
<message>
<source>The file %1 cannot be overwritten.</source>
- <translation>El fitxer %1 no es pot sobreecriure.</translation>
+ <translation type="vanished">El fitxer %1 no es pot sobreecriure.</translation>
</message>
<message>
<source>Building up file structure...</source>
- <translation>S&apos;està creant l&apos;estructura del fitxer...</translation>
+ <translation type="vanished">S&apos;està creant l&apos;estructura del fitxer...</translation>
</message>
<message>
<source>Cannot open data base file %1.</source>
- <translation>No s&apos;ha pogut obrir el fitxer de base de dades %1.</translation>
+ <translation type="vanished">No s&apos;ha pogut obrir el fitxer de base de dades %1.</translation>
</message>
<message>
<source>Cannot register namespace %1.</source>
- <translation>No s&apos;ha pogut registrar l&apos;espai de noms %1.</translation>
+ <translation type="vanished">No s&apos;ha pogut registrar l&apos;espai de noms %1.</translation>
</message>
<message>
<source>Insert custom filters...</source>
- <translation>Introduïu els filtres personalitzats...</translation>
+ <translation type="vanished">Introduïu els filtres personalitzats...</translation>
</message>
<message>
<source>Insert help data for filter section (%1 of %2)...</source>
- <translation>Introduïu les dades d&apos;ajuda per a filtrar la selecció (%1 de %2)...</translation>
+ <translation type="vanished">Introduïu les dades d&apos;ajuda per a filtrar la selecció (%1 de %2)...</translation>
</message>
<message>
<source>Documentation successfully generated.</source>
- <translation>La documentació s&apos;ha generat correctament.</translation>
+ <translation type="vanished">La documentació s&apos;ha generat correctament.</translation>
</message>
<message>
<source>Some tables already exist.</source>
- <translation>Algunas taules ja existeixen.</translation>
+ <translation type="vanished">Algunas taules ja existeixen.</translation>
</message>
<message>
<source>Cannot create tables.</source>
- <translation>No s&apos;han pogut crear les taules.</translation>
+ <translation type="vanished">No s&apos;han pogut crear les taules.</translation>
</message>
<message>
<source>Cannot register virtual folder.</source>
- <translation>No s&apos;ha pogut registrar la carpeta virtual.</translation>
+ <translation type="vanished">No s&apos;ha pogut registrar la carpeta virtual.</translation>
</message>
<message>
<source>Insert files...</source>
- <translation>Introduïu els fitxers...</translation>
+ <translation type="vanished">Introduïu els fitxers...</translation>
</message>
<message>
<source>The file %1 does not exist! Skipping it.</source>
- <translation>El fitxer %1 no existeix! S&apos;omet.</translation>
+ <translation type="vanished">El fitxer %1 no existeix! S&apos;omet.</translation>
</message>
<message>
<source>Cannot open file %1! Skipping it.</source>
- <translation>No s&apos;ha pogut obrir el fitxer %1! S&apos;omet.</translation>
+ <translation type="vanished">No s&apos;ha pogut obrir el fitxer %1! S&apos;omet.</translation>
</message>
<message>
<source>The filter %1 is already registered.</source>
- <translation>El filtre %1 ja està registrat.</translation>
+ <translation type="vanished">El filtre %1 ja està registrat.</translation>
</message>
<message>
<source>Cannot register filter %1.</source>
- <translation>No s&apos;ha pogut registrar el filtre %1.</translation>
+ <translation type="vanished">No s&apos;ha pogut registrar el filtre %1.</translation>
</message>
<message>
<source>Insert indices...</source>
- <translation>Introduïu els índexs...</translation>
+ <translation type="vanished">Introduïu els índexs...</translation>
</message>
<message>
<source>Insert contents...</source>
- <translation>Introduïu el contingut...</translation>
+ <translation type="vanished">Introduïu el contingut...</translation>
</message>
<message>
<source>Cannot insert contents.</source>
- <translation>No s&apos;ha pogut introduïr el contingut.</translation>
+ <translation type="vanished">No s&apos;ha pogut introduïr el contingut.</translation>
</message>
<message>
<source>Cannot register contents.</source>
- <translation>No s&apos;ha pogut registrar el contingut.</translation>
+ <translation type="vanished">No s&apos;ha pogut registrar el contingut.</translation>
</message>
<message>
<source>File &apos;%1&apos; does not exist.</source>
- <translation>El fitxer «%1» no existeix.</translation>
+ <translation type="vanished">El fitxer «%1» no existeix.</translation>
</message>
<message>
<source>File &apos;%1&apos; cannot be opened.</source>
- <translation>El fitxer «%1» no es pot obrir.</translation>
+ <translation type="vanished">El fitxer «%1» no es pot obrir.</translation>
</message>
<message>
<source>File &apos;%1&apos; contains an invalid link to file &apos;%2&apos;</source>
- <translation>El fitxer «%1» conté un enllaç no vàlid cap al fitxer «%2»</translation>
+ <translation type="vanished">El fitxer «%1» conté un enllaç no vàlid cap al fitxer «%2»</translation>
</message>
<message>
<source>Invalid links in HTML files.</source>
- <translation>Enllaços no vàlids en els fitxers HTML.</translation>
+ <translation type="vanished">Enllaços no vàlids en els fitxers HTML.</translation>
</message>
</context>
<context>
<name>QHelpProject</name>
<message>
<source>Unknown token in file &quot;%1&quot;.</source>
- <translation>Testimoni desconegut en el fitxer «%1».</translation>
+ <translation type="vanished">Testimoni desconegut en el fitxer «%1».</translation>
</message>
<message>
<source>Unknown token. Expected &quot;QtHelpProject&quot;.</source>
- <translation>Testimoni desconegut. S&apos;esperaba «QtHelpProject».</translation>
+ <translation type="vanished">Testimoni desconegut. S&apos;esperaba «QtHelpProject».</translation>
</message>
<message>
<source>Error in line %1: %2</source>
- <translation>Error a la línia %1: %2</translation>
+ <translation type="vanished">Error a la línia %1: %2</translation>
</message>
<message>
<source>Virtual folder has invalid syntax in file: &quot;%1&quot;</source>
- <translation>La carpeta virtual té una sintaxi no vàlida al fitxer: «%1»</translation>
+ <translation type="vanished">La carpeta virtual té una sintaxi no vàlida al fitxer: «%1»</translation>
</message>
<message>
<source>Namespace &quot;%1&quot; has invalid syntax in file: &quot;%2&quot;</source>
- <translation>L&apos;espai de noms «%1» té una sintaxis no vàlida al fitxer: «%2»</translation>
+ <translation type="vanished">L&apos;espai de noms «%1» té una sintaxis no vàlida al fitxer: «%2»</translation>
</message>
<message>
<source>Missing namespace in QtHelpProject file: &quot;%1&quot;</source>
- <translation>Manca l&apos;espai de noms al fitxer del QtHelpProject: «%1»</translation>
+ <translation type="vanished">Manca l&apos;espai de noms al fitxer del QtHelpProject: «%1»</translation>
</message>
<message>
<source>Missing virtual folder in QtHelpProject file: &quot;%1&quot;</source>
- <translation>Manca la carpeta virtual al fitxer del QtHelpProject: «%1»</translation>
+ <translation type="vanished">Manca la carpeta virtual al fitxer del QtHelpProject: «%1»</translation>
</message>
<message>
<source>The input file %1 could not be opened.</source>
- <translation>El fitxer d&apos;entrada %1 no es pot obrir.</translation>
+ <translation type="vanished">El fitxer d&apos;entrada %1 no es pot obrir.</translation>
</message>
</context>
<context>
@@ -272,27 +403,27 @@
</message>
<message>
<source>Advanced search</source>
- <translation>Cerca avançada</translation>
+ <translation type="vanished">Cerca avançada</translation>
</message>
<message>
<source>words &lt;B&gt;similar&lt;/B&gt; to:</source>
- <translation>paraules &lt;B&gt;similars&lt;/B&gt; a:</translation>
+ <translation type="vanished">paraules &lt;B&gt;similars&lt;/B&gt; a:</translation>
</message>
<message>
<source>&lt;B&gt;without&lt;/B&gt; the words:</source>
- <translation>&lt;B&gt;sense&lt;/B&gt; les paraules:</translation>
+ <translation type="vanished">&lt;B&gt;sense&lt;/B&gt; les paraules:</translation>
</message>
<message>
<source>with &lt;B&gt;exact phrase&lt;/B&gt;:</source>
- <translation>amb la &lt;B&gt;frase exacta&lt;/B&gt;:</translation>
+ <translation type="vanished">amb la &lt;B&gt;frase exacta&lt;/B&gt;:</translation>
</message>
<message>
<source>with &lt;B&gt;all&lt;/B&gt; of the words:</source>
- <translation>amb &lt;B&gt;totes&lt;/B&gt; aquestes paraules:</translation>
+ <translation type="vanished">amb &lt;B&gt;totes&lt;/B&gt; aquestes paraules:</translation>
</message>
<message>
<source>with &lt;B&gt;at least one&lt;/B&gt; of the words:</source>
- <translation>amb &lt;B&gt;almenys una&lt;/B&gt; d&apos;aquestes paraules:</translation>
+ <translation type="vanished">amb &lt;B&gt;almenys una&lt;/B&gt; d&apos;aquestes paraules:</translation>
</message>
</context>
<context>
@@ -309,4 +440,45 @@
<translation>0 - 0 de 0 coincidències</translation>
</message>
</context>
+<context>
+ <name>QOptionsWidget</name>
+ <message>
+ <source>No Option</source>
+ <translation>Sense opció</translation>
+ </message>
+ <message>
+ <source>Invalid Option</source>
+ <translation>Opció no vàlida</translation>
+ </message>
+</context>
+<context>
+ <name>QResultWidget</name>
+ <message>
+ <source>Search Results</source>
+ <translation>Resultat de la cerca</translation>
+ </message>
+ <message>
+ <source>Note:</source>
+ <translation>Nota:</translation>
+ </message>
+ <message>
+ <source>The search results may not be complete since the documentation is still being indexed.</source>
+ <translation>És possible que els resultats de la cerca no estiguin complets ja que la documentació encara s&apos;està indexant.</translation>
+ </message>
+ <message>
+ <source>Your search did not match any documents.</source>
+ <translation>La cerca no coincideix amb cap document.</translation>
+ </message>
+ <message>
+ <source>(The reason for this might be that the documentation is still being indexed.)</source>
+ <translation>(El motiu d&apos;això podria ser que la documentació encara s&apos;està indexant)</translation>
+ </message>
+</context>
+<context>
+ <name>fulltextsearch::qt::QHelpSearchIndexWriter</name>
+ <message>
+ <source>Cannot open database &quot;%1&quot; using connection &quot;%2&quot;: %3</source>
+ <translation>No s&apos;ha pogut obrir la base de dades «%1» usant la connexió «%2»: %3</translation>
+ </message>
+</context>
</TS>
diff --git a/translations/qt_help_de.ts b/translations/qt_help_de.ts
index 828b107..e06d14c 100644
--- a/translations/qt_help_de.ts
+++ b/translations/qt_help_de.ts
@@ -2,6 +2,17 @@
<!DOCTYPE TS>
<TS version="2.1" language="de">
<context>
+ <name>FilterNameDialogClass</name>
+ <message>
+ <source>Add Filter</source>
+ <translation>Filter hinzufügen</translation>
+ </message>
+ <message>
+ <source>Filter Name:</source>
+ <translation>Name des Filters:</translation>
+ </message>
+</context>
+<context>
<name>QHelp</name>
<message>
<source>Untitled</source>
@@ -96,6 +107,81 @@
</message>
</context>
<context>
+ <name>QHelpFilterSettingsWidget</name>
+ <message>
+ <source>Form</source>
+ <translation>Form</translation>
+ </message>
+ <message>
+ <source>Filter</source>
+ <translation>Filter</translation>
+ </message>
+ <message>
+ <source>Components</source>
+ <translation>Komponenten</translation>
+ </message>
+ <message>
+ <source>Versions</source>
+ <translation>Versionen</translation>
+ </message>
+ <message>
+ <source>Add...</source>
+ <translation>Hinzufügen...</translation>
+ </message>
+ <message>
+ <source>Rename...</source>
+ <translation>Umbenennen...</translation>
+ </message>
+ <message>
+ <source>Remove</source>
+ <translation>Löschen</translation>
+ </message>
+ <message>
+ <source>Add Filter</source>
+ <translation>Filter hinzufügen</translation>
+ </message>
+ <message>
+ <source>New Filter</source>
+ <translation>Neuer Filter</translation>
+ </message>
+ <message>
+ <source>Rename Filter</source>
+ <translation>Filter umbenennen</translation>
+ </message>
+ <message>
+ <source>Remove Filter</source>
+ <translation>Filter löschen</translation>
+ </message>
+ <message>
+ <source>Are you sure you want to remove the &quot;%1&quot; filter?</source>
+ <translation>Möchten Sie den Filter &quot;%1&quot; wirklich löschen?</translation>
+ </message>
+ <message>
+ <source>Filter Exists</source>
+ <translation>Filter existiert bereits</translation>
+ </message>
+ <message>
+ <source>The filter &quot;%1&quot; already exists.</source>
+ <translation>Der Filter &quot;%1&quot; existiert bereits.</translation>
+ </message>
+ <message>
+ <source>No Component</source>
+ <translation>Keine Komponente</translation>
+ </message>
+ <message>
+ <source>Invalid Component</source>
+ <translation>Ungültige Komponente</translation>
+ </message>
+ <message>
+ <source>No Version</source>
+ <translation>Keine Version</translation>
+ </message>
+ <message>
+ <source>Invalid Version</source>
+ <translation>Ungültige Version</translation>
+ </message>
+</context>
+<context>
<name>QHelpSearchQueryWidget</name>
<message>
<source>Search for:</source>
@@ -129,6 +215,17 @@
</message>
</context>
<context>
+ <name>QOptionsWidget</name>
+ <message>
+ <source>No Option</source>
+ <translation>Keine Option</translation>
+ </message>
+ <message>
+ <source>Invalid Option</source>
+ <translation>Ungültige Option</translation>
+ </message>
+</context>
+<context>
<name>QResultWidget</name>
<message>
<source>Search Results</source>
diff --git a/translations/qt_help_ko.ts b/translations/qt_help_ko.ts
index ebf8e0b..e459134 100644
--- a/translations/qt_help_ko.ts
+++ b/translations/qt_help_ko.ts
@@ -2,26 +2,14 @@
<!DOCTYPE TS>
<TS version="2.1" language="ko">
<context>
- <name>QCLuceneResultWidget</name>
+ <name>FilterNameDialogClass</name>
<message>
- <source>Search Results</source>
- <translation>검색 결과</translation>
- </message>
- <message>
- <source>Note:</source>
- <translation>메모:</translation>
+ <source>Add Filter</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>
+ <source>Filter Name:</source>
+ <translation>필터 이름:</translation>
</message>
</context>
<context>
@@ -34,7 +22,7 @@
<context>
<name>QHelpCollectionHandler</name>
<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>모음집 파일 &apos;%1&apos;이(가) 설정되지 않았습니다.</translation>
</message>
<message>
@@ -50,8 +38,40 @@
<translation>파일 %1에 테이블을 만들 수 없습니다.</translation>
</message>
<message>
- <source>The collection file &apos;%1&apos; already exists.</source>
- <translation>모음집 파일 &apos;%1&apos;이(가) 이미 존재합니다.</translation>
+ <source>Cannot create index tables in file %1.</source>
+ <translation>파일 %1에 색인 테이블을 만들 수 없습니다.</translation>
+ </message>
+ <message>
+ <source>Cannot register index tables in file %1.</source>
+ <translation>파일 %1의 색인 테이블을 등록할 수 없습니다.</translation>
+ </message>
+ <message>
+ <source>Cannot unregister index tables in file %1.</source>
+ <translation>파일 %1의 색인 테이블을 등록 해제할 수 없습니다.</translation>
+ </message>
+ <message>
+ <source>The collection file &quot;%1&quot; already exists.</source>
+ <translation>모음집 파일 &quot;%1&quot;이(가) 이미 존재합니다.</translation>
+ </message>
+ <message>
+ <source>Unknown filter &quot;%1&quot;.</source>
+ <translation>알 수 없는 필터 &quot;%1&quot;.</translation>
+ </message>
+ <message>
+ <source>Invalid documentation file &quot;%1&quot;.</source>
+ <translation>문서 파일 &quot;%1&quot;이(가) 잘못되었습니다.</translation>
+ </message>
+ <message>
+ <source>Cannot register namespace &quot;%1&quot;.</source>
+ <translation>네임스페이스 &quot;%1&quot;을(를) 등록할 수 없습니다.</translation>
+ </message>
+ <message>
+ <source>Cannot register virtual folder &apos;%1&apos;.</source>
+ <translation>가상 폴더 &apos;%1&apos;을(를) 등록할 수 없습니다.</translation>
+ </message>
+ <message>
+ <source>Version %1</source>
+ <translation>버전 %1</translation>
</message>
<message>
<source>Cannot create directory: %1</source>
@@ -62,10 +82,6 @@
<translation>모음집 파일을 복사할 수 없음: %1</translation>
</message>
<message>
- <source>Unknown filter &apos;%1&apos;.</source>
- <translation>알 수 없는 필터 &apos;%1&apos;.</translation>
- </message>
- <message>
<source>Cannot register filter %1.</source>
<translation>필터 %1을(를) 등록할 수 없습니다.</translation>
</message>
@@ -74,10 +90,6 @@
<translation>문서 파일 %1을(를) 열 수 없습니다.</translation>
</message>
<message>
- <source>Invalid documentation file &apos;%1&apos;.</source>
- <translation>문서 파일 &apos;%1&apos;이(가) 잘못되었습니다.</translation>
- </message>
- <message>
<source>The namespace %1 was not registered.</source>
<translation>네임스페이스 %1이(가) 등록되지 않았습니다.</translation>
</message>
@@ -85,170 +97,88 @@
<source>Namespace %1 already exists.</source>
<translation>네임스페이스 %1이(가) 이미 존재합니다.</translation>
</message>
- <message>
- <source>Cannot register namespace &apos;%1&apos;.</source>
- <translation>네임스페이스 &apos;%1&apos;을(를) 등록할 수 없습니다.</translation>
- </message>
- <message>
- <source>Cannot open database &apos;%1&apos; to optimize.</source>
- <translation>데이터베이스 &apos;%1&apos;을(를) 최적화하기 위하여 열 수 없습니다.</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>
- </message>
-</context>
-<context>
- <name>QHelpEngineCore</name>
- <message>
- <source>Cannot open documentation file %1: %2.</source>
- <translation>문서 파일 %1을(를) 열 수 없음: %2.</translation>
- </message>
- <message>
- <source>The specified namespace does not exist.</source>
- <translation>지정한 네임스페이스가 존재하지 않습니다.</translation>
+ <translation>데이터베이스 &quot;%1&quot; &quot;%2&quot;을(를) 열 수 없음: %3</translation>
</message>
</context>
<context>
- <name>QHelpGenerator</name>
- <message>
- <source>Invalid help data.</source>
- <translation>도움말 데이터가 잘못되었습니다.</translation>
- </message>
- <message>
- <source>No output file name specified.</source>
- <translation>출력 파일 이름이 지정되지 않았습니다.</translation>
- </message>
- <message>
- <source>The file %1 cannot be overwritten.</source>
- <translation>파일 %1에 겹쳐쓸 수 없습니다.</translation>
- </message>
- <message>
- <source>Building up file structure...</source>
- <translation>파일 구조 생성 중...</translation>
- </message>
- <message>
- <source>Cannot open data base file %1.</source>
- <translation>데이터베이스 파일 %1을(를) 열 수 없습니다.</translation>
- </message>
- <message>
- <source>Cannot register namespace %1.</source>
- <translation>네임스페이스 %1을(를) 등록할 수 없습니다.</translation>
- </message>
- <message>
- <source>Insert custom filters...</source>
- <translation>사용자 정의 필터 추가...</translation>
- </message>
+ <name>QHelpFilterSettingsWidget</name>
<message>
- <source>Insert help data for filter section (%1 of %2)...</source>
- <translation>필터 섹션에 도움말 데이터 추가(%2 중 %1)...</translation>
+ <source>Form</source>
+ <translation>폼</translation>
</message>
<message>
- <source>Documentation successfully generated.</source>
- <translation>문서가 성공적으로 생성되었습니다.</translation>
+ <source>Filter</source>
+ <translation>필터</translation>
</message>
<message>
- <source>Some tables already exist.</source>
- <translation>일부 테이블이 이미 존재합니다.</translation>
+ <source>Components</source>
+ <translation>구성 요소</translation>
</message>
<message>
- <source>Cannot create tables.</source>
- <translation>테이블을 만들 수 없습니다.</translation>
+ <source>Versions</source>
+ <translation>버전</translation>
</message>
<message>
- <source>Cannot register virtual folder.</source>
- <translation>가상 폴더를 등록할 수 없습니다.</translation>
+ <source>Add...</source>
+ <translation>추가...</translation>
</message>
<message>
- <source>Insert files...</source>
- <translation>파일 삽입...</translation>
+ <source>Rename...</source>
+ <translation>이름 바꾸기...</translation>
</message>
<message>
- <source>The file %1 does not exist! Skipping it.</source>
- <translation>파일 %1이(가) 존재하지 않습니다! 건너뜁니다.</translation>
+ <source>Remove</source>
+ <translation>삭제</translation>
</message>
<message>
- <source>Cannot open file %1! Skipping it.</source>
- <translation>파일 %1을(를) 열 수 없습니다! 건너뜁니다.</translation>
+ <source>Add Filter</source>
+ <translation>필터 추가</translation>
</message>
<message>
- <source>The filter %1 is already registered.</source>
- <translation>필터 %1이(가) 이미 등록되었습니다.</translation>
+ <source>New Filter</source>
+ <translation>새 필터</translation>
</message>
<message>
- <source>Cannot register filter %1.</source>
- <translation>필터 %1을(를) 등록할 수 없습니다.</translation>
+ <source>Rename Filter</source>
+ <translation>필터 이름 바꾸기</translation>
</message>
<message>
- <source>Insert indices...</source>
- <translation>인덱스 추가...</translation>
+ <source>Remove Filter</source>
+ <translation>필터 삭제</translation>
</message>
<message>
- <source>Insert contents...</source>
- <translation>내용 추가...</translation>
+ <source>Are you sure you want to remove the &quot;%1&quot; filter?</source>
+ <translation>필터 &quot;%1&quot;을(를) 삭제하시겠습니까?</translation>
</message>
<message>
- <source>Cannot insert contents.</source>
- <translation>내용을 추가할 수 없습니다.</translation>
+ <source>Filter Exists</source>
+ <translation>필터 존재함</translation>
</message>
<message>
- <source>Cannot register contents.</source>
- <translation>내용을 등록할 수 없습니다.</translation>
+ <source>The filter &quot;%1&quot; already exists.</source>
+ <translation>필터 &quot;%1&quot;이(가) 이미 존재합니다.</translation>
</message>
<message>
- <source>File &apos;%1&apos; does not exist.</source>
- <translation>파일 &apos;%1&apos;이(가) 존재하지 않습니다.</translation>
+ <source>No Component</source>
+ <translation>구성 요소 없음</translation>
</message>
<message>
- <source>File &apos;%1&apos; cannot be opened.</source>
- <translation>파일 &apos;%1&apos;을(를) 열 수 없습니다.</translation>
+ <source>Invalid Component</source>
+ <translation>잘못된 구성 요소</translation>
</message>
<message>
- <source>File &apos;%1&apos; contains an invalid link to file &apos;%2&apos;</source>
- <translation>파일 &apos;%1&apos;이(가) 파일 &apos;%2&apos;(으)로 가는 올바르지 않은 링크를 포함합니다</translation>
+ <source>No Version</source>
+ <translation>버전 없음</translation>
</message>
<message>
- <source>Invalid links in HTML files.</source>
- <translation>HTML 파일에 잘못된 링크가 있습니다.</translation>
- </message>
-</context>
-<context>
- <name>QHelpProject</name>
- <message>
- <source>Unknown token in file &quot;%1&quot;.</source>
- <translation>파일 &quot;%1&quot;에 알 수 없는 토큰이 있습니다.</translation>
- </message>
- <message>
- <source>Unknown token. Expected &quot;QtHelpProject&quot;.</source>
- <translation>알 수 없는 토큰. &quot;QtHelpProject&quot;를 예상하였습니다.</translation>
- </message>
- <message>
- <source>Error in line %1: %2</source>
- <translation>%1번째 줄에 오류가 있음: %2</translation>
- </message>
- <message>
- <source>Virtual folder has invalid syntax in file: &quot;%1&quot;</source>
- <translation>다음 파일에 있는 가상 폴더 문법이 잘못되었습니다: &quot;%1&quot;</translation>
- </message>
- <message>
- <source>Namespace &quot;%1&quot; has invalid syntax in file: &quot;%2&quot;</source>
- <translation>다음 파일에 있는 네임스페이스 &quot;%1&quot;의 문법이 잘못되었습니다: &quot;%2&quot;</translation>
- </message>
- <message>
- <source>Missing namespace in QtHelpProject file: &quot;%1&quot;</source>
- <translation>QtHelpProject 파일에 네임스페이스가 없습니다: &quot;%1&quot;</translation>
- </message>
- <message>
- <source>Missing virtual folder in QtHelpProject file: &quot;%1&quot;</source>
- <translation>QtHelpProject 파일에 가상 폴더가 없습니다: &quot;%1&quot;</translation>
- </message>
- <message>
- <source>The input file %1 could not be opened.</source>
- <translation>입력 파일 %1을(를) 열 수 없습니다.</translation>
+ <source>Invalid Version</source>
+ <translation>잘못된 버전</translation>
</message>
</context>
<context>
@@ -269,42 +199,59 @@
<source>Search</source>
<translation>찾기</translation>
</message>
+</context>
+<context>
+ <name>QHelpSearchResultWidget</name>
+ <message numerus="yes">
+ <source>%1 - %2 of %n Hits</source>
+ <translation>
+ <numerusform>검색 결과 %n개 중 %1 - %2</numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>0 - 0 of 0 Hits</source>
+ <translation>검색 결과 0개 중 0 - 0</translation>
+ </message>
+</context>
+<context>
+ <name>QOptionsWidget</name>
<message>
- <source>Advanced search</source>
- <translation>고급 검색</translation>
+ <source>No Option</source>
+ <translation>옵션 없음</translation>
</message>
<message>
- <source>words &lt;B&gt;similar&lt;/B&gt; to:</source>
- <translation>다음과 &lt;B&gt;비슷한&lt;/B&gt; 단어:</translation>
+ <source>Invalid Option</source>
+ <translation>잘못된 옵션</translation>
</message>
+</context>
+<context>
+ <name>QResultWidget</name>
<message>
- <source>&lt;B&gt;without&lt;/B&gt; the words:</source>
- <translation>다음 단어 &lt;B&gt;제외&lt;/B&gt;:</translation>
+ <source>Search Results</source>
+ <translation>검색 결과</translation>
+ </message>
+ <message>
+ <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>검색 결과 %n개 중 %1 - %2</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>데이터베이스 &quot;%1&quot;을(를) 연결 &quot;%2&quot;(으)로 열 수 없음: %3</translation>
</message>
</context>
</TS>
diff --git a/translations/qt_help_ru.ts b/translations/qt_help_ru.ts
index 7413321..23849bc 100644
--- a/translations/qt_help_ru.ts
+++ b/translations/qt_help_ru.ts
@@ -2,6 +2,17 @@
<!DOCTYPE TS>
<TS version="2.1" language="ru">
<context>
+ <name>FilterNameDialogClass</name>
+ <message>
+ <source>Add Filter</source>
+ <translation>Добавление фильтра</translation>
+ </message>
+ <message>
+ <source>Filter Name:</source>
+ <translation>Имя фильтра:</translation>
+ </message>
+</context>
+<context>
<name>QHelp</name>
<message>
<source>Untitled</source>
@@ -96,6 +107,81 @@
</message>
</context>
<context>
+ <name>QHelpFilterSettingsWidget</name>
+ <message>
+ <source>Form</source>
+ <translation></translation>
+ </message>
+ <message>
+ <source>Filter</source>
+ <translation>Фильтр</translation>
+ </message>
+ <message>
+ <source>Components</source>
+ <translation>Компоненты</translation>
+ </message>
+ <message>
+ <source>Versions</source>
+ <translation>Версии</translation>
+ </message>
+ <message>
+ <source>Add...</source>
+ <translation>Добавить...</translation>
+ </message>
+ <message>
+ <source>Rename...</source>
+ <translation>Переименовать...</translation>
+ </message>
+ <message>
+ <source>Remove</source>
+ <translation>Удалить</translation>
+ </message>
+ <message>
+ <source>Add Filter</source>
+ <translation>Добавление фильтра</translation>
+ </message>
+ <message>
+ <source>New Filter</source>
+ <translation>Новый фильтр</translation>
+ </message>
+ <message>
+ <source>Rename Filter</source>
+ <translation>Переименование фильтра</translation>
+ </message>
+ <message>
+ <source>Remove Filter</source>
+ <translation>Удаление фильтра</translation>
+ </message>
+ <message>
+ <source>Are you sure you want to remove the &quot;%1&quot; filter?</source>
+ <translation>Удалить фильтр «%1»?</translation>
+ </message>
+ <message>
+ <source>Filter Exists</source>
+ <translation>Фильтр существует</translation>
+ </message>
+ <message>
+ <source>The filter &quot;%1&quot; already exists.</source>
+ <translation>Фильтр «%1» уже существует.</translation>
+ </message>
+ <message>
+ <source>No Component</source>
+ <translation>Без компонента</translation>
+ </message>
+ <message>
+ <source>Invalid Component</source>
+ <translation>Неверный компонент</translation>
+ </message>
+ <message>
+ <source>No Version</source>
+ <translation>Без версии</translation>
+ </message>
+ <message>
+ <source>Invalid Version</source>
+ <translation>Неверная версия</translation>
+ </message>
+</context>
+<context>
<name>QHelpSearchQueryWidget</name>
<message>
<source>Search for:</source>
@@ -130,6 +216,17 @@
</message>
</context>
<context>
+ <name>QOptionsWidget</name>
+ <message>
+ <source>No Option</source>
+ <translation>Без опции</translation>
+ </message>
+ <message>
+ <source>Invalid Option</source>
+ <translation>Неверная опция</translation>
+ </message>
+</context>
+<context>
<name>QResultWidget</name>
<message>
<source>Search Results</source>
diff --git a/translations/qtbase_ca.ts b/translations/qtbase_ca.ts
index 987584d..050a15f 100644
--- a/translations/qtbase_ca.ts
+++ b/translations/qtbase_ca.ts
@@ -40,6 +40,20 @@
</message>
</context>
<context>
+ <name>Print Device Input Slot</name>
+ <message>
+ <source>Automatic</source>
+ <translation>Automàtic</translation>
+ </message>
+</context>
+<context>
+ <name>Print Device Output Bin</name>
+ <message>
+ <source>Automatic</source>
+ <translation>Automàtic</translation>
+ </message>
+</context>
+<context>
<name>QAbstractSocket</name>
<message>
<source>Socket operation timed out</source>
@@ -47,7 +61,7 @@
</message>
<message>
<source>Operation on socket is not supported</source>
- <translation>Operació no admesa en el sòcol</translation>
+ <translation>Operació no admesa al sòcol</translation>
</message>
<message>
<source>Host not found</source>
@@ -318,7 +332,7 @@
<source>Cursor at %1, %2
Press ESC to cancel</source>
<translation>Cursor a %1, %2
-Premeu ESC per cancel·lar</translation>
+Premeu ESC per a cancel·lar</translation>
</message>
<message>
<source>&amp;Pick Screen Color</source>
@@ -374,7 +388,15 @@ Premeu Esc per cancel·lar</translation>
</message>
<message>
<source>Displays this help.</source>
- <translation>Mostra aquesta ajuda.</translation>
+ <translation type="vanished">Mostra aquesta ajuda.</translation>
+ </message>
+ <message>
+ <source>Displays help on commandline options.</source>
+ <translation>Mostra l&apos;ajuda a les opcions de la línia d&apos;ordres.</translation>
+ </message>
+ <message>
+ <source>Displays help including Qt specific options.</source>
+ <translation>Mostra l&apos;ajuda incloent les opcions específiques de les Qt.</translation>
</message>
<message>
<source>Unknown option &apos;%1&apos;.</source>
@@ -532,6 +554,29 @@ Premeu Esc per cancel·lar</translation>
</message>
</context>
<context>
+ <name>QCupsPrinterSupport</name>
+ <message>
+ <source>Authentication Needed</source>
+ <translation>Cal autenticació</translation>
+ </message>
+ <message>
+ <source>Authentication needed to use %1.</source>
+ <translation>Cal autenticació per usar %1.</translation>
+ </message>
+ <message>
+ <source>Authentication needed to use %1 on %2.</source>
+ <translation>Cal autenticació per usar %1 a %2.</translation>
+ </message>
+ <message>
+ <source>Username:</source>
+ <translation>Nom d&apos;usuari:</translation>
+ </message>
+ <message>
+ <source>Password:</source>
+ <translation>Contrasenya:</translation>
+ </message>
+</context>
+<context>
<name>QDB2Driver</name>
<message>
<source>Unable to connect</source>
@@ -793,6 +838,196 @@ Premeu Esc per cancel·lar</translation>
</message>
</context>
<context>
+ <name>QDomParser</name>
+ <message>
+ <source>Error occurred while processing XML declaration</source>
+ <translation>Hi ha hagut un error en processar la declaració XML</translation>
+ </message>
+ <message>
+ <source>Multiple DTD sections are not allowed</source>
+ <translation>No es permeten seccions DTD múltiples</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing document type declaration</source>
+ <translation>Hi ha hagut un error en processar la declaració del tipus de document</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing comment</source>
+ <translation>Hi ha hagut un error en processar un comentari</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing a processing instruction</source>
+ <translation>Hi ha hagut un error en processar una instrucció de processat</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing a start element</source>
+ <translation>Hi ha hagut un error en processar un element d&apos;inici</translation>
+ </message>
+ <message>
+ <source>Unexpected end element &apos;%1&apos;</source>
+ <translation>Element de final «%1» no esperat</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing an end element</source>
+ <translation>Hi ha hagut un error en processar un element de final</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing the element content</source>
+ <translation>Hi ha hagut un error en processar el contingut d&apos;un element</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing comments</source>
+ <translation>Hi ha hagut un error en processar els comentaris</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing an entity reference</source>
+ <translation>Hi ha hagut un error en processar una referència d&apos;entitat</translation>
+ </message>
+ <message>
+ <source>Unexpected token</source>
+ <translation>Testimoni inesperat</translation>
+ </message>
+ <message>
+ <source>Tag mismatch</source>
+ <translation>L&apos;etiqueta no coincideix</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing entity declaration</source>
+ <translation>Hi ha hagut un error en processar la declaració d&apos;entitat</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing notation declaration</source>
+ <translation>Hi ha hagut un error en processar la declaració de notació</translation>
+ </message>
+</context>
+<context>
+ <name>QDtls</name>
+ <message>
+ <source>Invalid (empty) secret</source>
+ <translation>Secret no vàlid (buit)</translation>
+ </message>
+ <message>
+ <source>Multicast and broadcast addresses are not supported</source>
+ <translation>No s&apos;admeten les adreces de multidifusió ni de difusió</translation>
+ </message>
+ <message>
+ <source>Cannot set peer after handshake started</source>
+ <translation>No s&apos;ha pogut establir el parell després d&apos;iniciar la conformitat de connexió</translation>
+ </message>
+ <message>
+ <source>Invalid address</source>
+ <translation>Adreça no vàlida</translation>
+ </message>
+ <message>
+ <source>Cannot set verification name after handshake started</source>
+ <translation>No s&apos;ha pogut establir el nom de verificació després d&apos;iniciar la conformitat de connexió</translation>
+ </message>
+ <message>
+ <source>Cannot set configuration after handshake started</source>
+ <translation>No s&apos;ha pogut establir la configuració després d&apos;iniciar la conformitat de connexió</translation>
+ </message>
+ <message>
+ <source>Cannot start/continue handshake, invalid handshake state</source>
+ <translation>No s&apos;ha pogut iniciar/continuar la conformitat de connexió, estat no vàlid de la conformitat de connexió</translation>
+ </message>
+ <message>
+ <source>Invalid (nullptr) socket</source>
+ <translation>Sòcol no vàlid («nullptr»)</translation>
+ </message>
+ <message>
+ <source>To start a handshake you must set peer&apos;s address and port first</source>
+ <translation>Per iniciar una conformitat de connexió primer cal establir l&apos;adreça i el port del parell</translation>
+ </message>
+ <message>
+ <source>To start a handshake, DTLS server requires non-empty datagram (client hello)</source>
+ <translation>Per iniciar una conformitat de connexió, el servidor DTLS requereix un datagrama no buit («client hello»)</translation>
+ </message>
+ <message>
+ <source>Cannot start handshake, already done/in progress</source>
+ <translation>No s&apos;ha pogut iniciar la conformitat de connexió, ja està feta/en curs</translation>
+ </message>
+ <message>
+ <source>A valid QUdpSocket and non-empty datagram are needed to continue the handshake</source>
+ <translation>Per continuar la conformitat de connexió cal un QUdpSocket vàlid i un datagrama no buit</translation>
+ </message>
+ <message>
+ <source>Cannot continue handshake, not in InProgress state</source>
+ <translation>No s&apos;ha pogut continuar la conformitat de connexió, l&apos;estat no és «InProgress»</translation>
+ </message>
+ <message>
+ <source>Cannot resume, not in VerificationError state</source>
+ <translation>No s&apos;ha pogut continuar, l&apos;estat no és «VerificationError»</translation>
+ </message>
+ <message>
+ <source>No handshake in progress, nothing to abort</source>
+ <translation>No hi ha cap conformitat de connexió en curs, no hi ha res a interrompre</translation>
+ </message>
+ <message>
+ <source>Cannot send shutdown alert, not encrypted</source>
+ <translation>No s&apos;ha pogut enviar l&apos;alerta d&apos;atura, no està encriptada</translation>
+ </message>
+ <message>
+ <source>Cannot write a datagram, not in encrypted state</source>
+ <translation>No s&apos;ha pogut escriure un datagrama, no està en estat encriptada</translation>
+ </message>
+ <message>
+ <source>Cannot read a datagram, not in encrypted state</source>
+ <translation>No s&apos;ha pogut llegir un datagrama, no està en estat encriptada</translation>
+ </message>
+ <message>
+ <source>%1 failed</source>
+ <extracomment>%1: Some function</extracomment>
+ <translation>Ha fallat %1</translation>
+ </message>
+ <message>
+ <source>Invalid SslMode, SslServerMode or SslClientMode expected</source>
+ <translation>SslMode no vàlid, s&apos;esperava SslServerMode o SslClientMode</translation>
+ </message>
+ <message>
+ <source>Invalid protocol version, DTLS protocol expected</source>
+ <translation>Versió no vàlida del protocol, s&apos;esperava el protocol DTLS</translation>
+ </message>
+ <message>
+ <source>BIO_ADD_new failed, cannot start handshake</source>
+ <translation>Ha fallat BIO_ADD_new, no s&apos;ha pogut iniciar la conformitat de connexió</translation>
+ </message>
+ <message>
+ <source>Cannot start the handshake, verified client hello expected</source>
+ <translation>No s&apos;ha pogut iniciar la conformitat de connexió, s&apos;esperava un «client hello» verificat</translation>
+ </message>
+ <message>
+ <source>Peer verification failed</source>
+ <translation>Ha fallat la verificació del parell</translation>
+ </message>
+ <message>
+ <source>The DTLS connection has been closed</source>
+ <translation>S&apos;ha tancat la connexió DTLS</translation>
+ </message>
+ <message>
+ <source>Error while writing: %1</source>
+ <translation>Error en escriure: %1</translation>
+ </message>
+ <message>
+ <source>The DTLS connection has been shutdown</source>
+ <translation>S&apos;ha tancat la connexió DTLS</translation>
+ </message>
+ <message>
+ <source>Error while reading: %1</source>
+ <translation>Error en llegir: %1</translation>
+ </message>
+</context>
+<context>
+ <name>QDtlsClientVerifier</name>
+ <message>
+ <source>A valid UDP socket, non-empty datagram, valid address/port were expected</source>
+ <translation>S&apos;esperava un sòcol UDP vàlid, un datagrama no buit, una adreça/port vàlids</translation>
+ </message>
+ <message>
+ <source>BIO_ADDR_new failed, ignoring client hello</source>
+ <translation>Ha fallat BIO_ADDR_new, s&apos;ignora el «client hello»</translation>
+ </message>
+</context>
+<context>
<name>QErrorMessage</name>
<message>
<source>Debug Message:</source>
@@ -831,7 +1066,7 @@ Premeu Esc per cancel·lar</translation>
</message>
<message>
<source>Source file does not exist.</source>
- <translation>El fitxer origen no existeix.</translation>
+ <translation>El fitxer d&apos;origen no existeix.</translation>
</message>
<message>
<source>Destination file exists</source>
@@ -855,7 +1090,7 @@ Premeu Esc per cancel·lar</translation>
</message>
<message>
<source>Cannot remove source file</source>
- <translation>No s&apos;ha pogut eliminar el fitxer origen</translation>
+ <translation>No s&apos;ha pogut eliminar el fitxer d&apos;origen</translation>
</message>
<message>
<source>Cannot open destination file: %1</source>
@@ -866,8 +1101,12 @@ Premeu Esc per cancel·lar</translation>
<translation>No s&apos;ha pogut obrir %1 per entrada</translation>
</message>
<message>
+ <source>Cannot open for output: %1</source>
+ <translation>No s&apos;ha pogut obrir per sortida: %1</translation>
+ </message>
+ <message>
<source>Cannot open for output</source>
- <translation>No s&apos;ha pogut obrir per sortida</translation>
+ <translation type="vanished">No s&apos;ha pogut obrir per sortida</translation>
</message>
<message>
<source>Failure to write block</source>
@@ -1560,6 +1799,74 @@ El voleu suprimir igualment?</translation>
<comment>Translate this string to the string &apos;LTR&apos; in left-to-right languages or to &apos;RTL&apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment>
<translation>LTR</translation>
</message>
+ <message>
+ <source>QPA plugin. See QGuiApplication documentation for available options for each plugin.</source>
+ <translation>Connector QPA. Vegeu la documentació de QGuiApplication per a les opcions disponibles de cada connector.</translation>
+ </message>
+ <message>
+ <source>Path to the platform plugins.</source>
+ <translation>Camí als connectors de la plataforma.</translation>
+ </message>
+ <message>
+ <source>Platform theme.</source>
+ <translation>Tema de la plataforma.</translation>
+ </message>
+ <message>
+ <source>Additional plugins to load, can be specified multiple times.</source>
+ <translation>Connectors addicionals a carregar, es poden especificar diverses vegades.</translation>
+ </message>
+ <message>
+ <source>Window geometry for the main window, using the X11-syntax, like 100x100+50+50.</source>
+ <translation>Geometria de finestra de la finestra principal, usant la sintaxi X11, com 100x100+50+50.</translation>
+ </message>
+ <message>
+ <source>Default window icon.</source>
+ <translation>Icona predeterminada de la finestra.</translation>
+ </message>
+ <message>
+ <source>Title of the first window.</source>
+ <translation>Títol de la primera finestra.</translation>
+ </message>
+ <message>
+ <source>Sets the application&apos;s layout direction to Qt::RightToLeft (debugging helper).</source>
+ <translation>Estableix la direcció de la disposició de l&apos;aplicació a Qt::RightToLeft (ajudant de depuració).</translation>
+ </message>
+ <message>
+ <source>Restores the application from an earlier session.</source>
+ <translation>Restaura l&apos;aplicació d&apos;una sessió anterior.</translation>
+ </message>
+ <message>
+ <source>Display name, overrides $DISPLAY.</source>
+ <translation>Nom de la pantalla, sobreescriu $DISPLAY.</translation>
+ </message>
+ <message>
+ <source>Instance name according to ICCCM 4.1.2.5.</source>
+ <translation>Nom d&apos;instància d&apos;acord amb ICCCM 4.1.2.5.</translation>
+ </message>
+ <message>
+ <source>Disable mouse grabbing (useful in debuggers).</source>
+ <translation>Desactiva la captura del ratolí (útil als depuradors).</translation>
+ </message>
+ <message>
+ <source>Force mouse grabbing (even when running in a debugger).</source>
+ <translation>Força la captura del ratolí (inclús en executar a un depurador).</translation>
+ </message>
+ <message>
+ <source>ID of the X11 Visual to use.</source>
+ <translation>ID de la «Visual» X11 a usar.</translation>
+ </message>
+ <message>
+ <source>Alias for --windowgeometry.</source>
+ <translation>Àlies de --windowgeometry.</translation>
+ </message>
+ <message>
+ <source>Alias for --windowicon.</source>
+ <translation>Àlies de --windowicon.</translation>
+ </message>
+ <message>
+ <source>Alias for --windowtitle.</source>
+ <translation>Àlies de --windowtitle.</translation>
+ </message>
</context>
<context>
<name>QHostInfo</name>
@@ -1596,7 +1903,7 @@ El voleu suprimir igualment?</translation>
</message>
<message>
<source>Unknown error (%1)</source>
- <translation>Error desconegut (%1)</translation>
+ <translation type="vanished">Error desconegut (%1)</translation>
</message>
</context>
<context>
@@ -1787,7 +2094,7 @@ El voleu suprimir igualment?</translation>
</message>
<message>
<source>No space left on device</source>
- <translation>No queda espai en el dispositiu</translation>
+ <translation>No queda espai al dispositiu</translation>
</message>
<message>
<source>file to open is a directory</source>
@@ -1837,7 +2144,7 @@ El voleu suprimir igualment?</translation>
</message>
<message>
<source>Device not writable</source>
- <translation>No es pot escriure en el dispositiu</translation>
+ <translation>No es pot escriure al dispositiu</translation>
</message>
<message>
<source>Unsupported image format</source>
@@ -2029,7 +2336,7 @@ El voleu suprimir igualment?</translation>
</message>
<message>
<source>Cannot resolve symbol &quot;%1&quot; in %2: %3</source>
- <translation>No s&apos;ha pogut resoldre el símbol «%1» en %2: %3</translation>
+ <translation type="vanished">No s&apos;ha pogut resoldre el símbol «%1» en %2: %3</translation>
</message>
<message>
<source>&apos;%1&apos; is not a valid Mach-O binary (%2)</source>
@@ -2045,7 +2352,7 @@ El voleu suprimir igualment?</translation>
</message>
<message>
<source>no suitable architecture in fat binary</source>
- <translation>no hi ha cap arquitectura apropiada en el «fat binary»</translation>
+ <translation>no hi ha cap arquitectura apropiada al «fat binary»</translation>
</message>
<message>
<source>invalid magic %1</source>
@@ -2150,7 +2457,7 @@ El voleu suprimir igualment?</translation>
</message>
<message>
<source>%1: The socket operation is not supported</source>
- <translation>%1: Operació no admesa en el sòcol</translation>
+ <translation>%1: Operació no admesa al sòcol</translation>
</message>
<message>
<source>%1: Operation not permitted when socket is in this state</source>
@@ -2340,8 +2647,13 @@ El voleu suprimir igualment?</translation>
<translation>Oculta els detalls...</translation>
</message>
<message>
+ <source>&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across all major desktop operating systems. It is also available for embedded Linux and other embedded and mobile operating systems.&lt;/p&gt;&lt;p&gt;Qt is available under multiple licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of GNU (L)GPL.&lt;/p&gt;&lt;p&gt;Qt licensed under GNU (L)GPL is appropriate for the development of Qt&amp;nbsp;applications provided you can comply with the terms and conditions of the respective licenses.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) %1 The Qt Company Ltd and other contributors.&lt;/p&gt;&lt;p&gt;Qt and the Qt logo are trademarks of The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt is The Qt Company Ltd product developed as an open source project. See &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; for more information.&lt;/p&gt;</source>
+ <extracomment>Leave this text untranslated or include a verbatim copy of it below and note that it is the authoritative version in case of doubt.</extracomment>
+ <translation>&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across all major desktop operating systems. It is also available for embedded Linux and other embedded and mobile operating systems.&lt;/p&gt;&lt;p&gt;Qt is available under multiple licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of GNU (L)GPL.&lt;/p&gt;&lt;p&gt;Qt licensed under GNU (L)GPL is appropriate for the development of Qt&amp;nbsp;applications provided you can comply with the terms and conditions of the respective licenses.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) %1 The Qt Company Ltd and other contributors.&lt;/p&gt;&lt;p&gt;Qt and the Qt logo are trademarks of The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt is The Qt Company Ltd product developed as an open source project. See &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; for more information.&lt;/p&gt;</translation>
+ </message>
+ <message>
<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;Les Qt són un conjunt d&apos;eines C++ pel desenvolupament d&apos;aplicacions multiplataforma.&lt;/p&gt;&lt;p&gt;Les Qt proporcionen portabilitat amb un codi font únic entre els principals sistemes operatius. Les Qt també són disponibles per a Linux incrustat i sistemes operatius incrustats i mòbils.&lt;/p&gt;&lt;p&gt;Les Qt estan disponibles en tres opcions de llicència diferents dissenyades per adaptar-se a les necessitats dels diversos usuaris.&lt;/p&gt;&lt;p&gt;Les Qt llicenciades sota el nostre acord de llicència comercial són apropiades per al desenvolupament de programari propietari/comercial a on no voleu compartir cap codi font amb terceres parts o no podeu complir amb els termes de la versió 3 de la LGPL de la GNU.&lt;/p&gt;&lt;p&gt;Les Qt llicenciades sota la versió 3 de la LGPL de la GNU són apropiades per al desenvolupament d&apos;aplicacions Qt quan podeu complir amb els termes i condicions de la versió 3 de la LGPL de la GNU.&lt;/p&gt;&lt;p&gt;Si us plau, vegeu a &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; un resum de les llicències de les Qt.&lt;/p&gt;&lt;p&gt;Copyright (C) %1 The Qt Company Ltd i altres col·laboradors.&lt;/p&gt;&lt;p&gt;Les Qt i el logotip de les Qt són marques comercials de The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Les Qt són un producte de The Qt Company Ltd desenvolupat com un projecte de codi font obert. Vegeu &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; per a més informació.&lt;/p&gt;</translation>
+ <translation type="vanished">&lt;p&gt;Les Qt són un conjunt d&apos;eines C++ pel desenvolupament d&apos;aplicacions multiplataforma.&lt;/p&gt;&lt;p&gt;Les Qt proporcionen portabilitat amb un codi font únic entre els principals sistemes operatius. Les Qt també són disponibles per a Linux incrustat i sistemes operatius incrustats i mòbils.&lt;/p&gt;&lt;p&gt;Les Qt estan disponibles en tres opcions de llicència diferents dissenyades per adaptar-se a les necessitats dels diversos usuaris.&lt;/p&gt;&lt;p&gt;Les Qt llicenciades sota el nostre acord de llicència comercial són apropiades per al desenvolupament de programari propietari/comercial a on no voleu compartir cap codi font amb terceres parts o no podeu complir amb els termes de la versió 3 de la LGPL de la GNU.&lt;/p&gt;&lt;p&gt;Les Qt llicenciades sota la versió 3 de la LGPL de la GNU són apropiades per al desenvolupament d&apos;aplicacions Qt quan podeu complir amb els termes i condicions de la versió 3 de la LGPL de la GNU.&lt;/p&gt;&lt;p&gt;Si us plau, vegeu a &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; un resum de les llicències de les Qt.&lt;/p&gt;&lt;p&gt;Copyright (C) %1 The Qt Company Ltd i altres col·laboradors.&lt;/p&gt;&lt;p&gt;Les Qt i el logotip de les Qt són marques comercials de The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Les Qt són un producte de The Qt Company Ltd desenvolupat com un projecte de codi font obert. Vegeu &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; per a més informació.&lt;/p&gt;</translation>
</message>
<message>
<source>OK</source>
@@ -2445,7 +2757,7 @@ applications where you wish to use such applications in combination with softwar
</message>
<message>
<source>Datagram was too large to send</source>
- <translation>El datagrama era massa gran per enviar-lo</translation>
+ <translation>El datagrama era massa gran per a enviar-lo</translation>
</message>
<message>
<source>Unable to send a message</source>
@@ -2465,7 +2777,7 @@ applications where you wish to use such applications in combination with softwar
</message>
<message>
<source>Another socket is already listening on the same port</source>
- <translation>Ja hi ha un altre sòcol escoltant en el mateix port</translation>
+ <translation>Ja hi ha un altre sòcol escoltant al mateix port</translation>
</message>
<message>
<source>Operation on non-socket</source>
@@ -2525,7 +2837,7 @@ applications where you wish to use such applications in combination with softwar
<name>QNetworkAccessFileBackend</name>
<message>
<source>Request for opening non-local file %1</source>
- <translation>Sol·licitud per obrir el fitxer no local %1</translation>
+ <translation>Sol·licitud per a obrir el fitxer no local %1</translation>
</message>
<message>
<source>Error opening %1: %2</source>
@@ -2782,11 +3094,11 @@ applications where you wish to use such applications in combination with softwar
<name>QPPDOptionsModel</name>
<message>
<source>Name</source>
- <translation>Nom</translation>
+ <translation type="vanished">Nom</translation>
</message>
<message>
<source>Value</source>
- <translation>Valor</translation>
+ <translation type="vanished">Valor</translation>
</message>
</context>
<context>
@@ -3632,7 +3944,15 @@ applications where you wish to use such applications in combination with softwar
</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 no segueix la sintaxi correcta. Useu «,» per separar intervals i pàgines, «-» per definir intervals, i assegureu-vos que els intervals no se sobreposen entre ells.</translation>
+ <translation>%1 no segueix la sintaxi correcta. Useu «,» per a separar intervals i pàgines, «-» per a definir intervals, i assegureu-vos que els intervals no se sobreposen entre ells.</translation>
+ </message>
+ <message>
+ <source>Duplex Settings Conflicts</source>
+ <translation>Conflictes a la configuració d&apos;impressió a doble cara</translation>
+ </message>
+ <message>
+ <source>There are conflicts in duplex settings. Do you want to fix them?</source>
+ <translation>Hi ha conflictes a la configuració d&apos;impressió a doble cara. Els voleu corregir?</translation>
</message>
<message>
<source>Print to File (PDF)</source>
@@ -3659,7 +3979,7 @@ Si us plau, seleccioneu un nom de fitxer diferent.</translation>
<message>
<source>File %1 is not writable.
Please choose a different file name.</source>
- <translation>No es pot escriure en el fitxer %1.
+ <translation>No es pot escriure al fitxer %1.
Si us plau, seleccioneu un nom de fitxer diferent.</translation>
</message>
<message>
@@ -3684,7 +4004,7 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>Automatic</source>
- <translation>Automàtic</translation>
+ <translation type="vanished">Automàtic</translation>
</message>
</context>
<context>
@@ -3777,6 +4097,14 @@ Desactiveu una de les dues opcions.</translation>
<translation>Opcions del treball</translation>
</message>
<message>
+ <source>Page Setup Conflicts</source>
+ <translation>Conflictes de configuració de pàgina</translation>
+ </message>
+ <message>
+ <source>There are conflicts in page setup options. Do you want to fix them?</source>
+ <translation>Hi ha conflictes a les opcions de configuració de pàgina. Els voleu solucionar?</translation>
+ </message>
+ <message>
<source>Advanced Option Conflicts</source>
<translation>Conflictes d&apos;opcions avançades</translation>
</message>
@@ -3876,19 +4204,19 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>Duplex Printing</source>
- <translation>Impressió doble</translation>
+ <translation type="vanished">Impressió doble</translation>
</message>
<message>
<source>None</source>
- <translation>Cap</translation>
+ <translation type="vanished">Cap</translation>
</message>
<message>
<source>Long side</source>
- <translation>Vora llarga</translation>
+ <translation type="vanished">Vora llarga</translation>
</message>
<message>
<source>Short side</source>
- <translation>Vora curta</translation>
+ <translation type="vanished">Vora curta</translation>
</message>
<message>
<source>Pages</source>
@@ -3898,6 +4226,22 @@ Desactiveu una de les dues opcions.</translation>
<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>Especifiqueu les pàgines o intervals separats per comes. Els intervals s&apos;especifiquen amb dos nombres separats per un guió. P. ex: 3,5-7,9 imprimeix les pàgines 3, 5, 6, 7 i 9.</translation>
</message>
+ <message>
+ <source>Double Sided Printing</source>
+ <translation>Impressió a doble cara</translation>
+ </message>
+ <message>
+ <source>Off</source>
+ <translation>Inactiva</translation>
+ </message>
+ <message>
+ <source>Long side binding</source>
+ <translation>Enquadernació per la vora llarga</translation>
+ </message>
+ <message>
+ <source>Short side binding</source>
+ <translation>Enquadernació per la vora curta</translation>
+ </message>
</context>
<context>
<name>QPrintWidget</name>
@@ -4085,23 +4429,23 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>numbers out of order in {} quantifier</source>
- <translation>nombres fora de l&apos;interval en el quantificador {}</translation>
+ <translation>nombres fora de l&apos;interval al quantificador {}</translation>
</message>
<message>
<source>number too big in {} quantifier</source>
- <translation>nombre massa gran en el quantificador {}</translation>
+ <translation>nombre massa gran al quantificador {}</translation>
</message>
<message>
<source>missing terminating ] for character class</source>
- <translation>manca la terminació ] en la classe caràcter</translation>
+ <translation>manca la terminació ] a la classe caràcter</translation>
</message>
<message>
<source>invalid escape sequence in character class</source>
- <translation>seqüència d&apos;escapada no vàlida en la classe caràcter</translation>
+ <translation type="vanished">seqüència d&apos;escapada no vàlida en la classe caràcter</translation>
</message>
<message>
<source>range out of order in character class</source>
- <translation>fora d&apos;interval en la classe caràcter</translation>
+ <translation>fora d&apos;interval a la classe caràcter</translation>
</message>
<message>
<source>nothing to repeat</source>
@@ -4165,11 +4509,11 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>malformed number or name after (?(</source>
- <translation>nombre o nom amb format incorrecte després de (?(</translation>
+ <translation type="vanished">nombre o nom amb format incorrecte després de (?(</translation>
</message>
<message>
<source>conditional group contains more than two branches</source>
- <translation>un grup condicional conté més de dues branques</translation>
+ <translation type="vanished">un grup condicional conté més de dues branques</translation>
</message>
<message>
<source>assertion expected after (?(</source>
@@ -4177,7 +4521,7 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>(?R or (?[+-]digits must be followed by )</source>
- <translation>(?R o (?[+-]digits ha d&apos;anar seguit per )</translation>
+ <translation type="vanished">(?R o (?[+-]digits ha d&apos;anar seguit per )</translation>
</message>
<message>
<source>unknown POSIX class name</source>
@@ -4197,7 +4541,7 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>invalid condition (?(0)</source>
- <translation>condició no vàlida (?(0)</translation>
+ <translation type="vanished">condició no vàlida (?(0)</translation>
</message>
<message>
<source>\C not allowed in lookbehind assertion</source>
@@ -4205,7 +4549,7 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>PCRE does not support \L, \l, \N{name}, \U, or \u</source>
- <translation>PCRE no accepta \L, \l, \N{nom}, \U, ni \u</translation>
+ <translation type="vanished">PCRE no accepta \L, \l, \N{nom}, \U, ni \u</translation>
</message>
<message>
<source>number after (?C is &gt; 255</source>
@@ -4225,7 +4569,7 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>syntax error in subpattern name (missing terminator)</source>
- <translation>error de sintaxi en nom de subpatró (manca terminació)</translation>
+ <translation type="vanished">error de sintaxi en nom de subpatró (manca terminació)</translation>
</message>
<message>
<source>two named subpatterns have the same name</source>
@@ -4253,7 +4597,7 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>too many named subpatterns (maximum 10000)</source>
- <translation type="vanished">hi ha massa subpatrons amb nom (màxim 10000)</translation>
+ <translation>hi ha massa subpatrons amb nom (màxim 10000)</translation>
</message>
<message>
<source>octal value is greater than \377 (not in UTF-8 mode)</source>
@@ -4269,7 +4613,7 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>DEFINE group contains more than one branch</source>
- <translation>el grup DEFINE conté més d&apos;una branca</translation>
+ <translation type="vanished">el grup DEFINE conté més d&apos;una branca</translation>
</message>
<message>
<source>repeating a DEFINE group is not allowed</source>
@@ -4285,11 +4629,11 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>a numbered reference must not be zero</source>
- <translation>una referència amb número no pot ser zero</translation>
+ <translation type="vanished">una referència amb número no pot ser zero</translation>
</message>
<message>
<source>an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)</source>
- <translation>no es permet cap argument per (*ACCEPT), (*FAIL), o (*COMMIT)</translation>
+ <translation type="vanished">no es permet cap argument per (*ACCEPT), (*FAIL), o (*COMMIT)</translation>
</message>
<message>
<source>(*VERB) not recognized</source>
@@ -4297,7 +4641,7 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>number is too big</source>
- <translation>nombre massa gran</translation>
+ <translation type="vanished">nombre massa gran</translation>
</message>
<message>
<source>subpattern name expected</source>
@@ -4305,7 +4649,7 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>digit expected after (?+</source>
- <translation>s&apos;esperava un dígit després de (?+</translation>
+ <translation type="vanished">s&apos;esperava un dígit després de (?+</translation>
</message>
<message>
<source>] is an invalid data character in JavaScript compatibility mode</source>
@@ -4333,7 +4677,7 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>internal error: unknown opcode in find_fixedlength()</source>
- <translation>error intern: «opcode» desconegut en «find_fixedlength()»</translation>
+ <translation type="vanished">error intern: «opcode» desconegut en «find_fixedlength()»</translation>
</message>
<message>
<source>\N is not supported in a class</source>
@@ -4376,6 +4720,54 @@ Desactiveu una de les dues opcions.</translation>
<translation>caràcter no octal en \o{} (manca la clau de tancament?)</translation>
</message>
<message>
+ <source>escape sequence is invalid in character class</source>
+ <translation>seqüència d&apos;escapada no és vàlida a la classe caràcter</translation>
+ </message>
+ <message>
+ <source>missing closing parenthesis for condition</source>
+ <translation>manca el parèntesi de tancament a la condició</translation>
+ </message>
+ <message>
+ <source>a relative value of zero is not allowed</source>
+ <translation>no es permet un valor relatiu de zero</translation>
+ </message>
+ <message>
+ <source>conditional subpattern contains more than two branches</source>
+ <translation>el subpatró condicional conté més de dues branques</translation>
+ </message>
+ <message>
+ <source>digit expected after (?+ or (?-</source>
+ <translation>s&apos;esperava un dígit després de (?+ o (?-</translation>
+ </message>
+ <message>
+ <source>lookbehind is too complicated</source>
+ <translation>el «lookbehind» és massa complicat</translation>
+ </message>
+ <message>
+ <source>\C is not allowed in a lookbehind assertion in UTF-16 mode</source>
+ <translation>no es permet \C en una asserció «lookbehind» en mode UTF-16</translation>
+ </message>
+ <message>
+ <source>PCRE2 does not support \F, \L, \l, \N{name}, \U, or \u</source>
+ <translation>PCRE2 no admet \F, \L, \l, \N{nom}, \U, or \u</translation>
+ </message>
+ <message>
+ <source>syntax error in subpattern name (missing terminator?)</source>
+ <translation>error de sintaxi al nom de subpatró (manca un terminador?)</translation>
+ </message>
+ <message>
+ <source>subpattern name must start with a non-digit</source>
+ <translation>el nom del subpatró ha de començar per un no dígit</translation>
+ </message>
+ <message>
+ <source>subpattern name is too long (maximum 32 code units)</source>
+ <translation>el nom de subpatró és massa llarg (màxim 32 unitats de codi)</translation>
+ </message>
+ <message>
+ <source>DEFINE subpattern contains more than one branch</source>
+ <translation>el subpatró DEFINE conté més d&apos;una branca</translation>
+ </message>
+ <message>
<source>missing opening brace after \o</source>
<translation>manca una clau d&apos;obertura després de \o</translation>
</message>
@@ -4385,11 +4777,11 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>invalid range in character class</source>
- <translation>interval no vàlid en la classe caràcter</translation>
+ <translation>interval no vàlid a la classe caràcter</translation>
</message>
<message>
<source>group name must start with a non-digit</source>
- <translation>el nom del grup ha de començar sense un dígit</translation>
+ <translation type="vanished">el nom del grup ha de començar sense un dígit</translation>
</message>
<message>
<source>quantifier does not follow a repeatable item</source>
@@ -4421,7 +4813,7 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>letter or underscore expected after (?&lt; or (?&apos;</source>
- <translation>s&apos;espera una lletra o un subratllat després de (?&lt; o (?&apos;</translation>
+ <translation type="vanished">s&apos;espera una lletra o un subratllat després de (?&lt; o (?&apos;</translation>
</message>
<message>
<source>assertion expected after (?( or (?(?C)</source>
@@ -4445,7 +4837,7 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>\C is not allowed in a lookbehind assertion</source>
- <translation>\C no es permet en una asserció «lookbehind»</translation>
+ <translation type="vanished">\C no es permet en una asserció «lookbehind»</translation>
</message>
<message>
<source>number after (?C is greater than 255</source>
@@ -4469,11 +4861,11 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>subpattern name is too long (maximum 10000 characters)</source>
- <translation>el nom de subpatró és massa llarg (màxim 10000 caràcters)</translation>
+ <translation type="vanished">el nom de subpatró és massa llarg (màxim 10000 caràcters)</translation>
</message>
<message>
<source>too many named subpatterns (maximum 256)</source>
- <translation>hi ha massa subpatrons amb nom (màxim 256)</translation>
+ <translation type="vanished">hi ha massa subpatrons amb nom (màxim 256)</translation>
</message>
<message>
<source>octal value is greater than \377 in 8-bit non-UTF-8 mode</source>
@@ -4484,10 +4876,26 @@ Desactiveu una de les dues opcions.</translation>
<translation>error intern: paràmetre desconegut de línia nova</translation>
</message>
<message>
+ <source>(?R (recursive pattern call) must be followed by a closing parenthesis</source>
+ <translation>(?R (crida recursiva de patró) cal que estigui seguida per una parèntesi de tancament</translation>
+ </message>
+ <message>
+ <source>obsolete error (should not occur)</source>
+ <translation>error obsolet (no hauria d&apos;ocórrer)</translation>
+ </message>
+ <message>
<source>(*VERB) not recognized or malformed</source>
<translation>(*VERB) no es reconeix o amb format incorrecte</translation>
</message>
<message>
+ <source>subpattern number is too big</source>
+ <translation>el nombre de subpatrons és massa gran</translation>
+ </message>
+ <message>
+ <source>internal error: parsed pattern overflow</source>
+ <translation>error intern: desbordament de patró analitzat</translation>
+ </message>
+ <message>
<source>\c must be followed by a printable ASCII character</source>
<translation>\c ha d&apos;anar seguit d&apos;un caràcter ASCII imprimible</translation>
</message>
@@ -4497,7 +4905,7 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>SPARE ERROR</source>
- <translation>ERROR DE RESERVA</translation>
+ <translation type="vanished">ERROR DE RESERVA</translation>
</message>
<message>
<source>using UTF is disabled by the application</source>
@@ -4513,11 +4921,27 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>digits missing in \x{} or \o{}</source>
- <translation>manquen els dígits a\x{} o \o{}</translation>
+ <translation type="vanished">manquen els dígits a\x{} o \o{}</translation>
</message>
<message>
<source>syntax error in (?(VERSION condition</source>
- <translation>error de sintaxi a la condició (?(VERSION</translation>
+ <translation type="vanished">error de sintaxi a la condició (?(VERSION</translation>
+ </message>
+ <message>
+ <source>internal error: unknown meta code in check_lookbehinds()</source>
+ <translation>error intern: codi «meta» desconegut a «check_lookbehinds()»</translation>
+ </message>
+ <message>
+ <source>callout string is too long</source>
+ <translation>la cadena de crida és massa gran</translation>
+ </message>
+ <message>
+ <source>digits missing in \x{} or \o{} or \N{U+}</source>
+ <translation>manquen dígits a \x{} o \o{} o \N{U+}</translation>
+ </message>
+ <message>
+ <source>syntax error or number too big in (?(VERSION condition</source>
+ <translation>error de sintaxi o un nombre massa gran a la condició (?(VERSION</translation>
</message>
<message>
<source>internal error: unknown opcode in auto_possessify()</source>
@@ -4525,7 +4949,7 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>missing terminating delimiter for callout with string argument</source>
- <translation>Manca el delimitador de terminació de crida amb un argument de cadena</translation>
+ <translation>manca el delimitador de terminació de crida amb un argument de cadena</translation>
</message>
<message>
<source>unrecognized string delimiter follows (?C</source>
@@ -4556,6 +4980,46 @@ Desactiveu una de les dues opcions.</translation>
<translation>la cadena del patró és més gran que el límit definit per l&apos;aplicació</translation>
</message>
<message>
+ <source>internal error: unknown code in parsed pattern</source>
+ <translation>error intern: codi desconegut a un patró analitzat</translation>
+ </message>
+ <message>
+ <source>internal error: bad code value in parsed_skip()</source>
+ <translation>error intern: valor incorrecte de codi a «parsed_skip()»</translation>
+ </message>
+ <message>
+ <source>PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES is not allowed in UTF-16 mode</source>
+ <translation>no es permet PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES en el mode UTF-16</translation>
+ </message>
+ <message>
+ <source>invalid option bits with PCRE2_LITERAL</source>
+ <translation>bits no vàlids d&apos;opció amb PCRE2_LITERAL</translation>
+ </message>
+ <message>
+ <source>\N{U+dddd} is supported only in Unicode (UTF) mode</source>
+ <translation>\N{U+dddd} només s&apos;admet en el mode Unicode (UTF)</translation>
+ </message>
+ <message>
+ <source>invalid hyphen in option setting</source>
+ <translation>guió no vàlid a la definició d&apos;opció</translation>
+ </message>
+ <message>
+ <source>(*alpha_assertion) not recognized</source>
+ <translation>(*alpha_assertion) no es reconeix</translation>
+ </message>
+ <message>
+ <source>script runs require Unicode support, which this version of PCRE2 does not have</source>
+ <translation>l&apos;execució de l&apos;script requereix admetre l&apos;Unicode, que aquesta versió del PCRE2 no ho fa</translation>
+ </message>
+ <message>
+ <source>too many capturing groups (maximum 65535)</source>
+ <translation>massa grups de captura (màxim 65535)</translation>
+ </message>
+ <message>
+ <source>atomic assertion expected after (?( or (?(?C)</source>
+ <translation>s&apos;esperava una asserció atòmica després de (?( o (?(?C)</translation>
+ </message>
+ <message>
<source>no match</source>
<translation>no coincideix</translation>
</message>
@@ -4764,8 +5228,36 @@ Desactiveu una de les dues opcions.</translation>
<translation>recursivitat imbricada a la mateixa posició del subjecte</translation>
</message>
<message>
+ <source>matching depth limit exceeded</source>
+ <translation>s&apos;ha excedit el límit de profunditat de coincidències</translation>
+ </message>
+ <message>
+ <source>match with end before start or start moved backwards is not supported</source>
+ <translation>no s&apos;admet la coincidència amb el final abans de l&apos;inici o moure l&apos;inici cap enrere</translation>
+ </message>
+ <message>
+ <source>bad serialized data</source>
+ <translation>dades serialitzades incorrectes</translation>
+ </message>
+ <message>
+ <source>heap limit exceeded</source>
+ <translation>s&apos;ha excedit el límit de la memòria en monticles</translation>
+ </message>
+ <message>
+ <source>invalid syntax</source>
+ <translation>sintaxi no vàlida</translation>
+ </message>
+ <message>
+ <source>internal error - duplicate substitution match</source>
+ <translation>error intern - coincidència de substitució duplicada</translation>
+ </message>
+ <message>
+ <source>PCRE2_MATCH_INVALID_UTF is not supported for DFA matching</source>
+ <translation>no s&apos;admet PCRE2_MATCH_INVALID_UTF per a la coincidència DFA</translation>
+ </message>
+ <message>
<source>recursion limit exceeded</source>
- <translation>s&apos;ha excedit el límit de recursions</translation>
+ <translation type="vanished">s&apos;ha excedit el límit de recursions</translation>
</message>
<message>
<source>requested value is not available</source>
@@ -4781,7 +5273,7 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>bad escape sequence in replacement string</source>
- <translation>seqüència d&apos;escapada incorrecta en la cadena de reemplaçament</translation>
+ <translation>seqüència d&apos;escapada incorrecta a la cadena de reemplaçament</translation>
</message>
<message>
<source>expected closing curly bracket in replacement string</source>
@@ -4789,11 +5281,11 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>bad substitution in replacement string</source>
- <translation>substitució incorrecta en la cadena de reemplaçament</translation>
+ <translation>substitució incorrecta a la cadena de reemplaçament</translation>
</message>
<message>
<source>match with end before start is not supported</source>
- <translation>no s&apos;admet la coincidència amb el final abans de l&apos;inici</translation>
+ <translation type="vanished">no s&apos;admet la coincidència amb el final abans de l&apos;inici</translation>
</message>
<message>
<source>too many replacements (more than INT_MAX)</source>
@@ -4895,8 +5387,12 @@ 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.</source>
+ <translation>QSaveFile no pot obrir «%1» sense una reserva d&apos;escriptura directa activada.</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>
+ <translation type="vanished">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>
@@ -5678,10 +6174,34 @@ Desactiveu una de les dues opcions.</translation>
<translation>Hiberna</translation>
</message>
<message>
+ <source>Launch (G)</source>
+ <translation>Engega (G)</translation>
+ </message>
+ <message>
+ <source>Launch (H)</source>
+ <translation>Engega (H)</translation>
+ </message>
+ <message>
<source>Media Rewind</source>
<translation>Rebobina el suport</translation>
</message>
<message>
+ <source>Calendar</source>
+ <translation>Calendari</translation>
+ </message>
+ <message>
+ <source>Adjust contrast</source>
+ <translation>Ajusta el contrast</translation>
+ </message>
+ <message>
+ <source>Memo</source>
+ <translation>Anotació</translation>
+ </message>
+ <message>
+ <source>To-do list</source>
+ <translation>Llista de tasques pendents</translation>
+ </message>
+ <message>
<source>Media Fast Forward</source>
<translation>Avança ràpidament el suport</translation>
</message>
@@ -6042,6 +6562,7 @@ Desactiveu una de les dues opcions.</translation>
</message>
<message>
<source>+</source>
+ <extracomment>Key separator in shortcut string</extracomment>
<translation>+</translation>
</message>
<message>
@@ -6123,7 +6644,7 @@ Desactiveu una de les dues opcions.</translation>
<message>
<source>menu bar</source>
<extracomment>Role of an accessible object</extracomment>
- <translation>barra de menú</translation>
+ <translation>barra de menús</translation>
</message>
<message>
<source>scroll bar</source>
@@ -6325,7 +6846,7 @@ Role of an accessible object</extracomment>
<message>
<source>push button</source>
<extracomment>Role of an accessible object</extracomment>
- <translation>botó per prémer</translation>
+ <translation>botó per a prémer</translation>
</message>
<message>
<source>check box</source>
@@ -6468,6 +6989,21 @@ Role of an accessible object</extracomment>
<translation>contingut complementari</translation>
</message>
<message>
+ <source>terminal</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>terminal</translation>
+ </message>
+ <message>
+ <source>desktop</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>escriptori</translation>
+ </message>
+ <message>
+ <source>notification</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>notificació</translation>
+ </message>
+ <message>
<source>unknown</source>
<extracomment>Role of an accessible object</extracomment>
<translation>desconegut</translation>
@@ -6536,7 +7072,7 @@ Role of an accessible object</extracomment>
</message>
<message>
<source>OpenSSL version with disabled elliptic curves</source>
- <translation>Vesió de l&apos;OpenSSL amb les corbes el·líptiques desactivades</translation>
+ <translation>Versió de l&apos;OpenSSL amb les corbes el·líptiques desactivades</translation>
</message>
<message>
<source>Error when setting the OpenSSL configuration (%1)</source>
@@ -6568,7 +7104,7 @@ Role of an accessible object</extracomment>
</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>
+ <translation type="vanished">La versió de l&apos;OpenSSL és massa antiga, cal com a mínim la v1.0.2</translation>
</message>
<message>
<source>No error</source>
@@ -6663,6 +7199,50 @@ Role of an accessible object</extracomment>
<translation>El certificat del parell és a la llista negra</translation>
</message>
<message>
+ <source>No OCSP status response found</source>
+ <translation>No s&apos;ha trobat cap resposta de l&apos;estat OCSP</translation>
+ </message>
+ <message>
+ <source>The OCSP status request had invalid syntax</source>
+ <translation>La sol·licitud de l&apos;estat OCSP tenia una sintaxi no vàlida</translation>
+ </message>
+ <message>
+ <source>OCSP response contains an unexpected number of SingleResponse structures</source>
+ <translation>La resposta OCSP conté un nombre inesperat d&apos;estructures «SingleResponse»</translation>
+ </message>
+ <message>
+ <source>OCSP responder reached an inconsistent internal state</source>
+ <translation>El contestador OCSP ha arribat a un estat intern incoherent</translation>
+ </message>
+ <message>
+ <source>OCSP responder was unable to return a status for the requested certificate</source>
+ <translation>El contestador OCSP no ha pogut retornar un estat per al certificat sol·licitat</translation>
+ </message>
+ <message>
+ <source>The server requires the client to sign the OCSP request in order to construct a response</source>
+ <translation>El servidor requereix que el client signi la sol·licitud OCSP per tal de construir una resposta</translation>
+ </message>
+ <message>
+ <source>The client is not authorized to request OCSP status from this server</source>
+ <translation>El client no està autoritzat a sol·licitar un estat OCSP d&apos;aquest servidor</translation>
+ </message>
+ <message>
+ <source>OCSP responder&apos;s identity cannot be verified</source>
+ <translation>No s&apos;ha pogut verificar la identitat del contestador OCSP</translation>
+ </message>
+ <message>
+ <source>The identity of a certificate in an OCSP response cannot be established</source>
+ <translation>No s&apos;ha pogut establir la identitat d&apos;un certificat a una resposta OCSP</translation>
+ </message>
+ <message>
+ <source>The certificate status response has expired</source>
+ <translation>La resposta de l&apos;estat del certificat ha caducat</translation>
+ </message>
+ <message>
+ <source>The certificate&apos;s status is unknown</source>
+ <translation>L&apos;estat del certificat és desconegut</translation>
+ </message>
+ <message>
<source>Unknown error</source>
<translation>Error desconegut</translation>
</message>
@@ -6675,6 +7255,18 @@ Role of an accessible object</extracomment>
<translation>Error en crear la sessió SSL: %1</translation>
</message>
<message>
+ <source>Server-side QSslSocket does not support OCSP stapling</source>
+ <translation>El QSslSocket de la banda del servidor no admet la marca horària OCSP</translation>
+ </message>
+ <message>
+ <source>Failed to enable OCSP stapling</source>
+ <translation>Ha fallat en activar la marca horària OCSP</translation>
+ </message>
+ <message>
+ <source>Client-side sockets do not send OCSP responses</source>
+ <translation>Els sòcols de la banda del client no envien respostes OCSP</translation>
+ </message>
+ <message>
<source>Unable to init SSL Context: %1</source>
<translation>No s&apos;ha pogut iniciar el context SSL: %1</translation>
</message>
@@ -6687,16 +7279,164 @@ Role of an accessible object</extracomment>
<translation>No s&apos;han pogut desencriptar les dades: %1</translation>
</message>
<message>
+ <source>Failed to decode OCSP response</source>
+ <translation>Ha fallat en descodificar la resposta OCSP</translation>
+ </message>
+ <message>
+ <source>Failed to extract basic OCSP response</source>
+ <translation>Ha fallat en exterure la resposta OCSP bàsica</translation>
+ </message>
+ <message>
+ <source>No certificate verification store, cannot verify OCSP response</source>
+ <translation>No hi ha cap magatzem de verificació de certificats, no s&apos;ha pogut verificar la resposta OCSP</translation>
+ </message>
+ <message>
+ <source>Failed to decode a SingleResponse from OCSP status response</source>
+ <translation>Ha fallat en descodificar una «SingleResponse» d&apos;una resposta d&apos;estat OCSP</translation>
+ </message>
+ <message>
+ <source>Failed to extract &apos;this update time&apos; from the SingleResponse</source>
+ <translation>Ha fallat en extreure «this update time» de la «SingleResponse»</translation>
+ </message>
+ <message>
<source>The TLS/SSL connection has been closed</source>
<translation>S&apos;ha tancat la connexió TLS/SSL</translation>
</message>
<message>
<source>Error while reading: %1</source>
- <translation>Error mentre es llegia: %1</translation>
+ <translation>Error en llegir: %1</translation>
</message>
<message>
<source>Error during SSL handshake: %1</source>
- <translation>Error en la conformitat de connexió SSL: %1</translation>
+ <translation>Error durant la conformitat de connexió SSL: %1</translation>
+ </message>
+ <message>
+ <source>TLS initialization failed</source>
+ <translation>Ha fallat la inicialització del TLS</translation>
+ </message>
+ <message>
+ <source>Attempted to use an unsupported protocol.</source>
+ <translation>S&apos;ha intentat usar un protocol no admès.</translation>
+ </message>
+ <message>
+ <source>Insufficient memory</source>
+ <translation>Memòria insuficient</translation>
+ </message>
+ <message>
+ <source>Internal error</source>
+ <translation>Error intern</translation>
+ </message>
+ <message>
+ <source>An internal handle was invalid</source>
+ <translation>Un gestor intern no era vàlid</translation>
+ </message>
+ <message>
+ <source>An internal token was invalid</source>
+ <translation>Un testimoni intern no era vàlid</translation>
+ </message>
+ <message>
+ <source>Access denied</source>
+ <translation>S&apos;ha denegat l&apos;accés</translation>
+ </message>
+ <message>
+ <source>No authority could be contacted for authorization</source>
+ <translation>No s&apos;ha pogut contactar amb cap autoritat per a l&apos;autorització</translation>
+ </message>
+ <message>
+ <source>No credentials</source>
+ <translation>Sense credencials</translation>
+ </message>
+ <message>
+ <source>The target is unknown or unreachable</source>
+ <translation>El destí és desconegut o inaccessible</translation>
+ </message>
+ <message>
+ <source>An unsupported function was requested</source>
+ <translation>S&apos;ha sol·licitat una funció no admesa</translation>
+ </message>
+ <message>
+ <source>The hostname provided does not match the one received from the peer</source>
+ <translation>El nom d&apos;ordinador proporcionat no coincideix amb el rebut del parell</translation>
+ </message>
+ <message>
+ <source>No common protocol exists between the client and the server</source>
+ <translation>No existeix cap protocol comú entre el client i el servidor</translation>
+ </message>
+ <message>
+ <source>Unexpected or badly-formatted message received</source>
+ <translation>S&apos;ha rebut un missatge inesperat o formatat incorrectament</translation>
+ </message>
+ <message>
+ <source>The data could not be encrypted</source>
+ <translation>No s&apos;han pogut encriptar les dades</translation>
+ </message>
+ <message>
+ <source>No cipher suites in common</source>
+ <translation>No hi ha cap xifra adequada en comú</translation>
+ </message>
+ <message>
+ <source>The credentials were not recognized / Invalid argument</source>
+ <translation>No s&apos;han reconegut les credencials / Argument no vàlid</translation>
+ </message>
+ <message>
+ <source>The message was tampered with, damaged or out of sequence.</source>
+ <translation>El missatge s&apos;ha manipulat, està malmès o està fora de la seqüència.</translation>
+ </message>
+ <message>
+ <source>A message was received out of sequence.</source>
+ <translation>S&apos;ha rebut un missatge fora de la seqüència.</translation>
+ </message>
+ <message>
+ <source>Unknown error occurred: %1</source>
+ <translation>S&apos;ha produït un error desconegut: %1</translation>
+ </message>
+ <message>
+ <source>Invalid protocol chosen</source>
+ <translation>S&apos;ha triat un protocol no vàlid</translation>
+ </message>
+ <message>
+ <source>The certificate provided cannot be used for a client.</source>
+ <translation>El certificat proporcionat no pot ser usat per un client.</translation>
+ </message>
+ <message>
+ <source>The certificate provided cannot be used for a server.</source>
+ <translation>El certificat proporcionat no pot ser usat per un servidor.</translation>
+ </message>
+ <message>
+ <source>Server did not accept any certificate we could present.</source>
+ <translation>El servidor no accepta qualsevol certificat que es pugui presentar.</translation>
+ </message>
+ <message>
+ <source>Algorithm mismatch</source>
+ <translation>Algorisme desaparellat</translation>
+ </message>
+ <message>
+ <source>Handshake failed: %1</source>
+ <translation>Ha fallat la conformitat de la connexió: %1</translation>
+ </message>
+ <message>
+ <source>Failed to query the TLS context: %1</source>
+ <translation>Ha fallat en consultar el context del TLS: %1</translation>
+ </message>
+ <message>
+ <source>Did not get the required attributes for the connection.</source>
+ <translation>No s&apos;han aconseguit els atributs requerits per a la connexió.</translation>
+ </message>
+ <message>
+ <source>Unwanted protocol was negotiated</source>
+ <translation>S&apos;ha negociat un protocol no desitjat</translation>
+ </message>
+ <message>
+ <source>Renegotiation was unsuccessful: %1</source>
+ <translation>La renegociació ha estat infructuosa: %1</translation>
+ </message>
+ <message>
+ <source>Schannel failed to encrypt data: %1</source>
+ <translation>El «Schannel» ha fallat en encriptar les dades: %1</translation>
+ </message>
+ <message>
+ <source>Cannot provide a certificate with no key</source>
+ <translation>No es pot subministrar un certificat sense una clau</translation>
</message>
</context>
<context>
@@ -6789,6 +7529,10 @@ Role of an accessible object</extracomment>
<translation>No hi ha cap antecessor comú per les destinacions i origen des de l&apos;estat «%1»</translation>
</message>
<message>
+ <source>Child mode of state machine &apos;%1&apos; is not &apos;ExclusiveStates&apos;.</source>
+ <translation>El mode fill de la màquina d&apos;estats «%1» no és «ExclusiveStates».</translation>
+ </message>
+ <message>
<source>Unknown error</source>
<translation>Error desconegut</translation>
</message>
@@ -6853,7 +7597,7 @@ Role of an accessible object</extracomment>
</message>
<message>
<source>Sequential device (eg socket) for image read not supported</source>
- <translation>No s&apos;admet cap dispositiu seqüencial (p. ex. sòcol) per llegir una imatge</translation>
+ <translation>No s&apos;admet cap dispositiu seqüencial (p. ex. sòcol) per a llegir una imatge</translation>
</message>
<message>
<source>Seek file/device for image read failed</source>
@@ -6900,7 +7644,7 @@ Role of an accessible object</extracomment>
</message>
<message>
<source>No datagram available for reading</source>
- <translation>No hi ha cap datagrama disponible per llegir</translation>
+ <translation>No hi ha cap datagrama disponible per a llegir</translation>
</message>
</context>
<context>
@@ -7070,7 +7814,7 @@ Role of an accessible object</extracomment>
<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>
- <translation type="vanished">Les Qt no han pogut carregar el connector de la plataforma direct2d perquè la versió del Direct2D en aquest sistema és massa antiga. El requeriment mínim de sistema per aquest connector de plataforma és Windows 7 SP1 amb «Platform Update».
+ <translation type="vanished">Les Qt no han pogut carregar el connector de la plataforma Direct2D perquè la versió del Direct2D en aquest sistema és massa antiga. El requeriment mínim de sistema per aquest connector de plataforma és Windows 7 SP1 amb «Platform Update».
La versió mínima requerida del Direct2D és %1.%2.%3.%4. La versió del Direct2D en aquest sistema és %5.%6.%7.%8.</translation>
</message>
@@ -7078,7 +7822,7 @@ La versió mínima requerida del Direct2D és %1.%2.%3.%4. La versió del Direct
<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. The Direct2D version on this system is %2.</source>
- <translation>Les Qt no han pogut carregar el connector de la plataforma direct2d perquè la versió del Direct2D en aquest sistema és massa antiga. El requeriment mínim de sistema per aquest connector de plataforma és Windows 7 SP1 amb «Platform Update».
+ <translation>Les Qt no han pogut carregar el connector de la plataforma «direct2d» perquè la versió del Direct2D en aquest sistema és massa antiga. El requisit mínim de sistema per aquest connector de plataforma és Windows 7 SP1 amb «Platform Update».
La versió mínima requerida del Direct2D és %1. La versió del Direct2D en aquest sistema és %2.</translation>
</message>
@@ -7226,7 +7970,7 @@ La versió mínima requerida del Direct2D és %1. La versió del Direct2D en aqu
</message>
<message>
<source>error in the text declaration of an external entity</source>
- <translation>error en la declaració de text d&apos;una entitat externa</translation>
+ <translation>error a la declaració de text d&apos;una entitat externa</translation>
</message>
</context>
<context>
@@ -7245,7 +7989,7 @@ La versió mínima requerida del Direct2D és %1. La versió del Direct2D en aqu
</message>
<message>
<source>Sequence &apos;]]&gt;&apos; not allowed in content.</source>
- <translation>No es permet la seqüència «]]&gt;» en el contingut.</translation>
+ <translation>No es permet la seqüència «]]&gt;» al contingut.</translation>
</message>
<message>
<source>Encountered incorrectly encoded content.</source>
@@ -7337,7 +8081,7 @@ La versió mínima requerida del Direct2D és %1. La versió del Direct2D en aqu
</message>
<message>
<source>Unexpected &apos;%1&apos;.</source>
- <translation></translation>
+ <translation>«%1» inesperat.</translation>
</message>
<message>
<source>Expected </source>
@@ -7357,7 +8101,15 @@ La versió mínima requerida del Direct2D és %1. La versió del Direct2D en aqu
</message>
<message>
<source>Recursive entity detected.</source>
- <translation>S&apos;ha detectat una entitat recursiva.</translation>
+ <translation type="vanished">S&apos;ha detectat una entitat recursiva.</translation>
+ </message>
+ <message>
+ <source>Self-referencing entity detected.</source>
+ <translation>S&apos;ha detectat una entitat autoreferent.</translation>
+ </message>
+ <message>
+ <source>Entity expands to more characters than the entity expansion limit.</source>
+ <translation>L&apos;entitat s&apos;expandeix a més caràcters que el límit d&apos;expansió de l&apos;entitat.</translation>
</message>
<message>
<source>Start tag expected.</source>
diff --git a/translations/qtbase_de.ts b/translations/qtbase_de.ts
index 279f31a..c46e6f9 100644
--- a/translations/qtbase_de.ts
+++ b/translations/qtbase_de.ts
@@ -801,6 +801,69 @@ Drücken Sie ESC, um abzubrechen</translation>
</message>
</context>
<context>
+ <name>QDomParser</name>
+ <message>
+ <source>Error occurred while processing XML declaration</source>
+ <translation>Bei der Verarbeitung der XML-Deklaration trat ein Fehler auf</translation>
+ </message>
+ <message>
+ <source>Multiple DTD sections are not allowed</source>
+ <translation>Mehrfache DTD-Sektionen sind nicht zulässig</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing document type declaration</source>
+ <translation>Fehler bei der Verarbeitung der Dokumenttypdeklaration</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing comment</source>
+ <translation>Bei der Verarbeitung eines Kommentars ist ein Fehler aufgetreten</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing a processing instruction</source>
+ <translation>Bei der Verarbeitung einer Prozessing-Instruktion ist ein Fehler aufgetreten</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing a start element</source>
+ <translation>Bei der Verarbeitung eines öffnenden Elements ist ein Fehler aufgetreten</translation>
+ </message>
+ <message>
+ <source>Unexpected end element &apos;%1&apos;</source>
+ <translation>Unerwartetes schließendes Element &apos;%1&apos;</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing an end element</source>
+ <translation>Bei der Verarbeitung eines schließenden Elements ist ein Fehler aufgetreten</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing the element content</source>
+ <translation>Bei der Verarbeitung des Inhalts eines Elements ist ein Fehler aufgetreten</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing comments</source>
+ <translation>Bei der Verarbeitung von Kommentaren ist ein Fehler aufgetreten</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing an entity reference</source>
+ <translation>Bei der Verarbeitung einer Entity-Referenz ist ein Fehler aufgetreten</translation>
+ </message>
+ <message>
+ <source>Unexpected token</source>
+ <translation>Unerwartetes Token</translation>
+ </message>
+ <message>
+ <source>Tag mismatch</source>
+ <translation>Fehler bei der Schachtelung von Elementen</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing entity declaration</source>
+ <translation>Beim Verarbeiten einer Entity-Deklaration ist ein Fehler aufgetreten</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing notation declaration</source>
+ <translation>Beim Verarbeiten einer Notations-Deklaration ist ein Fehler aufgetreten</translation>
+ </message>
+</context>
+<context>
<name>QDtls</name>
<message>
<source>Invalid (empty) secret</source>
@@ -2179,10 +2242,6 @@ Möchten Sie die Datei trotzdem löschen?</translation>
<translation>Die Bibliothek %1 kann nicht entladen werden: %2</translation>
</message>
<message>
- <source>Cannot resolve symbol &quot;%1&quot; in %2: %3</source>
- <translation>Das Symbol &quot;%1&quot; kann in %2 nicht aufgelöst werden: %3</translation>
- </message>
- <message>
<source>&apos;%1&apos; is not a valid Mach-O binary (%2)</source>
<translation>&apos;%1&apos; ist keine gültige ausführbare Datei des Typs Mach-O (%2)</translation>
</message>
@@ -3999,32 +4058,32 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>Graustufen</translation>
</message>
<message>
- <source>Duplex Printing</source>
- <translation>Duplexdruck</translation>
+ <source>Page Set:</source>
+ <translation>Seiten-Satz:</translation>
</message>
<message>
- <source>None</source>
- <translation>Kein</translation>
+ <source>Pages</source>
+ <translation>Seiten</translation>
</message>
<message>
- <source>Long side</source>
- <translation>Lange Seite</translation>
+ <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>
<message>
- <source>Short side</source>
- <translation>Kurze Seite</translation>
+ <source>Double Sided Printing</source>
+ <translation>Beidseitiger Druck</translation>
</message>
<message>
- <source>Page Set:</source>
- <translation>Seiten-Satz:</translation>
+ <source>Off</source>
+ <translation>Aus</translation>
</message>
<message>
- <source>Pages</source>
- <translation>Seiten</translation>
+ <source>Long side binding</source>
+ <translation>Lange Seite</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>
+ <source>Short side binding</source>
+ <translation>Kurze Seite</translation>
</message>
</context>
<context>
@@ -4183,7 +4242,7 @@ Bitte deaktivieren Sie eine der beiden.</translation>
</message>
<message>
<source>unrecognized character follows \</source>
- <translation>Nicht erkanntes Zeichen nach \</translation>
+ <translation>nicht erkanntes Zeichen nach \</translation>
</message>
<message>
<source>numbers out of order in {} quantifier</source>
@@ -4198,10 +4257,6 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>schließende eckige Klammer fehlt bei Zeichenklasse</translation>
</message>
<message>
- <source>invalid escape sequence in character class</source>
- <translation>ungültige Escape-Sequenz in Zeichenklasse</translation>
- </message>
- <message>
<source>range out of order in character class</source>
<translation>ungültiger Bereich in Zeichenklasse</translation>
</message>
@@ -4230,20 +4285,12 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>interner Fehler: Code-Überlauf</translation>
</message>
<message>
- <source>lookbehind assertion is not fixed length</source>
- <translation>lookbehind assertion hat keine feste Länge</translation>
- </message>
- <message>
- <source>malformed number or name after (?(</source>
- <translation>Name oder Nummer nach (?( ungültig</translation>
+ <source>missing closing parenthesis for condition</source>
+ <translation>die schließende Klammer der Bedingung fehlt</translation>
</message>
<message>
- <source>conditional group contains more than two branches</source>
- <translation>bedingte Gruppe enthält mehr als zwei Verzweigungen</translation>
- </message>
- <message>
- <source>(?R or (?[+-]digits must be followed by )</source>
- <translation>(?R oder (?[+-]Ziffern erfordert schließende Klammer</translation>
+ <source>lookbehind assertion is not fixed length</source>
+ <translation>lookbehind assertion hat keine feste Länge</translation>
</message>
<message>
<source>unknown POSIX class name</source>
@@ -4254,22 +4301,10 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>POSIX-Sortierfolgen werden nicht unterstützt</translation>
</message>
<message>
- <source>invalid condition (?(0)</source>
- <translation>ungültige Bedingung (?(0)</translation>
- </message>
- <message>
- <source>PCRE does not support \L, \l, \N{name}, \U, or \u</source>
- <translation>PCRE unterstützt \L, \l, \N{name}, \U, oder \u nicht</translation>
- </message>
- <message>
<source>unrecognized character after (?P</source>
<translation>Zeichen nicht erkannt nach (?P</translation>
</message>
<message>
- <source>syntax error in subpattern name (missing terminator)</source>
- <translation>Syntaxfehler in Name des Untermusters (fehlendes Trennzeichen)</translation>
- </message>
- <message>
<source>malformed \P or \p sequence</source>
<translation>fehlerhafte \P- oder \p-Sequenz</translation>
</message>
@@ -4286,34 +4321,14 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>interner Fehler: bereits überprüfte Referenz auf Untermuster nicht gefunden</translation>
</message>
<message>
- <source>DEFINE group contains more than one branch</source>
- <translation>DEFINE-Gruppe enthält mehr als eine Verzweigung</translation>
- </message>
- <message>
<source>\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number</source>
<translation>auf \g folgt weder in Anführungszeichen, geschweifte oder eckige Klammern eingeschlossene Zahl oder Name noch eine einfache Zahl</translation>
</message>
<message>
- <source>a numbered reference must not be zero</source>
- <translation>eine nummerierte Referenz darf nicht Null sein</translation>
- </message>
- <message>
- <source>an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)</source>
- <translation>Argumente für (*ACCEPT), (*FAIL), oder (*COMMIT) nicht zulässig</translation>
- </message>
- <message>
- <source>number is too big</source>
- <translation>zu große Zahl</translation>
- </message>
- <message>
<source>subpattern name expected</source>
<translation>Name des Untermusters erwartet</translation>
</message>
<message>
- <source>digit expected after (?+</source>
- <translation>Ziffer erwartet nach (?+</translation>
- </message>
- <message>
<source>different names for subpatterns of the same number are not allowed</source>
<translation>verschiedene Namen für Untermuster mit derselben Nummer sind nicht zulässig</translation>
</message>
@@ -4326,10 +4341,6 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>auf \k folgt kein in Anführungszeichen, geschweifte oder eckige Klammern eingeschlossener Name</translation>
</message>
<message>
- <source>internal error: unknown opcode in find_fixedlength()</source>
- <translation>interner Fehler: Unbekannter Operationscode in find_fixedlength()</translation>
- </message>
- <message>
<source>\N is not supported in a class</source>
<translation>\N ist innerhalb einer Klasse nicht unterstützt</translation>
</message>
@@ -4354,16 +4365,56 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>öffnende Klammer fehlt nach \o</translation>
</message>
<message>
+ <source>escape sequence is invalid in character class</source>
+ <translation>eine Escape-Sequence ist innerhalb einer Zeichenklasse nicht zulässig</translation>
+ </message>
+ <message>
<source>parentheses are too deeply nested</source>
<translation>Klammern zu tief geschachtelt</translation>
</message>
<message>
- <source>invalid range in character class</source>
- <translation>ungültiger Bereich in Zeichenklasse</translation>
+ <source>a relative value of zero is not allowed</source>
+ <translation>0 ist als relativer Wert nicht zulässig</translation>
+ </message>
+ <message>
+ <source>conditional subpattern contains more than two branches</source>
+ <translation>ein bedingtes Untermuster enthält mehr als zwei Zweige</translation>
</message>
<message>
- <source>group name must start with a non-digit</source>
- <translation>Gruppenname darf nicht mit einer Ziffer beginnen</translation>
+ <source>digit expected after (?+ or (?-</source>
+ <translation>auf (?+ beziehungsweise (?- muss eine Ziffer folgen</translation>
+ </message>
+ <message>
+ <source>lookbehind is too complicated</source>
+ <translation>lookbehind-Bedingung ist zu kompliziert</translation>
+ </message>
+ <message>
+ <source>\C is not allowed in a lookbehind assertion in UTF-16 mode</source>
+ <translation>\C ist in einer Lookbehind-Assert-Prüfung im UTF-16-Modus nicht zulässig</translation>
+ </message>
+ <message>
+ <source>PCRE2 does not support \F, \L, \l, \N{name}, \U, or \u</source>
+ <translation>PCRE2 unterstützt nicht \F, \L, \l, \N{Name}, \U oder \u</translation>
+ </message>
+ <message>
+ <source>syntax error in subpattern name (missing terminator?)</source>
+ <translation>Syntaxfehler im Namen des Untermusters (fehlendes Trennzeichen?)</translation>
+ </message>
+ <message>
+ <source>subpattern name must start with a non-digit</source>
+ <translation>der Name eines Untermusters darf nicht mit einer Ziffer beginnen</translation>
+ </message>
+ <message>
+ <source>subpattern name is too long (maximum 32 code units)</source>
+ <translation>Name des Untermusters ist zu lang (maximal 32 Code-Einheiten)</translation>
+ </message>
+ <message>
+ <source>too many named subpatterns (maximum 10000)</source>
+ <translation>zu viele benannte Untermuster (maximal 10000)</translation>
+ </message>
+ <message>
+ <source>invalid range in character class</source>
+ <translation>ungültiger Bereich in Zeichenklasse</translation>
</message>
<message>
<source>quantifier does not follow a repeatable item</source>
@@ -4394,10 +4445,6 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>überzählige schließende Klammer</translation>
</message>
<message>
- <source>letter or underscore expected after (?&lt; or (?&apos;</source>
- <translation>auf (?&lt; oder (?&apos; muss ein Buchstabe oder Unterstrichzeichen folgen</translation>
- </message>
- <message>
<source>assertion expected after (?( or (?(?C)</source>
<translatorcomment>if /else</translatorcomment>
<translation>auf (?( oder (?(?C) muss eine Bedingung folgen</translation>
@@ -4419,10 +4466,6 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>Zeichencode in \x{} oder \o{} ist zu groß</translation>
</message>
<message>
- <source>\C is not allowed in a lookbehind assertion</source>
- <translation>\C ist in einer Lookbehind-Bedingung nicht zulässig</translation>
- </message>
- <message>
<source>number after (?C is greater than 255</source>
<translation>die auf (?C folgende Zahl ist größer als 255</translation>
</message>
@@ -4443,26 +4486,38 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>diese Version von PCRE2 unterstützt \P, \p, oder \X nicht</translation>
</message>
<message>
- <source>subpattern name is too long (maximum 10000 characters)</source>
- <translation>Name des Untermusters ist zu lang (höchstens 10000 Zeichen)</translation>
- </message>
- <message>
- <source>too many named subpatterns (maximum 256)</source>
- <translation>zuviele benannte Untermuster (höchstens 256)</translation>
- </message>
- <message>
<source>octal value is greater than \377 in 8-bit non-UTF-8 mode</source>
<translation>oktaler Wert ist größer als \377 (nicht im UTF8-Modus)</translation>
</message>
<message>
+ <source>DEFINE subpattern contains more than one branch</source>
+ <translation>DEFINE-Untermuster enthält mehr als eine Verzweigung</translation>
+ </message>
+ <message>
<source>internal error: unknown newline setting</source>
<translation>interner Fehler: Unbekannte Zeilenende-Einstellung</translation>
</message>
<message>
+ <source>(?R (recursive pattern call) must be followed by a closing parenthesis</source>
+ <translation>auf (?R (Rekursiver Musteraufruf) muss eine schließende Klammer folgen</translation>
+ </message>
+ <message>
+ <source>obsolete error (should not occur)</source>
+ <translation>obsoleter Fehler (sollte nicht auftreten)</translation>
+ </message>
+ <message>
<source>(*VERB) not recognized or malformed</source>
<translation>(*VERB) nicht erkannt oder fehlerhaft</translation>
</message>
<message>
+ <source>subpattern number is too big</source>
+ <translation>Nummer des Untermusters ist zu groß</translation>
+ </message>
+ <message>
+ <source>internal error: parsed pattern overflow</source>
+ <translation>interner Fehler: Überlauf bei verarbeitetem Muster</translation>
+ </message>
+ <message>
<source>\c must be followed by a printable ASCII character</source>
<translation>auf \c muss ein druckbares ASCII-Zeichen folgen</translation>
</message>
@@ -4471,10 +4526,6 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>auf \c muss ein Buchstabe oder eines der Zeichen [\]^_? folgen</translation>
</message>
<message>
- <source>SPARE ERROR</source>
- <translation>SPARE ERROR</translation>
- </message>
- <message>
<source>using UTF is disabled by the application</source>
<translation>UTF-Verwendung durch die Anwendung deaktiviert</translation>
</message>
@@ -4487,12 +4538,20 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>Zeichencode in \u...-Sequenz ist zu groß</translation>
</message>
<message>
- <source>digits missing in \x{} or \o{}</source>
- <translation>fehlende Ziffern in \x{} oder \o{}</translation>
+ <source>internal error: unknown meta code in check_lookbehinds()</source>
+ <translation>interner Fehler: Unbekannter Meta-Code in check_lookbehinds()</translation>
+ </message>
+ <message>
+ <source>callout string is too long</source>
+ <translation>callout-Zeichenkette ist zu lang</translation>
+ </message>
+ <message>
+ <source>digits missing in \x{} or \o{} or \N{U+}</source>
+ <translation>bei \x{}, \o{} oder \N{U+} fehlen Ziffern</translation>
</message>
<message>
- <source>syntax error in (?(VERSION condition</source>
- <translation>Syntaxfehler in (?(VERSION-Bedingung</translation>
+ <source>syntax error or number too big in (?(VERSION condition</source>
+ <translation>Syntaxfehler oder Zahl zu groß in (?(VERSION-Bedingung</translation>
</message>
<message>
<source>internal error: unknown opcode in auto_possessify()</source>
@@ -4531,6 +4590,46 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>Länge des Musters überschreitet das von der Anwendung gesetzte Limit</translation>
</message>
<message>
+ <source>internal error: unknown code in parsed pattern</source>
+ <translation>interner Fehler: Unbekannter Code bei verarbeitetem Muster</translation>
+ </message>
+ <message>
+ <source>internal error: bad code value in parsed_skip()</source>
+ <translation>interner Fehler: Ungültiger Code-Wert in parsed_skip()</translation>
+ </message>
+ <message>
+ <source>PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES is not allowed in UTF-16 mode</source>
+ <translation>PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES ist im UTF-16-Modus nicht zulässig</translation>
+ </message>
+ <message>
+ <source>invalid option bits with PCRE2_LITERAL</source>
+ <translation>ungültige Options-Bits bei PCRE2_LITERAL</translation>
+ </message>
+ <message>
+ <source>\N{U+dddd} is supported only in Unicode (UTF) mode</source>
+ <translation>\N{U+dddd} wird nur im Unicode (UTF)-Modus unterstützt</translation>
+ </message>
+ <message>
+ <source>invalid hyphen in option setting</source>
+ <translation>ungültiger Bindestrich beim Setzen der Option</translation>
+ </message>
+ <message>
+ <source>(*alpha_assertion) not recognized</source>
+ <translation>(*alpha_assertion) nicht erkannt</translation>
+ </message>
+ <message>
+ <source>script runs require Unicode support, which this version of PCRE2 does not have</source>
+ <translation>Skript-Ausführung erfordert Unicode-Unterstützung, die diese Version von PCRE2 nicht hat</translation>
+ </message>
+ <message>
+ <source>too many capturing groups (maximum 65535)</source>
+ <translation>zu viele Gruppen (maximal 65535)</translation>
+ </message>
+ <message>
+ <source>atomic assertion expected after (?( or (?(?C)</source>
+ <translation>nach (?( beziehungsweise (?(?C) wird eine atomare Assert-Prüfung erwartet</translation>
+ </message>
+ <message>
<source>no match</source>
<translation>keine Übereinstimmung</translation>
</message>
@@ -4739,8 +4838,32 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>geschachtelte Rekursion an gleicher Subjektposition</translation>
</message>
<message>
- <source>recursion limit exceeded</source>
- <translation>Rekursionslimit überschritten</translation>
+ <source>matching depth limit exceeded</source>
+ <translation>Limit der Match-Tiefe überschritten</translation>
+ </message>
+ <message>
+ <source>match with end before start or start moved backwards is not supported</source>
+ <translation>Match mit einer vor der Beginnmarkierung befindlichen Endemarkierung oder einer rückversetzten Beginnmarkierung wird nicht unterstützt</translation>
+ </message>
+ <message>
+ <source>bad serialized data</source>
+ <translation>ungültige serialisierte Daten</translation>
+ </message>
+ <message>
+ <source>heap limit exceeded</source>
+ <translation>Heap-Limit überschritten</translation>
+ </message>
+ <message>
+ <source>invalid syntax</source>
+ <translation>ungültige Syntax</translation>
+ </message>
+ <message>
+ <source>internal error - duplicate substitution match</source>
+ <translation>interner Fehler: Doppelte Entsprechung bei Substitution</translation>
+ </message>
+ <message>
+ <source>PCRE2_MATCH_INVALID_UTF is not supported for DFA matching</source>
+ <translation>PCRE2_MATCH_INVALID_UTF wird bei DFA-Matching nicht unterstützt</translation>
</message>
<message>
<source>requested value is not available</source>
@@ -4767,12 +4890,8 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>ungültige Substitution in Ersetzungszeichenkette</translation>
</message>
<message>
- <source>match with end before start is not supported</source>
- <translation>ein Match mit einem sich vor dem Anfang befindenden Ende wird nicht unterstützt</translation>
- </message>
- <message>
<source>too many replacements (more than INT_MAX)</source>
- <translation>zuviele Ersetzungen (mehr als INT_MAX)</translation>
+ <translation>zu viele Ersetzungen (mehr als INT_MAX)</translation>
</message>
</context>
<context>
@@ -5293,6 +5412,14 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>(F) starten</translation>
</message>
<message>
+ <source>Launch (G)</source>
+ <translation>(G) starten</translation>
+ </message>
+ <message>
+ <source>Launch (H)</source>
+ <translation>(H) starten</translation>
+ </message>
+ <message>
<source>Monitor Brightness Up</source>
<translation>Monitor heller</translation>
</message>
@@ -5393,6 +5520,10 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>Rechner</translation>
</message>
<message>
+ <source>Calendar</source>
+ <translation>Kalender</translation>
+ </message>
+ <message>
<source>Clear</source>
<translation>Löschen</translation>
</message>
@@ -5405,6 +5536,10 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>Schließen</translation>
</message>
<message>
+ <source>Adjust contrast</source>
+ <translation>Kontrasteinstellung</translation>
+ </message>
+ <message>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
@@ -5457,6 +5592,10 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>Meeting</translation>
</message>
<message>
+ <source>Memo</source>
+ <translation>Memo</translation>
+ </message>
+ <message>
<source>Keyboard Menu</source>
<translation>Tastaturmenü</translation>
</message>
@@ -5537,6 +5676,10 @@ Bitte deaktivieren Sie eine der beiden.</translation>
<translation>Terminal</translation>
</message>
<message>
+ <source>To-do list</source>
+ <translation>To-do-Liste</translation>
+ </message>
+ <message>
<source>Tools</source>
<translation>Werkzeuge</translation>
</message>
@@ -6681,10 +6824,6 @@ Role of an accessible object</extracomment>
<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>
- <message>
<source>Error when setting the elliptic curves (%1)</source>
<translation>Fehler beim Setzen der elliptischen Kurven (%1)</translation>
</message>
@@ -6753,10 +6892,6 @@ Role of an accessible object</extracomment>
<translation>Im Ablauf des SSL-Protokolls ist ein Fehler aufgetreten: %1</translation>
</message>
<message>
- <source>DTLS server requires a &apos;VerifyNone&apos; mode with your version of OpenSSL</source>
- <translation>Der DTLS-Server verlangt für Ihre Version der OpenSSL-Bibliothek den &apos;VerifyNone&apos;-Modus</translation>
- </message>
- <message>
<source>TLS initialization failed</source>
<translation>Die Initialisierung von TLS schlug fehl</translation>
</message>
@@ -6975,8 +7110,8 @@ Role of an accessible object</extracomment>
<translation>Die Ziele und die Quelle des Übergangs vom Zustand &apos;%1&apos; haben keinen gemeinsamen Ursprung</translation>
</message>
<message>
- <source>Child mode of state machine &apos;%1&apos; is not &apos;ExclusiveStates&apos;!</source>
- <translation>Der Child-Modus der Zustandsmaschine &apos;%1&apos; ist nicht &apos;ExclusiveStates&apos;!</translation>
+ <source>Child mode of state machine &apos;%1&apos; is not &apos;ExclusiveStates&apos;.</source>
+ <translation>Der Child-Modus der Zustandsmaschine &apos;%1&apos; ist nicht &apos;ExclusiveStates&apos;.</translation>
</message>
<message>
<source>Unknown error</source>
@@ -7522,8 +7657,12 @@ Die minimal erforderliche Version von Direct2D ist %1 Die auf diesem System inst
<translation>Es wurden Zeichendaten erwartet.</translation>
</message>
<message>
- <source>Recursive entity detected.</source>
- <translation>Es wurde eine rekursive Entity festgestellt.</translation>
+ <source>Self-referencing entity detected.</source>
+ <translation>Es wurde eine selbstreferenzierende Entity festgestellt.</translation>
+ </message>
+ <message>
+ <source>Entity expands to more characters than the entity expansion limit.</source>
+ <translation>Die Expansion einer Entity überschreitet das Entity-Expansions-Limit.</translation>
</message>
<message>
<source>Start tag expected.</source>
diff --git a/translations/qtbase_ko.ts b/translations/qtbase_ko.ts
index 8dbe24a..f1b3793 100644
--- a/translations/qtbase_ko.ts
+++ b/translations/qtbase_ko.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="ko">
+<TS version="2.1" language="ko">
<context>
<name>CloseButton</name>
<message>
@@ -24,7 +24,7 @@
</message>
<message>
<source>Show All</source>
- <translation>모두 보이기</translation>
+ <translation>모두 표시</translation>
</message>
<message>
<source>Preferences...</source>
@@ -40,14 +40,28 @@
</message>
</context>
<context>
+ <name>Print Device Input Slot</name>
+ <message>
+ <source>Automatic</source>
+ <translation>자동</translation>
+ </message>
+</context>
+<context>
+ <name>Print Device Output Bin</name>
+ <message>
+ <source>Automatic</source>
+ <translation>자동</translation>
+ </message>
+</context>
+<context>
<name>QAbstractSocket</name>
<message>
<source>Socket operation timed out</source>
- <translation>소켓 작업 시간 초과</translation>
+ <translation>소켓 작업 시간 초과됨</translation>
</message>
<message>
<source>Operation on socket is not supported</source>
- <translation>소켓 작업이 지원되지 않음</translation>
+ <translation>소켓 작업을 지원하지 않음</translation>
</message>
<message>
<source>Host not found</source>
@@ -325,20 +339,10 @@ ESC 키를 누르면 취소합니다</translation>
<translation>화면 색상 선택(&amp;P)</translation>
</message>
<message>
- <source>Cursor at %1, %2, color: %3
-Press ESC to cancel</source>
- <translation>커서 위치: %1, %2, 색: %3
-ESC 키를 누르면 취소합니다</translation>
- </message>
- <message>
<source>Select Color</source>
<translation>색 선택</translation>
</message>
<message>
- <source>Pick Screen Color</source>
- <translation>화면 색상 선택</translation>
- </message>
- <message>
<source>&amp;Basic colors</source>
<translation>기본 색상(&amp;B)</translation>
</message>
@@ -373,8 +377,12 @@ ESC 키를 누르면 취소합니다</translation>
<translation>버전 정보를 표시합니다.</translation>
</message>
<message>
- <source>Displays this help.</source>
- <translation>이 도움말을 표시합니다.</translation>
+ <source>Displays help on commandline options.</source>
+ <translation>명령행 옵션 도움말을 표시합니다.</translation>
+ </message>
+ <message>
+ <source>Displays help including Qt specific options.</source>
+ <translation>Qt 지정 옵션을 포함한 도움말을 표시합니다.</translation>
</message>
<message>
<source>Unknown option &apos;%1&apos;.</source>
@@ -481,7 +489,7 @@ ESC 키를 누르면 취소합니다</translation>
</message>
<message>
<source>Second Shift (16:00 to 23:59)</source>
- <translation>야간(16:00-23:59)</translation>
+ <translation>저녁(16:00-23:59)</translation>
</message>
<message>
<source>Third Shift (00:00 to 07:59)</source>
@@ -532,6 +540,29 @@ ESC 키를 누르면 취소합니다</translation>
</message>
</context>
<context>
+ <name>QCupsPrinterSupport</name>
+ <message>
+ <source>Authentication Needed</source>
+ <translation>인증이 필요함</translation>
+ </message>
+ <message>
+ <source>Authentication needed to use %1.</source>
+ <translation>%1을(를) 사용하려면 인증해야 합니다.</translation>
+ </message>
+ <message>
+ <source>Authentication needed to use %1 on %2.</source>
+ <translation>%2의 %1을(를) 사용하려면 인증해야 합니다.</translation>
+ </message>
+ <message>
+ <source>Username:</source>
+ <translation>사용자 이름:</translation>
+ </message>
+ <message>
+ <source>Password:</source>
+ <translation>암호:</translation>
+ </message>
+</context>
+<context>
<name>QDB2Driver</name>
<message>
<source>Unable to connect</source>
@@ -585,25 +616,6 @@ ESC 키를 누르면 취소합니다</translation>
</message>
</context>
<context>
- <name>QDateTimeEdit</name>
- <message>
- <source>AM</source>
- <translation>오전</translation>
- </message>
- <message>
- <source>am</source>
- <translation>오전</translation>
- </message>
- <message>
- <source>PM</source>
- <translation>오후</translation>
- </message>
- <message>
- <source>pm</source>
- <translation>오후</translation>
- </message>
-</context>
-<context>
<name>QDateTimeParser</name>
<message>
<source>AM</source>
@@ -672,7 +684,7 @@ ESC 키를 누르면 취소합니다</translation>
<name>QDnsLookupRunnable</name>
<message>
<source>IPv6 addresses for nameservers are currently not supported</source>
- <translation>네임 서버 IPv6 주소는 아직 지원되지 않음</translation>
+ <translation>네임 서버 IPv6 주소는 아직 지원하지 않음</translation>
</message>
<message>
<source>Invalid domain name</source>
@@ -691,10 +703,6 @@ ESC 키를 누르면 취소합니다</translation>
<translation>리졸버를 초기화할 수 없음</translation>
</message>
<message>
- <source>IPv6 addresses for nameservers is currently not supported</source>
- <translation>네임 서버 IPv6 주소는 아직 지원되지 않음</translation>
- </message>
- <message>
<source>Server could not process query</source>
<translation>서버에서 질의를 처리할 수 없음</translation>
</message>
@@ -756,7 +764,7 @@ ESC 키를 누르면 취소합니다</translation>
</message>
<message>
<source>No hostname given</source>
- <translation>호스트 이름이 지정되지 않음</translation>
+ <translation>호스트 이름을 지정하지 않았음</translation>
</message>
<message>
<source>Invalid hostname</source>
@@ -793,6 +801,196 @@ ESC 키를 누르면 취소합니다</translation>
</message>
</context>
<context>
+ <name>QDomParser</name>
+ <message>
+ <source>Error occurred while processing XML declaration</source>
+ <translation>XML 선언을 처리하는 중 오류 발생</translation>
+ </message>
+ <message>
+ <source>Multiple DTD sections are not allowed</source>
+ <translation>다중 DTD 섹션은 허용되지 않음</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing document type declaration</source>
+ <translation>문서 형식 정의(DTD)를 처리하는 중 오류 발생</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing comment</source>
+ <translation>주석을 처리하는 중 오류 발생</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing a processing instruction</source>
+ <translation>처리 명령을 처리하는 중 오류 발생</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing a start element</source>
+ <translation>시작 원소를 처리하는 중 오류 발생</translation>
+ </message>
+ <message>
+ <source>Unexpected end element &apos;%1&apos;</source>
+ <translation>예상하지 못한 끝 원소 &apos;%1&apos;</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing an end element</source>
+ <translation>끝 원소를 처리하는 중 오류 발생</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing the element content</source>
+ <translation>원소 내용을 처리하는 중 오류 발생</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing comments</source>
+ <translation>주석을 처리하는 중 오류 발생</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing an entity reference</source>
+ <translation>엔티티 참조를 처리하는 중 오류 발생</translation>
+ </message>
+ <message>
+ <source>Unexpected token</source>
+ <translation>예상하지 못한 토큰</translation>
+ </message>
+ <message>
+ <source>Tag mismatch</source>
+ <translation>태그가 일치하지 않음</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing entity declaration</source>
+ <translation>엔티티 선언을 처리하는 중 오류 발생</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing notation declaration</source>
+ <translation>표기법 선언을 처리하는 중 오류 발생</translation>
+ </message>
+</context>
+<context>
+ <name>QDtls</name>
+ <message>
+ <source>Invalid (empty) secret</source>
+ <translation>잘못된(빈) 비밀</translation>
+ </message>
+ <message>
+ <source>Multicast and broadcast addresses are not supported</source>
+ <translation>멀티캐스트 및 브로드캐스트 주소는 지원하지 않음</translation>
+ </message>
+ <message>
+ <source>Cannot set peer after handshake started</source>
+ <translation>악수가 시작된 후 동료를 설정할 수 없음</translation>
+ </message>
+ <message>
+ <source>Invalid address</source>
+ <translation>잘못된 주소</translation>
+ </message>
+ <message>
+ <source>Cannot set verification name after handshake started</source>
+ <translation>악수가 시작된 후 검증 이름을 설정할 수 없음</translation>
+ </message>
+ <message>
+ <source>Cannot set configuration after handshake started</source>
+ <translation>악수가 시작된 후 설정을 지정할 수 없음</translation>
+ </message>
+ <message>
+ <source>Cannot start/continue handshake, invalid handshake state</source>
+ <translation>악수를 시작하거나 계속할 수 없음, 잘못된 악수 상태</translation>
+ </message>
+ <message>
+ <source>Invalid (nullptr) socket</source>
+ <translation>잘못된(빈 포인터) 소켓</translation>
+ </message>
+ <message>
+ <source>To start a handshake you must set peer&apos;s address and port first</source>
+ <translation>악수를 시작하려면 상대방의 주소와 포트를 지정해야 함</translation>
+ </message>
+ <message>
+ <source>To start a handshake, DTLS server requires non-empty datagram (client hello)</source>
+ <translation>악수를 시작하려면 DTLS 서버에서 비어 있지 않은 다이어그램이 필요함(클라이언트 hello)</translation>
+ </message>
+ <message>
+ <source>Cannot start handshake, already done/in progress</source>
+ <translation>악수를 시작할 수 없음, 이미 완료되었거나 진행 중</translation>
+ </message>
+ <message>
+ <source>A valid QUdpSocket and non-empty datagram are needed to continue the handshake</source>
+ <translation>악수를 진행하려면 올바른 QUdpSocket과 비어 있지 않은 다이어그램이 필요함</translation>
+ </message>
+ <message>
+ <source>Cannot continue handshake, not in InProgress state</source>
+ <translation>악수를 진행할 수 없음, InProgress 상태가 아님</translation>
+ </message>
+ <message>
+ <source>Cannot resume, not in VerificationError state</source>
+ <translation>다시 시작할 수 없음, VerificationError 상태가 아님</translation>
+ </message>
+ <message>
+ <source>No handshake in progress, nothing to abort</source>
+ <translation>진행 중인 악수가 없음, 중단할 항목 없음</translation>
+ </message>
+ <message>
+ <source>Cannot send shutdown alert, not encrypted</source>
+ <translation>종료 경고를 보낼 수 없음, 암호화되지 않음</translation>
+ </message>
+ <message>
+ <source>Cannot write a datagram, not in encrypted state</source>
+ <translation>데이터그램을 쓸 수 없음, 암호화된 상태가 아님</translation>
+ </message>
+ <message>
+ <source>Cannot read a datagram, not in encrypted state</source>
+ <translation>데이터그램을 읽을 수 없음, 암호화된 상태가 아님</translation>
+ </message>
+ <message>
+ <source>%1 failed</source>
+ <extracomment>%1: Some function</extracomment>
+ <translation>%1 실패</translation>
+ </message>
+ <message>
+ <source>Invalid SslMode, SslServerMode or SslClientMode expected</source>
+ <translation>잘못된 SslMode, SslServerMode 또는 SslClientMode를 예상함</translation>
+ </message>
+ <message>
+ <source>Invalid protocol version, DTLS protocol expected</source>
+ <translation>잘못된 프로토콜 버전, DTLS 프로토콜을 예상함</translation>
+ </message>
+ <message>
+ <source>BIO_ADD_new failed, cannot start handshake</source>
+ <translation>BIO_ADD_new 실패, 악수를 시작할 수 없음</translation>
+ </message>
+ <message>
+ <source>Cannot start the handshake, verified client hello expected</source>
+ <translation>악수를 시작할 수 없음, 검증된 클라이언트 hello를 예상함</translation>
+ </message>
+ <message>
+ <source>Peer verification failed</source>
+ <translation>동료 검증 실패</translation>
+ </message>
+ <message>
+ <source>The DTLS connection has been closed</source>
+ <translation>DTLS 연결이 종료됨</translation>
+ </message>
+ <message>
+ <source>Error while writing: %1</source>
+ <translation>쓰는 중 오류 발생: %1</translation>
+ </message>
+ <message>
+ <source>The DTLS connection has been shutdown</source>
+ <translation>DTLS 연결이 끊어짐</translation>
+ </message>
+ <message>
+ <source>Error while reading: %1</source>
+ <translation>읽는 중 오류 발생: %1</translation>
+ </message>
+</context>
+<context>
+ <name>QDtlsClientVerifier</name>
+ <message>
+ <source>A valid UDP socket, non-empty datagram, valid address/port were expected</source>
+ <translation>올바른 UDP 소켓, 비어 있지 않은 다이어그램, 올바른 주소/포트를 예상함</translation>
+ </message>
+ <message>
+ <source>BIO_ADDR_new failed, ignoring client hello</source>
+ <translation>BIO_ADD_new 실패, 클라이언트 hello를 무시함</translation>
+ </message>
+</context>
+<context>
<name>QErrorMessage</name>
<message>
<source>Debug Message:</source>
@@ -803,12 +1001,20 @@ ESC 키를 누르면 취소합니다</translation>
<translation>경고:</translation>
</message>
<message>
+ <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;S)</translation>
+ <translation>이 메시지를 다시 표시(&amp;S)</translation>
</message>
<message>
<source>&amp;OK</source>
@@ -819,7 +1025,7 @@ ESC 키를 누르면 취소합니다</translation>
<name>QFile</name>
<message>
<source>Destination file is the same file.</source>
- <translation>대상 파일이 동일 파일입니다.</translation>
+ <translation>대상 파일이 같은 파일입니다.</translation>
</message>
<message>
<source>Source file does not exist.</source>
@@ -830,8 +1036,8 @@ ESC 키를 누르면 취소합니다</translation>
<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>
@@ -846,12 +1052,16 @@ ESC 키를 누르면 취소합니다</translation>
<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>
+ <translation>%1에서 입력을 받으려고 열 수 없음</translation>
</message>
<message>
- <source>Cannot open for output</source>
- <translation>출력을 위하여 열 수 없음</translation>
+ <source>Cannot open for output: %1</source>
+ <translation>출력하려고 열 수 없음: %1</translation>
</message>
<message>
<source>Failure to write block</source>
@@ -859,7 +1069,7 @@ ESC 키를 누르면 취소합니다</translation>
</message>
<message>
<source>Cannot create %1 for output</source>
- <translation>%1에 쓰기 위하여 열 수 없음</translation>
+ <translation>%1에 쓰려고 열 수 없음</translation>
</message>
</context>
<context>
@@ -868,6 +1078,10 @@ ESC 키를 누르면 취소합니다</translation>
<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>
@@ -881,7 +1095,7 @@ ESC 키를 누르면 취소합니다</translation>
</message>
<message>
<source>Go back</source>
- <translation>뒤로 가기</translation>
+ <translation>뒤로 이동</translation>
</message>
<message>
<source>Alt+Left</source>
@@ -893,7 +1107,7 @@ ESC 키를 누르면 취소합니다</translation>
</message>
<message>
<source>Go forward</source>
- <translation>앞으로 가기</translation>
+ <translation>앞으로 이동</translation>
</message>
<message>
<source>Alt+Right</source>
@@ -905,7 +1119,7 @@ ESC 키를 누르면 취소합니다</translation>
</message>
<message>
<source>Go to the parent directory</source>
- <translation>부모 디렉터리로 가기</translation>
+ <translation>부모 디렉터리로 이동</translation>
</message>
<message>
<source>Alt+Up</source>
@@ -941,7 +1155,7 @@ ESC 키를 누르면 취소합니다</translation>
</message>
<message>
<source>List of places and bookmarks</source>
- <translation>장소와 즐겨찾기 목록</translation>
+ <translation>장소와 책갈피 목록</translation>
</message>
<message>
<source>Files</source>
@@ -989,7 +1203,7 @@ ESC 키를 누르면 취소합니다</translation>
</message>
<message>
<source>Show </source>
- <translation>보이기</translation>
+ <translation>표시 </translation>
</message>
<message>
<source>&amp;Rename</source>
@@ -1001,7 +1215,7 @@ ESC 키를 누르면 취소합니다</translation>
</message>
<message>
<source>Show &amp;hidden files</source>
- <translation>숨김 파일 보이기(&amp;H)</translation>
+ <translation>숨김 파일 표시(&amp;H)</translation>
</message>
<message>
<source>&amp;New Folder</source>
@@ -1100,11 +1314,6 @@ Do you want to delete it anyway?</source>
<translation>별명</translation>
</message>
<message>
- <source>Alias</source>
- <comment>Mac OS X Finder</comment>
- <translation>별명</translation>
- </message>
- <message>
<source>Shortcut</source>
<comment>All other platforms</comment>
<translation>바로 가기</translation>
@@ -1117,31 +1326,11 @@ Do you want to delete it anyway?</source>
<context>
<name>QFileSystemModel</name>
<message>
- <source>%1 TB</source>
- <translation>%1TB</translation>
- </message>
- <message>
- <source>%1 GB</source>
- <translation>%1GB</translation>
- </message>
- <message>
- <source>%1 MB</source>
- <translation>%1MB</translation>
- </message>
- <message>
- <source>%1 KB</source>
- <translation>%1KB</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;&quot;%1&quot; 이름을 사용할 수 없습니다.&lt;/b&gt;&lt;p&gt;다른 이름을 사용하거나, 글자 수를 줄이거나, 구두점을 사용하지 마십시오.</translation>
</message>
<message>
@@ -1174,18 +1363,10 @@ 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>
<message>
- <source>Normal</source>
- <translation>일반</translation>
- </message>
- <message>
<source>Bold</source>
<translation>굵게</translation>
</message>
@@ -1441,7 +1622,7 @@ Do you want to delete it anyway?</source>
</message>
<message>
<source>Data Connection refused</source>
- <translation>데이터 연결 거부됨</translation>
+ <translation>데이터 연결이 거부됨</translation>
</message>
<message>
<source>Unknown error</source>
@@ -1536,12 +1717,80 @@ Do you want to delete it anyway?</source>
<comment>Translate this string to the string &apos;LTR&apos; in left-to-right languages or to &apos;RTL&apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment>
<translation>LTR</translation>
</message>
+ <message>
+ <source>QPA plugin. See QGuiApplication documentation for available options for each plugin.</source>
+ <translation>QPA 플러그인입니다. 각각 플러그인의 옵션을 보려면 QGuiApplication 문서를 참조하십시오.</translation>
+ </message>
+ <message>
+ <source>Path to the platform plugins.</source>
+ <translation>플랫폼 플러그인 경로입니다.</translation>
+ </message>
+ <message>
+ <source>Platform theme.</source>
+ <translation>플랫폼 테마입니다.</translation>
+ </message>
+ <message>
+ <source>Additional plugins to load, can be specified multiple times.</source>
+ <translation>추가로 불러올 플러그인입니다. 여러 번 지정할 수 있습니다.</translation>
+ </message>
+ <message>
+ <source>Window geometry for the main window, using the X11-syntax, like 100x100+50+50.</source>
+ <translation>주 창의 창 크기와 위치입니다. X11 문법을 사용하십시오. 예: 100x100+50+50.</translation>
+ </message>
+ <message>
+ <source>Default window icon.</source>
+ <translation>기본 창 아이콘입니다.</translation>
+ </message>
+ <message>
+ <source>Title of the first window.</source>
+ <translation>첫 창의 제목입니다.</translation>
+ </message>
+ <message>
+ <source>Sets the application&apos;s layout direction to Qt::RightToLeft (debugging helper).</source>
+ <translation>프로그램의 레이아웃 방향을 Qt::RightToLeft로 설정합니다(디버깅 도우미).</translation>
+ </message>
+ <message>
+ <source>Restores the application from an earlier session.</source>
+ <translation>프로그램을 이전 세션에서 복원합니다.</translation>
+ </message>
+ <message>
+ <source>Display name, overrides $DISPLAY.</source>
+ <translation>디스플레이 이름입니다. $DISPLAY를 재정의합니다.</translation>
+ </message>
+ <message>
+ <source>Instance name according to ICCCM 4.1.2.5.</source>
+ <translation>ICCCM 4.1.2.5에 의한 인스턴스 이름입니다.</translation>
+ </message>
+ <message>
+ <source>Disable mouse grabbing (useful in debuggers).</source>
+ <translation>마우스 잡기를 비활성화합니다(디버거에서 유용함).</translation>
+ </message>
+ <message>
+ <source>Force mouse grabbing (even when running in a debugger).</source>
+ <translation>마우스 잡기를 강제로 사용합니다(디버거에서 실행 중일 때에도).</translation>
+ </message>
+ <message>
+ <source>ID of the X11 Visual to use.</source>
+ <translation>사용할 X11 Visual의 ID입니다.</translation>
+ </message>
+ <message>
+ <source>Alias for --windowgeometry.</source>
+ <translation>--windowgeometry의 별칭입니다.</translation>
+ </message>
+ <message>
+ <source>Alias for --windowicon.</source>
+ <translation>--windowicon의 별칭입니다.</translation>
+ </message>
+ <message>
+ <source>Alias for --windowtitle.</source>
+ <translation>--windowtitle의 별칭입니다.</translation>
+ </message>
</context>
<context>
<name>QHostInfo</name>
<message>
<source>No host name given</source>
- <translation>호스트 이름이 지정되지 않음</translation>
+ <translation>호스트 이름을 지정하지 않았음</translation>
</message>
<message>
<source>Unknown error</source>
@@ -1552,7 +1801,7 @@ Do you want to delete it anyway?</source>
<name>QHostInfoAgent</name>
<message>
<source>No host name given</source>
- <translation>호스트 이름이 지정되지 않았음</translation>
+ <translation>호스트 이름을 지정하지 않았음</translation>
</message>
<message>
<source>Invalid hostname</source>
@@ -1566,14 +1815,6 @@ Do you want to delete it anyway?</source>
<source>Host not found</source>
<translation>호스트를 찾을 수 없음</translation>
</message>
- <message>
- <source>Unknown error</source>
- <translation>알 수 없는 오류</translation>
- </message>
- <message>
- <source>Unknown error (%1)</source>
- <translation>알 수 없는 오류 (%1)</translation>
- </message>
</context>
<context>
<name>QHttp</name>
@@ -1603,7 +1844,7 @@ Do you want to delete it anyway?</source>
</message>
<message>
<source>Unknown protocol specified</source>
- <translation>알 수 없는 프로토콜</translation>
+ <translation>알 수 없는 프로토콜을 지정함</translation>
</message>
<message>
<source>SSL handshake failed</source>
@@ -1634,7 +1875,7 @@ Do you want to delete it anyway?</source>
</message>
<message>
<source>Proxy denied connection</source>
- <translation>프록시에서 연결 거부됨</translation>
+ <translation>프록시에서 연결을 거부함</translation>
</message>
<message>
<source>Error communicating with HTTP proxy</source>
@@ -1665,7 +1906,7 @@ Do you want to delete it anyway?</source>
</message>
<message>
<source>Could not start transaction</source>
- <translation>트랙잭션을 시작할 수 없음</translation>
+ <translation>트랜잭션을 시작할 수 없음</translation>
</message>
<message>
<source>Unable to commit transaction</source>
@@ -1808,6 +2049,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>
@@ -1815,6 +2060,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>
@@ -1890,7 +2139,7 @@ Do you want to delete it anyway?</source>
<name>QKeySequenceEdit</name>
<message>
<source>Press shortcut</source>
- <translation>바로 가기 키를 누르십시오</translation>
+ <translation>단축키를 누르십시오</translation>
</message>
<message>
<source>%1, ...</source>
@@ -1913,8 +2162,50 @@ Do you want to delete it anyway?</source>
<translation>&apos;%1&apos;은(는) 잘못된 ELF 객체임 (%2)</translation>
</message>
<message>
- <source>Plugin verification data mismatch in &apos;%1&apos;</source>
- <translation>&apos;%1&apos;의 플러그인 확인 데이터가 일치하지 않음</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>각각 %1바이트 크기의 섹션 %n개를 보고했으며 파일 크기를 초과함</numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>shstrtab section header seems to be at %1</source>
+ <translation>shstrtab 섹션 헤더가 %1에 있는 것 같음</translation>
+ </message>
+ <message>
+ <source>string table seems to be at %1</source>
+ <translation>문자열 테이블이 %1에 있는 것 같음</translation>
+ </message>
+ <message>
+ <source>section name %1 of %2 behind end of file</source>
+ <translation>%2의 섹션 이름 %1이(가) 파일 끝 이후에 있음</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>Failed to extract plugin meta data from &apos;%1&apos;</source>
@@ -1949,10 +2240,6 @@ Do you want to delete it anyway?</source>
<translation>라이브러리 %1을(를) 닫을 수 없음: %2</translation>
</message>
<message>
- <source>Cannot resolve symbol &quot;%1&quot; in %2: %3</source>
- <translation>%2의 심볼 &quot;%1&quot;을(를) 불러올 수 없음: %3</translation>
- </message>
- <message>
<source>&apos;%1&apos; is not a valid Mach-O binary (%2)</source>
<translation>&apos;%1&apos;은(는) 올바른 Mach-O 바이너리가 아님(%2)</translation>
</message>
@@ -2071,7 +2358,7 @@ Do you want to delete it anyway?</source>
</message>
<message>
<source>%1: The socket operation is not supported</source>
- <translation>%1: 소켓 작업이 지원되지 않음</translation>
+ <translation>%1: 소켓 작업을 지원하지 않음</translation>
</message>
<message>
<source>%1: Operation not permitted when socket is in this state</source>
@@ -2254,33 +2541,22 @@ Do you want to delete it anyway?</source>
<name>QMessageBox</name>
<message>
<source>Show Details...</source>
- <translation>자세한 정보 보기...</translation>
+ <translation>자세한 정보 표시...</translation>
</message>
<message>
<source>Hide Details...</source>
<translation>자세한 정보 숨기기...</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는 크로스 플랫폼 프로그램 개발을 위한 C++ 툴킷입니다.&lt;/p&gt;&lt;p&gt;Qt는 모든 주요 데스크톱 운영 체제에서 단일 소스 코드 호환성을 제공합니다.임베디드 리눅스 및 다른 임베디드 및 모바일 운영 체제에서도 사용할 수 있습니다.&lt;/p&gt;&lt;p&gt;다양한 사용자의 요구에 부응하기 위하여, Qt는 두 종류의 라이선스 옵션으로 제공됩니다.&lt;/p&gt;&lt;p&gt;상용 소프트웨어를 개발하면서 제 3자와 소스 코드를 공유하고 싶지 않거나, GNU LGPL 3의 조건을 만족할 수 없으면 상용 라이선스 Qt를 사용하십시오.&lt;/p&gt;&lt;p&gt;GNU LGPL 3의 조건을 만족하는 Qt 기반 프로그램을 개발하려면 GNU LGPL 3 라이선스 Qt를 사용하십시오.&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 and the Qt logo are trademarks of The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt는 오픈 소스 프로젝트로 개발되는 The Qt Company Ltd의 제품입니다. 더 많은 정보를 보려면 &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; 사이트를 방문하십시오.&lt;/p&gt;</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 multiple licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of GNU (L)GPL.&lt;/p&gt;&lt;p&gt;Qt licensed under GNU (L)GPL is appropriate for the development of Qt&amp;nbsp;applications provided you can comply with the terms and conditions of the respective licenses.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) %1 The Qt Company Ltd and other contributors.&lt;/p&gt;&lt;p&gt;Qt and the Qt logo are trademarks of The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt is The Qt Company Ltd product developed as an open source project. See &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; for more information.&lt;/p&gt;</source>
+ <extracomment>Leave this text untranslated or include a verbatim copy of it below and note that it is the authoritative version in case of doubt.</extracomment>
+ <translation type="unfinished"></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 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 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 Digia Plc and/or its subsidiary(-ies) and other contributors.&lt;/p&gt;&lt;p&gt;Qt and the Qt logo are trademarks of Digia Plc and/or its subsidiary(-ies).&lt;/p&gt;&lt;p&gt;Qt is a Digia 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는 모든 주요 데스크톱 운영 체제에서 단일 소스 코드 호환성을 제공합니다.임베디드 리눅스 및 다른 임베디드 및 모바일 운영 체제에서도 사용할 수 있습니다.&lt;/p&gt;&lt;p&gt;다양한 사용자의 요구에 부응하기 위하여, Qt는 세 종류의 라이선스 옵션으로 제공됩니다.&lt;/p&gt;&lt;p&gt;상용 소프트웨어를 개발하면서 제 3자와 소스 코드를 공유하고 싶지 않거나, GNU LGPL 3 또는 GNU LGPL 2.1의 조건을 만족할 수 없으면 상용 라이선스 Qt를 사용하십시오.&lt;/p&gt;&lt;p&gt;GNU LGPL 3의 조건을 만족하는 Qt 기반 프로그램을 개발하려면 GNU LGPL 3 라이선스 Qt를 사용하십시오.&lt;/p&gt;&lt;p&gt;GNU LGPL 2.1의 조건을 만족하는 Qt 기반 프로그램을 개발하려면 GNU LGPL 2.1 라이선스 Qt를 사용하십시오.&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 Digia Plc and/or its subsidiary(-ies) and other contributors.&lt;/p&gt;&lt;p&gt;Qt and the Qt logo are trademarks of Digia Plc and/or its subsidiary(-ies).&lt;/p&gt;&lt;p&gt;Qt는 오픈 소스 프로젝트로 개발되는 Digia의 제품입니다. 더 많은 정보를 보려면 &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>
@@ -2289,7 +2565,7 @@ Do you want to delete it anyway?</source>
<name>QNativeSocketEngine</name>
<message>
<source>Unable to initialize non-blocking socket</source>
- <translation>논블러킹 소켓을 초기화할 수 없음</translation>
+ <translation>논블로킹 소켓을 초기화할 수 없음</translation>
</message>
<message>
<source>Unable to initialize broadcast socket</source>
@@ -2489,10 +2765,6 @@ Do you want to delete it anyway?</source>
<context>
<name>QNetworkReply</name>
<message>
- <source>Error downloading %1 - server replied: %2</source>
- <translation>%1을(를) 다운로드하는 중 오류 발생 - 서버 응답: %2</translation>
- </message>
- <message>
<source>Background request not allowed.</source>
<translation>백그라운드 요청이 허용되지 않았습니다.</translation>
</message>
@@ -2550,11 +2822,11 @@ Do you want to delete it anyway?</source>
</message>
<message>
<source>The session was aborted by the user or system.</source>
- <translation>사용자나 시스템에서 세션을 중단하였습니다.</translation>
+ <translation>사용자나 시스템에서 세션을 중단했습니다.</translation>
</message>
<message>
<source>The requested operation is not supported by the system.</source>
- <translation>시스템에서 요청한 구성을 지원하지 않습니다.</translation>
+ <translation>시스템에서 요청한 작업을 지원하지 않습니다.</translation>
</message>
<message>
<source>The specified configuration cannot be used.</source>
@@ -2659,7 +2931,7 @@ Do you want to delete it anyway?</source>
</message>
<message>
<source>QODBCResult::reset: Unable to set &apos;SQL_CURSOR_STATIC&apos; as statement attribute. Please check your ODBC driver configuration</source>
- <translation>QODBCResult::reset: &apos;SQL_CURSOR_STATIC&apos;을 구문 속성으로 설정할 수 없음. ODBC 드라이버의 설정을 확인하십시오</translation>
+ <translation>QODBCResult::reset: &apos;SQL_CURSOR_STATIC&apos;을 구문 속성으로 설정할 수 없습니다. ODBC 드라이버의 설정을 확인하십시오</translation>
</message>
<message>
<source>Unable to execute statement</source>
@@ -2675,7 +2947,7 @@ Do you want to delete it anyway?</source>
</message>
<message>
<source>Unable to fetch first</source>
- <translation>이전 항목을 가져올 수 없음</translation>
+ <translation>첫 항목을 가져올 수 없음</translation>
</message>
<message>
<source>Unable to fetch previous</source>
@@ -2698,15 +2970,15 @@ Do you want to delete it anyway?</source>
</message>
<message>
<source>Could not begin transaction</source>
- <translation>트랙잭션을 시작할 수 없음</translation>
+ <translation>트랜잭션을 시작할 수 없음</translation>
</message>
<message>
<source>Could not commit transaction</source>
- <translation>트랙잭션을 커밋할 수 없음</translation>
+ <translation>트랜잭션을 커밋할 수 없음</translation>
</message>
<message>
<source>Could not rollback transaction</source>
- <translation>트랙잭션을 되돌릴 수 없음</translation>
+ <translation>트랜잭션을 되돌릴 수 없음</translation>
</message>
<message>
<source>Unable to subscribe</source>
@@ -2720,10 +2992,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>
@@ -2796,7 +3080,7 @@ Do you want to delete it anyway?</source>
</message>
<message>
<source>Page Layout</source>
- <translation>쪽 레이아우</translation>
+ <translation>쪽 레이아웃</translation>
</message>
<message>
<source>Page order:</source>
@@ -2992,15 +3276,15 @@ Do you want to delete it anyway?</source>
</message>
<message>
<source>Executive (7.5 x 10 in)</source>
- <translation>Executive (7.5 x 10 in)</translation>
+ <translation>Executive(7.5 x 10 in)</translation>
</message>
<message>
<source>Executive (7.25 x 10.5 in)</source>
- <translation>Executive (7.25 x 10.5 in)</translation>
+ <translation>Executive(7.25 x 10.5 in)</translation>
</message>
<message>
<source>Folio (8.27 x 13 in)</source>
- <translation>폴리오 (8.27 x 13 in)</translation>
+ <translation>폴리오(8.27 x 13 in)</translation>
</message>
<message>
<source>Legal</source>
@@ -3516,8 +3800,24 @@ Do you want to delete it anyway?</source>
<translation>설정(&amp;O) &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의 문법이 잘못되었습니다. &apos;,&apos;를 사용하여 범위와 쪽을 구분하고, &apos;-&apos;를 사용하여 범위를 선언하고, 범위가 겹치지 않는지 확인하십시오.</translation>
+ </message>
+ <message>
+ <source>Duplex Settings Conflicts</source>
+ <translation>양면 인쇄 설정 충돌</translation>
+ </message>
+ <message>
+ <source>There are conflicts in duplex settings. Do you want to fix them?</source>
+ <translation>양면 인쇄 설정이 충돌합니다. 해결하시겠습니까?</translation>
+ </message>
+ <message>
<source>Print to File (PDF)</source>
- <translation>파일로 인쇄 (PDF)</translation>
+ <translation>파일로 인쇄(PDF)</translation>
</message>
<message>
<source>Local file</source>
@@ -3563,10 +3863,6 @@ Please turn one of those options off.</source>
<source>OK</source>
<translation>확인</translation>
</message>
- <message>
- <source>Automatic</source>
- <translation>자동</translation>
- </message>
</context>
<context>
<name>QPrintPreviewDialog</name>
@@ -3624,7 +3920,7 @@ Please turn one of those options off.</source>
</message>
<message>
<source>Show single page</source>
- <translation>한 쪽 보이기</translation>
+ <translation>한 쪽 보기</translation>
</message>
<message>
<source>Show facing pages</source>
@@ -3657,6 +3953,22 @@ Please turn one of those options off.</source>
<source>Job Options</source>
<translation>작업 설정</translation>
</message>
+ <message>
+ <source>Page Setup Conflicts</source>
+ <translation>쪽 설정 충돌</translation>
+ </message>
+ <message>
+ <source>There are conflicts in page setup options. Do you want to fix them?</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>
@@ -3668,6 +3980,14 @@ 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>
@@ -3737,23 +4057,31 @@ Please turn one of those options off.</source>
</message>
<message>
<source>Grayscale</source>
- <translation>그레이스케일</translation>
+ <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>
<message>
- <source>Duplex Printing</source>
+ <source>Double Sided Printing</source>
<translation>양면 인쇄</translation>
</message>
<message>
- <source>None</source>
- <translation>없음</translation>
+ <source>Off</source>
+ <translation>끔</translation>
</message>
<message>
- <source>Long side</source>
- <translation>긴 쪽</translation>
+ <source>Long side binding</source>
+ <translation>긴 쪽으로 제본</translation>
</message>
<message>
- <source>Short side</source>
- <translation>짧은 쪽</translation>
+ <source>Short side binding</source>
+ <translation>짧은 쪽으로 제본</translation>
</message>
</context>
<context>
@@ -3819,15 +4147,15 @@ Please turn one of those options off.</source>
</message>
<message>
<source>Could not open input redirection for reading</source>
- <translation>읽기 위해 입력 리다이렉션을 열 수 없음</translation>
+ <translation>읽으려고 입력 리디렉션을 열 수 없음</translation>
</message>
<message>
<source>Could not open output redirection for writing</source>
- <translation>쓰기 위해 출력 리다이렉션을 열 수 없음</translation>
+ <translation>쓰려고 출력 리디렉션을 열 수 없음</translation>
</message>
<message>
<source>Resource error (fork failure): %1</source>
- <translation>자원 오류 (fork 실패): %1</translation>
+ <translation>자원 오류(fork 실패): %1</translation>
</message>
<message>
<source>Process operation timed out</source>
@@ -3846,28 +4174,6 @@ Please turn one of those options off.</source>
</message>
</context>
<context>
- <name>QQnxFileDialogHelper</name>
- <message>
- <source>All files (*.*)</source>
- <translation>모든 파일 (*.*)</translation>
- </message>
- <message>
- <source>CANCEL</source>
- <translation>취소</translation>
- </message>
- <message>
- <source>OK</source>
- <translation>확인</translation>
- </message>
-</context>
-<context>
- <name>QQnxFilePicker</name>
- <message>
- <source>Pick a file</source>
- <translation>파일 선택</translation>
- </message>
-</context>
-<context>
<name>QRegExp</name>
<message>
<source>no error occurred</source>
@@ -3949,18 +4255,10 @@ Please turn one of those options off.</source>
<translation>문자 클래스 끝에 ] 기호가 없음</translation>
</message>
<message>
- <source>invalid escape sequence in character class</source>
- <translation>문자 클래스에 잘못된 탈출 시퀀스가 있음</translation>
- </message>
- <message>
<source>range out of order in character class</source>
<translation>문자 클래스의 범위가 올바르지 않음</translation>
</message>
<message>
- <source>nothing to repeat</source>
- <translation>반복할 항목 없음</translation>
- </message>
- <message>
<source>internal error: unexpected repeat</source>
<translation>내부 오류: 예상하지 못한 반복</translation>
</message>
@@ -3973,264 +4271,612 @@ Please turn one of those options off.</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>
+ <source>regular expression is too large</source>
+ <translation>정규 표현식이 너무 큼</translation>
+ </message>
+ <message>
+ <source>internal error: code overflow</source>
+ <translation>내부 오류: 코드 넘침</translation>
+ </message>
+ <message>
+ <source>lookbehind assertion is not fixed length</source>
+ <translation>룩비하인드 조건이 고정 길이가 아님</translation>
</message>
<message>
- <source>unknown option bit(s) set</source>
- <translation>알 수 없는 옵션 비트 설정됨</translation>
+ <source>unknown POSIX class name</source>
+ <translation>알 수 없는 POSIX 클래스 이름</translation>
</message>
<message>
- <source>missing ) after comment</source>
- <translation>주석 뒤에 ) 없음</translation>
+ <source>POSIX collating elements are not supported</source>
+ <translation>POSIX 정렬 순서 원소를 지원하지 않음</translation>
</message>
<message>
- <source>regular expression is too large</source>
- <translation>정규 표현식이 너무 큼</translation>
+ <source>unrecognized character after (?P</source>
+ <translation>(?P 다음에 알 수 없는 글자가 옴</translation>
</message>
<message>
- <source>failed to get memory</source>
- <translation>메모리를 할당할 수 없음</translation>
+ <source>malformed \P or \p sequence</source>
+ <translation>\P 또는 \p 시퀀스가 잘못됨</translation>
</message>
<message>
- <source>unmatched parentheses</source>
- <translation>괄호가 맞지 않음</translation>
+ <source>unknown property name after \P or \p</source>
+ <translation>\P 또는 \p 다음에 알 수 없는 속성 이름이 옴</translation>
</message>
<message>
- <source>internal error: code overflow</source>
- <translation>내부 오류: 코드 넘침</translation>
+ <source>too many named subpatterns (maximum 10000)</source>
+ <translation>이름 있는 하위 패턴이 너무 많음(최대 10000개)</translation>
</message>
<message>
- <source>unrecognized character after (?&lt;</source>
- <translation>(?&lt; 다음에 예상하지 못한 글자가 옴</translation>
+ <source>internal error: overran compiling workspace</source>
+ <translation>내부 오류: 컴파일 작업 공간 넘침</translation>
</message>
<message>
- <source>lookbehind assertion is not fixed length</source>
- <translation>룩비하인드 조건이 고정 길이가 아님</translation>
+ <source>internal error: previously-checked referenced subpattern not found</source>
+ <translation>내부 오류: 이전에 확인된 참조된 하위 패턴을 찾을 수 없음</translation>
</message>
<message>
- <source>malformed number or name after (?(</source>
- <translation>(?( 다음에 잘못된 숫자나 이름이 옴</translation>
+ <source>\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number</source>
+ <translation>\g 다음에 중괄호, 부등호, 따옴표로 둘러싸인 이름/숫자 또는 둘러싸는 부호 없는 숫자가 오지 않음</translation>
</message>
<message>
- <source>conditional group contains more than two branches</source>
- <translation>조건 그룹에 두 개를 초과하는 브랜치가 있음</translation>
+ <source>subpattern name expected</source>
+ <translation>하위 패턴 이름이 필요함</translation>
</message>
<message>
- <source>assertion expected after (?(</source>
- <translation>(?( 다음에 조건을 예상함</translation>
+ <source>different names for subpatterns of the same number are not allowed</source>
+ <translation>같은 번호를 가진 하위 패턴에 서로 다른 이름을 사용할 수 없음</translation>
</message>
<message>
- <source>(?R or (?[+-]digits must be followed by )</source>
- <translation>(?R 또는 (?[+-]digits 다음에 ) 문자가 와야 함</translation>
+ <source>(*MARK) must have an argument</source>
+ <translation>(*MARK)에 인자가 필요함</translation>
</message>
<message>
- <source>unknown POSIX class name</source>
- <translation>알 수 없는 POSIX 클래스 이름</translation>
+ <source>\k is not followed by a braced, angle-bracketed, or quoted name</source>
+ <translation>\k 다음에 중괄호, 부등호, 따옴표로 둘러싸인 이름이 와야 함</translation>
</message>
<message>
- <source>POSIX collating elements are not supported</source>
- <translation>POSIX 정렬 순서 원소를 지원하지 않음</translation>
+ <source>\N is not supported in a class</source>
+ <translation>클래스 내에서 \N을 사용할 수 없음</translation>
+ </message>
+ <message>
+ <source>disallowed Unicode code point (&gt;= 0xd800 &amp;&amp; &lt;= 0xdfff)</source>
+ <translation>사용할 수 없는 유니코드 코드 포인트 (&gt;= 0xd800 &amp;&amp; &lt;= 0xdfff)</translation>
</message>
<message>
- <source>this version of PCRE is not compiled with PCRE_UTF8 support</source>
- <translation>사용 중인 PCRE가 PCRE_UTF8 지원을 추가하여 컴파일되지 않았음</translation>
+ <source>name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)</source>
+ <translation>(*MARK), (*PRUNE), (*SKIP), (*THEN)의 이름이 너무 김</translation>
+ </message>
+ <message>
+ <source>non-hex character in \x{} (closing brace missing?)</source>
+ <translation>\x{}에 16진 문자가 아닌 것이 옴(닫는 괄호가 없을 수도 있음)</translation>
+ </message>
+ <message>
+ <source>non-octal character in \o{} (closing brace missing?)</source>
+ <translation>\o{}에 8진수 숫자가 아닌 것이 옴(닫는 괄호가 없을 수도 있음)</translation>
+ </message>
+ <message>
+ <source>escape sequence is invalid in character class</source>
+ <translation>탈출 시퀀스가 문자 클래스에서 잘못됨</translation>
+ </message>
+ <message>
+ <source>quantifier does not follow a repeatable item</source>
+ <translation>한정자가 반복 가능한 항목을 따르지 않음</translation>
+ </message>
+ <message>
+ <source>missing closing parenthesis</source>
+ <translation>닫는 괄호가 없음</translation>
+ </message>
+ <message>
+ <source>pattern passed as NULL</source>
+ <translation>pattern이 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>character value in \x{...} sequence is too large</source>
- <translation>\x{...} 시퀀스 내의 문자 값이 너무 큼</translation>
+ <source>unmatched closing parenthesis</source>
+ <translation>닫는 괄호가 맞지 않음</translation>
</message>
<message>
- <source>invalid condition (?(0)</source>
- <translation>잘못된 조건 (?(0)</translation>
+ <source>missing closing parenthesis for condition</source>
+ <translation>조건문을 닫는 괄호가 없음</translation>
</message>
<message>
- <source>\C not allowed in lookbehind assertion</source>
- <translation>룩비하인드 조건에 \C를 사용할 수 없음</translation>
+ <source>a relative value of zero is not allowed</source>
+ <translation>상대값으로 0을 사용할 수 없음</translation>
</message>
<message>
- <source>PCRE does not support \L, \l, \N{name}, \U, or \u</source>
- <translation>PCRE에서 \L, \l, \N{name}, \U, \u를 지원하지 않음</translation>
+ <source>conditional subpattern contains more than two branches</source>
+ <translation>조건 그룹에 두 개를 초과하는 브랜치가 있음</translation>
+ </message>
+ <message>
+ <source>assertion expected after (?( or (?(?C)</source>
+ <translation>(?( 또는 (?(?C) 다음에 조건이 필요함</translation>
+ </message>
+ <message>
+ <source>digit expected after (?+ or (?-</source>
+ <translation>(?+ 또는 (?- 다음에 숫자가 필요함</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>character code point value in \x{} or \o{} is too large</source>
+ <translation>\x{} 또는 \o{}에 있는 문자 코드 포인트 값이 너무 큼</translation>
+ </message>
+ <message>
+ <source>lookbehind is too complicated</source>
+ <translation>룩비하인드가 너무 복잡함</translation>
+ </message>
+ <message>
+ <source>\C is not allowed in a lookbehind assertion in UTF-16 mode</source>
+ <translation>UTF-16 모드에서 룩비하인드 조건에 \C를 사용할 수 없음</translation>
</message>
<message>
- <source>number after (?C is &gt; 255</source>
+ <source>PCRE2 does not support \F, \L, \l, \N{name}, \U, or \u</source>
+ <translation>PCRE2에서 \F, \L, \l, \N{name}, \U, \u를 지원하지 않음</translation>
+ </message>
+ <message>
+ <source>number after (?C is greater than 255</source>
<translation>(?C 다음의 숫자가 255보다 큼</translation>
</message>
<message>
- <source>closing ) for (?C expected</source>
+ <source>closing parenthesis for (?C expected</source>
<translation>(?C에 대한 닫는 ) 기호가 필요함</translation>
</message>
<message>
- <source>recursive call could loop indefinitely</source>
- <translation>재귀 호출이 무한히 반복될 수 있음</translation>
+ <source>invalid escape sequence in (*VERB) name</source>
+ <translation>(*VERB) 이름에 잘못된 탈출 시퀀스가 있음</translation>
</message>
<message>
- <source>unrecognized character after (?P</source>
- <translation>(?P 다음에 알 수 없는 글자가 옴</translation>
+ <source>syntax error in subpattern name (missing terminator?)</source>
+ <translation>하위 패턴 이름에 구문 오류(종결자 없음)</translation>
</message>
<message>
- <source>syntax error in subpattern name (missing terminator)</source>
- <translation>하위 패턴 이름에 구문 오류(종결자 없음)</translation>
+ <source>two named subpatterns have the same name (PCRE2_DUPNAMES not set)</source>
+ <translation>두 개 이상의 이름이 있는 하위 패턴의 이름이 동일함(PCRE2_DUPNAMES 설정되지 않음)</translation>
</message>
<message>
- <source>two named subpatterns have the same name</source>
- <translation>두 개 이상의 이름이 있는 하위 패턴의 이름이 동일함</translation>
+ <source>subpattern name must start with a non-digit</source>
+ <translation>하위 패턴 이름이 숫자로 시작할 수 없음</translation>
</message>
<message>
- <source>invalid UTF-8 string</source>
- <translation>잘못된 UTF-8 문자열</translation>
+ <source>this version of PCRE2 does not have support for \P, \p, or \X</source>
+ <translation>이 PCRE2 버전에서 \P, \p, \X를 지원하지 않음</translation>
</message>
<message>
- <source>support for \P, \p, and \X has not been compiled</source>
- <translation>\P, \p, \X 지원이 컴파일되지 않았음</translation>
+ <source>subpattern name is too long (maximum 32 code units)</source>
+ <translation>하위 패턴 이름이 너무 김(최대 32개 코드 단위)</translation>
</message>
<message>
- <source>malformed \P or \p sequence</source>
- <translation>\P 또는 \p 시퀀스가 잘못됨</translation>
+ <source>octal value is greater than \377 in 8-bit non-UTF-8 mode</source>
+ <translation>비 UTF-8 모드에서 8진수 값이 \377보다 큼</translation>
</message>
<message>
- <source>unknown property name after \P or \p</source>
- <translation>\P 또는 \p 다음에 알 수 없는 속성 이름이 옴</translation>
+ <source>DEFINE subpattern contains more than one branch</source>
+ <translation>DEFINE 하위 패턴에 하나 이상의 브랜치가 포함됨</translation>
</message>
<message>
- <source>subpattern name is too long (maximum 32 characters)</source>
- <translation>하위 패턴 이름이 너무 김(최대 32글자)</translation>
+ <source>missing opening brace after \o</source>
+ <translation>\o 다음에 여는 중괄호가 없음</translation>
</message>
<message>
- <source>too many named subpatterns (maximum 10000)</source>
- <translation>이름 있는 하위 패턴이 너무 많음(최대 10000개)</translation>
+ <source>internal error: unknown newline setting</source>
+ <translation>내부 오류: 예상하지 못한 새로운 줄 설정</translation>
</message>
<message>
- <source>octal value is greater than \377 (not in UTF-8 mode)</source>
- <translation>8진수 값이 \377보다 큼(UTF-8 모드 제외)</translation>
+ <source>(?R (recursive pattern call) must be followed by a closing parenthesis</source>
+ <translation>(?R (재귀적 패턴 호출) 다음에는 닫는 괄호가 와야 함</translation>
</message>
<message>
- <source>internal error: overran compiling workspace</source>
- <translation>내부 오류: 컴파일 작업 공간 넘침</translation>
+ <source>obsolete error (should not occur)</source>
+ <translation>오래된 오류(일어나면 안 됨)</translation>
</message>
<message>
- <source>internal error: previously-checked referenced subpattern not found</source>
- <translation>내부 오류: 이전에 확인된 참조된 하위 패턴을 찾을 수 없음</translation>
+ <source>(*VERB) not recognized or malformed</source>
+ <translation>(*VERB)가 인식되지 않거나 잘못됨</translation>
</message>
<message>
- <source>DEFINE group contains more than one branch</source>
- <translation>DEFINE 그룹에 하나 이상의 브랜치가 포함됨</translation>
+ <source>subpattern number is too big</source>
+ <translation>하위 패턴 숫자가 너무 큼</translation>
</message>
<message>
- <source>repeating a DEFINE group is not allowed</source>
- <translation>DEFINE 그룹을 반복해서 사용할 수 없음</translation>
+ <source>internal error: parsed pattern overflow</source>
+ <translation>내부 오류: 처리된 패턴 넘침</translation>
</message>
<message>
- <source>inconsistent NEWLINE options</source>
- <translation>일관성 없는 NEWLINE 옵션</translation>
+ <source>\c must be followed by a printable ASCII character</source>
+ <translation>\c 다음에 출력 가능한 ASCII 글자가 와야 함</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>
+ <source>\c must be followed by a letter or one of [\]^_?</source>
+ <translation>\c 다음에 [\]^_? 중 한 글자가 와야 함</translation>
</message>
<message>
- <source>a numbered reference must not be zero</source>
- <translation>참조 번호가 0일 수 없음</translation>
+ <source>internal error: unknown meta code in check_lookbehinds()</source>
+ <translation>내부 오류: check_lookbehinds()의 알 수 없는 opcode</translation>
</message>
<message>
- <source>an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)</source>
- <translation>(*ACCEPT), (*FAIL), (*COMMIT)에는 인자를 사용할 수 없음</translation>
+ <source>callout string is too long</source>
+ <translation>외부 호출 문자열이 너무 김</translation>
</message>
<message>
- <source>(*VERB) not recognized</source>
- <translation>(*VERB)가 인식되지 않음</translation>
+ <source>using UTF is disabled by the application</source>
+ <translation>프로그램에서 UTF 사용을 허용하지 않음</translation>
</message>
<message>
- <source>number is too big</source>
- <translation>숫자가 너무 큼</translation>
+ <source>using UCP is disabled by the application</source>
+ <translation>프로그램에서 UCP 사용을 허용하지 않음</translation>
</message>
<message>
- <source>subpattern name expected</source>
- <translation>하위 패턴 이름이 필요함</translation>
+ <source>character code point value in \u.... sequence is too large</source>
+ <translation>\u....에 있는 문자 코드 포인트 값이 너무 큼</translation>
</message>
<message>
- <source>digit expected after (?+</source>
- <translation>(?+ 다음에 숫자가 필요함</translation>
+ <source>digits missing in \x{} or \o{} or \N{U+}</source>
+ <translation>\x{}, \o{}, \N{U+}에 숫자가 없음</translation>
</message>
<message>
- <source>] is an invalid data character in JavaScript compatibility mode</source>
- <translation>자바스크립트 호환 모드에서 ] 글자는 잘못된 데이터 글자임</translation>
+ <source>syntax error or number too big in (?(VERSION condition</source>
+ <translation>(?(VERSION 조건의 구문 오류 또는 숫자가 너무 큼</translation>
</message>
<message>
- <source>different names for subpatterns of the same number are not allowed</source>
- <translation>같은 번호를 가진 하위 패턴에 서로 다른 이름을 사용할 수 없음</translation>
+ <source>internal error: unknown opcode in auto_possessify()</source>
+ <translation>내부 오류: auto_possessify()에서 예상하지 못한 작업 코드</translation>
</message>
<message>
- <source>(*MARK) must have an argument</source>
- <translation>(*MARK)에 인자가 필요함</translation>
+ <source>missing terminating delimiter for callout with string argument</source>
+ <translation>문자열 인자가 있는 외부 호출에 끝 구분자 없음</translation>
</message>
<message>
- <source>this version of PCRE is not compiled with PCRE_UCP support</source>
- <translation>사용 중인 PCRE가 PCRE_UCP 지원을 추가하여 컴파일되지 않았음</translation>
+ <source>unrecognized string delimiter follows (?C</source>
+ <translation>(?C 다음에 알 수 없는 글자가 옴</translation>
</message>
<message>
- <source>\c must be followed by an ASCII character</source>
- <translation>\c 다음에 ASCII 글자가 와야 함</translation>
+ <source>using \C is disabled by the application</source>
+ <translation>프로그램에서 \C 사용을 허용하지 않음</translation>
</message>
<message>
- <source>\k is not followed by a braced, angle-bracketed, or quoted name</source>
- <translation>\k 다음에 중괄호, 부등호, 따옴표로 둘러싸인 이름이 와야 함</translation>
+ <source>(?| and/or (?J: or (?x: parentheses are too deeply nested</source>
+ <translation>(?|, (?J:, (?x: 괄호 깊이가 너무 깊음</translation>
</message>
<message>
- <source>internal error: unknown opcode in find_fixedlength()</source>
- <translation>내부 오류: find_fixedlength()의 알 수 없는 opcode</translation>
+ <source>using \C is disabled in this PCRE2 library</source>
+ <translation>이 PCRE2 라이브러리에서 \C 사용을 허용하지 않음</translation>
</message>
<message>
- <source>\N is not supported in a class</source>
- <translation>클래스 내에서 \N을 사용할 수 없음</translation>
+ <source>regular expression is too complicated</source>
+ <translation>정규 표현식이 너무 복잡함</translation>
</message>
<message>
- <source>too many forward references</source>
- <translation>너무 많은 사전 참조</translation>
+ <source>lookbehind assertion is too long</source>
+ <translation>룩비하인드 조건이 너무 김</translation>
</message>
<message>
- <source>disallowed Unicode code point (&gt;= 0xd800 &amp;&amp; &lt;= 0xdfff)</source>
- <translation>사용할 수 없는 유니코드 코드 포인트 (&gt;= 0xd800 &amp;&amp; &lt;= 0xdfff)</translation>
+ <source>pattern string is longer than the limit set by the application</source>
+ <translation>패턴 문자열이 프로그램에서 설정한 한계보다 더 김</translation>
</message>
<message>
- <source>invalid UTF-16 string</source>
- <translation>잘못된 UTF-16 문자열</translation>
+ <source>internal error: unknown code in parsed pattern</source>
+ <translation>내부 오류: 처리된 패턴에 알 수 없는 코드</translation>
</message>
<message>
- <source>name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)</source>
- <translation>(*MARK), (*PRUNE), (*SKIP), (*THEN)의 이름이 너무 김</translation>
+ <source>internal error: bad code value in parsed_skip()</source>
+ <translation>내부 오류: parsed_skip()에 잘못된 코드 값</translation>
</message>
<message>
- <source>character value in \u.... sequence is too large</source>
- <translation>\u.... 시퀀스의 문자 값이 너무 큼</translation>
+ <source>PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES is not allowed in UTF-16 mode</source>
+ <translation>UTF-16 모드에서 PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES가 허용되지 않음</translation>
</message>
<message>
- <source>invalid UTF-32 string</source>
- <translation>잘못된 UTF-32 문자열</translation>
+ <source>invalid option bits with PCRE2_LITERAL</source>
+ <translation>PCRE2_LITERAL에 잘못된 옵션 비트</translation>
</message>
<message>
- <source>setting UTF is disabled by the application</source>
- <translation>프로그램에서 UTF 설정을 허용하지 않음</translation>
+ <source>\N{U+dddd} is supported only in Unicode (UTF) mode</source>
+ <translation>\N{U+dddd}는 유니코드(UTF) 모드에서만 지원함</translation>
</message>
<message>
- <source>non-hex character in \x{} (closing brace missing?)</source>
- <translation>\x{}에 16진 문자가 아닌 것이 옴(닫는 괄호가 없을 수도 있음)</translation>
+ <source>invalid hyphen in option setting</source>
+ <translation>옵션 설정에 잘못된 하이픈</translation>
</message>
<message>
- <source>non-octal character in \o{} (closing brace missing?)</source>
- <translation>\o{}에 8진수 숫자가 아닌 것이 옴(닫는 괄호가 없을 수도 있음)</translation>
+ <source>(*alpha_assertion) not recognized</source>
+ <translation>(*alpha_assertion)이 인식되지 않음</translation>
</message>
<message>
- <source>missing opening brace after \o</source>
- <translation>\o 다음에 여는 중괄호가 없음</translation>
+ <source>script runs require Unicode support, which this version of PCRE2 does not have</source>
+ <translation>스크립트를 실행하려면 유니코드 지원이 필요하지만 이 PCRE2 버전에서 지원하지 않음</translation>
+ </message>
+ <message>
+ <source>too many capturing groups (maximum 65535)</source>
+ <translation>캡처 그룹이 너무 많음(최대 65535개)</translation>
+ </message>
+ <message>
+ <source>atomic assertion expected after (?( or (?(?C)</source>
+ <translation>(?( 또는 (?(?C) 다음에 원자적 조건이 필요함</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 오류: 두 번째 바이트의 최상위 비트가 0x80이 아님</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: byte 3 top bits not 0x80</source>
+ <translation>UTF-8 오류: 세 번째 바이트의 최상위 비트가 0x80이 아님</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: byte 4 top bits not 0x80</source>
+ <translation>UTF-8 오류: 네 번째 바이트의 최상위 비트가 0x80이 아님</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: byte 5 top bits not 0x80</source>
+ <translation>UTF-8 오류: 다섯 번째 바이트의 최상위 비트가 0x80이 아님</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: byte 6 top bits not 0x80</source>
+ <translation>UTF-8 오류: 여섯 번째 바이트의 최상위 비트가 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 오류: 불필요하게 긴 2바이트 시퀀스</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: overlong 3-byte sequence</source>
+ <translation>UTF-8 오류: 불필요하게 긴 3바이트 시퀀스</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: overlong 4-byte sequence</source>
+ <translation>UTF-8 오류: 불필요하게 긴 4바이트 시퀀스</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: overlong 5-byte sequence</source>
+ <translation>UTF-8 오류: 불필요하게 긴 5바이트 시퀀스</translation>
+ </message>
+ <message>
+ <source>UTF-8 error: overlong 6-byte sequence</source>
+ <translation>UTF-8 오류: 불필요하게 긴 6바이트 시퀀스</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>
+ <translation>DFA 다시 시작 작업 공간에 잘못된 데이터</translation>
+ </message>
+ <message>
+ <source>too much recursion for DFA matching</source>
+ <translation>DFA 일치에 재귀 단계가 너무 깊음</translation>
+ </message>
+ <message>
+ <source>backreference condition or recursion test is not supported for DFA matching</source>
+ <translation>DFA 일치에서는 역참조 조건이나 재귀 테스트를 지원하지 않음</translation>
+ </message>
+ <message>
+ <source>function is not supported for DFA matching</source>
+ <translation>DFA 일치에서는 함수를 지원하지 않음</translation>
+ </message>
+ <message>
+ <source>pattern contains an item that is not supported for DFA matching</source>
+ <translation>패턴에 DFA 일치에서 사용할 수 없는 항목이 포함됨</translation>
+ </message>
+ <message>
+ <source>workspace size exceeded in DFA matching</source>
+ <translation>DFA 일치 작업 공간 크기 초과</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>
+ <translation>같은 위치에 재귀 중첩됨</translation>
+ </message>
+ <message>
+ <source>matching depth 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>대체 문자열에 잘못된 탈출 시퀀스가 있음</translation>
+ </message>
+ <message>
+ <source>expected closing curly bracket in replacement string</source>
+ <translation>대체 문자열에 닫는 중괄호가 필요함</translation>
+ </message>
+ <message>
+ <source>bad substitution in replacement string</source>
+ <translation>대체 문자열에 잘못된 대체가 있음</translation>
+ </message>
+ <message>
+ <source>match with end before start or start moved backwards is not supported</source>
+ <translation>끝이 시작 이전에 있거나 시작이 뒤로 이동하는 일치는 지원하지 않음</translation>
+ </message>
+ <message>
+ <source>too many replacements (more than INT_MAX)</source>
+ <translation>대체 작업이 너무 많음(INT_MAX 초과)</translation>
+ </message>
+ <message>
+ <source>bad serialized data</source>
+ <translation>잘못된 직렬화된 값</translation>
+ </message>
+ <message>
+ <source>heap limit exceeded</source>
+ <translation>힙 한계에 도달함</translation>
+ </message>
+ <message>
+ <source>invalid syntax</source>
+ <translation>잘못된 문법</translation>
+ </message>
+ <message>
+ <source>internal error - duplicate substitution match</source>
+ <translation>내부 오류 - 복제 대체 일치</translation>
+ </message>
+ <message>
+ <source>PCRE2_MATCH_INVALID_UTF is not supported for DFA matching</source>
+ <translation>PCRE2_MATCH_INVALID_UTF는 DFA 일치에서 사용할 수 없음</translation>
</message>
<message>
<source>parentheses are too deeply nested</source>
@@ -4241,17 +4887,9 @@ Please turn one of those options off.</source>
<translation>문자 클래스에 잘못된 범위가 있음</translation>
</message>
<message>
- <source>group name must start with a non-digit</source>
- <translation>그룹 이름이 숫자로 시작할 수 없음</translation>
- </message>
- <message>
<source>parentheses are too deeply nested (stack check)</source>
<translation>괄호 깊이가 너무 깊음(스택 확인)</translation>
</message>
- <message>
- <source>digits missing in \x{} or \o{}</source>
- <translation>\x{} 또는 \o{}에 숫자가 없음</translation>
- </message>
</context>
<context>
<name>QSQLite2Driver</name>
@@ -4348,6 +4986,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.</source>
+ <translation>QSaveFile에서 직접 쓰기 폴백을 활성화하지 않고 &apos;%1&apos;을(를) 열 수 없습니다.</translation>
+ </message>
+ <message>
<source>Writing canceled by application</source>
<translation>프로그램에서 쓰기 작업을 취소함</translation>
</message>
@@ -4376,19 +5018,19 @@ Please turn one of those options off.</source>
</message>
<message>
<source>Page left</source>
- <translation>왼쪽 페이지</translation>
+ <translation>한 쪽 왼쪽</translation>
</message>
<message>
<source>Page up</source>
- <translation>위쪽 페이지</translation>
+ <translation>한 쪽 위</translation>
</message>
<message>
<source>Page right</source>
- <translation>오른쪽 페이지</translation>
+ <translation>한 쪽 오른쪽</translation>
</message>
<message>
<source>Page down</source>
- <translation>아래쪽 페이지</translation>
+ <translation>한 쪽 아래</translation>
</message>
<message>
<source>Scroll left</source>
@@ -4474,7 +5116,7 @@ Please turn one of those options off.</source>
</message>
<message>
<source>%1: system-imposed size restrictions</source>
- <translation>%1: 시스템에서 크게를 제한함</translation>
+ <translation>%1: 시스템에서 크기를 제한함</translation>
</message>
<message>
<source>%1: not attached</source>
@@ -4680,7 +5322,7 @@ Please turn one of those options off.</source>
</message>
<message>
<source>Favorites</source>
- <translation>즐겨찾기</translation>
+ <translation>책갈피</translation>
</message>
<message>
<source>Search</source>
@@ -4767,6 +5409,14 @@ Please turn one of those options off.</source>
<translation>(F) 실행</translation>
</message>
<message>
+ <source>Launch (G)</source>
+ <translation>(G) 실행</translation>
+ </message>
+ <message>
+ <source>Launch (H)</source>
+ <translation>(H) 실행</translation>
+ </message>
+ <message>
<source>Monitor Brightness Up</source>
<translation>모니터 밝기 증가</translation>
</message>
@@ -4824,7 +5474,7 @@ Please turn one of those options off.</source>
</message>
<message>
<source>Add Favorite</source>
- <translation>즐겨찾기에 추가</translation>
+ <translation>책갈피에 추가</translation>
</message>
<message>
<source>Hot Links</source>
@@ -4871,6 +5521,10 @@ Please turn one of those options off.</source>
<translation>계산기</translation>
</message>
<message>
+ <source>Calendar</source>
+ <translation>달력</translation>
+ </message>
+ <message>
<source>Clear</source>
<translation>지우기</translation>
</message>
@@ -4883,6 +5537,10 @@ Please turn one of those options off.</source>
<translation>닫기</translation>
</message>
<message>
+ <source>Adjust contrast</source>
+ <translation>명암 조정</translation>
+ </message>
+ <message>
<source>Copy</source>
<translation>복사</translation>
</message>
@@ -4935,6 +5593,10 @@ Please turn one of those options off.</source>
<translation>미팅</translation>
</message>
<message>
+ <source>Memo</source>
+ <translation>메모</translation>
+ </message>
+ <message>
<source>Keyboard Menu</source>
<translation>키보드 메뉴</translation>
</message>
@@ -5015,6 +5677,10 @@ Please turn one of those options off.</source>
<translation>터미널</translation>
</message>
<message>
+ <source>To-do list</source>
+ <translation>할 일 목록</translation>
+ </message>
+ <message>
<source>Tools</source>
<translation>도구</translation>
</message>
@@ -5483,6 +6149,7 @@ Please turn one of those options off.</source>
</message>
<message>
<source>+</source>
+ <extracomment>Key separator in shortcut string</extracomment>
<translation>+</translation>
</message>
<message>
@@ -5671,12 +6338,12 @@ Role of an accessible object</extracomment>
<message>
<source>column header</source>
<extracomment>Role of an accessible object - part of a table</extracomment>
- <translation>열 머릿글</translation>
+ <translation>열 머리글</translation>
</message>
<message>
<source>row header</source>
<extracomment>Role of an accessible object - part of a table</extracomment>
- <translation>행 머릿글</translation>
+ <translation>행 머리글</translation>
</message>
<message>
<source>column</source>
@@ -5881,7 +6548,7 @@ Role of an accessible object</extracomment>
<message>
<source>footer</source>
<extracomment>Role of an accessible object</extracomment>
- <translation>꼬릿글</translation>
+ <translation>꼬리글</translation>
</message>
<message>
<source>form</source>
@@ -5891,7 +6558,7 @@ Role of an accessible object</extracomment>
<message>
<source>heading</source>
<extracomment>Role of an accessible object</extracomment>
- <translation>머릿글</translation>
+ <translation>머리글</translation>
</message>
<message>
<source>note</source>
@@ -5904,6 +6571,21 @@ Role of an accessible object</extracomment>
<translation>보조 내용</translation>
</message>
<message>
+ <source>terminal</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>터미널</translation>
+ </message>
+ <message>
+ <source>desktop</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>바탕 화면</translation>
+ </message>
+ <message>
+ <source>notification</source>
+ <extracomment>Role of an accessible object</extracomment>
+ <translation>알림</translation>
+ </message>
+ <message>
<source>unknown</source>
<extracomment>Role of an accessible object</extracomment>
<translation>알 수 없음</translation>
@@ -5921,24 +6603,36 @@ Role of an accessible object</extracomment>
</message>
<message>
<source>The given Diffie-Hellman parameters are deemed unsafe</source>
- <translation>지정한 디피-헬만 인자가 안전하지 않음</translation>
+ <translation>지정한 디피-헬먼 인자가 안전하지 않음</translation>
</message>
</context>
<context>
<name>QSslSocket</name>
<message>
+ <source>Error when setting the OpenSSL configuration (%1)</source>
+ <translation>OpenSSL 설정을 지정하는 중 오류 발생(%1)</translation>
+ </message>
+ <message>
<source>Error when setting the elliptic curves (%1)</source>
<translation>타원 곡선을 설정하는 중 오류 발생(%1)</translation>
</message>
<message>
<source>Error creating SSL context (%1)</source>
- <translation>SSL 컨텍스트를 만드는 중 오류 발생(%1)</translation>
+ <translation>SSL 콘텍스트를 만드는 중 오류 발생(%1)</translation>
</message>
<message>
<source>unsupported protocol</source>
<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>
@@ -5960,11 +6654,35 @@ Role of an accessible object</extracomment>
</message>
<message>
<source>Diffie-Hellman parameters are not valid</source>
- <translation>디피-헬만 인자가 올바르지 않음</translation>
+ <translation>디피-헬먼 인자가 올바르지 않음</translation>
+ </message>
+ <message>
+ <source>OpenSSL version with disabled elliptic curves</source>
+ <translation>타원 곡선이 비활성화된 OpenSSL 버전</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>OpenSSL version too old, need at least v1.0.2</source>
- <translation>OpenSSL 버전이 너무 오래됨, 최소 v1.0.2가 필요함</translation>
+ <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>No error</source>
@@ -6040,11 +6758,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>현재 인증서의 발급자 이름과 상위 인증서의 이름이 일치하지 않아서 현재 후보 발급자 인증서가 거부되었습니다</translation>
+ <translation>현재 인증서의 발급자 이름과 상위 인증서의 이름이 일치하지 않아서 현재 후보 발급자 인증서가 거부됨</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>현재 인증서의 인증자 키 식별자와 발급자 이름 및 시리얼 번호가 일치하지 않아서 현재 후보 발급자 인증서가 거부되었습니다</translation>
+ <translation>현재 인증서의 인증자 키 식별자와 발급자 이름 및 시리얼 번호가 일치하지 않아서 현재 후보 발급자 인증서가 거부됨</translation>
</message>
<message>
<source>The peer did not present any certificate</source>
@@ -6059,6 +6777,50 @@ Role of an accessible object</extracomment>
<translation>동료 인증서가 블랙리스트에 포함됨</translation>
</message>
<message>
+ <source>No OCSP status response found</source>
+ <translation>OCSP 상태 응답을 찾을 수 없음</translation>
+ </message>
+ <message>
+ <source>The OCSP status request had invalid syntax</source>
+ <translation>OCSP 상태 요청에 잘못된 문법이 있음</translation>
+ </message>
+ <message>
+ <source>OCSP response contains an unexpected number of SingleResponse structures</source>
+ <translation>OCSP 응답에 예상하지 못한 개수의 SingleResponse 구조체가 있음</translation>
+ </message>
+ <message>
+ <source>OCSP responder reached an inconsistent internal state</source>
+ <translation>OCSP 응답기의 내부 상태가 잘못됨</translation>
+ </message>
+ <message>
+ <source>OCSP responder was unable to return a status for the requested certificate</source>
+ <translation>OCSP 응답기에서 요청한 인증서의 상태를 반환할 수 없음</translation>
+ </message>
+ <message>
+ <source>The server requires the client to sign the OCSP request in order to construct a response</source>
+ <translation>서버에서 응답을 구축하려면 클라이언트에서 OCSP 요청을 서명해야 함</translation>
+ </message>
+ <message>
+ <source>The client is not authorized to request OCSP status from this server</source>
+ <translation>클라이언트가 이 서버에서 OCSP 상태를 조회하도록 인증받지 않았음</translation>
+ </message>
+ <message>
+ <source>OCSP responder&apos;s identity cannot be verified</source>
+ <translation>OCSP 응답기의 자격 증명을 검증할 수 없음</translation>
+ </message>
+ <message>
+ <source>The identity of a certificate in an OCSP response cannot be established</source>
+ <translation>OCSP 응답의 인증서의 식별자를 확인할 수 없음</translation>
+ </message>
+ <message>
+ <source>The certificate status response has expired</source>
+ <translation>인증서 상태 응답이 만료됨</translation>
+ </message>
+ <message>
+ <source>The certificate&apos;s status is unknown</source>
+ <translation>인증서 상태를 알 수 없음</translation>
+ </message>
+ <message>
<source>Unknown error</source>
<translation>알 수 없는 오류</translation>
</message>
@@ -6071,8 +6833,20 @@ Role of an accessible object</extracomment>
<translation>SSL 세션을 만드는 중 오류 발생: %1</translation>
</message>
<message>
+ <source>Server-side QSslSocket does not support OCSP stapling</source>
+ <translation>서버 측 QSslSocket에서 OCSP 스테이플링을 지원하지 않음</translation>
+ </message>
+ <message>
+ <source>Failed to enable OCSP stapling</source>
+ <translation>OCSP 스테이플링을 활성화할 수 없음</translation>
+ </message>
+ <message>
+ <source>Client-side sockets do not send OCSP responses</source>
+ <translation>클라이언트 측 소켓에서 OCSP 응답을 보내지 않음</translation>
+ </message>
+ <message>
<source>Unable to init SSL Context: %1</source>
- <translation>SSL 컨텍스트를 초기화할 수 없음: %1</translation>
+ <translation>SSL 콘텍스트를 초기화할 수 없음: %1</translation>
</message>
<message>
<source>Unable to write data: %1</source>
@@ -6083,6 +6857,26 @@ Role of an accessible object</extracomment>
<translation>데이터를 복호화할 수 없음: %1</translation>
</message>
<message>
+ <source>Failed to decode OCSP response</source>
+ <translation>OCSP 응답을 디코드할 수 없음</translation>
+ </message>
+ <message>
+ <source>Failed to extract basic OCSP response</source>
+ <translation>기본 OCSP 응답을 추출할 수 없음</translation>
+ </message>
+ <message>
+ <source>No certificate verification store, cannot verify OCSP response</source>
+ <translation>인증서 검증 저장소가 없음, OCSP 응답을 검증할 수 없음</translation>
+ </message>
+ <message>
+ <source>Failed to decode a SingleResponse from OCSP status response</source>
+ <translation>OCSP 상태 응답에서 SingleResponse를 디코드할 수 없음</translation>
+ </message>
+ <message>
+ <source>Failed to extract &apos;this update time&apos; from the SingleResponse</source>
+ <translation>SingleResponse에서 &apos;this update time&apos;을 추출할 수 없음</translation>
+ </message>
+ <message>
<source>The TLS/SSL connection has been closed</source>
<translation>TLS/SSL 연결이 종료됨</translation>
</message>
@@ -6094,6 +6888,134 @@ Role of an accessible object</extracomment>
<source>Error during SSL handshake: %1</source>
<translation>SSL 악수 중 오류 발생: %1</translation>
</message>
+ <message>
+ <source>TLS initialization failed</source>
+ <translation>TLS 초기화 실패</translation>
+ </message>
+ <message>
+ <source>Attempted to use an unsupported protocol.</source>
+ <translation>지원하지 않는 프로토콜 사용을 시도했습니다.</translation>
+ </message>
+ <message>
+ <source>Insufficient memory</source>
+ <translation>메모리 부족</translation>
+ </message>
+ <message>
+ <source>Internal error</source>
+ <translation>내부 오류</translation>
+ </message>
+ <message>
+ <source>An internal handle was invalid</source>
+ <translation>내부 핸들이 잘못됨</translation>
+ </message>
+ <message>
+ <source>An internal token was invalid</source>
+ <translation>내부 토큰이 잘못됨</translation>
+ </message>
+ <message>
+ <source>Access denied</source>
+ <translation>접근이 거부됨</translation>
+ </message>
+ <message>
+ <source>No authority could be contacted for authorization</source>
+ <translation>인증 기관에 연락할 수 없음</translation>
+ </message>
+ <message>
+ <source>No credentials</source>
+ <translation>인증 정보 없음</translation>
+ </message>
+ <message>
+ <source>The target is unknown or unreachable</source>
+ <translation>대상을 알 수 없거나 접근할 수 없음</translation>
+ </message>
+ <message>
+ <source>An unsupported function was requested</source>
+ <translation>지원하지 않는 기능을 요청함</translation>
+ </message>
+ <message>
+ <source>The hostname provided does not match the one received from the peer</source>
+ <translation>지정한 호스트 이름이 동료에게서 받은 호스트 이름과 일치하지 않음</translation>
+ </message>
+ <message>
+ <source>No common protocol exists between the client and the server</source>
+ <translation>클라이언트와 서버 사이에 공통된 프로토콜이 없음</translation>
+ </message>
+ <message>
+ <source>Unexpected or badly-formatted message received</source>
+ <translation>예상하지 못했거나 형식이 잘못된 메시지를 받음</translation>
+ </message>
+ <message>
+ <source>The data could not be encrypted</source>
+ <translation>데이터를 암호화할 수 없음</translation>
+ </message>
+ <message>
+ <source>No cipher suites in common</source>
+ <translation>공통 암호화 스위트가 없음</translation>
+ </message>
+ <message>
+ <source>The credentials were not recognized / Invalid argument</source>
+ <translation>인증 정보가 인식되지 않음 / 인자가 잘못됨</translation>
+ </message>
+ <message>
+ <source>The message was tampered with, damaged or out of sequence.</source>
+ <translation>메시지가 중간에서 변조되었거나, 손상되었거나, 순서가 잘못되었습니다.</translation>
+ </message>
+ <message>
+ <source>A message was received out of sequence.</source>
+ <translation>메시지 수신 순서가 잘못되었습니다.</translation>
+ </message>
+ <message>
+ <source>Unknown error occurred: %1</source>
+ <translation>알 수 없는 오류 발생: %1</translation>
+ </message>
+ <message>
+ <source>Invalid protocol chosen</source>
+ <translation>잘못된 프로토콜 선택함</translation>
+ </message>
+ <message>
+ <source>The certificate provided cannot be used for a client.</source>
+ <translation>지정한 인증서를 클라이언트에 사용할 수 없습니다.</translation>
+ </message>
+ <message>
+ <source>The certificate provided cannot be used for a server.</source>
+ <translation>지정한 인증서를 서버에 사용할 수 없습니다.</translation>
+ </message>
+ <message>
+ <source>Server did not accept any certificate we could present.</source>
+ <translation>서버에서 제시한 인증서를 받아들이지 않았습니다.</translation>
+ </message>
+ <message>
+ <source>Algorithm mismatch</source>
+ <translation>알고리즘이 일치하지 않음</translation>
+ </message>
+ <message>
+ <source>Handshake failed: %1</source>
+ <translation>악수 실패: %1</translation>
+ </message>
+ <message>
+ <source>Failed to query the TLS context: %1</source>
+ <translation>TLS 콘텍스트를 질의할 수 없음: %1</translation>
+ </message>
+ <message>
+ <source>Did not get the required attributes for the connection.</source>
+ <translation>연결에 필요한 속성을 가져올 수 없었습니다.</translation>
+ </message>
+ <message>
+ <source>Unwanted protocol was negotiated</source>
+ <translation>원하지 않는 프로토콜로 협상함</translation>
+ </message>
+ <message>
+ <source>Renegotiation was unsuccessful: %1</source>
+ <translation>재협상 실패: %1</translation>
+ </message>
+ <message>
+ <source>Schannel failed to encrypt data: %1</source>
+ <translation>Schannel에서 데이터를 암호화할 수 없음: %1</translation>
+ </message>
+ <message>
+ <source>Cannot provide a certificate with no key</source>
+ <translation>키가 없는 인증서를 제공할 수 없음</translation>
+ </message>
</context>
<context>
<name>QStandardPaths</name>
@@ -6185,6 +7107,10 @@ Role of an accessible object</extracomment>
<translation>상태 &apos;%1&apos;에서 전환되는 원본과 대상에 공통된 조상이 없음</translation>
</message>
<message>
+ <source>Child mode of state machine &apos;%1&apos; is not &apos;ExclusiveStates&apos;.</source>
+ <translation>상태 머신 &apos;%1&apos;의 자식 모드가 &apos;ExclusiveStates&apos;가 아닙니다.</translation>
+ </message>
+ <message>
<source>Unknown error</source>
<translation>알 수 없는 오류</translation>
</message>
@@ -6268,6 +7194,10 @@ Role of an accessible object</extracomment>
<translation>그림 색 농도가 올바르지 않음</translation>
</message>
<message>
+ <source>Image size exceeds limit</source>
+ <translation>그림 크기가 제한을 초과함</translation>
+ </message>
+ <message>
<source>Could not seek to image read footer</source>
<translation>그림을 읽는 중 끝 부분으로 검색할 수 없음</translation>
</message>
@@ -6281,7 +7211,7 @@ Role of an accessible object</extracomment>
</message>
<message>
<source>Could not reset to read data</source>
- <translation>데이터를 읽기 위하여 초기화할 수 없음</translation>
+ <translation>데이터를 읽으려고 초기화할 수 없음</translation>
</message>
</context>
<context>
@@ -6461,10 +7391,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>시스템에 설치된 Direct2D 버전이 너무 오래 되어서 direct2d 플랫폼 플러그인을 불러올 수 없습니다. 이 플랫폼 플러그인의 최소 사양은 Windows 7 SP1 및 플랫폼 업데이트 설치입니다.
-필요한 최소 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>
@@ -6475,7 +7405,7 @@ The minimum Direct2D version required is %1.%2.%3.%4. The Direct2D version on th
<name>QWizard</name>
<message>
<source>Go Back</source>
- <translation>뒤로 가기</translation>
+ <translation>뒤로 이동</translation>
</message>
<message>
<source>&lt; &amp;Back</source>
@@ -6602,7 +7532,7 @@ The minimum Direct2D version required is %1.%2.%3.%4. The Direct2D version on th
</message>
<message>
<source>unparsed entity reference in wrong context</source>
- <translation>잘못된 컨텍스트에 처리되지 않은 엔티티 참조가 있음</translation>
+ <translation>잘못된 콘텍스트에 처리되지 않은 엔티티 참조가 있음</translation>
</message>
<message>
<source>recursive entities</source>
@@ -6633,7 +7563,7 @@ The minimum Direct2D version required is %1.%2.%3.%4. The Direct2D version on th
</message>
<message>
<source>Encountered incorrectly encoded content.</source>
- <translation>잘못 인코딩된 내용을 발견하였습니다.</translation>
+ <translation>잘못 인코딩된 내용을 발견했습니다.</translation>
</message>
<message>
<source>Namespace prefix &apos;%1&apos; not declared</source>
@@ -6665,11 +7595,11 @@ The minimum Direct2D version required is %1.%2.%3.%4. The Direct2D version on th
</message>
<message>
<source>%1 is an invalid encoding name.</source>
- <translation>인코딩 이름 %1이(가) 잘못되었습니다.</translation>
+ <translation>%1은(는) 잘못된 인코딩 이름입니다.</translation>
</message>
<message>
<source>Encoding %1 is unsupported</source>
- <translation>인코딩 %1은(는) 지원되지 않습니다</translation>
+ <translation>%1 인코딩은 지원하지 않습니다</translation>
</message>
<message>
<source>Standalone accepts only yes or no.</source>
@@ -6688,24 +7618,48 @@ 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>&apos;%1&apos;</translation>
</message>
<message>
- <source>, but got &apos;</source>
- <translation>, 돌아온 것은 &apos;</translation>
+ <source>%1 or &apos;%2&apos;</source>
+ <comment>expected</comment>
+ <extracomment>&lt;first option&gt;, &apos;&lt;second option&gt;&apos;</extracomment>
+ <translation>%1 또는 &apos;%2&apos;</translation>
</message>
<message>
- <source>Unexpected &apos;</source>
- <translation>예상하지 못한 &apos;</translation>
+ <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, 또는 &apos;%2&apos;</translation>
+ </message>
+ <message>
+ <source>Expected %1, but got &apos;%2&apos;.</source>
+ <translation>&apos;%1&apos;을(를) 예상했지만 &apos;%2&apos;을(를) 받았습니다.</translation>
+ </message>
+ <message>
+ <source>Unexpected &apos;%1&apos;.</source>
+ <translation>예상하지 못한 &apos;%1&apos;.</translation>
</message>
<message>
<source>Expected character data.</source>
<translation>예상하지 못한 문자열 데이터입니다.</translation>
</message>
<message>
- <source>Recursive entity detected.</source>
- <translation>재귀적 엔티티가 감지되었습니다.</translation>
+ <source>Self-referencing entity detected.</source>
+ <translation>자기 자신을 참조하는 엔티티가 감지되었습니다.</translation>
+ </message>
+ <message>
+ <source>Entity expands to more characters than the entity expansion limit.</source>
+ <translation>엔티티가 엔티티 확장 제한에 설정한 것보다 더 많은 글자로 확장됩니다.</translation>
</message>
<message>
<source>Start tag expected.</source>
diff --git a/translations/qtbase_ru.ts b/translations/qtbase_ru.ts
index c845dfb..04b7207 100644
--- a/translations/qtbase_ru.ts
+++ b/translations/qtbase_ru.ts
@@ -378,10 +378,6 @@ Press ESC to cancel</source>
<translation>Показать сведения о версии.</translation>
</message>
<message>
- <source>Displays this help.</source>
- <translation>Показать эту справку.</translation>
- </message>
- <message>
<source>Displays help on commandline options.</source>
<translation>Вывод справки по параметрам командной строки.</translation>
</message>
@@ -810,6 +806,69 @@ Press ESC to cancel</source>
</message>
</context>
<context>
+ <name>QDomParser</name>
+ <message>
+ <source>Error occurred while processing XML declaration</source>
+ <translation>Возникла ошибка при обработке объявления XML</translation>
+ </message>
+ <message>
+ <source>Multiple DTD sections are not allowed</source>
+ <translation>Недопустимо более одной DTD секции</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing document type declaration</source>
+ <translation>Возникла ошибка при обработке объявления типа документа</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing comment</source>
+ <translation>Возникла ошибка при обработке комментария</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing a processing instruction</source>
+ <translation>Возникла ошибка при обработке инструкции обработки</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing a start element</source>
+ <translation>Возникла ошибка при обработке начального элемента</translation>
+ </message>
+ <message>
+ <source>Unexpected end element &apos;%1&apos;</source>
+ <translation>Неожиданный конечный элемент «%1»</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing an end element</source>
+ <translation>Возникла ошибка при обработке конечного элемента</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing the element content</source>
+ <translation>Возникла ошибка при обработке содержимого элемента</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing comments</source>
+ <translation>Возникла ошибка при обработке комментариев</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing an entity reference</source>
+ <translation>Возникла ошибка при обработке ссылки на объект</translation>
+ </message>
+ <message>
+ <source>Unexpected token</source>
+ <translation>Неожиданный токен</translation>
+ </message>
+ <message>
+ <source>Tag mismatch</source>
+ <translation>Теги не соответствуют</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing entity declaration</source>
+ <translation>Возникла ошибка при обработке объявления объекта</translation>
+ </message>
+ <message>
+ <source>Error occurred while processing notation declaration</source>
+ <translation type="unfinished">Ошибка при обработке объявления нотации</translation>
+ </message>
+</context>
+<context>
<name>QDtls</name>
<message>
<source>Invalid (empty) secret</source>
@@ -1761,10 +1820,6 @@ Do you want to delete it anyway?</source>
<source>Host not found</source>
<translation>Узел не найден</translation>
</message>
- <message>
- <source>Unknown error (%1)</source>
- <translation>Неизвестная ошибка (%1)</translation>
- </message>
</context>
<context>
<name>QHttp</name>
@@ -2192,10 +2247,6 @@ Do you want to delete it anyway?</source>
<translation>Невозможно выгрузить библиотеку %1: %2</translation>
</message>
<message>
- <source>Cannot resolve symbol &quot;%1&quot; in %2: %3</source>
- <translation>Невозможно разрешить символ «%1» в %2: %3</translation>
- </message>
- <message>
<source>&apos;%1&apos; is not a valid Mach-O binary (%2)</source>
<translation>«%1» неверный бинарный файл Mach-O (%2)</translation>
</message>
@@ -4013,32 +4064,32 @@ Please turn one of those options off.</source>
<translation>Оттенки серого</translation>
</message>
<message>
- <source>Duplex Printing</source>
- <translation>Двусторонняя печать</translation>
+ <source>Page Set:</source>
+ <translation>Список страниц:</translation>
</message>
<message>
- <source>None</source>
- <translation>Нет</translation>
+ <source>Pages</source>
+ <translation>Страницы</translation>
</message>
<message>
- <source>Long side</source>
- <translation>По длинной стороне</translation>
+ <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>
<message>
- <source>Short side</source>
- <translation>По короткой стороне</translation>
+ <source>Double Sided Printing</source>
+ <translation>Двусторонняя печать</translation>
</message>
<message>
- <source>Page Set:</source>
- <translation>Список страниц:</translation>
+ <source>Off</source>
+ <translation>Отключена</translation>
</message>
<message>
- <source>Pages</source>
- <translation>Страницы</translation>
+ <source>Long side binding</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>
+ <source>Short side binding</source>
+ <translation>Переплёт по короткой стороне</translation>
</message>
</context>
<context>
@@ -4212,10 +4263,6 @@ Please turn one of those options off.</source>
<translation>отсутствует завершающая ] для класса символов</translation>
</message>
<message>
- <source>invalid escape sequence in character class</source>
- <translation>некорректная ESC-последовательность в классе символов</translation>
- </message>
- <message>
<source>range out of order in character class</source>
<translation>некорректный диапазон в классе символов</translation>
</message>
@@ -4244,20 +4291,12 @@ Please turn one of those options off.</source>
<translation>внутренняя ошибка: переполнение кода</translation>
</message>
<message>
- <source>lookbehind assertion is not fixed length</source>
- <translation>утверждение lookbehind не фиксированной длины</translation>
- </message>
- <message>
- <source>malformed number or name after (?(</source>
- <translation>некорректно сформировано число или имя после (?(</translation>
+ <source>missing closing parenthesis for condition</source>
+ <translation>отсутствует закрывающая скобка условия</translation>
</message>
<message>
- <source>conditional group contains more than two branches</source>
- <translation>условная группа содержит более двух веток</translation>
- </message>
- <message>
- <source>(?R or (?[+-]digits must be followed by )</source>
- <translation>за (?R или (?[+-]цифры должна следовать )</translation>
+ <source>lookbehind assertion is not fixed length</source>
+ <translation>утверждение lookbehind не фиксированной длины</translation>
</message>
<message>
<source>unknown POSIX class name</source>
@@ -4268,22 +4307,10 @@ Please turn one of those options off.</source>
<translation>POSIX-сортировка элементов не поддерживается</translation>
</message>
<message>
- <source>invalid condition (?(0)</source>
- <translation>некорректное условие (?(0)</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>unrecognized character after (?P</source>
<translation>не опознан символ после (?P</translation>
</message>
<message>
- <source>syntax error in subpattern name (missing terminator)</source>
- <translation>синтаксическая ошибка в имени подшаблона (отсутствует признак завершения)</translation>
- </message>
- <message>
<source>malformed \P or \p sequence</source>
<translation>некорректно сформирована последовательность \P или \p</translation>
</message>
@@ -4300,34 +4327,14 @@ Please turn one of those options off.</source>
<translation>внутренняя ошибка: ранее проверенный подшаблон не найден</translation>
</message>
<message>
- <source>DEFINE group contains more than one branch</source>
- <translation>группа DEFINE содержит более одной ветки</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>
<message>
- <source>a numbered reference must not be zero</source>
- <translation>нумерованная ссылка не должна быть нулём</translation>
- </message>
- <message>
- <source>an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)</source>
- <translation>для (*ACCEPT), (*FAIL) и (*COMMIT) аргументы не допустимы</translation>
- </message>
- <message>
- <source>number is too big</source>
- <translation>число слишком велико</translation>
- </message>
- <message>
<source>subpattern name expected</source>
<translation>требуется имя подшаблона</translation>
</message>
<message>
- <source>digit expected after (?+</source>
- <translation>после (?+ требуется цифра</translation>
- </message>
- <message>
<source>different names for subpatterns of the same number are not allowed</source>
<translation>отличные имена для подшаблонов с одним номером не допустимы</translation>
</message>
@@ -4340,10 +4347,6 @@ Please turn one of those options off.</source>
<translation>за \k должно следовать название, заключённое в фигурные/угловые скобки или кавычки</translation>
</message>
<message>
- <source>internal error: unknown opcode in find_fixedlength()</source>
- <translation>внутренняя ошибка: неизвестный опкод в find_fixedlength()</translation>
- </message>
- <message>
<source>\N is not supported in a class</source>
<translation>\N не поддерживается в классе</translation>
</message>
@@ -4368,16 +4371,56 @@ Please turn one of those options off.</source>
<translation>отсутствует открывающая фигурная скобка после \o</translation>
</message>
<message>
+ <source>escape sequence is invalid in character class</source>
+ <translation>ESC-последовательность в классе символов не допустима</translation>
+ </message>
+ <message>
<source>parentheses are too deeply nested</source>
<translation>слишком большое вложение скобок</translation>
</message>
<message>
- <source>invalid range in character class</source>
- <translation>недопустимый диапазон в классе символов</translation>
+ <source>a relative value of zero is not allowed</source>
+ <translation>относительное значение нуль не допустимо</translation>
+ </message>
+ <message>
+ <source>conditional subpattern contains more than two branches</source>
+ <translation>условный подшаблон содержит более двух вариантов</translation>
</message>
<message>
- <source>group name must start with a non-digit</source>
- <translation>имя группы не должно начинаться с цифры</translation>
+ <source>digit expected after (?+ or (?-</source>
+ <translation>ожидается цифра после (?+ или (?-</translation>
+ </message>
+ <message>
+ <source>lookbehind is too complicated</source>
+ <translation>слишком сложный lookbehind</translation>
+ </message>
+ <message>
+ <source>\C is not allowed in a lookbehind assertion in UTF-16 mode</source>
+ <translation>\C не допустимо в утверждении lookbehind в режиме UTF-16</translation>
+ </message>
+ <message>
+ <source>PCRE2 does not support \F, \L, \l, \N{name}, \U, or \u</source>
+ <translation>PCRE2 не поддерживает \F, \L, \l, \N{name}, \U и \u</translation>
+ </message>
+ <message>
+ <source>syntax error in subpattern name (missing terminator?)</source>
+ <translation>синтаксическая ошибка в имени подшаблона (отсутствует терминатор?)</translation>
+ </message>
+ <message>
+ <source>subpattern name must start with a non-digit</source>
+ <translation>имя подшаблона не должно начинаться с цифры</translation>
+ </message>
+ <message>
+ <source>subpattern name is too long (maximum 32 code units)</source>
+ <translation>слишком длинное имя подшаблона (максимум 32 кодовых единицы)</translation>
+ </message>
+ <message>
+ <source>too many named subpatterns (maximum 10000)</source>
+ <translation>слишком много именованных подшаблонов (максимум 10000)</translation>
+ </message>
+ <message>
+ <source>invalid range in character class</source>
+ <translation>недопустимый диапазон в классе символов</translation>
</message>
<message>
<source>quantifier does not follow a repeatable item</source>
@@ -4408,10 +4451,6 @@ Please turn one of those options off.</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>
@@ -4432,10 +4471,6 @@ Please turn one of those options off.</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>
@@ -4456,26 +4491,38 @@ Please turn one of those options off.</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>DEFINE subpattern contains more than one branch</source>
+ <translation>подшаблон DEFINE содержит более одного варианта</translation>
+ </message>
+ <message>
<source>internal error: unknown newline setting</source>
<translation>внутренняя ошибка: неизвестный разделитель строк</translation>
</message>
<message>
+ <source>(?R (recursive pattern call) must be followed by a closing parenthesis</source>
+ <translation>(?R (рекурсивный вызов шаблона) должен завершаться закрывающей скобкой</translation>
+ </message>
+ <message>
+ <source>obsolete error (should not occur)</source>
+ <translation>устаревшая ошибка (возникать не должна)</translation>
+ </message>
+ <message>
<source>(*VERB) not recognized or malformed</source>
<translation>(*VERB) не опознан или неверен</translation>
</message>
<message>
+ <source>subpattern number is too big</source>
+ <translation>номер подшаблона слишком велик</translation>
+ </message>
+ <message>
+ <source>internal error: parsed pattern overflow</source>
+ <translation>внутренняя ошибка: переполнение разбора шаблона</translation>
+ </message>
+ <message>
<source>\c must be followed by a printable ASCII character</source>
<translation>после \c должен идти печатаемый символ ASCII</translation>
</message>
@@ -4484,10 +4531,6 @@ Please turn one of those options off.</source>
<translation>после \c должна идти буква или один из [\]^_?</translation>
</message>
<message>
- <source>SPARE ERROR</source>
- <translation>ОШИБКА SPARE</translation>
- </message>
- <message>
<source>using UTF is disabled by the application</source>
<translation>использование UTF отключено приложением</translation>
</message>
@@ -4500,12 +4543,20 @@ Please turn one of those options off.</source>
<translation>значение кодовой точки символа в последовательности \u.... слишком большое</translation>
</message>
<message>
- <source>digits missing in \x{} or \o{}</source>
- <translation>отсутствуют цифры в \x{} или \o{}</translation>
+ <source>internal error: unknown meta code in check_lookbehinds()</source>
+ <translation>внутренняя ошибка: неизвестный мета-код в check_lookbehinds()</translation>
</message>
<message>
- <source>syntax error in (?(VERSION condition</source>
- <translation>синтаксическая ошибка в условии (?(VERSION</translation>
+ <source>callout string is too long</source>
+ <translation>слишком длинная строка callout</translation>
+ </message>
+ <message>
+ <source>digits missing in \x{} or \o{} or \N{U+}</source>
+ <translation>отсутствуют цифры в \x{}, \o{} или \N{U+}</translation>
+ </message>
+ <message>
+ <source>syntax error or number too big in (?(VERSION condition</source>
+ <translation>синтаксическая ошибка или число слишком велико в условии (?(VERSION</translation>
</message>
<message>
<source>internal error: unknown opcode in auto_possessify()</source>
@@ -4544,6 +4595,46 @@ Please turn one of those options off.</source>
<translation>строка шаблона больше ограничения, заданного приложением</translation>
</message>
<message>
+ <source>internal error: unknown code in parsed pattern</source>
+ <translation>внутренняя ошибка: неизвестный код в разобранном шаблоне</translation>
+ </message>
+ <message>
+ <source>internal error: bad code value in parsed_skip()</source>
+ <translation>внутренняя ошибка: неверное значение кода в parsed_skip()</translation>
+ </message>
+ <message>
+ <source>PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES is not allowed in UTF-16 mode</source>
+ <translation>PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES не допустим в режиме UTF-16</translation>
+ </message>
+ <message>
+ <source>invalid option bits with PCRE2_LITERAL</source>
+ <translation>неверные биты опций с PCRE2_LITERAL</translation>
+ </message>
+ <message>
+ <source>\N{U+dddd} is supported only in Unicode (UTF) mode</source>
+ <translation>\N{U+dddd} поддерживается только в режиме Unicode (UTF)</translation>
+ </message>
+ <message>
+ <source>invalid hyphen in option setting</source>
+ <translation>неверный дефис в настройке опции</translation>
+ </message>
+ <message>
+ <source>(*alpha_assertion) not recognized</source>
+ <translation>не распознана (*alpha_assertion)</translation>
+ </message>
+ <message>
+ <source>script runs require Unicode support, which this version of PCRE2 does not have</source>
+ <translation>для запуска скрипта необходима поддержка Unicode, которая отсутствует у этой версии PCRE2</translation>
+ </message>
+ <message>
+ <source>too many capturing groups (maximum 65535)</source>
+ <translation>слишком много захватываемых групп (максимум 65535)</translation>
+ </message>
+ <message>
+ <source>atomic assertion expected after (?( or (?(?C)</source>
+ <translation>требуется атомарное утверждение после (?( или (?(?C)</translation>
+ </message>
+ <message>
<source>no match</source>
<translation>нет соответствий</translation>
</message>
@@ -4754,8 +4845,32 @@ Please turn one of those options off.</source>
<translation>вложенная рекурсия в той же позиции субъекта</translation>
</message>
<message>
- <source>recursion limit exceeded</source>
- <translation>предел рекурсии превышен</translation>
+ <source>matching depth limit exceeded</source>
+ <translation>глубина совпадений превышена</translation>
+ </message>
+ <message>
+ <source>match with end before start or start moved backwards is not supported</source>
+ <translation>не поддерживается сравнение с окончанием до начала или с началом смещенным назад</translation>
+ </message>
+ <message>
+ <source>bad serialized data</source>
+ <translation>неверные данные сериализации</translation>
+ </message>
+ <message>
+ <source>heap limit exceeded</source>
+ <translation>превышен предел кучи</translation>
+ </message>
+ <message>
+ <source>invalid syntax</source>
+ <translation>неверный синтаксис</translation>
+ </message>
+ <message>
+ <source>internal error - duplicate substitution match</source>
+ <translation>внутренняя ошибка: двойное совпадение для замены</translation>
+ </message>
+ <message>
+ <source>PCRE2_MATCH_INVALID_UTF is not supported for DFA matching</source>
+ <translation>PCRE2_MATCH_INVALID_UTF не поддерживается для сравнения DFA</translation>
</message>
<message>
<source>requested value is not available</source>
@@ -4783,10 +4898,6 @@ Please turn one of those options off.</source>
<translation>плохая замена в замещающей строке</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>
@@ -4890,10 +5001,6 @@ Please turn one of those options off.</source>
<translation>QSaveFile не может открыть «%1» без включения прямой записи.</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>
@@ -5342,7 +5449,7 @@ Please turn one of those options off.</source>
</message>
<message>
<source>Power Off</source>
- <translation>Отключение питания</translation>
+ <translation>Выключение</translation>
</message>
<message>
<source>Wake Up</source>
@@ -5362,7 +5469,7 @@ Please turn one of those options off.</source>
</message>
<message>
<source>Sleep</source>
- <translation>Спящий режим</translation>
+ <translation>Ждущий режим</translation>
</message>
<message>
<source>LightBulb</source>
@@ -5686,7 +5793,7 @@ Please turn one of those options off.</source>
</message>
<message>
<source>Hibernate</source>
- <translation>Перейти в сон</translation>
+ <translation>Спящий режим</translation>
</message>
<message>
<source>Media Rewind</source>
@@ -5698,7 +5805,7 @@ Please turn one of those options off.</source>
</message>
<message>
<source>Power Down</source>
- <translation>Выключить</translation>
+ <translation>Отключение питания</translation>
</message>
<message>
<source>Microphone Mute</source>
@@ -6729,10 +6836,6 @@ Role of an accessible object</extracomment>
<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>
- <message>
<source>Error creating SSL session, %1</source>
<translation>Ошибка создания сессии SSL, %1</translation>
</message>
@@ -6797,10 +6900,6 @@ Role of an accessible object</extracomment>
<translation>Ошибка квитирования SSL: %1</translation>
</message>
<message>
- <source>DTLS server requires a &apos;VerifyNone&apos; mode with your version of OpenSSL</source>
- <translation>Серверу DTLS требуется режим «VerifyNone» для текущей версии OpenSSL</translation>
- </message>
- <message>
<source>TLS initialization failed</source>
<translation>Не удалось инициализировать TLS</translation>
</message>
@@ -7566,8 +7665,12 @@ The minimum Direct2D version required is %1. The Direct2D version on this system
<translation>Требуются символьные данные.</translation>
</message>
<message>
- <source>Recursive entity detected.</source>
- <translation>Обнаружен рекурсивный объект.</translation>
+ <source>Self-referencing entity detected.</source>
+ <translation>Обнаружен объект, ссылающийся на себя.</translation>
+ </message>
+ <message>
+ <source>Entity expands to more characters than the entity expansion limit.</source>
+ <translation>При разворачивании объекта число символов превысило предел.</translation>
</message>
<message>
<source>Start tag expected.</source>
diff --git a/translations/qtconnectivity_ca.ts b/translations/qtconnectivity_ca.ts
index d937cb1..600af3e 100644
--- a/translations/qtconnectivity_ca.ts
+++ b/translations/qtconnectivity_ca.ts
@@ -40,6 +40,10 @@
<translation>L&apos;adreça de l&apos;adaptador de Bluetooth no és vàlida</translation>
</message>
<message>
+ <source>One or more device discovery methods are not supported on this platform</source>
+ <translation>Un o més mètodes de descobriment de dispositius no està admès en aquesta plataforma</translation>
+ </message>
+ <message>
<source>Device does not support Bluetooth</source>
<translation>El dispositiu no admet Bluetooth</translation>
</message>
@@ -48,12 +52,28 @@
<translation>L&apos;adreça indicada no és un dispositiu local.</translation>
</message>
<message>
+ <source>Missing Location permission. Search is not possible.</source>
+ <translation>Manca el permís d&apos;ubicació. No es pot cercar.</translation>
+ </message>
+ <message>
+ <source>Location service turned off. Search is not possible.</source>
+ <translation>El servei d&apos;ubicació està apagat. No es pot cercar.</translation>
+ </message>
+ <message>
+ <source>Classic Discovery cannot be started</source>
+ <translation>No s&apos;ha pogut iniciar el descobriment clàssic</translation>
+ </message>
+ <message>
+ <source>Low Energy Discovery not supported</source>
+ <translation>No s&apos;admet el descobriment de baixa potència</translation>
+ </message>
+ <message>
<source>Discovery cannot be started</source>
- <translation>El descobriment de dispositius no s&apos;ha pogut iniciar</translation>
+ <translation type="vanished">El descobriment de dispositius no s&apos;ha pogut iniciar</translation>
</message>
<message>
<source>Bluetooth adapter error</source>
- <translation>Error en l&apos;adaptador de Bluetooth</translation>
+ <translation>Error a l&apos;adaptador de Bluetooth</translation>
</message>
<message>
<source>Device discovery not supported on this platform</source>
@@ -476,8 +496,7 @@
</message>
<message>
<source>Bond Management</source>
- <extracomment>Connection management (Bluetooth)
-</extracomment>
+ <extracomment>Connection management (Bluetooth)</extracomment>
<translation>Gestió dels enllaços</translation>
</message>
<message>
@@ -566,7 +585,7 @@
</message>
<message>
<source>Common ISDN Access Protocol</source>
- <translation>Protocol per a l&apos;accés RDSI comú</translation>
+ <translation>Protocol per a l&apos;accés XDSI comú</translation>
</message>
<message>
<source>UdiCPlain</source>
@@ -586,26 +605,22 @@
</message>
<message>
<source>GAP Device Name</source>
- <extracomment>GAP: Generic Access Profile (Bluetooth)
-</extracomment>
+ <extracomment>GAP: Generic Access Profile (Bluetooth)</extracomment>
<translation>Nom del dispositiu GAP</translation>
</message>
<message>
<source>GAP Appearance</source>
- <extracomment>GAP: Generic Access Profile (Bluetooth)
-</extracomment>
+ <extracomment>GAP: Generic Access Profile (Bluetooth)</extracomment>
<translation>Aparença GAP</translation>
</message>
<message>
<source>GAP Peripheral Privacy Flag</source>
- <extracomment>GAP: Generic Access Profile (Bluetooth)
-</extracomment>
+ <extracomment>GAP: Generic Access Profile (Bluetooth)</extracomment>
<translation>Indicador de la privadesa del perifèric GAP</translation>
</message>
<message>
<source>GAP Reconnection Address</source>
- <extracomment>GAP: Generic Access Profile (Bluetooth)
-</extracomment>
+ <extracomment>GAP: Generic Access Profile (Bluetooth)</extracomment>
<translation>Adreça de reconnexió GAP</translation>
</message>
<message>
@@ -614,8 +629,7 @@
</message>
<message>
<source>GATT Service Changed</source>
- <extracomment>GATT: _G_eneric _Att_ribute Profile (Bluetooth)
-</extracomment>
+ <extracomment>GATT: _G_eneric _Att_ribute Profile (Bluetooth)</extracomment>
<translation>El servei GATT ha canviat</translation>
</message>
<message>
@@ -652,7 +666,7 @@
</message>
<message>
<source>Local Time Information</source>
- <translation>Informació de la hora local</translation>
+ <translation>Informació de l&apos;hora local</translation>
</message>
<message>
<source>Time With DST</source>
@@ -660,23 +674,23 @@
</message>
<message>
<source>Time Accuracy</source>
- <translation>Precisió de la hora</translation>
+ <translation>Precisió de l&apos;hora</translation>
</message>
<message>
<source>Time Source</source>
- <translation>Origen de la hora</translation>
+ <translation>Origen de l&apos;hora</translation>
</message>
<message>
<source>Reference Time Information</source>
- <translation>Informació de la hora de referència</translation>
+ <translation>Informació de l&apos;hora de referència</translation>
</message>
<message>
<source>Time Update Control Point</source>
- <translation>Punt de control per a l&apos;actualització de la hora</translation>
+ <translation>Punt de control per a actualitzar l&apos;hora</translation>
</message>
<message>
<source>Time Update State</source>
- <translation>Estat d&apos;actualització de la hora</translation>
+ <translation>Estat d&apos;actualització de l&apos;hora</translation>
</message>
<message>
<source>Glucose Measurement</source>
@@ -824,8 +838,7 @@
</message>
<message>
<source>HID Information</source>
- <extracomment>HID: Human Interface Device Profile (Bluetooth)
-</extracomment>
+ <extracomment>HID: Human Interface Device Profile (Bluetooth)</extracomment>
<translation>Informació HID</translation>
</message>
<message>
@@ -834,8 +847,7 @@
</message>
<message>
<source>HID Control Point</source>
- <extracomment>HID: Human Interface Device Profile (Bluetooth)
-</extracomment>
+ <extracomment>HID: Human Interface Device Profile (Bluetooth)</extracomment>
<translation>Punt de control HID</translation>
</message>
<message>
@@ -860,20 +872,17 @@
</message>
<message>
<source>Record Access Control Point</source>
- <extracomment>Glucose Sensor patient record database.
-</extracomment>
+ <extracomment>Glucose Sensor patient record database.</extracomment>
<translation>Punt de control per a l&apos;accés al registre</translation>
</message>
<message>
<source>RSC Measurement</source>
- <extracomment>RSC: Running Speed and Cadence
-</extracomment>
+ <extracomment>RSC: Running Speed and Cadence</extracomment>
<translation>Mesura de la velocitat i cadència de la carrera</translation>
</message>
<message>
<source>RSC Feature</source>
- <extracomment>RSC: Running Speed and Cadence
-</extracomment>
+ <extracomment>RSC: Running Speed and Cadence</extracomment>
<translation>Característica per a la velocitat i cadència de la carrera</translation>
</message>
<message>
@@ -882,14 +891,12 @@
</message>
<message>
<source>CSC Measurement</source>
- <extracomment>CSC: Cycling Speed and Cadence
-</extracomment>
+ <extracomment>CSC: Cycling Speed and Cadence</extracomment>
<translation>Mesura de la velocitat i cadència fent ciclisme</translation>
</message>
<message>
<source>CSC Feature</source>
- <extracomment>CSC: Cycling Speed and Cadence
-</extracomment>
+ <extracomment>CSC: Cycling Speed and Cadence</extracomment>
<translation>Característica per a la velocitat i cadència fent ciclisme</translation>
</message>
<message>
@@ -934,14 +941,12 @@
</message>
<message>
<source>Magnetic Declination</source>
- <extracomment>Angle between geographic and magnetic north
-</extracomment>
+ <extracomment>Angle between geographic and magnetic north</extracomment>
<translation>Declinació magnètica</translation>
</message>
<message>
<source>Elevation</source>
- <extracomment>Above/below sea level
-</extracomment>
+ <extracomment>Above/below sea level</extracomment>
<translation>Elevació</translation>
</message>
<message>
@@ -958,8 +963,7 @@
</message>
<message>
<source>True Wind Speed</source>
- <extracomment>Wind speed while standing
-</extracomment>
+ <extracomment>Wind speed while standing</extracomment>
<translation>Velocitat real del vent</translation>
</message>
<message>
@@ -968,8 +972,7 @@
</message>
<message>
<source>Apparent Wind Speed</source>
- <extracomment>Wind speed while observer is moving
-</extracomment>
+ <extracomment>Wind speed while observer is moving</extracomment>
<translation>Velocitat aparent del vent</translation>
</message>
<message>
@@ -978,8 +981,7 @@
</message>
<message>
<source>Gust Factor</source>
- <extracomment>Factor by which wind gust is stronger than average wind
-</extracomment>
+ <extracomment>Factor by which wind gust is stronger than average wind</extracomment>
<translation>Factor de ràfegues</translation>
</message>
<message>
@@ -1012,8 +1014,7 @@
</message>
<message>
<source>Descriptor Value Changed</source>
- <extracomment>Environmental sensing related
-</extracomment>
+ <extracomment>Environmental sensing related</extracomment>
<translation>El valor del descriptor ha canviat</translation>
</message>
<message>
@@ -1030,8 +1031,7 @@
</message>
<message>
<source>Age</source>
- <extracomment>Age of person
-</extracomment>
+ <extracomment>Age of person</extracomment>
<translation>Edat</translation>
</message>
<message>
@@ -1084,8 +1084,7 @@
</message>
<message>
<source>Height</source>
- <extracomment>Height of a person
-</extracomment>
+ <extracomment>Height of a person</extracomment>
<translation>Altura</translation>
</message>
<message>
@@ -1130,8 +1129,7 @@
</message>
<message>
<source>Database Change Increment</source>
- <extracomment>Environmental sensing related
-</extracomment>
+ <extracomment>Environmental sensing related</extracomment>
<translation>Increment del canvi de la base de dades</translation>
</message>
<message>
@@ -1176,7 +1174,7 @@
</message>
<message>
<source>Characteristic User Description</source>
- <translation>Característica per a la descripció de l’usuari</translation>
+ <translation>Característica per a la descripció de l&apos;usuari</translation>
</message>
<message>
<source>Client Characteristic Configuration</source>
@@ -1235,11 +1233,11 @@
</message>
<message>
<source>Trying to connect while connection is in progress</source>
- <translation>S&apos;ha intentat connectar quan ja hi ha en progés una connexió</translation>
+ <translation>S&apos;ha intentat connectar quan ja hi ha una connexió en curs</translation>
</message>
<message>
<source>Service cannot be found</source>
- <translation>El servei no es pot trobar</translation>
+ <translation>No s&apos;ha pogut trobar el servei</translation>
</message>
<message>
<source>Invalid data/data size</source>
@@ -1255,11 +1253,20 @@
</message>
<message>
<source>Unknown socket error</source>
- <translation>Error de sòcol desconegut</translation>
+ <translation>Error desconegut de sòcol</translation>
+ </message>
+ <message>
+ <source>Network Error: %1</source>
+ <translation>Error de xarxa: %1</translation>
</message>
<message>
<source>Connecting to port is not supported</source>
- <translation>El connectar amb un port no está admès</translation>
+ <translation type="vanished">El connectar amb un port no está admès</translation>
+ </message>
+ <message>
+ <source>Cannot connect to %1</source>
+ <comment>%1 = uuid</comment>
+ <translation>No s&apos;ha pogut connectar a %1</translation>
</message>
<message>
<source>Device does not support Bluetooth</source>
@@ -1285,7 +1292,7 @@
</message>
<message>
<source>Input stream thread cannot be started</source>
- <translation>No s&apos;ha pogut iniciar el fil del flux d’entrada</translation>
+ <translation>No s&apos;ha pogut iniciar el fil del flux d&apos;entrada</translation>
</message>
<message>
<source>Connection to service failed</source>
@@ -1293,7 +1300,7 @@
</message>
<message>
<source>Error during write on socket.</source>
- <translation>Error mentre s&apos;escribia en el sòcol.</translation>
+ <translation>Error mentre s&apos;escrivia al sòcol.</translation>
</message>
<message>
<source>Network error during read</source>
@@ -1301,7 +1308,81 @@
</message>
<message>
<source>Cannot set connection security level</source>
- <translation>No s&apos;ha pogut establir el nivel de seguretat</translation>
+ <translation>No s&apos;ha pogut establir el nivell de seguretat</translation>
+ </message>
+ <message>
+ <source>Cannot export profile on DBus</source>
+ <translation>No s&apos;ha pogut exportar el perfil al DBus</translation>
+ </message>
+ <message>
+ <source>Cannot register profile on DBus</source>
+ <translation>No s&apos;ha pogut registrar el perfil al DBus</translation>
+ </message>
+ <message>
+ <source>Cannot find remote device</source>
+ <translation>No s&apos;ha pogut trobar el dispositiu remot</translation>
+ </message>
+ <message>
+ <source>Cannot connect to remote profile</source>
+ <translation>No s&apos;ha pogut connectar al perfil remot</translation>
+ </message>
+ <message>
+ <source>Missing serviceUuid or Serial Port service class uuid</source>
+ <translation>Manca el «serviceUuid» o l&apos;UUID de la classe de servei «Serial Port»</translation>
+ </message>
+ <message>
+ <source>Invalid Bluetooth address passed to connectToService()</source>
+ <translation>Adreça Bluetooth no vàlida passada a «connectToService()»</translation>
+ </message>
+ <message>
+ <source>Unsupported protocol. Win32 only supports RFCOMM sockets</source>
+ <translation>Protocol no admès. El Win32 només admet sòcols RFCOMM</translation>
+ </message>
+ <message>
+ <source>Failed to create socket</source>
+ <translation>Ha fallat en crear el sòcol</translation>
+ </message>
+ <message>
+ <source>Socket type not handled: %1</source>
+ <translation>Tipus de sòcol no gestionat: %1</translation>
+ </message>
+ <message>
+ <source>Logic error: more bytes sent than passed to ::send</source>
+ <translation>Error lògic: s&apos;han enviat més bytes que els passats a «::send»</translation>
+ </message>
+ <message>
+ <source>Network error</source>
+ <translation>Error de xarxa</translation>
+ </message>
+ <message>
+ <source>Remote host closed connection</source>
+ <translation>L&apos;ordinador remot ha tancat la connexió</translation>
+ </message>
+ <message>
+ <source>Connection timed out</source>
+ <translation>La connexió ha caducat</translation>
+ </message>
+ <message>
+ <source>Host not reachable</source>
+ <translation>L&apos;ordinador és inaccessible</translation>
+ </message>
+ <message>
+ <source>Host refused connection</source>
+ <translation>L&apos;ordinador ha refusat la connexió</translation>
+ </message>
+</context>
+<context>
+ <name>QBluetoothSocketPrivateAndroid</name>
+ <message>
+ <source>Connecting to port is not supported</source>
+ <translation>No s&apos;admet connectar al port</translation>
+ </message>
+</context>
+<context>
+ <name>QBluetoothSocketPrivateBluezDBus</name>
+ <message>
+ <source>Connecting to port is not supported via Bluez DBus</source>
+ <translation>No s&apos;admet connectar al port via el DBus del Bluez</translation>
</message>
</context>
<context>
@@ -1388,5 +1469,33 @@
<source>Error occurred trying to connect to remote device.</source>
<translation>Ha succeït un error en intentar connectar amb el dispositiu remot.</translation>
</message>
+ <message>
+ <source>Remote device closed the connection</source>
+ <translation>El dispositiu remot ha tancat la connexió</translation>
+ </message>
+ <message>
+ <source>Failed to authorize on the remote device</source>
+ <translation>Ha fallat l&apos;autorització al dispositiu remot</translation>
+ </message>
+ <message>
+ <source>Advertisement data is larger than 31 bytes</source>
+ <translation>Les dades d&apos;anunci són més grans que 31 bytes</translation>
+ </message>
+ <message>
+ <source>Advertisement feature not supported on the platform</source>
+ <translation>La funcionalitat d&apos;anunci no està admesa a la plataforma</translation>
+ </message>
+ <message>
+ <source>Error occurred trying to start advertising</source>
+ <translation>Ha succeït un error en intentar iniciar l&apos;anunci</translation>
+ </message>
+ <message>
+ <source>Failed due to too many advertisers</source>
+ <translation>Ha fallat per massa anunciants</translation>
+ </message>
+ <message>
+ <source>Unknown advertisement error</source>
+ <translation>Error desconegut d&apos;anunci</translation>
+ </message>
</context>
</TS>
diff --git a/translations/qtconnectivity_de.ts b/translations/qtconnectivity_de.ts
index f08ece9..89122ea 100644
--- a/translations/qtconnectivity_de.ts
+++ b/translations/qtconnectivity_de.ts
@@ -24,6 +24,10 @@
<translation>Die Berechtigung zur Positionsbestimmung fehlt. Es ist keine Suche möglich.</translation>
</message>
<message>
+ <source>Location service turned off. Search is not possible.</source>
+ <translation>Standortbestimmung abgeschaltet. Suche ist nicht möglich.</translation>
+ </message>
+ <message>
<source>Classic Discovery cannot be started</source>
<translation>Standardsuche kann nicht gestartet werden</translation>
</message>
diff --git a/translations/qtconnectivity_ko.ts b/translations/qtconnectivity_ko.ts
index 92ff6ca..84bbb5a 100644
--- a/translations/qtconnectivity_ko.ts
+++ b/translations/qtconnectivity_ko.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="ko">
+<TS version="2.1" language="ko">
<context>
<name>QBluetoothDeviceDiscoveryAgent</name>
<message>
@@ -20,8 +20,12 @@
<translation>전달한 주소가 로컬 장치가 아닙니다.</translation>
</message>
<message>
- <source>Missing Location permission. Search is not possible</source>
- <translation>위치 권한이 없습니다. 검색할 수 없습니다</translation>
+ <source>Missing Location permission. Search is not possible.</source>
+ <translation>위치 권한이 없습니다. 검색할 수 없습니다.</translation>
+ </message>
+ <message>
+ <source>Location service turned off. Search is not possible.</source>
+ <translation>위치 서비스가 꺼져 있습니다. 검색할 수 없습니다.</translation>
</message>
<message>
<source>Classic Discovery cannot be started</source>
@@ -52,10 +56,6 @@
<translation>LE 장치 조회를 시작할 수 없음</translation>
</message>
<message>
- <source>Discovery cannot be started</source>
- <translation>발견을 시작할 수 없음</translation>
- </message>
- <message>
<source>Discovery cannot be stopped</source>
<translation>발견을 중지할 수 없음</translation>
</message>
@@ -68,18 +68,6 @@
<translation>블루투스 어댑터 오류</translation>
</message>
<message>
- <source>No Bluetooth device available</source>
- <translation>블루투스 장치를 사용할 수 없음</translation>
- </message>
- <message>
- <source>Cannot open remote device socket</source>
- <translation>원격 장치 소켓을 열 수 없음</translation>
- </message>
- <message>
- <source>Cannot connect to Bluetooth socket notifier</source>
- <translation>블루투스 소켓 알림이에 연결할 수 없음</translation>
- </message>
- <message>
<source>Cannot start device inquiry</source>
<translation>장치 조회를 시작할 수 없음</translation>
</message>
@@ -155,30 +143,6 @@
<translation>사용자 정의 서비스</translation>
</message>
<message>
- <source>Result received in callback is null</source>
- <translation>콜백으로 수신한 결과가 null임</translation>
- </message>
- <message>
- <source>Failed to initialize Bluetooth stack</source>
- <translation>블루투스 스택을 초기화할 수 없음</translation>
- </message>
- <message>
- <source>Could not retrieve remote device address</source>
- <translation>원격 장치 주소를 가져올 수 없음</translation>
- </message>
- <message>
- <source>Failed to open remote device file</source>
- <translation>원격 장치 파일을 열 수 없음</translation>
- </message>
- <message>
- <source>Operation canceled</source>
- <translation>작업 취소됨</translation>
- </message>
- <message>
- <source>Service query timed out</source>
- <translation>서비스 질의 시간 초과됨</translation>
- </message>
- <message>
<source>Service Discovery</source>
<translation>서비스 발견</translation>
</message>
@@ -527,14 +491,6 @@
<translation>환경 감지 트리거 설정</translation>
</message>
<message>
- <source>Running Speed and Cadance</source>
- <translation>달리는 속도와 박자</translation>
- </message>
- <message>
- <source>Cycling Speed and Cadance</source>
- <translation>사이클 속도와 박자</translation>
- </message>
- <message>
<source>Cycling Power</source>
<translation>사이클 힘</translation>
</message>
@@ -656,10 +612,6 @@
<translation>UdiCPlain</translation>
</message>
<message>
- <source>Multi-Channel Adaptation Protocol -Conrol</source>
- <translation>다채널 적응형 프로토콜 - Conrol</translation>
- </message>
- <message>
<source>Multi-Channel Adaptation Protocol - Data</source>
<translation>다채널 적응형 프로토콜 - 데이터</translation>
</message>
@@ -834,7 +786,7 @@
</message>
<message>
<source>Glucose Measurement Context</source>
- <translation>혈당 측정 컨텍스트</translation>
+ <translation>혈당 측정 콘텍스트</translation>
</message>
<message>
<source>Blood Pressure Measurement</source>
@@ -980,10 +932,6 @@
<translation>사이클 힘 기능</translation>
</message>
<message>
- <source>Cycling Power COntrol Point</source>
- <translation>사이클 힘 제어 지점</translation>
- </message>
- <message>
<source>Location And Speed</source>
<translation>위치와 속도</translation>
</message>
@@ -1245,10 +1193,6 @@
<translation>클라이언트 특징 설정</translation>
</message>
<message>
- <source>Server Characteristic Configuratio</source>
- <translation>서버 특징 설정</translation>
- </message>
- <message>
<source>Characteristic Presentation Format</source>
<translation>특징 표시 형식</translation>
</message>
@@ -1288,10 +1232,6 @@
<translation>알 수 없는 소켓 오류</translation>
</message>
<message>
- <source>Connecting to port is not supported</source>
- <translation>포트 연결이 지원되지 않음</translation>
- </message>
- <message>
<source>Service cannot be found</source>
<translation>서비스를 찾을 수 없음</translation>
</message>
@@ -1326,6 +1266,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>
@@ -1335,7 +1280,7 @@
</message>
<message>
<source>Error during write on socket.</source>
- <translation>소켓에 쓰는 중 오류가 발생하였습니다.</translation>
+ <translation>소켓에 쓰는 중 오류가 발생했습니다.</translation>
</message>
<message>
<source>Cannot read while not connected</source>
@@ -1357,6 +1302,80 @@
<source>Network Error: %1</source>
<translation>네트워크 오류: %1</translation>
</message>
+ <message>
+ <source>Cannot export profile on DBus</source>
+ <translation>DBus로 프로필을 내보낼 수 없음</translation>
+ </message>
+ <message>
+ <source>Cannot register profile on DBus</source>
+ <translation>DBus에 프로필을 등록할 수 없음</translation>
+ </message>
+ <message>
+ <source>Cannot find remote device</source>
+ <translation>원격 장치를 찾을 수 없음</translation>
+ </message>
+ <message>
+ <source>Cannot connect to remote profile</source>
+ <translation>원격 프로필에 연결할 수 없음</translation>
+ </message>
+ <message>
+ <source>Missing serviceUuid or Serial Port service class uuid</source>
+ <translation>serviceUuid 또는 직렬 포트 서비스 클래스 uuid가 없음</translation>
+ </message>
+ <message>
+ <source>Invalid Bluetooth address passed to connectToService()</source>
+ <translation>connectToService()에 잘못된 블루투스 주소가 전달됨</translation>
+ </message>
+ <message>
+ <source>Unsupported protocol. Win32 only supports RFCOMM sockets</source>
+ <translation>지원하지 않는 프로토콜입니다. Win32에서는 RFCOMM 소켓만 지원합니다</translation>
+ </message>
+ <message>
+ <source>Failed to create socket</source>
+ <translation>소켓을 만들 수 없음</translation>
+ </message>
+ <message>
+ <source>Socket type not handled: %1</source>
+ <translation>소켓 형식을 처리할 수 없음: %1</translation>
+ </message>
+ <message>
+ <source>Logic error: more bytes sent than passed to ::send</source>
+ <translation>논리 오류: ::send에 전달한 것보다 더 많은 바이트를 전송함</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>QBluetoothSocketPrivateAndroid</name>
+ <message>
+ <source>Connecting to port is not supported</source>
+ <translation>포트 연결이 지원되지 않음</translation>
+ </message>
+</context>
+<context>
+ <name>QBluetoothSocketPrivateBluezDBus</name>
+ <message>
+ <source>Connecting to port is not supported via Bluez DBus</source>
+ <translation>Bluez DBus를 통한 포트 연결이 지원되지 않음</translation>
+ </message>
</context>
<context>
<name>QBluetoothTransferReply</name>
@@ -1365,10 +1384,6 @@
<translation>잘못된 입력 장치(null)</translation>
</message>
<message>
- <source>QIODevice cannot be read.Make sure it is open for reading.</source>
- <translation>QIODevice에서 읽을 수 없습니다. 읽을 수 였도록 열려 있는지 확인하십시오.</translation>
- </message>
- <message>
<source>Source file does not exist</source>
<translation>원본 파일이 존재하지 않음</translation>
</message>
@@ -1404,10 +1419,6 @@
<source>Push service not found</source>
<translation>푸시 서비스를 찾을 수 없음</translation>
</message>
- <message>
- <source>Resurce busy.</source>
- <translation>자원이 바쁩니다.</translation>
- </message>
</context>
<context>
<name>QBluetoothTransferReplyBluez</name>
@@ -1451,8 +1462,32 @@
<translation>원격 장치에 연결을 시도하는 중 오류가 발생했습니다.</translation>
</message>
<message>
+ <source>Remote device closed the connection</source>
+ <translation>원격 장치에서 연결을 닫았음</translation>
+ </message>
+ <message>
+ <source>Failed to authorize on the remote device</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>Error occurred trying to start advertising</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/qtconnectivity_ru.ts b/translations/qtconnectivity_ru.ts
index 61f1915..374c8df 100644
--- a/translations/qtconnectivity_ru.ts
+++ b/translations/qtconnectivity_ru.ts
@@ -24,6 +24,10 @@
<translation>Отсутствует разрешение на определение местоположения. Поиск невозможен.</translation>
</message>
<message>
+ <source>Location service turned off. Search is not possible.</source>
+ <translation>Сервис определения местоположения отключён. Поиск невозможен.</translation>
+ </message>
+ <message>
<source>Classic Discovery cannot be started</source>
<translation>Невозможно запустить классическое обнаружение</translation>
</message>
diff --git a/translations/qtdeclarative_de.ts b/translations/qtdeclarative_de.ts
index 3fa7013..8473825 100644
--- a/translations/qtdeclarative_de.ts
+++ b/translations/qtdeclarative_de.ts
@@ -37,20 +37,6 @@
</message>
</context>
<context>
- <name>QInputMethod</name>
- <message>
- <source>InputMethod is an abstract class</source>
- <translation>InputMethod ist eine abstrakte Klasse</translation>
- </message>
-</context>
-<context>
- <name>QQmlAbstractDelegateComponent</name>
- <message>
- <source>Cannot create instance of abstract class AbstractDelegateComponent.</source>
- <translation>Es kann keine Instanz der abstrakten Klasse AbstractDelegateComponent erstellt werden.</translation>
- </message>
-</context>
-<context>
<name>QQmlAnonymousComponentResolver</name>
<message>
<source>Component objects cannot declare new functions.</source>
@@ -293,6 +279,14 @@
anzuzeigen.</translation>
</message>
<message>
+ <source>helps to see if a translated text
+ will result in an elided text
+ in QML elements.</source>
+ <translation>hilft festzustellen, ob ein übersetzter Text
+ in QML-Elementen beschnitten
+ wird.</translation>
+ </message>
+ <message>
<source>Other services offered by qmltooling plugins that implement QQmlDebugServiceFactory and which can be found in the standard plugin paths will also be available and can be specified. If no &quot;services&quot; argument is given, all services found this way, including the default ones, are loaded.</source>
<translation>Es können auch andere Dienste angegeben werden, die von qmltooling-Plugins bereitgestellt werden, die QQmlDebugServiceFactory implementieren und in den Standard-Plugin-Pfaden gefunden werden können. Wenn kein &quot;services&quot;-Argument angegeben wurde, werden alle auf diesem Wege gefundenen Dienste einschließlich der Standarddienste geladen.</translation>
</message>
@@ -476,10 +470,18 @@
<translation>&quot;%1&quot; ist nicht eindeutig. Es kommt in %2 und %3 vor</translation>
</message>
<message>
+ <source>- %1 is neither a type nor a namespace</source>
+ <translation>- %1 ist weder ein Typ noch ein Namensraum</translation>
+ </message>
+ <message>
<source>- %1 is not a namespace</source>
<translation>- %1 ist kein gültiger Namensraum</translation>
</message>
<message>
+ <source>- %1 is not a type</source>
+ <translation>- %1 ist kein Typ</translation>
+ </message>
+ <message>
<source>- nested namespaces not allowed</source>
<translation>- geschachtelte Namensräume sind nicht zulässig</translation>
</message>
@@ -1081,11 +1083,11 @@
<translation>Der Listeneigenschaft &quot;%1&quot; kann kein Objekt zugewiesen werden</translation>
</message>
<message>
- <source>Can not assign value of type &quot;%1&quot; to property &quot;%2&quot;, expecting &quot;%3&quot;</source>
+ <source>Cannot assign value of type &quot;%1&quot; to property &quot;%2&quot;, expecting &quot;%3&quot;</source>
<translation>Der Eigenschaft &quot;%2&quot; kann kein Wert des Typs &quot;%1&quot; zugewiesen werden; es wird &quot;%3&quot; erwartet</translation>
</message>
<message>
- <source>Can not assign value of type &quot;%1&quot; to property &quot;%2&quot;, expecting an object</source>
+ <source>Cannot assign value of type &quot;%1&quot; to property &quot;%2&quot;, expecting an object</source>
<translation>Der Eigenschaft &quot;%2&quot; kann kein Wert des Typs &quot;%1&quot; zugewiesen werden; es wird ein Objekt erwartet</translation>
</message>
<message>
@@ -1158,6 +1160,10 @@
<translation>Die Datei oder das Verzeichnis konnte nicht gefunden werden</translation>
</message>
<message>
+ <source>Type %1 has no inline component type called %2</source>
+ <translation>Der Typ %1 hat keinen eingebetteten Komponententyp des Namens %2</translation>
+ </message>
+ <message>
<source>File is empty</source>
<translation>Die Datei ist leer</translation>
</message>
@@ -1188,21 +1194,6 @@
<source>Cannot animate read-only property &quot;%1&quot;</source>
<translation>Die Eigenschaft &quot;%1&quot; ist schreibgeschützt und kann daher nicht animiert werden</translation>
</message>
- <message>
- <source>Animation is an abstract class</source>
- <translation>Die Klasse Animation ist abstrakt</translation>
- </message>
- <message>
- <source>Animator is an abstract class</source>
- <translation>Die Klasse Animator ist abstrakt</translation>
- </message>
-</context>
-<context>
- <name>QQuickAccessibleAttached</name>
- <message>
- <source>Accessible is only available via attached properties</source>
- <translation>Auf Accessible kann nur mittels Eigenschaften des Typs&apos;attached&apos; zugegriffen werden</translation>
- </message>
</context>
<context>
<name>QQuickAnchorAnimation</name>
@@ -1263,20 +1254,6 @@
</message>
</context>
<context>
- <name>QQuickAnimatedImage</name>
- <message>
- <source>Qt was built without support for QMovie</source>
- <translation>Diese Version der Qt-Bibliothek wurde ohne Unterstützung für die Klasse QMovie erstellt</translation>
- </message>
-</context>
-<context>
- <name>QQuickApplication</name>
- <message>
- <source>Application is an abstract class</source>
- <translation>&apos;Application&apos; ist eine abstrakte Klasse</translation>
- </message>
-</context>
-<context>
<name>QQuickBehavior</name>
<message>
<source>Cannot change the animation assigned to a Behavior.</source>
@@ -1284,29 +1261,11 @@
</message>
</context>
<context>
- <name>QQuickDragAttached</name>
- <message>
- <source>Drag is only available via attached properties</source>
- <translation>Auf Drag kann nur mittels Eigenschaften des Typs &apos;attached&apos; zugegriffen werden</translation>
- </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>
<translation>Die EnterKey-Eigenschaft des Typs &apos;attached&apos; kann nur mit Elementen der Klasse Item verwendet werden</translation>
</message>
- <message>
- <source>EnterKey is only available via attached properties</source>
- <translation>Auf EnterKey kann nur mittels Eigenschaften des Typs &apos;attached&apos; zugegriffen werden</translation>
- </message>
</context>
<context>
<name>QQuickFlipable</name>
@@ -1320,44 +1279,15 @@
</message>
</context>
<context>
- <name>QQuickGraphicsInfo</name>
- <message>
- <source>GraphicsInfo is only available via attached properties</source>
- <translation>Auf GraphicsInfo kann nur mittels Eigenschaften des Typs &apos;attached&apos; zugegriffen werden</translation>
- </message>
-</context>
-<context>
<name>QQuickItemView</name>
<message>
<source>Delegate must be of Item type</source>
<translation>Delegate-Komponente muss vom Typ &apos;Item&apos; sein</translation>
</message>
- <message>
- <source>ItemView is an abstract base class</source>
- <translation>ItemView ist eine abstrakte Basisklasse</translation>
- </message>
-</context>
-<context>
- <name>QQuickKeyNavigationAttached</name>
- <message>
- <source>KeyNavigation is only available via attached properties</source>
- <translation>Tastennavigation ist nur über Eigenschaften des Typs &apos;attached&apos; verfügbar</translation>
- </message>
-</context>
-<context>
- <name>QQuickKeysAttached</name>
- <message>
- <source>Keys is only available via attached properties</source>
- <translation>Die Unterstützung für Tasten ist nur über Eigenschaften des Typs &apos;attached&apos; verfügbar</translation>
- </message>
</context>
<context>
<name>QQuickLayoutMirroringAttached</name>
<message>
- <source>LayoutMirroring is only available via attached properties</source>
- <translation>LayoutMirroring ist nur in Verbindung mit Eigenschaften des Typs &quot;attached&quot; möglich</translation>
- </message>
- <message>
<source>LayoutDirection attached property only works with Items and Windows</source>
<translation>Die Eigenschaft LayoutDirection des Typs &apos;attached&apos; funktioniert nur mit Objekten des Typs Item oder Window</translation>
</message>
@@ -1370,31 +1300,6 @@
</message>
</context>
<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>
-</context>
-<context>
- <name>QQuickOpenGLInfo</name>
- <message>
- <source>OpenGLInfo is only available via attached properties</source>
- <translation>Auf OpenGLInfo kann nur mittels Eigenschaften des Typs &apos;attached&apos; zugegriffen werden</translation>
- </message>
-</context>
-<context>
- <name>QQuickPaintedItem</name>
- <message>
- <source>Cannot create instance of abstract class PaintedItem</source>
- <translation>Es kann keine Instanz der abstrakten Klasse PaintedItem erstellt werden</translation>
- </message>
-</context>
-<context>
<name>QQuickParentAnimation</name>
<message>
<source>Unable to preserve appearance under complex transform</source>
@@ -1473,41 +1378,6 @@
</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>PointerMouseEvent is only available as a parameter of several signals in PointerHandler</source>
- <translation>PointerMouseEvent ist nur als Parameter einiger Signale in PointerHandler verfügbar</translation>
- </message>
- <message>
- <source>PointerTouchEvent is only available as a parameter of several signals in PointerHandler</source>
- <translation>PointerTouchEvent ist nur als Parameter einiger Signale in 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>PointerHandler is an abstract base class</source>
- <translation>PointerHandler ist eine abstrakte Basisklasse</translation>
- </message>
- <message>
- <source>ImageBase is an abstract base class</source>
- <translation>ImageBase ist eine abstrakte Basisklasse</translation>
- </message>
-</context>
-<context>
<name>QQuickPropertyAnimation</name>
<message>
<source>Cannot set a duration of &lt; 0</source>
@@ -1537,20 +1407,6 @@
</message>
</context>
<context>
- <name>QQuickShaderEffectMesh</name>
- <message>
- <source>Cannot create instance of abstract class ShaderEffectMesh.</source>
- <translation>Es kann keine Instanz der abstrakten Klasse ShaderEffectMesh erstellt werden.</translation>
- </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>
@@ -1562,20 +1418,6 @@
</message>
</context>
<context>
- <name>QQuickTouchPoint</name>
- <message>
- <source>PointingDeviceUniqueId is only available via read-only properties</source>
- <translation>PointingDeviceUniqueId ist nur über schreibgeschützte Eigenschaften verfügbar</translation>
- </message>
-</context>
-<context>
- <name>QQuickViewTransitionAttached</name>
- <message>
- <source>ViewTransition is only available via attached properties</source>
- <translation>ViewTransition ist nur über Eigenschaften des Typs &apos;attached&apos; verfügbar</translation>
- </message>
-</context>
-<context>
<name>QQuickWindow</name>
<message>
<source>Failed to create %1 context for format %2.
@@ -1593,6 +1435,10 @@ Installieren Sie einen Treiber, der OpenGL 2.0 oder neuer bereitstellt, oder ste
<extracomment>%1 Context type (Open GL, EGL), %2 format specification</extracomment>
<translation>Es konnte kein %1-Kontext für das Format %2 erzeugt werden</translation>
</message>
+ <message>
+ <source>Failed to initialize graphics backend for %1.</source>
+ <translation>Das Graphics-Backend für %1 konnte nicht initialisiert werden.</translation>
+ </message>
</context>
<context>
<name>QQuickWindowQmlImpl</name>
@@ -1662,10 +1508,6 @@ Installieren Sie einen Treiber, der OpenGL 2.0 oder neuer bereitstellt, oder ste
<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>
- <translation>%1 &apos;%2&apos; kann nicht in einen geschützten Namensraum &apos;%3&apos; installiert werden</translation>
- </message>
- <message>
<source>Cannot install %1 &apos;%2&apos; into protected module &apos;%3&apos; version &apos;%4&apos;</source>
<translation>%1 &apos;%2&apos; kann nicht in das geschützte Modul &apos;%3&apos; der Version &apos;%4&apos; installiert werden</translation>
</message>
diff --git a/translations/qtdeclarative_ko.ts b/translations/qtdeclarative_ko.ts
index b777fa9..2143734 100644
--- a/translations/qtdeclarative_ko.ts
+++ b/translations/qtdeclarative_ko.ts
@@ -1,19 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="ko">
+<TS version="2.1" language="ko">
<context>
<name>Object</name>
<message>
- <source>Duplicate method name</source>
- <translation>중복된 메서드 이름</translation>
- </message>
- <message>
- <source>Method names cannot begin with an upper case letter</source>
- <translation>메서드 이름은 대문자로 시작할 수 없음</translation>
- </message>
- <message>
- <source>Illegal method name</source>
- <translation>잘못된 메서드 이름</translation>
+ <source>Duplicate scoped enum name</source>
+ <translation>잘못된 범위 한정 열거형 이름</translation>
</message>
<message>
<source>Duplicate signal name</source>
@@ -45,13 +37,6 @@
</message>
</context>
<context>
- <name>QInputMethod</name>
- <message>
- <source>InputMethod is an abstract class</source>
- <translation>InputMethod는 추상 클래스임</translation>
- </message>
-</context>
-<context>
<name>QQmlAnonymousComponentResolver</name>
<message>
<source>Component objects cannot declare new functions.</source>
@@ -71,7 +56,7 @@
</message>
<message>
<source>Component elements may not contain properties other than id</source>
- <translation>Component 원소는 id 이외의 다른 속성을 포함할 수 없음</translation>
+ <translation>컴포넌트 원소는 id 이외의 다른 속성을 포함할 수 없음</translation>
</message>
<message>
<source>Invalid component body specification</source>
@@ -93,10 +78,6 @@
<source>Invalid alias target location: %1</source>
<translation>잘못된 별명 대상 위치: %1</translation>
</message>
- <message>
- <source>Invalid alias location</source>
- <translation>잘못된 별명 위치</translation>
- </message>
</context>
<context>
<name>QQmlCodeGenerator</name>
@@ -133,6 +114,34 @@
<translation>잘못된 속성 이름</translation>
</message>
<message>
+ <source>Duplicate method name</source>
+ <translation>중복된 메서드 이름</translation>
+ </message>
+ <message>
+ <source>Method names cannot begin with an upper case letter</source>
+ <translation>메서드 이름은 대문자로 시작할 수 없음</translation>
+ </message>
+ <message>
+ <source>Illegal method name</source>
+ <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>Invalid component id specification</source>
<translation>잘못된 컴포넌트 id 지정</translation>
</message>
@@ -172,8 +181,8 @@
<translation>createObject: 값이 객체가 아님</translation>
</message>
<message>
- <source>Object destroyed during incubation</source>
- <translation>객체를 만드는 중 파괴됨</translation>
+ <source>Object or context destroyed during incubation</source>
+ <translation>객체나 콘텍스트를 만드는 중 파괴됨</translation>
</message>
</context>
<context>
@@ -194,6 +203,14 @@
<source>Connections: script expected</source>
<translation>연결: 스크립트가 필요함</translation>
</message>
+ <message>
+ <source>Implicitly defined onFoo properties in Connections are deprecated. Use this syntax instead: function onFoo(&lt;arguments&gt;) { ... }</source>
+ <translation>Connections 객체에 암시적으로 선언된 onFoo 속성은 오래되었습니다. 다음 문법을 대신 사용하십시오: function onFoo(&lt;arguments&gt;) { ... }</translation>
+ </message>
+ <message>
+ <source>Detected function &quot;%1&quot; in Connections element. This is probably intended to be a signal handler but no signal of the target matches the name.</source>
+ <translation>Connections 원소에서 &quot;%1&quot; 함수를 감지했습니다. 시그널 처리기인 것 같지만 대상의 시그널 중에 그러한 이름을 가진 것이 없습니다.</translation>
+ </message>
</context>
<context>
<name>QQmlDebugServerImpl</name>
@@ -260,6 +277,14 @@
표시할 수 있도록 이 서비스를 사용합니다.</translation>
</message>
<message>
+ <source>helps to see if a translated text
+ will result in an elided text
+ in QML elements.</source>
+ <translation>번역된 문자열이 QML 원소에서
+ 생략되어서 표시될지를
+ 미리 볼 수 있습니다.</translation>
+ </message>
+ <message>
<source>Other services offered by qmltooling plugins that implement QQmlDebugServiceFactory and which can be found in the standard plugin paths will also be available and can be specified. If no &quot;services&quot; argument is given, all services found this way, including the default ones, are loaded.</source>
<translation>표준 플러그인 경로에서 찾을 수 있는 QQmlDebugServiceFactory를 구현하는 qmltooling 플러그인도 사용할 수 있으며 여기에 지정할 수 있습니다. &quot;services&quot; 인자를 지정하지 않으면 기본 서비스를 포함하여 여기에 해당하는 모든 서비스를 불러옵니다.</translation>
</message>
@@ -278,6 +303,10 @@
<source>The group of a DelegateModel cannot be changed within onChanged</source>
<translation>onChanged 내에서 DelegateModel의 그룹을 변경할 수 없습니다</translation>
</message>
+ <message>
+ <source>The delegates of a DelegateModel cannot be changed within onUpdated.</source>
+ <translation>onUpdated 내에서 DelegateModel의 대리자를 변경할 수 없습니다.</translation>
+ </message>
</context>
<context>
<name>QQmlDelegateModelGroup</name>
@@ -381,7 +410,7 @@
<context>
<name>QQmlEngine</name>
<message>
- <source>Locale cannot be instantiated. Use Qt.locale()</source>
+ <source>Locale cannot be instantiated. Use Qt.locale()</source>
<translation>로캘의 인스턴스를 생성할 수 없습니다. Qt.locale()을 사용하십시오</translation>
</message>
<message>
@@ -413,6 +442,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>
@@ -435,10 +468,18 @@
<translation>&quot;%1&quot;이(가) 모호합니다. %2, %3에서 찾았습니다</translation>
</message>
<message>
+ <source>- %1 is neither a type nor a namespace</source>
+ <translation>- %1이(가) 형식이나 네임스페이스가 아님</translation>
+ </message>
+ <message>
<source>- %1 is not a namespace</source>
<translation>- %1이(가) 네임스페이스가 아님</translation>
</message>
<message>
+ <source>- %1 is not a type</source>
+ <translation>- %1이(가) 형식이 아님</translation>
+ </message>
+ <message>
<source>- nested namespaces not allowed</source>
<translation>- 중첩된 네임스페이스를 사용할 수 없음</translation>
</message>
@@ -448,19 +489,19 @@
</message>
<message>
<source>is ambiguous. Found in %1 and in %2</source>
- <translation>이(가) 모호합니다. %1와(과) %2에서 찾았습니다</translation>
+ <translation>이(가) 모호합니다. %1와(과) %2에서 찾았음</translation>
</message>
<message>
<source>is ambiguous. Found in %1 in version %2.%3 and %4.%5</source>
- <translation>이(가) 모호합니다. %1에서 버전 %2.%3, %4.%5을(를) 찾았습니다</translation>
+ <translation>이(가) 모호합니다. %1에서 버전 %2.%3, %4.%5을(를) 찾았음</translation>
</message>
<message>
<source>is instantiated recursively</source>
- <translation>이(가) 재귀적으로 인스턴스화되었습니다</translation>
+ <translation>이(가) 재귀적으로 인스턴스화됨</translation>
</message>
<message>
<source>is not a type</source>
- <translation>이(가) 형식이 아닙니다</translation>
+ <translation>이(가) 형식이 아님</translation>
</message>
<message>
<source>static plugin for module &quot;%1&quot; with name &quot;%2&quot; has no metadata URI</source>
@@ -487,10 +528,6 @@
<translation>모듈 &quot;%1&quot;의 플러그인 &quot;%2&quot;을(를) 찾을 수 없음</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>&quot;%1&quot; 버전 %2.%3이(가) 모듈 &quot;%4&quot;에 한 번 이상 정의되었음</translation>
</message>
@@ -511,22 +548,6 @@
<translation>import &quot;%1&quot;에 qmldir과 네임스페이스가 없음</translation>
</message>
<message>
- <source>Module loaded for URI &apos;%1&apos; does not implement QQmlTypesExtensionInterface</source>
- <translation>URI &apos;%1&apos;에서 불러온 모듈이 QQmlTypesExtensionInterface를 구현하지 않음</translation>
- </message>
- <message>
- <source>Module namespace &apos;%1&apos; does not match import URI &apos;%2&apos;</source>
- <translation>모듈 네임스페이스 &apos;%1&apos;이(가) 가져오기 URI &apos;%2&apos;와(과) 일치 않음</translation>
- </message>
- <message>
- <source>Namespace &apos;%1&apos; has already been used for type registration</source>
- <translation>네임스페이스 &apos;%1&apos;이(가) 형식 등록에 이미 사용됨</translation>
- </message>
- <message>
- <source>Module &apos;%1&apos; does not contain a module identifier directive - it cannot be protected from external registrations.</source>
- <translation>모듈 &apos;%1&apos;이(가) 모듈 식별자 선언을 포함하지 않음 - 외부 등록에서 보호받을 수 없습니다.</translation>
- </message>
- <message>
<source>File name case mismatch for &quot;%1&quot;</source>
<translation>파일 이름의 대소문자가 &quot;%1&quot;와(과) 일치하지 않음</translation>
</message>
@@ -534,12 +555,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>
@@ -626,7 +647,7 @@
</message>
<message>
<source>Cannot assign primitives to lists</source>
- <translation>원시 타입을 목록에 할당할 수 없음</translation>
+ <translation>원시 형식을 목록에 할당할 수 없음</translation>
</message>
<message>
<source>Unable to create object of type %1</source>
@@ -659,8 +680,16 @@
<translation>가져온 파일이 스크립트여야 함</translation>
</message>
<message>
+ <source>Module import requires a minor version (missing dot)</source>
+ <translation>모듈을 가져오려면 부 버전이 필요함(점이 없음)</translation>
+ </message>
+ <message>
+ <source>Module import requires a minor version (missing number)</source>
+ <translation>모듈을 가져오려면 부 버전이 필요함(숫자가 없음)</translation>
+ </message>
+ <message>
<source>File import requires a qualifier</source>
- <translation>파일을 가져오려면 지정가가 필요함</translation>
+ <translation>파일을 가져오려면 지정자가 필요함</translation>
</message>
<message>
<source>Invalid import qualifier</source>
@@ -688,7 +717,7 @@
</message>
<message>
<source>Reserved name &quot;Qt&quot; cannot be used as an qualifier</source>
- <translation>예약됨 이름 &quot;Qt&quot;는 지정자 이름으로 사용할 수 없음</translation>
+ <translation>예약된 이름 &quot;Qt&quot;는 지정자 이름으로 사용할 수 없음</translation>
</message>
<message>
<source>Script import qualifiers must be unique.</source>
@@ -743,6 +772,14 @@
<translation>잘못된 유니코드 탈출 시퀀스</translation>
</message>
<message>
+ <source>Unexpected token &apos;.&apos;</source>
+ <translation>예상하지 못한 토큰 &apos;.&apos;</translation>
+ </message>
+ <message>
+ <source>End of file reached at escape sequence</source>
+ <translation>탈출 시퀀스에서 파일의 끝에 도달함</translation>
+ </message>
+ <message>
<source>Illegal hexadecimal escape sequence</source>
<translation>잘못된 16진 탈출 시퀀스</translation>
</message>
@@ -755,6 +792,14 @@
<translation>줄 끝에서 닫히지 않은 문자열</translation>
</message>
<message>
+ <source>At least one octal digit is required after &apos;0%1&apos;</source>
+ <translation>&apos;0%1&apos; 다음에 최소 1개의 8진 숫자가 필요함</translation>
+ </message>
+ <message>
+ <source>At least one binary digit is required after &apos;0%1&apos;</source>
+ <translation>&apos;0%1&apos; 다음에 최소 1개의 2진 숫자가 필요함</translation>
+ </message>
+ <message>
<source>Decimal numbers can&apos;t start with &apos;0&apos;</source>
<translation>10진 숫자가 &apos;0&apos;으로 시작할 수 없음</translation>
</message>
@@ -782,14 +827,6 @@
<source>Syntax error</source>
<translation>구문 오류</translation>
</message>
- <message>
- <source>Unexpected token `%1&apos;</source>
- <translation>예상하지 못한 토큰 &apos;%1&apos;</translation>
- </message>
- <message>
- <source>Expected token `%1&apos;</source>
- <translation>토큰 &apos;%1&apos;이(가) 필요함</translation>
- </message>
</context>
<context>
<name>QQmlPartsModel</name>
@@ -803,7 +840,7 @@
</message>
</context>
<context>
- <name>QQmlPropertyCacheCreator</name>
+ <name>QQmlPropertyCacheCreatorBase</name>
<message>
<source>Fully dynamic types cannot declare new properties.</source>
<translation>완전 동적 형식에서는 새로운 속성을 선언할 수 없습니다.</translation>
@@ -818,7 +855,7 @@
</message>
<message>
<source>Non-existent attached object</source>
- <translation>존재하지 않는 첨부된 개체</translation>
+ <translation>존재하지 않는 첨부된 객체</translation>
</message>
<message>
<source>Cannot override FINAL property</source>
@@ -840,44 +877,13 @@
<source>Invalid property type</source>
<translation>잘못된 속성 형식</translation>
</message>
-</context>
-<context>
- <name>QQmlPropertyCacheCreatorBase</name>
- <message>
- <source>Fully dynamic types cannot declare new properties.</source>
- <translation>완전 동적 형식에서는 새로운 속성을 선언할 수 없습니다.</translation>
- </message>
<message>
- <source>Fully dynamic types cannot declare new signals.</source>
- <translation>완전 동적 형식에서는 새로운 시그널을 선언할 수 없습니다.</translation>
- </message>
- <message>
- <source>Fully Dynamic types cannot declare new functions.</source>
- <translation>완전 동적 형식에서는 새로운 함수를 선언할 수 없습니다.</translation>
+ <source>Cyclic alias</source>
+ <translation>별명의 순환 참조</translation>
</message>
<message>
- <source>Non-existent attached object</source>
- <translation>존재하지 않는 첨부된 객체</translation>
- </message>
- <message>
- <source>Cannot override FINAL property</source>
- <translation>FINAL 속성을 재정의할 수 없음</translation>
- </message>
- <message>
- <source>Invalid signal parameter type: %1</source>
- <translation>잘못된 시그널 인자 종류: %1</translation>
- </message>
- <message>
- <source>Duplicate signal name: invalid override of property change signal or superclass signal</source>
- <translation>중복된 시그널 이름: 속성 변경 시그널이나 상위 클래스의 시그널을 잘못 재정의함</translation>
- </message>
- <message>
- <source>Duplicate method name: invalid override of property change signal or superclass signal</source>
- <translation>중복된 메서드 이름: 속성 변경 시그널이나 상위 클래스의 시그널을 잘못 재정의함</translation>
- </message>
- <message>
- <source>Invalid property type</source>
- <translation>잘못된 속성 형식</translation>
+ <source>Invalid alias target</source>
+ <translation>잘못된 별명 대상</translation>
</message>
</context>
<context>
@@ -916,7 +922,7 @@
</message>
<message>
<source>Cannot assign multiple values to a script property</source>
- <translation>스크립트 속성에 다중 값을 할당할 수 없음</translation>
+ <translation>스크립트 속성에 여러 값을 할당할 수 없음</translation>
</message>
<message>
<source>Cannot assign multiple values to a singular property</source>
@@ -931,6 +937,14 @@
<translation>잘못된 그룹 속성 접근</translation>
</message>
<message>
+ <source>Invalid grouped property access: Property &quot;%1&quot; with primitive type &quot;%2&quot;.</source>
+ <translation>잘못된 그룹 속성 접근: 속성 &quot;%1&quot;의 원시 형식 &quot;%2&quot;.</translation>
+ </message>
+ <message>
+ <source>Invalid grouped property access: Property &quot;%1&quot; with type &quot;%2&quot;, which is not a value type</source>
+ <translation>잘못된 그룹 속성 접근: 속성 &quot;%1&quot;(형식 &quot;%2&quot;)은(는) 값 형식이 아님</translation>
+ </message>
+ <message>
<source>Cannot assign to non-existent default property</source>
<translation>존재하지 않는 기본 속성에 할당할 수 없음</translation>
</message>
@@ -939,14 +953,22 @@
<translation>존재하지 않는 속성 &quot;%1&quot;에 할당할 수 없음</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>
+ <translation>원시 형식을 목록에 할당할 수 없음</translation>
</message>
<message>
<source>Invalid property assignment: unknown enumeration</source>
<translation>잘못된 속성 대입: 알 수 없는 열거형</translation>
</message>
<message>
+ <source> - Assigning null to incompatible properties in QML is deprecated. This will become a compile error in future versions of Qt.</source>
+ <translation> - QML에서 호환되지 않는 속성에 null을 할당하는 것은 오래되었습니다. Qt의 이후 버전에서는 컴파일 오류가 발생할 것입니다.</translation>
+ </message>
+ <message>
<source>Invalid property assignment: string expected</source>
<translation>잘못된 속성 대입: 문자열이 필요함</translation>
</message>
@@ -1059,20 +1081,24 @@
<translation>객체를 목록 속성 &quot;%1&quot;에 할당할 수 없음</translation>
</message>
<message>
- <source>Cannot assign object to list</source>
- <translation>개체를 목록에 할당할 수 없음</translation>
+ <source>Cannot assign value of type &quot;%1&quot; to property &quot;%2&quot;, expecting &quot;%3&quot;</source>
+ <translation>형식이 &quot;%1&quot;인 값을 &quot;%2&quot; 속성에 할당할 수 없음, &quot;%3&quot;을(를) 예상함</translation>
</message>
<message>
- <source>Unexpected object assignment</source>
- <translation>예상하지 못한 객체 할당</translation>
+ <source>Cannot assign value of type &quot;%1&quot; to property &quot;%2&quot;, expecting an object</source>
+ <translation>형식이 &quot;%1&quot;인 값을 &quot;%2&quot; 속성에 할당할 수 없음, 객체를 예상함</translation>
</message>
<message>
- <source>Invalid property assignment: script expected</source>
- <translation>잘못된 속성 대입: script가 필요함</translation>
+ <source>Cannot assign object of type &quot;%1&quot; to property of type &quot;%2&quot; as the former is neither the same as the latter nor a sub-class of it.</source>
+ <translation>형식이 동일하지 않거나 하위 클래스가 아니기 때문에 형식이 &quot;%1&quot;인 객체를 형식이 &quot;%2&quot;인 속성에 할당할 수 없습니다.</translation>
</message>
<message>
- <source>Cannot assign object to property</source>
- <translation>객체를 속성에 할당할 수 없음</translation>
+ <source>Cannot assign to property of unknown type &quot;%1&quot;.</source>
+ <translation>알 수 없는 형식 &quot;%1&quot;인 속성에 할당할 수 없습니다.</translation>
+ </message>
+ <message>
+ <source>Invalid property assignment: script expected</source>
+ <translation>잘못된 속성 대입: script가 필요함</translation>
</message>
</context>
<context>
@@ -1087,17 +1113,6 @@
</message>
</context>
<context>
- <name>QQmlTypeCompiler</name>
- <message>
- <source>Composite Singleton Type %1 is not creatable.</source>
- <translation>복합 싱글톤 형식 %1을(를) 만들 수 없습니다.</translation>
- </message>
- <message>
- <source>Element is not creatable.</source>
- <translation>원소를 만들 수 없습니다.</translation>
- </message>
-</context>
-<context>
<name>QQmlTypeData</name>
<message>
<source>Composite Singleton Type %1 is not creatable.</source>
@@ -1123,10 +1138,22 @@
<translation>비 복합 싱글톤 형식 %1에서 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>이전에 파일이 호환되지 않는 Qt로 컴파일되었고 원본 파일을 찾을 수 없습니다. 다시 컴파일하십시오</translation>
+ </message>
+ <message>
+ <source>No such file or directory</source>
+ <translation>그러한 파일이나 디렉터리가 없음</translation>
+ </message>
+ <message>
<source>Script %1 unavailable</source>
<translation>스크립트 %1을(를) 사용할 수 없음</translation>
</message>
<message>
+ <source>Type %1 has no inline component type called %2</source>
+ <translation>형식 %1에 인라인 구성 요소 형식 %2이(가) 없음</translation>
+ </message>
+ <message>
<source>Type %1 unavailable</source>
<translation>형식 %1을(를) 사용할 수 없음</translation>
</message>
@@ -1135,6 +1162,10 @@
<translation>qmldir 내에서 싱글톤으로 선언하지만 형식 %1에서 pragma Singleton을 찾을 수 없습니다.</translation>
</message>
<message>
+ <source>File is empty</source>
+ <translation>파일이 비어 있음</translation>
+ </message>
+ <message>
<source>module &quot;%1&quot; is not installed</source>
<translation>모듈 &quot;%1&quot;이(가) 설치되지 않았음</translation>
</message>
@@ -1161,21 +1192,6 @@
<source>Cannot animate read-only property &quot;%1&quot;</source>
<translation>읽기 전용 속성 &quot;%1&quot;에 애니메이션을 설정할 수 없음</translation>
</message>
- <message>
- <source>Animation is an abstract class</source>
- <translation>Animation이 추상 클래스임</translation>
- </message>
- <message>
- <source>Animator is an abstract class</source>
- <translation>Animator는 추상 클래스임</translation>
- </message>
-</context>
-<context>
- <name>QQuickAccessibleAttached</name>
- <message>
- <source>Accessible is only available via attached properties</source>
- <translation>Accessible은 첨부된 속성을 통해서만 사용할 수 있음</translation>
- </message>
</context>
<context>
<name>QQuickAnchorAnimation</name>
@@ -1188,23 +1204,23 @@
<name>QQuickAnchors</name>
<message>
<source>Possible anchor loop detected on fill.</source>
- <translation>fill에서 앵커 반복 감지됨.</translation>
+ <translation>fill에서 앵커 반복이 감지되었습니다.</translation>
</message>
<message>
<source>Possible anchor loop detected on centerIn.</source>
- <translation>centerIn에서 앵커 반복 감지됨.</translation>
+ <translation>centerIn에서 앵커 반복이 감지되었습니다.</translation>
</message>
<message>
<source>Cannot anchor to an item that isn&apos;t a parent or sibling.</source>
- <translation>부모나 자식이 아닌 항목에 앵커를 설정할 수 없음.</translation>
+ <translation>부모나 자식이 아닌 항목에 앵커를 설정할 수 없습니다.</translation>
</message>
<message>
<source>Possible anchor loop detected on vertical anchor.</source>
- <translation>수직 앵커에서 앵커 반복 감지됨.</translation>
+ <translation>수직 앵커에서 앵커 반복이 감지되었습니다.</translation>
</message>
<message>
<source>Possible anchor loop detected on horizontal anchor.</source>
- <translation>수평 앵커에서 앵커 반복 감지됨.</translation>
+ <translation>수평 앵커에서 앵커 반복이 감지되었습니다.</translation>
</message>
<message>
<source>Cannot specify left, right, and horizontalCenter anchors at the same time.</source>
@@ -1212,15 +1228,15 @@
</message>
<message>
<source>Cannot anchor to a null item.</source>
- <translation>빈 항목에 앵커를 설정할 수 없음.</translation>
+ <translation>빈 항목에 앵커를 설정할 수 없습니다.</translation>
</message>
<message>
<source>Cannot anchor a horizontal edge to a vertical edge.</source>
- <translation>수평선을 수직선에 앵커로 설정할 수 없음.</translation>
+ <translation>수평선을 수직선에 앵커로 설정할 수 없습니다.</translation>
</message>
<message>
<source>Cannot anchor item to self.</source>
- <translation>자기 자신에 앵커를 설정할 수 없음.</translation>
+ <translation>자기 자신에 앵커를 설정할 수 없습니다.</translation>
</message>
<message>
<source>Cannot specify top, bottom, and verticalCenter anchors at the same time.</source>
@@ -1232,35 +1248,14 @@
</message>
<message>
<source>Cannot anchor a vertical edge to a horizontal edge.</source>
- <translation>수직선을 수평선에 앵커로 설정할 수 없음.</translation>
- </message>
-</context>
-<context>
- <name>QQuickAnimatedImage</name>
- <message>
- <source>Qt was built without support for QMovie</source>
- <translation>Qt 빌드에 QMovie 지원이 빠졌음</translation>
- </message>
-</context>
-<context>
- <name>QQuickApplication</name>
- <message>
- <source>Application is an abstract class</source>
- <translation>Application은 추상 클래스임</translation>
+ <translation>수직선을 수평선에 앵커로 설정할 수 없습니다.</translation>
</message>
</context>
<context>
<name>QQuickBehavior</name>
<message>
<source>Cannot change the animation assigned to a Behavior.</source>
- <translation>Behavior에 할당된 애니메이션을 변경할 수 없음.</translation>
- </message>
-</context>
-<context>
- <name>QQuickDragAttached</name>
- <message>
- <source>Drag is only available via attached properties</source>
- <translation>Drag는 첨부된 속성을 통해서만 사용할 수 있음</translation>
+ <translation>Behavior에 할당된 애니메이션을 변경할 수 없습니다.</translation>
</message>
</context>
<context>
@@ -1269,10 +1264,6 @@
<source>EnterKey attached property only works with Items</source>
<translation>EnterKey 첨부된 속성은 Item에서만 동작함</translation>
</message>
- <message>
- <source>EnterKey is only available via attached properties</source>
- <translation>EnterKeys는 첨부된 속성을 통해서만 사용할 수 있음</translation>
- </message>
</context>
<context>
<name>QQuickFlipable</name>
@@ -1286,48 +1277,15 @@
</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>
- </message>
- <message>
<source>Delegate must be of Item type</source>
<translation>Delegate는 Item 형식이어야 함</translation>
</message>
</context>
<context>
- <name>QQuickKeyNavigationAttached</name>
- <message>
- <source>KeyNavigation is only available via attached properties</source>
- <translation>KeyNavigation은 첨부된 속성을 통해서만 사용할 수 있음</translation>
- </message>
-</context>
-<context>
- <name>QQuickKeysAttached</name>
- <message>
- <source>Keys is only available via attached properties</source>
- <translation>Keys는 첨부된 속성을 통해서만 사용할 수 있음</translation>
- </message>
-</context>
-<context>
<name>QQuickLayoutMirroringAttached</name>
<message>
- <source>LayoutDirection attached property only works with Items</source>
- <translation>연결된 속성 LayoutDirection은 Item에서만 동작함</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은 Item이나 Window에서만 동작함</translation>
</message>
@@ -1340,27 +1298,6 @@
</message>
</context>
<context>
- <name>QQuickMouseEvent</name>
- <message>
- <source>MouseEvent is only available within handlers in MouseArea</source>
- <translation>MouseEvent는 MouseArea의 핸들러에서만 사용할 수 있음</translation>
- </message>
-</context>
-<context>
- <name>QQuickOpenGLInfo</name>
- <message>
- <source>OpenGLInfo is only available via attached properties</source>
- <translation>OpenGLInfo는 첨부된 속성을 통해서만 사용할 수 있음</translation>
- </message>
-</context>
-<context>
- <name>QQuickPaintedItem</name>
- <message>
- <source>Cannot create instance of abstract class PaintedItem</source>
- <translation>추상 클래스 PaintedItem의 인스턴스를 만들 수 없음</translation>
- </message>
-</context>
-<context>
<name>QQuickParentAnimation</name>
<message>
<source>Unable to preserve appearance under complex transform</source>
@@ -1430,12 +1367,12 @@
<translation>공급자에서 텍스처를 가져올 수 없음: %1</translation>
</message>
<message>
- <source>Cannot open: %1</source>
- <translation>다음을 열 수 없음: %1</translation>
+ <source>Error decoding: %1</source>
+ <translation>디코딩 오류: %1</translation>
</message>
<message>
- <source>Invalid image data: %1</source>
- <translation>잘못된 그림 데이터: %1</translation>
+ <source>Cannot open: %1</source>
+ <translation>다음을 열 수 없음: %1</translation>
</message>
</context>
<context>
@@ -1468,13 +1405,6 @@
</message>
</context>
<context>
- <name>QQuickShaderEffectMesh</name>
- <message>
- <source>Cannot create instance of abstract class ShaderEffectMesh.</source>
- <translation>추상 클래스 ShaderEffectMesh의 인스턴스를 만들 수 없습니다.</translation>
- </message>
-</context>
-<context>
<name>QQuickTextUtil</name>
<message>
<source>%1 does not support loading non-visual cursor delegates.</source>
@@ -1486,13 +1416,6 @@
</message>
</context>
<context>
- <name>QQuickViewTransitionAttached</name>
- <message>
- <source>ViewTransition is only available via attached properties</source>
- <translation>ViewTransition은 첨부된 속성을 통해서만 사용할 수 있음</translation>
- </message>
-</context>
-<context>
<name>QQuickWindow</name>
<message>
<source>Failed to create %1 context for format %2.
@@ -1500,7 +1423,7 @@ This is most likely caused by not having the necessary graphics drivers installe
Install a driver providing OpenGL 2.0 or higher, or, if this is not possible, make sure the ANGLE Open GL ES 2.0 emulation libraries (%3, %4 and d3dcompiler_*.dll) are available in the application executable&apos;s directory or in a location listed in PATH.</source>
<extracomment>%1 Context type (Open GL, EGL), %2 format, ANGLE %3, %4 library names</extracomment>
- <translation>형식 %2에 대한 %1 컨텍스트를 생성할 수 없습니다.
+ <translation>형식 %2에 대한 %1 콘텍스트를 생성할 수 없습니다.
필요한 그래픽 드라이버가 설치되어 있지 않을 수도 있습니다.
OpenGL 2.0 이상을 지원하는 드라이버를 설치하시거나, 해당 드라이버를 사용할 수 없다면 실행 파일이 있는 디렉터리나 PATH에 있는 디렉터리에 ANGLE OpenGL ES 2.0 에뮬레이션 라이브러리(%3, %4, d3dcompiler_*.dll)를 설치하십시오.</translation>
@@ -1508,7 +1431,11 @@ OpenGL 2.0 이상을 지원하는 드라이버를 설치하시거나, 해당 드
<message>
<source>Failed to create %1 context for format %2</source>
<extracomment>%1 Context type (Open GL, EGL), %2 format specification</extracomment>
- <translation>형식 %2에 대한 %1 컨텍스트를 생성할 수 없음</translation>
+ <translation>형식 %2에 대한 %1 콘텍스트를 생성할 수 없음</translation>
+ </message>
+ <message>
+ <source>Failed to initialize graphics backend for %1.</source>
+ <translation>%1의 그래픽 백엔드를 초기화할 수 없습니다.</translation>
</message>
</context>
<context>
@@ -1523,31 +1450,6 @@ OpenGL 2.0 이상을 지원하는 드라이버를 설치하시거나, 해당 드
</message>
</context>
<context>
- <name>QQuickXmlListModel</name>
- <message>
- <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
- <translation>&quot;%1&quot;이(가) 이전 역할 이름과 중복되므로 비활성화될 것입니다.</translation>
- </message>
- <message>
- <source>invalid query: &quot;%1&quot;</source>
- <translation>잘못된 쿼리: &quot;%1&quot;</translation>
- </message>
-</context>
-<context>
- <name>QQuickXmlListModelRole</name>
- <message>
- <source>An XmlRole query must not start with &apos;/&apos;</source>
- <translation>XmlRole 쿼리는 &apos;/&apos;로 시작하면 안 됨</translation>
- </message>
-</context>
-<context>
- <name>QQuickXmlRoleList</name>
- <message>
- <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
- <translation>XmlListModel 쿼리는 &apos;/&apos;나 &apos;//&apos;로 시작해야 함</translation>
- </message>
-</context>
-<context>
<name>SignalHandlerConverter</name>
<message>
<source>Non-existent attached object</source>
@@ -1571,7 +1473,7 @@ OpenGL 2.0 이상을 지원하는 드라이버를 설치하시거나, 해당 드
</message>
<message>
<source>Cannot assign a value to a signal (expecting a script to be run)</source>
- <translation>값을 시그널에 지정할 수 없음 (스크립트가 실행될 것을 예상함)</translation>
+ <translation>값을 시그널에 지정할 수 없음(스크립트가 실행될 것을 예상함)</translation>
</message>
<message>
<source>Incorrectly specified signal assignment</source>
@@ -1596,16 +1498,12 @@ OpenGL 2.0 이상을 지원하는 드라이버를 설치하시거나, 해당 드
<context>
<name>qmlRegisterType</name>
<message>
- <source>Invalid QML %1 name &quot;%2&quot;</source>
- <translation>잘못된 QML %1 이름 &quot;%2&quot;</translation>
+ <source>Invalid QML %1 name &quot;%2&quot;; type names must begin with an uppercase letter</source>
+ <translation>잘못된 QML %1 이름 &quot;%2&quot;. 형식 이름은 대문자로 시작해야 함</translation>
</message>
<message>
- <source>Cannot install %1 &apos;%2&apos; into unregistered namespace &apos;%3&apos;</source>
- <translation>등록되지 않은 네임스페이스 &apos;%3&apos;에 %1 &apos;%2&apos;을(를) 설치할 수 없음</translation>
- </message>
- <message>
- <source>Cannot install %1 &apos;%2&apos; into protected namespace &apos;%3&apos;</source>
- <translation>보호된 네임스페이스 &apos;%3&apos;에 %1 &apos;%2&apos;을(를) 설치할 수 없음</translation>
+ <source>Invalid QML %1 name &quot;%2&quot;</source>
+ <translation>잘못된 QML %1 이름 &quot;%2&quot;</translation>
</message>
<message>
<source>Cannot install %1 &apos;%2&apos; into protected module &apos;%3&apos; version &apos;%4&apos;</source>
diff --git a/translations/qtdeclarative_ru.ts b/translations/qtdeclarative_ru.ts
index b02cd90..6e6e164 100644
--- a/translations/qtdeclarative_ru.ts
+++ b/translations/qtdeclarative_ru.ts
@@ -37,20 +37,6 @@
</message>
</context>
<context>
- <name>QInputMethod</name>
- <message>
- <source>InputMethod is an abstract class</source>
- <translation>InputMethod ― это абстрактный класс</translation>
- </message>
-</context>
-<context>
- <name>QQmlAbstractDelegateComponent</name>
- <message>
- <source>Cannot create instance of abstract class AbstractDelegateComponent.</source>
- <translation>Нельзя создавать экземпляры абстрактного класса AbstractDelegateComponent.</translation>
- </message>
-</context>
-<context>
<name>QQmlAnonymousComponentResolver</name>
<message>
<source>Component objects cannot declare new functions.</source>
@@ -291,6 +277,14 @@
отладочных сообщений в консоли отладчика.</translation>
</message>
<message>
+ <source>helps to see if a translated text
+ will result in an elided text
+ in QML elements.</source>
+ <translation>помогает увидеть, приведёт ли переведенный текст
+ к пропаже его части
+ в элементах QML.</translation>
+ </message>
+ <message>
<source>Other services offered by qmltooling plugins that implement QQmlDebugServiceFactory and which can be found in the standard plugin paths will also be available and can be specified. If no &quot;services&quot; argument is given, all services found this way, including the default ones, are loaded.</source>
<translation>Другие сервисы, предоставляемые модулями qmltooling, реализующими QQmlDebugServiceFactory и находящимися в стандартных каталогах модулей, также будут доступны и могут быть указаны. Если параметр «services» не указан, то будут загружены все найденные сервисы.</translation>
</message>
@@ -416,10 +410,6 @@
<context>
<name>QQmlEngine</name>
<message>
- <source>Locale cannot be instantiated. Use Qt.locale()</source>
- <translation>Нельзя создать локаль. Используйте Qt.locale()</translation>
- </message>
- <message>
<source>Locale cannot be instantiated. Use Qt.locale()</source>
<translation>Нельзя создать локаль. Используйте Qt.locale()</translation>
</message>
@@ -478,8 +468,16 @@
<translation>«%1» неоднозначно. Найдено в %2 и %3</translation>
</message>
<message>
+ <source>- %1 is neither a type nor a namespace</source>
+ <translation>- %1 не является ни типом, ни пространством имён</translation>
+ </message>
+ <message>
<source>- %1 is not a namespace</source>
- <translation>- %1 ― некорректное пространство имён</translation>
+ <translation>- %1 не является пространством имён</translation>
+ </message>
+ <message>
+ <source>- %1 is not a type</source>
+ <translation>- %1 не является типом</translation>
</message>
<message>
<source>- nested namespaces not allowed</source>
@@ -550,25 +548,9 @@
<translation>каталог «%1» не содержит ни qmldir, ни namespace</translation>
</message>
<message>
- <source>Module loaded for URI &apos;%1&apos; does not implement QQmlTypesExtensionInterface</source>
- <translation>Модуль загруженный для URI «%1» не реализует QQmlTypesExtensionInterface</translation>
- </message>
- <message>
<source>File name case mismatch for &quot;%1&quot;</source>
<translation>Регистр имени файла не соответствует «%1»</translation>
</message>
- <message>
- <source>Module namespace &apos;%1&apos; does not match import URI &apos;%2&apos;</source>
- <translation>Пространство имён модуля «%1» не совпадает с импортируемым URI «%2»</translation>
- </message>
- <message>
- <source>Namespace &apos;%1&apos; has already been used for type registration</source>
- <translation>Пространство имён «%1» уже используется для регистрации типов</translation>
- </message>
- <message>
- <source>Module &apos;%1&apos; does not contain a module identifier directive - it cannot be protected from external registrations.</source>
- <translation>Модуль «%1» не содержит директивы определения модуля ― он не может быть защищён от внешних регистраций.</translation>
- </message>
</context>
<context>
<name>QQmlListModel</name>
@@ -1111,10 +1093,6 @@
<translation>Невозможно присвоить свойству неизвестного типа «%1».</translation>
</message>
<message>
- <source>Unexpected object assignment for property &quot;%1&quot;</source>
- <translation>Неожиданное присваивание объекта для свойства «%1»</translation>
- </message>
- <message>
<source>Cannot assign object of type &quot;%1&quot; to property of type &quot;%2&quot; as the former is neither the same as the latter nor a sub-class of it.</source>
<translation>Нельзя назначить объект типа «%1» свойству типа «%2», так как тип первого не совпадает со вторым и не является его производным.</translation>
</message>
@@ -1180,6 +1158,10 @@
<translation>Нет такого файла или каталога</translation>
</message>
<message>
+ <source>Type %1 has no inline component type called %2</source>
+ <translation>У типа %1 отсутствует встроенный компонентный тип %2</translation>
+ </message>
+ <message>
<source>File is empty</source>
<translation>Файл пуст</translation>
</message>
@@ -1210,21 +1192,6 @@
<source>Cannot animate read-only property &quot;%1&quot;</source>
<translation>Невозможно анимировать свойство только для чтения «%1»</translation>
</message>
- <message>
- <source>Animation is an abstract class</source>
- <translation>Animation ― это абстрактный класс</translation>
- </message>
- <message>
- <source>Animator is an abstract class</source>
- <translation>Animator ― это абстрактный класс</translation>
- </message>
-</context>
-<context>
- <name>QQuickAccessibleAttached</name>
- <message>
- <source>Accessible is only available via attached properties</source>
- <translation>Accessible доступна только через прикреплённые свойства</translation>
- </message>
</context>
<context>
<name>QQuickAnchorAnimation</name>
@@ -1285,20 +1252,6 @@
</message>
</context>
<context>
- <name>QQuickAnimatedImage</name>
- <message>
- <source>Qt was built without support for QMovie</source>
- <translation>Qt было собрано без поддержки QMovie</translation>
- </message>
-</context>
-<context>
- <name>QQuickApplication</name>
- <message>
- <source>Application is an abstract class</source>
- <translation>Application ― это абстрактный класс</translation>
- </message>
-</context>
-<context>
<name>QQuickBehavior</name>
<message>
<source>Cannot change the animation assigned to a Behavior.</source>
@@ -1306,29 +1259,11 @@
</message>
</context>
<context>
- <name>QQuickDragAttached</name>
- <message>
- <source>Drag is only available via attached properties</source>
- <translation>Drag доступна только через прикреплённые свойства</translation>
- </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>
<translation>Подключённое свойство EnterKey работает только с элементами</translation>
</message>
- <message>
- <source>EnterKey is only available via attached properties</source>
- <translation>EnterKey доступно только через подключённые свойства</translation>
- </message>
</context>
<context>
<name>QQuickFlipable</name>
@@ -1342,44 +1277,15 @@
</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>
- </message>
- <message>
<source>Delegate must be of Item type</source>
<translation>Делегат должен иметь тип Item</translation>
</message>
</context>
<context>
- <name>QQuickKeyNavigationAttached</name>
- <message>
- <source>KeyNavigation is only available via attached properties</source>
- <translation>KeyNavigation доступна только через прикреплённые свойства</translation>
- </message>
-</context>
-<context>
- <name>QQuickKeysAttached</name>
- <message>
- <source>Keys is only available via attached properties</source>
- <translation>Keys доступны только через прикреплённые свойства</translation>
- </message>
-</context>
-<context>
<name>QQuickLayoutMirroringAttached</name>
<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>
@@ -1392,31 +1298,6 @@
</message>
</context>
<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>
-</context>
-<context>
- <name>QQuickOpenGLInfo</name>
- <message>
- <source>OpenGLInfo is only available via attached properties</source>
- <translation>OpenGLInfo доступно только через подключаемые свойства</translation>
- </message>
-</context>
-<context>
- <name>QQuickPaintedItem</name>
- <message>
- <source>Cannot create instance of abstract class PaintedItem</source>
- <translation>Нельзя создавать экземпляры абстрактного класса PaintedItem</translation>
- </message>
-</context>
-<context>
<name>QQuickParentAnimation</name>
<message>
<source>Unable to preserve appearance under complex transform</source>
@@ -1495,41 +1376,6 @@
</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>PointerMouseEvent is only available as a parameter of several signals in PointerHandler</source>
- <translation>PointerMouseEvent доступен только как параметр нескольких сигналов в PointerHandler</translation>
- </message>
- <message>
- <source>PointerTouchEvent is only available as a parameter of several signals in PointerHandler</source>
- <translation>PointerTouchEvent доступен только как параметр нескольких сигналов в 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>PointerHandler is an abstract base class</source>
- <translation>PointerHandler — абстрактный базовый класс</translation>
- </message>
- <message>
- <source>ImageBase is an abstract base class</source>
- <translation>ImageBase ― это абстрактный класс</translation>
- </message>
-</context>
-<context>
<name>QQuickPropertyAnimation</name>
<message>
<source>Cannot set a duration of &lt; 0</source>
@@ -1559,20 +1405,6 @@
</message>
</context>
<context>
- <name>QQuickShaderEffectMesh</name>
- <message>
- <source>Cannot create instance of abstract class ShaderEffectMesh.</source>
- <translation>Нельзя создавать экземпляры абстрактного класса ShaderEffectMesh.</translation>
- </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>
@@ -1584,20 +1416,6 @@
</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>
- <translation>ViewTransition доступна только через прикреплённые свойства</translation>
- </message>
-</context>
-<context>
<name>QQuickWindow</name>
<message>
<source>Failed to create %1 context for format %2.
@@ -1615,6 +1433,10 @@ Install a driver providing OpenGL 2.0 or higher, or, if this is not possible, ma
<extracomment>%1 Context type (Open GL, EGL), %2 format specification</extracomment>
<translation>Не удалось создать контекст %1 для формата %2</translation>
</message>
+ <message>
+ <source>Failed to initialize graphics backend for %1.</source>
+ <translation>Не удалось инициализировать графический интерфейс для %1.</translation>
+ </message>
</context>
<context>
<name>QQuickWindowQmlImpl</name>
@@ -1684,10 +1506,6 @@ 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 protected namespace &apos;%3&apos;</source>
- <translation>Нельзя устанавливать %1 «%2» в защищённое пространство имён «%3»</translation>
- </message>
- <message>
<source>Cannot install %1 &apos;%2&apos; into protected module &apos;%3&apos; version &apos;%4&apos;</source>
<translation>Нельзя установить %1 «%2» в защищённый модуль «%3» версии «%4»</translation>
</message>
diff --git a/translations/qtlocation_ca.ts b/translations/qtlocation_ca.ts
index 5100a15..d7d60c6 100644
--- a/translations/qtlocation_ca.ts
+++ b/translations/qtlocation_ca.ts
@@ -2,6 +2,22 @@
<!DOCTYPE TS>
<TS version="2.1" language="ca">
<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>El connector Esri requereix un paràmetre «esri.token».
+Visiteu https://developers.arcgis.com/authentication/accessing-arcgis-online-services/</translation>
+ </message>
+</context>
+<context>
+ <name>PlaceSearchReplyEsri</name>
+ <message>
+ <source>Response parse error</source>
+ <translation>Error en analitzar la resposta</translation>
+ </message>
+</context>
+<context>
<name>QDeclarativeGeoMap</name>
<message>
<source>No Map</source>
@@ -16,19 +32,23 @@
<name>QDeclarativeGeoRouteModel</name>
<message>
<source>Plugin does not support routing.</source>
- <translation>El connector no admet l&apos;encaminament.</translation>
+ <translation>El connector no admet itineraris.</translation>
</message>
<message>
<source>Cannot route, plugin not set.</source>
- <translation>No s&apos;ha pogut calcular l&apos;encaminament, no s&apos;ha establert el connector.</translation>
+ <translation>No s&apos;ha pogut calcular l&apos;itinerari, no s&apos;ha definit el connector.</translation>
</message>
<message>
<source>Cannot route, route manager not set.</source>
- <translation>No s&apos;ha pogut calcular l&apos;encaminament, nos&apos;ha establert el gestor de l&apos;encaminament.</translation>
+ <translation>No s&apos;ha pogut calcular l&apos;itinerari, no s&apos;ha definit el gestor d&apos;itineraris.</translation>
+ </message>
+ <message>
+ <source>Cannot route, valid query not set.</source>
+ <translation>No s&apos;ha pogut calcular l&apos;itinerari, no s&apos;ha definit cap consulta vàlida.</translation>
</message>
<message>
<source>Not enough waypoints for routing.</source>
- <translation>No hi ha prous punts de ruta per a calcular l&apos;encaminament.</translation>
+ <translation>No hi ha punts de ruta suficients per a calcular l&apos;itinerari.</translation>
</message>
</context>
<context>
@@ -51,14 +71,113 @@
</message>
</context>
<context>
- <name>QGeoRouteReplyOsm</name>
+ <name>QDeclarativeNavigator</name>
+ <message>
+ <source>Plugin does not support navigation.</source>
+ <translation>El connector no admet navegació.</translation>
+ </message>
+ <message>
+ <source>Failed to create a navigator object.</source>
+ <translation>Ha fallat en crear un objecte navegador.</translation>
+ </message>
+</context>
+<context>
+ <name>QGeoCodeReplyMapbox</name>
+ <message>
+ <source>Response parse error</source>
+ <translation>Error en analitzar la resposta</translation>
+ </message>
+</context>
+<context>
+ <name>QGeoMapMapboxGL</name>
+ <message>
+ <source>Development access token, do not use in production.</source>
+ <translation>Testimoni d&apos;accés de desenvolupament. No utilitzeu en producció.</translation>
+ </message>
+</context>
+<context>
+ <name>QGeoMappingManagerEngineItemsOverlay</name>
+ <message>
+ <source>Empty Map</source>
+ <translation>Mapa buit</translation>
+ </message>
+</context>
+<context>
+ <name>QGeoMappingManagerEngineMapboxGL</name>
+ <message>
+ <source>China Streets</source>
+ <translation>Carrers de la Xina</translation>
+ </message>
+ <message>
+ <source>China Light</source>
+ <translation>Xina clar</translation>
+ </message>
+ <message>
+ <source>China Dark</source>
+ <translation>Xina fosc</translation>
+ </message>
+ <message>
+ <source>Streets</source>
+ <translation>Carrers</translation>
+ </message>
+ <message>
+ <source>Basic</source>
+ <translation>Bàsic</translation>
+ </message>
+ <message>
+ <source>Bright</source>
+ <translation>Brillant</translation>
+ </message>
+ <message>
+ <source>Outdoors</source>
+ <translation>Exteriors</translation>
+ </message>
+ <message>
+ <source>Satellite</source>
+ <translation>Satèl·lit</translation>
+ </message>
+ <message>
+ <source>Satellite Streets</source>
+ <translation>Carrers des de satèl·lit</translation>
+ </message>
+ <message>
+ <source>Light</source>
+ <translation>Clar</translation>
+ </message>
+ <message>
+ <source>Dark</source>
+ <translation>Fosc</translation>
+ </message>
+ <message>
+ <source>Navigation Preview Day</source>
+ <translation>Vista prèvia de la navegació de dia</translation>
+ </message>
+ <message>
+ <source>Navigation Preview Night</source>
+ <translation>Vista prèvia de la navegació de nit</translation>
+ </message>
+ <message>
+ <source>Navigation Guidance Day</source>
+ <translation>Guia de la navegació de dia</translation>
+ </message>
+ <message>
+ <source>Navigation Guidance Night</source>
+ <translation>Guia de la navegació de nit</translation>
+ </message>
+ <message>
+ <source>User provided style</source>
+ <translation>Estil proporcionat per l&apos;usuari</translation>
+ </message>
+</context>
+<context>
+ <name>QGeoRouteParserOsrmV4</name>
<message>
<source>Go straight.</source>
- <translation>Segueix dret.</translation>
+ <translation>Segueix recte.</translation>
</message>
<message>
<source>Go straight onto %1.</source>
- <translation>Segueix dret a %1.</translation>
+ <translation>Segueix recte a %1.</translation>
</message>
<message>
<source>Turn slightly right.</source>
@@ -78,11 +197,11 @@
</message>
<message>
<source>Make a sharp right.</source>
- <translation>Gira fort a la dreta.</translation>
+ <translation>Gira pronunciadament a la dreta.</translation>
</message>
<message>
<source>Make a sharp right onto %1.</source>
- <translation>Gira fort a la dreta a %1.</translation>
+ <translation>Gira pronunciadament a la dreta a %1.</translation>
</message>
<message>
<source>When it is safe to do so, perform a U-turn.</source>
@@ -90,11 +209,11 @@
</message>
<message>
<source>Make a sharp left.</source>
- <translation>Gira fort a l&apos;esquerra.</translation>
+ <translation>Gira pronunciadament a l&apos;esquerra.</translation>
</message>
<message>
<source>Make a sharp left onto %1.</source>
- <translation>Gira fort a l&apos;esquerra a %1.</translation>
+ <translation>Gira pronunciadament a l&apos;esquerra a %1.</translation>
</message>
<message>
<source>Turn left.</source>
@@ -114,15 +233,15 @@
</message>
<message>
<source>Reached waypoint.</source>
- <translation>S&apos;ha arribat al punt del camí.</translation>
+ <translation>S&apos;ha arribat al punt de ruta.</translation>
</message>
<message>
<source>Head on.</source>
- <translation>De front.</translation>
+ <translation>Endavant.</translation>
</message>
<message>
<source>Head onto %1.</source>
- <translation>De front a %1.</translation>
+ <translation>Endavant a %1.</translation>
</message>
<message>
<source>Enter the roundabout.</source>
@@ -210,7 +329,7 @@
</message>
<message>
<source>Stay on the roundabout.</source>
- <translation>Romàn a la rotonda.</translation>
+ <translation>Roman a la rotonda.</translation>
</message>
<message>
<source>Start at the end of the street.</source>
@@ -230,11 +349,838 @@
</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>nord</translation>
+ </message>
+ <message>
+ <source>East</source>
+ <translation>est</translation>
+ </message>
+ <message>
+ <source>South</source>
+ <translation>sud</translation>
+ </message>
+ <message>
+ <source>West</source>
+ <translation>oest</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>primera</translation>
+ </message>
+ <message>
+ <source>second</source>
+ <comment>roundabout exit</comment>
+ <translation>segona</translation>
+ </message>
+ <message>
+ <source>third</source>
+ <comment>roundabout exit</comment>
+ <translation>tercera</translation>
+ </message>
+ <message>
+ <source>fourth</source>
+ <comment>roundabout exit</comment>
+ <translation>quarta</translation>
+ </message>
+ <message>
+ <source>fifth</source>
+ <comment>roundabout exit</comment>
+ <translation>cinquena</translation>
+ </message>
+ <message>
+ <source>sixth</source>
+ <comment>roundabout exit</comment>
+ <translation>sisena</translation>
+ </message>
+ <message>
+ <source>seventh</source>
+ <comment>roundabout exit</comment>
+ <translation>setena</translation>
+ </message>
+ <message>
+ <source>eighth</source>
+ <comment>roundabout exit</comment>
+ <translation>vuitena</translation>
+ </message>
+ <message>
+ <source>ninth</source>
+ <comment>roundabout exit</comment>
+ <translation>novena</translation>
+ </message>
+ <message>
+ <source>tenth</source>
+ <comment>roundabout exit</comment>
+ <translation>desena</translation>
+ </message>
+ <message>
+ <source>eleventh</source>
+ <comment>roundabout exit</comment>
+ <translation>onzena</translation>
+ </message>
+ <message>
+ <source>twelfth</source>
+ <comment>roundabout exit</comment>
+ <translation>dosena</translation>
+ </message>
+ <message>
+ <source>thirteenth</source>
+ <comment>roundabout exit</comment>
+ <translation>tretzena</translation>
+ </message>
+ <message>
+ <source>fourteenth</source>
+ <comment>roundabout exit</comment>
+ <translation>catorzena</translation>
+ </message>
+ <message>
+ <source>fifteenth</source>
+ <comment>roundabout exit</comment>
+ <translation>quinzena</translation>
+ </message>
+ <message>
+ <source>sixteenth</source>
+ <comment>roundabout exit</comment>
+ <translation>setzena</translation>
+ </message>
+ <message>
+ <source>seventeenth</source>
+ <comment>roundabout exit</comment>
+ <translation>dissetena</translation>
+ </message>
+ <message>
+ <source>eighteenth</source>
+ <comment>roundabout exit</comment>
+ <translation>divuitena</translation>
+ </message>
+ <message>
+ <source>nineteenth</source>
+ <comment>roundabout exit</comment>
+ <translation>dinovena</translation>
+ </message>
+ <message>
+ <source>twentieth</source>
+ <comment>roundabout exit</comment>
+ <translation>vintena</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> i agafa la %1 sortida</translation>
+ </message>
+ <message>
+ <source> and take the %1 exit onto %2</source>
+ <translation> i agafa la %1 sortida a %2</translation>
+ </message>
+ <message>
+ <source>You have arrived at your destination, straight ahead</source>
+ <translation>Has arribat a la teva destinació, tot recte</translation>
+ </message>
+ <message>
+ <source>You have arrived at your destination, on the left</source>
+ <translation>Has arribat a la teva destinació, a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source>You have arrived at your destination, on the right</source>
+ <translation>Has arribat a la teva destinació, a la dreta</translation>
+ </message>
+ <message>
+ <source>You have arrived at your destination</source>
+ <translation>Has arribat a la teva destinació</translation>
+ </message>
+ <message>
+ <source>Continue straight</source>
+ <translation>Segueix recte</translation>
+ </message>
+ <message>
+ <source>Continue straight on %1</source>
+ <translation>Segueix recte a %1</translation>
+ </message>
+ <message>
+ <source>Continue left</source>
+ <translation>Continua a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source>Continue left onto %1</source>
+ <translation>Continua a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source>Continue slightly left</source>
+ <translation>Continua lleugerament a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source>Continue slightly left on %1</source>
+ <translation>Continua lleugerament a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source>Continue right</source>
+ <translation>Continua a la dreta</translation>
+ </message>
+ <message>
+ <source>Continue right onto %1</source>
+ <translation>Continua a la dreta a %1</translation>
+ </message>
+ <message>
+ <source>Continue slightly right</source>
+ <translation>Continua lleugerament a la dreta</translation>
+ </message>
+ <message>
+ <source>Continue slightly right on %1</source>
+ <translation>Continua lleugerament a la dreta a %1</translation>
+ </message>
+ <message>
+ <source>Make a U-turn</source>
+ <translation>Fes un canvi de sentit</translation>
+ </message>
+ <message>
+ <source>Make a U-turn onto %1</source>
+ <translation>Fes un canvi de sentit a %1</translation>
+ </message>
+ <message>
+ <source>Continue</source>
+ <translation>Continua</translation>
+ </message>
+ <message>
+ <source>Continue on %1</source>
+ <translation>Continua a %1</translation>
+ </message>
+ <message>
+ <source>Head %1</source>
+ <extracomment>%1 is &quot;North&quot;, &quot;South&quot;, &quot;East&quot; or &quot;West&quot;</extracomment>
+ <translation>Direcció %1</translation>
+ </message>
+ <message>
+ <source>Head %1 onto %2</source>
+ <translation>Direcció %1 a %2</translation>
+ </message>
+ <message>
+ <source>Depart</source>
+ <translation>Sortida</translation>
+ </message>
+ <message>
+ <source>Depart onto %1</source>
+ <translation>Sortida a %1</translation>
+ </message>
+ <message>
+ <source>At the end of the road, turn left</source>
+ <translation>Al final de la carretera, gira a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source>At the end of the road, turn left onto %1</source>
+ <translation>Al final de la carretera, gira a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source>At the end of the road, turn right</source>
+ <translation>Al final de la carretera, gira a la dreta</translation>
+ </message>
+ <message>
+ <source>At the end of the road, turn right onto %1</source>
+ <translation>Al final de la carretera, gira a la dreta a %1</translation>
+ </message>
+ <message>
+ <source>At the end of the road, make a U-turn</source>
+ <translation>Al final de la carretera, fes un canvi de sentit</translation>
+ </message>
+ <message>
+ <source>At the end of the road, make a U-turn onto %1</source>
+ <translation>Al final de la carretera, fes un canvi de sentit a %1</translation>
+ </message>
+ <message>
+ <source>At the end of the road, continue straight</source>
+ <translation>Al final de la carretera, continua recte</translation>
+ </message>
+ <message>
+ <source>At the end of the road, continue straight onto %1</source>
+ <translation>Al final de la carretera, continua recte a %1</translation>
+ </message>
+ <message>
+ <source>At the end of the road, continue</source>
+ <translation>Al final de la carretera, continua</translation>
+ </message>
+ <message>
+ <source>At the end of the road, continue onto %1</source>
+ <translation>Al final de la carretera, continua a %1</translation>
+ </message>
+ <message>
+ <source>Take the ferry</source>
+ <translation>Agafa el transbordador</translation>
+ </message>
+ <message>
+ <source>At the fork, take a sharp left</source>
+ <translation>A la bifurcació, fes un gir pronunciat a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source>At the fork, take a sharp left onto %1</source>
+ <translation>A la bifurcació, fes un gir pronunciat a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source>At the fork, turn left</source>
+ <translation>A la bifurcació, gira a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source>At the fork, turn left onto %1</source>
+ <translation>A la bifurcació, gira a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source>At the fork, keep left</source>
+ <translation>A la bifurcació, mantén l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source>At the fork, keep left onto %1</source>
+ <translation>A la bifurcació, mantén l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source>At the fork, take a sharp right</source>
+ <translation>A la bifurcació, fes un gir pronunciat a la dreta</translation>
+ </message>
+ <message>
+ <source>At the fork, take a sharp right onto %1</source>
+ <translation>A la bifurcació, fes un gir pronunciat a la dreta a %1</translation>
+ </message>
+ <message>
+ <source>At the fork, turn right</source>
+ <translation>A la bifurcació, gira a la dreta</translation>
+ </message>
+ <message>
+ <source>At the fork, turn right onto %1</source>
+ <translation>A la bifurcació, gira a la dreta a %1</translation>
+ </message>
+ <message>
+ <source>At the fork, keep right</source>
+ <translation>A la bifurcació, mantén la dreta</translation>
+ </message>
+ <message>
+ <source>At the fork, keep right onto %1</source>
+ <translation>A la bifurcació, mantén la dreta a %1</translation>
+ </message>
+ <message>
+ <source>At the fork, continue straight ahead</source>
+ <translation>A la bifurcació, continua recte</translation>
+ </message>
+ <message>
+ <source>At the fork, continue straight ahead onto %1</source>
+ <translation>A la bifurcació, continua recte a %1</translation>
+ </message>
+ <message>
+ <source>At the fork, continue</source>
+ <translation>A la bifurcació, continua</translation>
+ </message>
+ <message>
+ <source>At the fork, continue onto %1</source>
+ <translation>A la bifurcació, continua a %1</translation>
+ </message>
+ <message>
+ <source>Merge sharply left</source>
+ <translation>Unió pronunciada a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source>Merge sharply left onto %1</source>
+ <translation>Unió pronunciada a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source>Merge left</source>
+ <translation>Unió a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source>Merge left onto %1</source>
+ <translation>Unió a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source>Merge slightly left</source>
+ <translation>Unió lleugerament a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source>Merge slightly left on %1</source>
+ <translation>Unió lleugerament a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source>Merge sharply right</source>
+ <translation>Unió pronunciada a la dreta</translation>
+ </message>
+ <message>
+ <source>Merge sharply right onto %1</source>
+ <translation>Unió pronunciada a la dreta a %1</translation>
+ </message>
+ <message>
+ <source>Merge right</source>
+ <translation>Unió a la dreta</translation>
+ </message>
+ <message>
+ <source>Merge right onto %1</source>
+ <translation>Unió a la dreta a %1</translation>
+ </message>
+ <message>
+ <source>Merge slightly right</source>
+ <translation>Unió lleugerament a la dreta</translation>
+ </message>
+ <message>
+ <source>Merge slightly right on %1</source>
+ <translation>Unió lleugerament a la dreta a %1</translation>
+ </message>
+ <message>
+ <source>Merge straight</source>
+ <translation>Unió recta</translation>
+ </message>
+ <message>
+ <source>Merge straight on %1</source>
+ <translation>Unió recta a %1</translation>
+ </message>
+ <message>
+ <source>Merge</source>
+ <translation>Unió</translation>
+ </message>
+ <message>
+ <source>Merge onto %1</source>
+ <translation>Unió a %1</translation>
+ </message>
+ <message>
+ <source>Take a sharp left</source>
+ <translation>Agafa pronunciadament a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source>Take a sharp left onto %1</source>
+ <translation>Agafa pronunciadament a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source>Turn left</source>
+ <translation>Gira a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source>Turn left onto %1</source>
+ <translation>Gira a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source>Continue slightly left onto %1</source>
+ <translation>Continua lleugerament a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source>Take a sharp right</source>
+ <translation>Gira pronunciadament a la dreta</translation>
+ </message>
+ <message>
+ <source>Take a sharp right onto %1</source>
+ <translation>Gira pronunciadament a la dreta a %1</translation>
+ </message>
+ <message>
+ <source>Turn right</source>
+ <translation>Gira a la dreta</translation>
+ </message>
+ <message>
+ <source>Turn right onto %1</source>
+ <translation>Gira a la dreta a %1</translation>
+ </message>
+ <message>
+ <source>Continue slightly right onto %1</source>
+ <translation>Continua lleugerament a la dreta a %1</translation>
+ </message>
+ <message>
+ <source>Continue straight onto %1</source>
+ <translation>Continua recte a %1</translation>
+ </message>
+ <message>
+ <source>Continue onto %1</source>
+ <translation>Continua a %1</translation>
+ </message>
+ <message>
+ <source>Continue on the left</source>
+ <translation>Continua a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source>Continue on the left on %1</source>
+ <translation>Continua a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source>Continue on the right</source>
+ <translation>Continua a la dreta</translation>
+ </message>
+ <message>
+ <source>Continue on the right on %1</source>
+ <translation>Continua a la dreta a %1</translation>
+ </message>
+ <message>
+ <source>Take the ramp on the left</source>
+ <translation>Agafa la rampa de l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source>Take the ramp on the left onto %1</source>
+ <translation>Agafa la rampa de l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source>Take the ramp on the right</source>
+ <translation>Agafa la rampa de la dreta</translation>
+ </message>
+ <message>
+ <source>Take the ramp on the right onto %1</source>
+ <translation>Agafa la rampa de la dreta a %1</translation>
+ </message>
+ <message>
+ <source>Take the ramp</source>
+ <translation>Agafa la rampa</translation>
+ </message>
+ <message>
+ <source>Take the ramp onto %1</source>
+ <translation>Agafa la rampa a %1</translation>
+ </message>
+ <message>
+ <source>Get off the bike and push</source>
+ <translation>Baixa de la bicicleta i empeny</translation>
+ </message>
+ <message>
+ <source>Get off the bike and push onto %1</source>
+ <translation>Baixa de la bicicleta i empeny a %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>Entra a la rotonda</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>Entra a la rotonda</translation>
+ </message>
+ <message>
+ <source>At the roundabout, continue straight</source>
+ <translation>A la rotonda, continua recte</translation>
+ </message>
+ <message>
+ <source>At the roundabout, continue straight on %1</source>
+ <translation>A la rotonda, continua recte a %1</translation>
+ </message>
+ <message>
+ <source>At the roundabout, turn left</source>
+ <translation>A la rotonda, gira a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source>At the roundabout, turn left onto %1</source>
+ <translation>A la rotonda, gira a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source>At the roundabout, turn right</source>
+ <translation>A la rotonda, gira a la dreta</translation>
+ </message>
+ <message>
+ <source>At the roundabout, turn right onto %1</source>
+ <translation>A la rotonda, gira a la dreta a %1</translation>
+ </message>
+ <message>
+ <source>At the roundabout, turn around</source>
+ <translation>A la rotonda, dóna la volta</translation>
+ </message>
+ <message>
+ <source>At the roundabout, turn around onto %1</source>
+ <translation>A la rotonda, dóna la volta a %1</translation>
+ </message>
+ <message>
+ <source>At the roundabout, continue</source>
+ <translation>A la rotonda, continua</translation>
+ </message>
+ <message>
+ <source>At the roundabout, continue onto %1</source>
+ <translation>A la rotonda, continua a %1</translation>
+ </message>
+ <message>
+ <source>Take the train</source>
+ <translation>Agafa el tren</translation>
+ </message>
+ <message>
+ <source>Take the train [%1]</source>
+ <translation>Agafa el tren [%1]</translation>
+ </message>
+ <message>
+ <source>Go straight</source>
+ <translation>Segueix recte</translation>
+ </message>
+ <message>
+ <source>Go straight onto %1</source>
+ <translation>Segueix recte a %1</translation>
+ </message>
+ <message>
+ <source>Turn slightly left</source>
+ <translation>Gira lleugerament a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source>Turn slightly left onto %1</source>
+ <translation>Gira lleugerament a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source>Turn slightly right</source>
+ <translation>Gira lleugerament a la dreta</translation>
+ </message>
+ <message>
+ <source>Turn slightly right onto %1</source>
+ <translation>Gira lleugerament a la dreta a %1</translation>
+ </message>
+ <message>
+ <source>Turn</source>
+ <translation>Gira</translation>
+ </message>
+ <message>
+ <source>Turn onto %1</source>
+ <translation>Gira a %1</translation>
+ </message>
+ <message>
+ <source> and continue straight</source>
+ <extracomment>This string will be prepended with lane instructions. E.g., &quot;Use the left or the right lane and continue straight&quot;</extracomment>
+ <translation> i continua recte</translation>
+ </message>
+ <message>
+ <source> and continue straight onto %1</source>
+ <translation> i continua recte a %1</translation>
+ </message>
+ <message>
+ <source> and make a sharp left</source>
+ <translation> i gira pronunciadament a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source> and make a sharp left onto %1</source>
+ <translation> i gira pronunciadament a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source> and turn left</source>
+ <translation> i gira a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source> and turn left onto %1</source>
+ <translation> i gira a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source> and make a slight left</source>
+ <translation> i gira lleugerament a l&apos;esquerra</translation>
+ </message>
+ <message>
+ <source> and make a slight left onto %1</source>
+ <translation> i gira lleugerament a l&apos;esquerra a %1</translation>
+ </message>
+ <message>
+ <source> and make a sharp right</source>
+ <translation> i gira pronunciadament a la dreta</translation>
+ </message>
+ <message>
+ <source> and make a sharp right onto %1</source>
+ <translation> i gira lleugerament a la dreta a %1</translation>
+ </message>
+ <message>
+ <source> and turn right</source>
+ <translation> i gira a la dreta</translation>
+ </message>
+ <message>
+ <source> and turn right onto %1</source>
+ <translation> i gira a la dreta a %1</translation>
+ </message>
+ <message>
+ <source> and make a slight right</source>
+ <translation> i gira lleugerament a la dreta</translation>
+ </message>
+ <message>
+ <source> and make a slight right onto %1</source>
+ <translation> i gira lleugerament a la dreta a %1</translation>
+ </message>
+ <message>
+ <source> and make a U-turn</source>
+ <translation> i fes un canvi de sentit</translation>
+ </message>
+ <message>
+ <source> and make a U-turn onto %1</source>
+ <translation> i fes un canvi de sentit a %1</translation>
+ </message>
+</context>
+<context>
+ <name>QGeoRouteReplyOsm</name>
+ <message>
+ <source>Go straight.</source>
+ <translation type="vanished">Segueix dret.</translation>
+ </message>
+ <message>
+ <source>Go straight onto %1.</source>
+ <translation type="vanished">Segueix dret a %1.</translation>
+ </message>
+ <message>
+ <source>Turn slightly right.</source>
+ <translation type="vanished">Gira lleugerament a la dreta.</translation>
+ </message>
+ <message>
+ <source>Turn slightly right onto %1.</source>
+ <translation type="vanished">Gira lleugerament a la dreta a %1.</translation>
+ </message>
+ <message>
+ <source>Turn right.</source>
+ <translation type="vanished">Gira a la dreta.</translation>
+ </message>
+ <message>
+ <source>Turn right onto %1.</source>
+ <translation type="vanished">Gira a la dreta a %1.</translation>
+ </message>
+ <message>
+ <source>Make a sharp right.</source>
+ <translation type="vanished">Gira fort a la dreta.</translation>
+ </message>
+ <message>
+ <source>Make a sharp right onto %1.</source>
+ <translation type="vanished">Gira fort a la dreta a %1.</translation>
+ </message>
+ <message>
+ <source>When it is safe to do so, perform a U-turn.</source>
+ <translation type="vanished">Quan sigui segur, realitzeu un canvi de sentit.</translation>
+ </message>
+ <message>
+ <source>Make a sharp left.</source>
+ <translation type="vanished">Gira fort a l&apos;esquerra.</translation>
+ </message>
+ <message>
+ <source>Make a sharp left onto %1.</source>
+ <translation type="vanished">Gira fort a l&apos;esquerra a %1.</translation>
+ </message>
+ <message>
+ <source>Turn left.</source>
+ <translation type="vanished">Gira a l&apos;esquerra.</translation>
+ </message>
+ <message>
+ <source>Turn left onto %1.</source>
+ <translation type="vanished">Gira a l&apos;esquerra a %1.</translation>
+ </message>
+ <message>
+ <source>Turn slightly left.</source>
+ <translation type="vanished">Gira lleugerament a l&apos;esquerra.</translation>
+ </message>
+ <message>
+ <source>Turn slightly left onto %1.</source>
+ <translation type="vanished">Gira lleugerament a l&apos;esquerra a %1.</translation>
+ </message>
+ <message>
+ <source>Reached waypoint.</source>
+ <translation type="vanished">S&apos;ha arribat al punt del camí.</translation>
+ </message>
+ <message>
+ <source>Head on.</source>
+ <translation type="vanished">De front.</translation>
+ </message>
+ <message>
+ <source>Head onto %1.</source>
+ <translation type="vanished">De front a %1.</translation>
+ </message>
+ <message>
+ <source>Enter the roundabout.</source>
+ <translation type="vanished">Entra a la rotonda.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the first exit.</source>
+ <translation type="vanished">A la rotonda agafa la primera sortida.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the first exit onto %1.</source>
+ <translation type="vanished">A la rotonda agafa la primera sortida a %1.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the second exit.</source>
+ <translation type="vanished">A la rotonda agafa la segona sortida.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the second exit onto %1.</source>
+ <translation type="vanished">A la rotonda agafa la segona sortida a %1.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the third exit.</source>
+ <translation type="vanished">A la rotonda agafa la tercera sortida.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the third exit onto %1.</source>
+ <translation type="vanished">A la rotonda agafa la tercera sortida a %1.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the fourth exit.</source>
+ <translation type="vanished">A la rotonda agafa la quarta sortida.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the fourth exit onto %1.</source>
+ <translation type="vanished">A la rotonda agafa la quarta sortida a %1.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the fifth exit.</source>
+ <translation type="vanished">A la rotonda agafa la cinquena sortida.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the fifth exit onto %1.</source>
+ <translation type="vanished">A la rotonda agafa la cinquena sortida a %1.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the sixth exit.</source>
+ <translation type="vanished">A la rotonda agafa la sisena sortida.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the sixth exit onto %1.</source>
+ <translation type="vanished">A la rotonda agafa la sisena sortida a %1.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the seventh exit.</source>
+ <translation type="vanished">A la rotonda agafa la setena sortida.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the seventh exit onto %1.</source>
+ <translation type="vanished">A la rotonda agafa la setena sortida a %1.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the eighth exit.</source>
+ <translation type="vanished">A la rotonda agafa la vuitena sortida.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the eighth exit onto %1.</source>
+ <translation type="vanished">A la rotonda agafa la vuitena sortida a %1.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the ninth exit.</source>
+ <translation type="vanished">A la rotonda agafa la novena sortida.</translation>
+ </message>
+ <message>
+ <source>At the roundabout take the ninth exit onto %1.</source>
+ <translation type="vanished">A la rotonda agafa la novena sortida a %1.</translation>
+ </message>
+ <message>
+ <source>Leave the roundabout.</source>
+ <translation type="vanished">Surt de la rotonda.</translation>
+ </message>
+ <message>
+ <source>Leave the roundabout onto %1.</source>
+ <translation type="vanished">Surt de la rotonda a %1.</translation>
+ </message>
+ <message>
+ <source>Stay on the roundabout.</source>
+ <translation type="vanished">Romàn a la rotonda.</translation>
+ </message>
+ <message>
+ <source>Start at the end of the street.</source>
+ <translation type="vanished">Comença al final del carrer.</translation>
+ </message>
+ <message>
+ <source>Start at the end of %1.</source>
+ <translation type="vanished">Comença al final de %1.</translation>
+ </message>
+ <message>
+ <source>You have reached your destination.</source>
+ <translation type="vanished">Has arribat a la teva destinació.</translation>
+ </message>
+ <message>
+ <source>Don&apos;t know what to say for &apos;%1&apos;</source>
+ <translation type="vanished">No sé què dir per a «%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.
Please visit https://www.mapbox.com</source>
- <translation>El connector de Mapbox requereix els paràmetres «mapbox.map_id» i «mapbox.access_token».
+ <translation type="vanished">El connector de Mapbox requereix els paràmetres «mapbox.map_id» i «mapbox.access_token».
+Visiteu https://www.mapbox.com</translation>
+ </message>
+ <message>
+ <source>Mapbox plugin requires a &apos;mapbox.access_token&apos; parameter.
+Please visit https://www.mapbox.com</source>
+ <translation>El connector de Mapbox requereix un paràmetre «mapbox.access_token».
Visiteu https://www.mapbox.com</translation>
</message>
</context>
@@ -249,26 +1195,97 @@ Visiteu https://www.mapbox.com</translation>
<name>QGeoTiledMapOsm</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>Quadrants cortesia de &lt;a href=&apos;http://www.mapquest.com/&apos;&gt;MapQuest&lt;/a&gt;&lt;br/&gt; &amp;copy; de les dades dels col·laboradors d&apos;&lt;a href=&apos;http://www.openstreetmap.org/copyright&apos;&gt;OpenStreetMap&lt;/a&gt;</translation>
+ <translation type="vanished">Quadrants cortesia de &lt;a href=&apos;http://www.mapquest.com/&apos;&gt;MapQuest&lt;/a&gt;&lt;br/&gt; &amp;copy; de les dades dels col·laboradors d&apos;&lt;a href=&apos;http://www.openstreetmap.org/copyright&apos;&gt;OpenStreetMap&lt;/a&gt;</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>Mapes &amp;copy; de &lt;a href=&apos;http://www.thunderforest.com/&apos;&gt;Thunderforest&lt;/a&gt;&lt;br/&gt;&amp;copy; de les dades dels col·laboradors d&apos;&lt;a href=&apos;http://www.openstreetmap.org/copyright&apos;&gt;OpenStreetMap&lt;/a&gt;</translation>
+ <translation type="vanished">Mapes &amp;copy; de &lt;a href=&apos;http://www.thunderforest.com/&apos;&gt;Thunderforest&lt;/a&gt;&lt;br/&gt;&amp;copy; de les dades dels col·laboradors d&apos;&lt;a href=&apos;http://www.openstreetmap.org/copyright&apos;&gt;OpenStreetMap&lt;/a&gt;</translation>
</message>
<message>
<source>&amp;copy; &lt;a href=&apos;http://www.openstreetmap.org/copyright&apos;&gt;OpenStreetMap&lt;/a&gt; contributors</source>
- <translation>&amp;copy; dels col·laboradors d&apos;&lt;a href=&apos;http://www.openstreetmap.org/copyright&apos;&gt;OpenStreetMap&lt;/a&gt;</translation>
+ <translation type="vanished">&amp;copy; dels col·laboradors d&apos;&lt;a href=&apos;http://www.openstreetmap.org/copyright&apos;&gt;OpenStreetMap&lt;/a&gt;</translation>
</message>
</context>
<context>
<name>QGeoTiledMappingManagerEngineMapbox</name>
<message>
<source>Custom</source>
- <translation>Personalitzat</translation>
+ <translation type="vanished">Personalitzat</translation>
</message>
<message>
<source>Mapbox custom map</source>
- <translation>Mapa personalitzat de Mapbox</translation>
+ <translation type="vanished">Mapa personalitzat de Mapbox</translation>
+ </message>
+ <message>
+ <source>Street</source>
+ <extracomment>Noun describing map type &apos;Street map&apos;</extracomment>
+ <translation>Carrer</translation>
+ </message>
+ <message>
+ <source>Light</source>
+ <extracomment>Noun describing type of a map using light colors (weak contrast)</extracomment>
+ <translation>Clar</translation>
+ </message>
+ <message>
+ <source>Dark</source>
+ <extracomment>Noun describing type of a map using dark colors</extracomment>
+ <translation>Fosc</translation>
+ </message>
+ <message>
+ <source>Satellite</source>
+ <extracomment>Noun describing type of a map created by satellite</extracomment>
+ <translation>Satèl·lit</translation>
+ </message>
+ <message>
+ <source>Streets Satellite</source>
+ <extracomment>Noun describing type of a street map created by satellite</extracomment>
+ <translation>Carrers des de satèl·lit</translation>
+ </message>
+ <message>
+ <source>Wheatpaste</source>
+ <extracomment>Noun describing type of a map using wheat paste colors</extracomment>
+ <translatorcomment>&quot;Wheat paste&quot; és un tipus de cola per enganxar cartells a les parets. Els cartells tenen colors molt bàsics (https://en.wikipedia.org/wiki/Wheatpaste).</translatorcomment>
+ <translation>Colors bàsics</translation>
+ </message>
+ <message>
+ <source>Streets Basic</source>
+ <extracomment>Noun describing type of a basic street map</extracomment>
+ <translation>Carrers bàsic</translation>
+ </message>
+ <message>
+ <source>Comic</source>
+ <extracomment>Noun describing type of a map using cartoon-style fonts</extracomment>
+ <translation>Còmic</translation>
+ </message>
+ <message>
+ <source>Outdoors</source>
+ <extracomment>Noun describing type of a map for outdoor activities</extracomment>
+ <translation>Exteriors</translation>
+ </message>
+ <message>
+ <source>Run Bike Hike</source>
+ <extracomment>Noun describing type of a map for sports</extracomment>
+ <translation>Córrer, bicicleta, excursió</translation>
+ </message>
+ <message>
+ <source>Pencil</source>
+ <extracomment>Noun describing type of a map drawn by pencil</extracomment>
+ <translation>Llapis</translation>
+ </message>
+ <message>
+ <source>Pirates</source>
+ <extracomment>Noun describing type of a treasure map with pirate boat watermark</extracomment>
+ <translation>Pirates</translation>
+ </message>
+ <message>
+ <source>Emerald</source>
+ <extracomment>Noun describing type of a map using emerald colors</extracomment>
+ <translation>Maragda</translation>
+ </message>
+ <message>
+ <source>High Contrast</source>
+ <extracomment>Noun describing type of a map with high contrast</extracomment>
+ <translation>Contrast alt</translation>
</message>
</context>
<context>
@@ -561,7 +1578,7 @@ Visiteu https://www.mapbox.com</translation>
</message>
<message>
<source>Waterway</source>
- <translation>Vía navegable</translation>
+ <translation>Via navegable</translation>
</message>
<message>
<source>Network request error</source>
@@ -569,11 +1586,25 @@ Visiteu https://www.mapbox.com</translation>
</message>
</context>
<context>
+ <name>QPlaceSearchReplyMapbox</name>
+ <message>
+ <source>Response parse error</source>
+ <translation>Error en analitzar la resposta</translation>
+ </message>
+</context>
+<context>
<name>QPlaceSearchReplyOsm</name>
<message>
<source>Communication error</source>
- <translation>Error en la comunicació</translation>
+ <translation type="vanished">Error en la comunicació</translation>
+ </message>
+ <message>
+ <source>Response parse error</source>
+ <translation>Error en analitzar la resposta</translation>
</message>
+</context>
+<context>
+ <name>QPlaceSearchSuggestionReplyMapbox</name>
<message>
<source>Response parse error</source>
<translation>Error en analitzar la resposta</translation>
diff --git a/translations/qtlocation_ko.ts b/translations/qtlocation_ko.ts
index 41c9f11..4c15cca 100644
--- a/translations/qtlocation_ko.ts
+++ b/translations/qtlocation_ko.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="ko">
+<TS version="2.1" language="ko">
<context>
<name>GeoServiceProviderFactoryEsri</name>
<message>
@@ -11,6 +11,13 @@ https://developers.arcgis.com/authentication/accessing-arcgis-online-services/
</message>
</context>
<context>
+ <name>PlaceSearchReplyEsri</name>
+ <message>
+ <source>Response parse error</source>
+ <translation>응답 처리 오류</translation>
+ </message>
+</context>
+<context>
<name>QDeclarativeGeoMap</name>
<message>
<source>No Map</source>
@@ -36,6 +43,10 @@ https://developers.arcgis.com/authentication/accessing-arcgis-online-services/
<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>
@@ -60,6 +71,105 @@ https://developers.arcgis.com/authentication/accessing-arcgis-online-services/
</message>
</context>
<context>
+ <name>QDeclarativeNavigator</name>
+ <message>
+ <source>Plugin does not support navigation.</source>
+ <translation>플러그인에서 경로 탐색을 지원하지 않습니다.</translation>
+ </message>
+ <message>
+ <source>Failed to create a navigator object.</source>
+ <translation>경로 탐색기 객체를 만들 수 없습니다.</translation>
+ </message>
+</context>
+<context>
+ <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>China Streets</source>
+ <translation>중국 거리</translation>
+ </message>
+ <message>
+ <source>China Light</source>
+ <translation>중국 밝음</translation>
+ </message>
+ <message>
+ <source>China Dark</source>
+ <translation>중국 어두움</translation>
+ </message>
+ <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>
@@ -123,7 +233,7 @@ https://developers.arcgis.com/authentication/accessing-arcgis-online-services/
</message>
<message>
<source>Reached waypoint.</source>
- <translation>경유 지점에 도착하였습니다.</translation>
+ <translation>경유 지점에 도착했습니다.</translation>
</message>
<message>
<source>Head on.</source>
@@ -139,75 +249,75 @@ https://developers.arcgis.com/authentication/accessing-arcgis-online-services/
</message>
<message>
<source>At the roundabout take the first exit.</source>
- <translation>회전 교차로의 첫번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 첫 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the first exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 첫번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 %1 방면 첫 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the second exit.</source>
- <translation>회전 교차로의 두번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 두 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the second exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 두번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 %1 방면 두 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the third exit.</source>
- <translation>회전 교차로의 세번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 세 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the third exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 세번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 %1 방면 세 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the fourth exit.</source>
- <translation>회전 교차로의 네번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 네 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the fourth exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 네번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 %1 방면 네 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the fifth exit.</source>
- <translation>회전 교차로의 다섯번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 다섯 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the fifth exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 다섯번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 %1 방면 다섯 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the sixth exit.</source>
- <translation>회전 교차로의 여섯번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 여섯 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the sixth exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 여섯번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 %1 방면 여섯 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the seventh exit.</source>
- <translation>회전 교차로의 일곱번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 일곱 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the seventh exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 일곱번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 %1 방면 일곱 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the eighth exit.</source>
- <translation>회전 교차로의 여덟번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 여덟 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the eighth exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 여덟번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 %1 방면 여덟 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the ninth exit.</source>
- <translation>회전 교차로의 아홉번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 아홉 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>At the roundabout take the ninth exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 아홉번째 출구로 나가십시오.</translation>
+ <translation>회전 교차로의 %1 방면 아홉 번째 출구로 나가십시오.</translation>
</message>
<message>
<source>Leave the roundabout.</source>
@@ -242,7 +352,7 @@ https://developers.arcgis.com/authentication/accessing-arcgis-online-services/
<name>QGeoRouteParserOsrmV5</name>
<message>
<source>North</source>
- <extracomment>Always used in &quot;Head %1 [onto &lt;street name&gt;]&quot;</extracomment>
+ <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>
@@ -261,102 +371,102 @@ https://developers.arcgis.com/authentication/accessing-arcgis-online-services/
<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>
+ <translation>첫 번째</translation>
</message>
<message>
<source>second</source>
<comment>roundabout exit</comment>
- <translation>두번째</translation>
+ <translation>두 번째</translation>
</message>
<message>
<source>third</source>
<comment>roundabout exit</comment>
- <translation>세번째</translation>
+ <translation>세 번째</translation>
</message>
<message>
<source>fourth</source>
<comment>roundabout exit</comment>
- <translation>네번째</translation>
+ <translation>네 번째</translation>
</message>
<message>
<source>fifth</source>
<comment>roundabout exit</comment>
- <translation>다섯번째</translation>
+ <translation>다섯 번째</translation>
</message>
<message>
<source>sixth</source>
<comment>roundabout exit</comment>
- <translation>여섯번째</translation>
+ <translation>여섯 번째</translation>
</message>
<message>
<source>seventh</source>
<comment>roundabout exit</comment>
- <translation>일곱번째</translation>
+ <translation>일곱 번째</translation>
</message>
<message>
<source>eighth</source>
<comment>roundabout exit</comment>
- <translation>여덟번째</translation>
+ <translation>여덟 번째</translation>
</message>
<message>
<source>ninth</source>
<comment>roundabout exit</comment>
- <translation>아홉번째</translation>
+ <translation>아홉 번째</translation>
</message>
<message>
<source>tenth</source>
<comment>roundabout exit</comment>
- <translation>열번째</translation>
+ <translation>열 번째</translation>
</message>
<message>
<source>eleventh</source>
<comment>roundabout exit</comment>
- <translation>열한번째</translation>
+ <translation>열한 번째</translation>
</message>
<message>
<source>twelfth</source>
<comment>roundabout exit</comment>
- <translation>열두번째</translation>
+ <translation>열두 번째</translation>
</message>
<message>
<source>thirteenth</source>
<comment>roundabout exit</comment>
- <translation>열세번째</translation>
+ <translation>열세 번째</translation>
</message>
<message>
<source>fourteenth</source>
<comment>roundabout exit</comment>
- <translation>열네번째</translation>
+ <translation>열네 번째</translation>
</message>
<message>
<source>fifteenth</source>
<comment>roundabout exit</comment>
- <translation>열다섯번째</translation>
+ <translation>열다섯 번째</translation>
</message>
<message>
<source>sixteenth</source>
<comment>roundabout exit</comment>
- <translation>열여섯번째</translation>
+ <translation>열여섯 번째</translation>
</message>
<message>
<source>seventeenth</source>
<comment>roundabout exit</comment>
- <translation>열일곱번째</translation>
+ <translation>열일곱 번째</translation>
</message>
<message>
<source>eighteenth</source>
<comment>roundabout exit</comment>
- <translation>열여덟번째</translation>
+ <translation>열여덟 번째</translation>
</message>
<message>
<source>nineteenth</source>
<comment>roundabout exit</comment>
- <translation>열아홉번째</translation>
+ <translation>열아홉 번째</translation>
</message>
<message>
<source>twentieth</source>
<comment>roundabout exit</comment>
- <translation>스무번째</translation>
+ <translation>스무 번째</translation>
</message>
<message>
<source> and take the %1 exit</source>
@@ -441,6 +551,7 @@ https://developers.arcgis.com/authentication/accessing-arcgis-online-services/
</message>
<message>
<source>Head %1</source>
+ <extracomment>%1 is &quot;North&quot;, &quot;South&quot;, &quot;East&quot; or &quot;West&quot;</extracomment>
<translation>%1으로 진행</translation>
</message>
<message>
@@ -664,12 +775,16 @@ https://developers.arcgis.com/authentication/accessing-arcgis-online-services/
<translation>%1 방면으로 우회전</translation>
</message>
<message>
- <source>Contine slightly right</source>
- <translation>약간 오른쪽으로 진행</translation>
+ <source>Continue slightly right onto %1</source>
+ <translation>%1 방면으로 약간 오른쪽으로 진행</translation>
</message>
<message>
- <source>Contine slightly right onto %1</source>
- <translation>%1 방면으로 약간 오른쪽으로 진행</translation>
+ <source>Continue on the right</source>
+ <translation>오른쪽으로 계속 진행</translation>
+ </message>
+ <message>
+ <source>Continue on the right on %1</source>
+ <translation>%1에서 오른쪽으로 계속 진행</translation>
</message>
<message>
<source>Continue straight onto %1</source>
@@ -688,14 +803,6 @@ https://developers.arcgis.com/authentication/accessing-arcgis-online-services/
<translation>%1 방면으로 왼쪽으로 계속 진행</translation>
</message>
<message>
- <source>Contine on the right</source>
- <translation>오른쪽으로 계속 진행</translation>
- </message>
- <message>
- <source>Contine on the right on %1</source>
- <translation>%1 방면으로 오른쪽으로 계속 진행</translation>
- </message>
- <message>
<source>Take the ramp on the left</source>
<translation>왼쪽 램프로 진행</translation>
</message>
@@ -782,6 +889,10 @@ https://developers.arcgis.com/authentication/accessing-arcgis-online-services/
<translation>열차 탑승</translation>
</message>
<message>
+ <source>Take the train [%1]</source>
+ <translation>열차 탑승 [%1]</translation>
+ </message>
+ <message>
<source>Go straight</source>
<translation>직진</translation>
</message>
@@ -815,6 +926,7 @@ https://developers.arcgis.com/authentication/accessing-arcgis-online-services/
</message>
<message>
<source> and continue straight</source>
+ <extracomment>This string will be prepended with lane instructions. E.g., &quot;Use the left or the right lane and continue straight&quot;</extracomment>
<translation> 그리고 계속 진행</translation>
</message>
<message>
@@ -879,185 +991,6 @@ https://developers.arcgis.com/authentication/accessing-arcgis-online-services/
</message>
</context>
<context>
- <name>QGeoRouteReplyOsm</name>
- <message>
- <source>Go straight.</source>
- <translation>직진하십시오.</translation>
- </message>
- <message>
- <source>Go straight 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 right.</source>
- <translation>우회전하십시오.</translation>
- </message>
- <message>
- <source>Turn right onto %1.</source>
- <translation>%1 방향으로 우회전하십시오.</translation>
- </message>
- <message>
- <source>Make a sharp right.</source>
- <translation>크게 우회전하십시오.</translation>
- </message>
- <message>
- <source>Make a sharp right onto %1.</source>
- <translation>%1 방향으로 크게 우회전하십시오.</translation>
- </message>
- <message>
- <source>When it is safe to do so, perform a U-turn.</source>
- <translation>유턴 허용 시 유턴하십시오.</translation>
- </message>
- <message>
- <source>Make a sharp left.</source>
- <translation>크게 좌회전하십시오.</translation>
- </message>
- <message>
- <source>Make 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>Turn slightly left.</source>
- <translation>약간 좌회전하십시오.</translation>
- </message>
- <message>
- <source>Turn slightly left onto %1.</source>
- <translation>%1 방향으로 약간 좌회전하십시오.</translation>
- </message>
- <message>
- <source>Reached waypoint.</source>
- <translation>경유 지점에 도착하였습니다.</translation>
- </message>
- <message>
- <source>Head on.</source>
- <translation>직진하십시오.</translation>
- </message>
- <message>
- <source>Head onto %1.</source>
- <translation>%1 방향으로 직진하십시오.</translation>
- </message>
- <message>
- <source>Enter the roundabout.</source>
- <translation>회전 교차로에 진입하십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the first exit.</source>
- <translation>회전 교차로의 첫번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the first exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 첫번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the second exit.</source>
- <translation>회전 교차로의 두번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the second exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 두번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the third exit.</source>
- <translation>회전 교차로의 세번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the third exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 세번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the fourth exit.</source>
- <translation>회전 교차로의 네번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the fourth exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 네번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the fifth exit.</source>
- <translation>회전 교차로의 다섯번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the fifth exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 다섯번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the sixth exit.</source>
- <translation>회전 교차로의 여섯번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the sixth exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 여섯번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the seventh exit.</source>
- <translation>회전 교차로의 일곱번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the seventh exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 일곱번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the eighth exit.</source>
- <translation>회전 교차로의 여덟번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the eighth exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 여덟번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the ninth exit.</source>
- <translation>회전 교차로의 아홉번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>At the roundabout take the ninth exit onto %1.</source>
- <translation>회전 교차로의 %1 방면 아홉번째 출구로 나가십시오.</translation>
- </message>
- <message>
- <source>Leave the roundabout.</source>
- <translation>회전 교차로에서 나가십시오.</translation>
- </message>
- <message>
- <source>Leave the roundabout onto %1.</source>
- <translation>%1 방면으로 회전 교차로에서 나가십시오.</translation>
- </message>
- <message>
- <source>Stay on the roundabout.</source>
- <translation>회전 교차로에서 계속 진행하십시오.</translation>
- </message>
- <message>
- <source>Start at the end of the street.</source>
- <translation>길 끝에서 시작하십시오.</translation>
- </message>
- <message>
- <source>Start at the end of %1.</source>
- <translation>%1 끝에서 시작하십시오.</translation>
- </message>
- <message>
- <source>You have reached your destination.</source>
- <translation>목적지에 도착하였습니다.</translation>
- </message>
- <message>
- <source>Don&apos;t know what to say for &apos;%1&apos;</source>
- <translation>&apos;%1&apos;을 무엇이라고 말해야 할 지 모르겠습니다</translation>
- </message>
-</context>
-<context>
<name>QGeoServiceProviderFactoryMapbox</name>
<message>
<source>Mapbox plugin requires a &apos;mapbox.access_token&apos; parameter.
@@ -1376,17 +1309,9 @@ https://www.mapbox.com 사이트를 방문하십시오</translation>
<translation>urlprefix 인자로 지정한 사용자 정의 URL 지도</translation>
</message>
<message>
- <source>OpenStreetMap street map</source>
- <translation>OpenStreetMap 거리 지도</translation>
- </message>
- <message>
<source>Satellite Map</source>
<translation>위성 지도</translation>
</message>
- <message>
- <source>OpenStreetMap satellite map</source>
- <translation>OpenStreetMap 위성 지도</translation>
- </message>
</context>
<context>
<name>QPlaceManagerEngineOsm</name>
@@ -1452,11 +1377,21 @@ https://www.mapbox.com 사이트를 방문하십시오</translation>
</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/qtlocation_ru.ts b/translations/qtlocation_ru.ts
index a236a0f..267927c 100644
--- a/translations/qtlocation_ru.ts
+++ b/translations/qtlocation_ru.ts
@@ -551,6 +551,7 @@ Please visit https://developers.arcgis.com/authentication/accessing-arcgis-onlin
</message>
<message>
<source>Head %1</source>
+ <extracomment>%1 is &quot;North&quot;, &quot;South&quot;, &quot;East&quot; or &quot;West&quot;</extracomment>
<translation>Направляйтесь на %1</translation>
</message>
<message>
@@ -926,6 +927,7 @@ Please visit https://developers.arcgis.com/authentication/accessing-arcgis-onlin
</message>
<message>
<source> and continue straight</source>
+ <extracomment>This string will be prepended with lane instructions. E.g., &quot;Use the left or the right lane and continue straight&quot;</extracomment>
<translation> и продолжайте движение прямо</translation>
</message>
<message>
diff --git a/translations/qtmultimedia_ca.ts b/translations/qtmultimedia_ca.ts
index 5c45043..d44662f 100644
--- a/translations/qtmultimedia_ca.ts
+++ b/translations/qtmultimedia_ca.ts
@@ -153,7 +153,7 @@
<name>CameraBinRecorder</name>
<message>
<source>QMediaRecorder::pause() is not supported by camerabin2.</source>
- <translation>QMediaRecorder::pause() no és acceptat per «camerabin2».</translation>
+ <translation>QMediaRecorder::pause() no és admés pel «camerabin2».</translation>
</message>
<message>
<source>Service has not been started</source>
@@ -179,7 +179,7 @@
</message>
<message>
<source>Failed to connect graph</source>
- <translation>Ha fallat en connectar amb el graf</translation>
+ <translation>Ha fallat en connectar amb el gràfic</translation>
</message>
<message>
<source>Failed to get stream control</source>
@@ -203,15 +203,15 @@
</message>
<message>
<source>Failed to create filter graph</source>
- <translation>Ha fallat en crear el graf de filtres</translation>
+ <translation>Ha fallat en crear el gràfic de filtres</translation>
</message>
<message>
<source>Failed to create graph builder</source>
- <translation>Ha fallat en crear el constructor de grafs</translation>
+ <translation>Ha fallat en crear el constructor de gràfics</translation>
</message>
<message>
<source>Failed to connect capture graph and filter graph</source>
- <translation>Ha fallat en crear el graf de captures i el graf de filtres</translation>
+ <translation>Ha fallat en crear el gràfic de captures i el gràfic de filtres</translation>
</message>
<message>
<source>No capture device found</source>
@@ -347,7 +347,7 @@
<name>QAndroidCameraSession</name>
<message>
<source>Camera cannot be started without a viewfinder.</source>
- <translation>La càmera no es pot iniciar sense un visor.</translation>
+ <translation type="vanished">La càmera no es pot iniciar sense un visor.</translation>
</message>
<message>
<source>Camera not ready</source>
@@ -364,7 +364,7 @@
</message>
<message>
<source>Camera preview failed to start.</source>
- <translation>La vista prèvia de la càmara ha fallat en iniciar-se.</translation>
+ <translation>La vista prèvia de la càmera ha fallat en iniciar-se.</translation>
</message>
<message>
<source>Could not open destination file: %1</source>
diff --git a/translations/qtmultimedia_ko.ts b/translations/qtmultimedia_ko.ts
index cc91697..1036e7b 100644
--- a/translations/qtmultimedia_ko.ts
+++ b/translations/qtmultimedia_ko.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="ko">
+<TS version="2.1" language="ko">
<context>
<name>AudioContainerControl</name>
<message>
@@ -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>
@@ -190,7 +114,7 @@
</message>
<message>
<source>Attempting to play invalid Qt resource.</source>
- <translation>잘못된 Qt 자원을 재생하려고 하였습니다.</translation>
+ <translation>잘못된 Qt 리소스를 재생하려고 했습니다.</translation>
</message>
<message>
<source>The system cannot find the file specified.</source>
@@ -262,11 +186,11 @@
</message>
<message>
<source>Media session non-fatal error.</source>
- <translation>미디어 세션에서 치명적이지 않은 오류가 발생하였습니다.</translation>
+ <translation>미디어 세션에서 치명적이지 않은 오류가 발생했습니다.</translation>
</message>
<message>
<source>Media session serious error.</source>
- <translation>미디어 세션에서 치명적인 오류가 발생하였습니다.</translation>
+ <translation>미디어 세션에서 치명적인 오류가 발생했습니다.</translation>
</message>
<message>
<source>Unsupported media, a codec is missing.</source>
@@ -291,10 +215,6 @@
<context>
<name>QAndroidCameraSession</name>
<message>
- <source>Camera cannot be started without a viewfinder.</source>
- <translation>뷰파인더 없이 카메라를 시작할 수 없습니다.</translation>
- </message>
- <message>
<source>Camera not ready</source>
<translation>카메라가 준비되지 않음</translation>
</message>
@@ -393,13 +313,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>
@@ -441,10 +354,6 @@
<context>
<name>QGstreamerPlayerControl</name>
<message>
- <source>Attempting to play invalid Qt resource</source>
- <translation>잘못된 Qt 자원을 재생하려고 함</translation>
- </message>
- <message>
<source>Attempting to play invalid user stream</source>
<translation>잘못된 사용자 스트림을 재생하려고 함</translation>
</message>
@@ -459,10 +368,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>
@@ -490,7 +395,7 @@
<name>QMediaPlayer</name>
<message>
<source>Attempting to play invalid Qt resource</source>
- <translation>잘못된 Qt 자원을 재생하려고 함</translation>
+ <translation>잘못된 Qt 리소스를 재생하려고 함</translation>
</message>
<message>
<source>The QMediaPlayer object does not have a valid service</source>
@@ -532,7 +437,7 @@
</message>
<message>
<source>CameraFocus is provided by Camera</source>
- <translation>카메라에서 CameraFocusᅟ를 제공함</translation>
+ <translation>카메라에서 CameraFocus를 제공함</translation>
</message>
<message>
<source>CameraFlash is provided by Camera</source>
@@ -558,6 +463,10 @@
<translation>재생 목록 파일에 잘못된 줄이 있음</translation>
</message>
<message>
+ <source>Invalid stream</source>
+ <translation>잘못된 스트림</translation>
+ </message>
+ <message>
<source>Empty file provided</source>
<translation>빈 파일을 제공함</translation>
</message>
@@ -567,21 +476,6 @@
</message>
</context>
<context>
- <name>QPlaylistFileParserPrivate</name>
- <message>
- <source>%1 playlist type is unknown</source>
- <translation>%1 재생 목록 형식을 알 수 없음</translation>
- </message>
- <message>
- <source>invalid line in playlist file</source>
- <translation>재생 목록 파일에 잘못된 줄이 있음</translation>
- </message>
- <message>
- <source>Empty file provided</source>
- <translation>빈 파일을 제공함</translation>
- </message>
-</context>
-<context>
<name>QWinRTCameraImageCaptureControl</name>
<message>
<source>Camera not ready</source>
diff --git a/translations/qtmultimedia_ru.ts b/translations/qtmultimedia_ru.ts
index 6c399d2..6898b27 100644
--- a/translations/qtmultimedia_ru.ts
+++ b/translations/qtmultimedia_ru.ts
@@ -215,10 +215,6 @@
<context>
<name>QAndroidCameraSession</name>
<message>
- <source>Camera cannot be started without a viewfinder.</source>
- <translation>Невозможно запустить камеру без видоискателя.</translation>
- </message>
- <message>
<source>Camera not ready</source>
<translation>Камера не готова</translation>
</message>
diff --git a/translations/qtquickcontrols2_ko.ts b/translations/qtquickcontrols2_ko.ts
index c155d69..da4a662 100644
--- a/translations/qtquickcontrols2_ko.ts
+++ b/translations/qtquickcontrols2_ko.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="ko_KR">
+<TS version="2.1" language="ko">
<context>
<name>QQuickPlatformDialog</name>
<message>
@@ -13,6 +13,13 @@
</message>
</context>
<context>
+ <name>QtQuickControls2ImagineStylePlugin</name>
+ <message>
+ <source>Imagine is an attached property</source>
+ <translation>Imagine은 첨부된 속성임</translation>
+ </message>
+</context>
+<context>
<name>QtQuickControls2MaterialStylePlugin</name>
<message>
<source>Material is an attached property</source>
diff --git a/translations/qtquickcontrols_ko.ts b/translations/qtquickcontrols_ko.ts
new file mode 100644
index 0000000..58038c0
--- /dev/null
+++ b/translations/qtquickcontrols_ko.ts
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ko">
+<context>
+ <name>DefaultColorDialog</name>
+ <message>
+ <source>Hue</source>
+ <translation>명도</translation>
+ </message>
+ <message>
+ <source>Saturation</source>
+ <translation>채도</translation>
+ </message>
+ <message>
+ <source>Luminosity</source>
+ <translation>휘도</translation>
+ </message>
+ <message>
+ <source>Alpha</source>
+ <translation>투명도</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>취소</translation>
+ </message>
+ <message>
+ <source>OK</source>
+ <translation>확인</translation>
+ </message>
+</context>
+<context>
+ <name>DefaultDialogWrapper</name>
+ <message>
+ <source>Show Details...</source>
+ <translation>자세히 보기...</translation>
+ </message>
+</context>
+<context>
+ <name>DefaultFileDialog</name>
+ <message>
+ <source>Go up to the folder containing this one</source>
+ <translation>이 폴더를 포함하는 상위 폴더로 이동</translation>
+ </message>
+ <message>
+ <source>Remove favorite</source>
+ <translation>책갈피 삭제</translation>
+ </message>
+ <message>
+ <source>Add the current directory as a favorite</source>
+ <translation>현재 디렉터리를 책갈피에 추가</translation>
+ </message>
+ <message>
+ <source>Filename</source>
+ <translation>파일 이름</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <comment>file type (extension)</comment>
+ <translation>형식</translation>
+ </message>
+ <message>
+ <source>Size</source>
+ <comment>file size</comment>
+ <translation>크기</translation>
+ </message>
+ <message>
+ <source>Modified</source>
+ <comment>last-modified time</comment>
+ <translation>수정한 날짜</translation>
+ </message>
+ <message>
+ <source>Accessed</source>
+ <comment>last-accessed time</comment>
+ <translation>접근한 날짜</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>취소</translation>
+ </message>
+ <message>
+ <source>Choose</source>
+ <translation>선택</translation>
+ </message>
+ <message>
+ <source>Open</source>
+ <translation>열기</translation>
+ </message>
+ <message>
+ <source>Save</source>
+ <translation>저장</translation>
+ </message>
+</context>
+<context>
+ <name>DefaultFontDialog</name>
+ <message>
+ <source>Font</source>
+ <translation>글꼴</translation>
+ </message>
+ <message>
+ <source>Weight</source>
+ <translation>굵기</translation>
+ </message>
+ <message>
+ <source>Size</source>
+ <translation>크기</translation>
+ </message>
+ <message>
+ <source>Font Family</source>
+ <translation>글꼴 종류</translation>
+ </message>
+ <message>
+ <source>Thin</source>
+ <translation>얇음</translation>
+ </message>
+ <message>
+ <source>ExtraLight</source>
+ <translation>더 가벼움</translation>
+ </message>
+ <message>
+ <source>Light</source>
+ <translation>가벼움</translation>
+ </message>
+ <message>
+ <source>Normal</source>
+ <translation>일반</translation>
+ </message>
+ <message>
+ <source>Medium</source>
+ <translation>중간</translation>
+ </message>
+ <message>
+ <source>DemiBold</source>
+ <translation>데미볼드</translation>
+ </message>
+ <message>
+ <source>Bold</source>
+ <translation>진하게</translation>
+ </message>
+ <message>
+ <source>ExtraBold</source>
+ <translation>더 진하게</translation>
+ </message>
+ <message>
+ <source>Black</source>
+ <translation>블랙</translation>
+ </message>
+ <message>
+ <source>Style</source>
+ <translation>스타일</translation>
+ </message>
+ <message>
+ <source>Italic</source>
+ <translation>기울임꼴</translation>
+ </message>
+ <message>
+ <source>Underline</source>
+ <translation>밑줄</translation>
+ </message>
+ <message>
+ <source>Overline</source>
+ <translation>윗줄</translation>
+ </message>
+ <message>
+ <source>Strikeout</source>
+ <translation>취소선</translation>
+ </message>
+ <message>
+ <source>Writing System</source>
+ <translation>문자 체계</translation>
+ </message>
+ <message>
+ <source>Sample</source>
+ <translation>미리 보기</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>취소</translation>
+ </message>
+ <message>
+ <source>OK</source>
+ <translation>확인</translation>
+ </message>
+</context>
+<context>
+ <name>DefaultMessageDialog</name>
+ <message>
+ <source>OK</source>
+ <translation>확인</translation>
+ </message>
+ <message>
+ <source>Open</source>
+ <translation>열기</translation>
+ </message>
+ <message>
+ <source>Save</source>
+ <translation>저장</translation>
+ </message>
+ <message>
+ <source>Save All</source>
+ <translation>모두 저장</translation>
+ </message>
+ <message>
+ <source>Retry</source>
+ <translation>다시 시도</translation>
+ </message>
+ <message>
+ <source>Ignore</source>
+ <translation>무시</translation>
+ </message>
+ <message>
+ <source>Apply</source>
+ <translation>적용</translation>
+ </message>
+ <message>
+ <source>Yes</source>
+ <translation>예</translation>
+ </message>
+ <message>
+ <source>Yes to All</source>
+ <translation>모두 예</translation>
+ </message>
+ <message>
+ <source>No</source>
+ <translation>아니요</translation>
+ </message>
+ <message>
+ <source>No to All</source>
+ <translation>모두 아니요</translation>
+ </message>
+ <message>
+ <source>Discard</source>
+ <translation>무시</translation>
+ </message>
+ <message>
+ <source>Reset</source>
+ <translation>초기화</translation>
+ </message>
+ <message>
+ <source>Restore Defaults</source>
+ <translation>기본값으로 복원</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>취소</translation>
+ </message>
+ <message>
+ <source>Abort</source>
+ <translation>중지</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>닫기</translation>
+ </message>
+ <message>
+ <source>Show Details...</source>
+ <translation>자세한 정보 표시...</translation>
+ </message>
+ <message>
+ <source>Help</source>
+ <translation>도움말</translation>
+ </message>
+ <message>
+ <source>Hide Details</source>
+ <translation>자세한 정보 숨기기</translation>
+ </message>
+</context>
+<context>
+ <name>EditMenu_base</name>
+ <message>
+ <source>&amp;Undo</source>
+ <translation>실행 취소(&amp;U)</translation>
+ </message>
+ <message>
+ <source>&amp;Redo</source>
+ <translation>다시 실행(&amp;R)</translation>
+ </message>
+ <message>
+ <source>Cu&amp;t</source>
+ <translation>잘라내기(&amp;T)</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>복사(&amp;C)</translation>
+ </message>
+ <message>
+ <source>&amp;Paste</source>
+ <translation>붙여넣기(&amp;P)</translation>
+ </message>
+ <message>
+ <source>Delete</source>
+ <translation>삭제</translation>
+ </message>
+ <message>
+ <source>Clear</source>
+ <translation>지우기</translation>
+ </message>
+ <message>
+ <source>Select All</source>
+ <translation>모두 선택</translation>
+ </message>
+</context>
+</TS>
diff --git a/translations/qtscript_ca.ts b/translations/qtscript_ca.ts
index 4c0e93f..d5625a0 100644
--- a/translations/qtscript_ca.ts
+++ b/translations/qtscript_ca.ts
@@ -178,7 +178,7 @@
</message>
<message>
<source>&lt;img src=&quot;:/qt/scripttools/debugging/images/wrap.png&quot;&gt;&amp;nbsp;Search wrapped</source>
- <translation>&lt;img src=&quot;:/qt/scripttools/debugging/images/wrap.png&quot;&gt;&amp;nbsp;Cerca embolcallada</translation>
+ <translation>&lt;img src=&quot;:/qt/scripttools/debugging/images/wrap.png&quot;&gt;&amp;nbsp;Cerca continuada des del començament</translation>
</message>
</context>
<context>
diff --git a/translations/qtscript_ko.ts b/translations/qtscript_ko.ts
index f3bf9ac..d0fee39 100644
--- a/translations/qtscript_ko.ts
+++ b/translations/qtscript_ko.ts
@@ -43,7 +43,7 @@
<name>QScriptDebugger</name>
<message>
<source>Go to Line</source>
- <translation>줄로 가기</translation>
+ <translation>줄로 이동</translation>
</message>
<message>
<source>Line:</source>
diff --git a/translations/qtserialport_ko.ts b/translations/qtserialport_ko.ts
index 023b212..bd01688 100644
--- a/translations/qtserialport_ko.ts
+++ b/translations/qtserialport_ko.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="ko_KR">
+<TS version="2.1" language="ko">
<context>
<name>QSerialPort</name>
<message>
diff --git a/translations/qtwebengine_de.ts b/translations/qtwebengine_de.ts
index b6a71d9..914a14e 100644
--- a/translations/qtwebengine_de.ts
+++ b/translations/qtwebengine_de.ts
@@ -101,6 +101,37 @@
</message>
</context>
<context>
+ <name>QQuickPdfDocument</name>
+ <message>
+ <source>no error</source>
+ <translation>kein Fehler</translation>
+ </message>
+ <message>
+ <source>data not yet available</source>
+ <translation>Daten stehen noch nicht bereit</translation>
+ </message>
+ <message>
+ <source>file not found</source>
+ <translation>Datei nicht gefunden</translation>
+ </message>
+ <message>
+ <source>invalid file format</source>
+ <translation>ungültiges Dateiformat</translation>
+ </message>
+ <message>
+ <source>incorrect password</source>
+ <translation>ungültiges Passwort</translation>
+ </message>
+ <message>
+ <source>unsupported security scheme</source>
+ <translation>nicht unterstütztes Sicherheitsverfahren</translation>
+ </message>
+ <message>
+ <source>unknown error</source>
+ <translation>unbekannter Fehler</translation>
+ </message>
+</context>
+<context>
<name>QQuickWebEngineView</name>
<message>
<source>Stop</source>
@@ -266,18 +297,6 @@
<translation>&amp;Liste einfügen</translation>
</message>
<message>
- <source>&amp;Back</source>
- <translation>&amp;Zurück</translation>
- </message>
- <message>
- <source>&amp;Forward</source>
- <translation>&amp;Vorwärts</translation>
- </message>
- <message>
- <source>&amp;Reload</source>
- <translation>&amp;Neu laden</translation>
- </message>
- <message>
<source>Select folder to upload</source>
<translation>Verzeichnis zum Hochladen</translation>
</message>
diff --git a/translations/qtwebengine_ko.ts b/translations/qtwebengine_ko.ts
index ca8fae3..539b34c 100644
--- a/translations/qtwebengine_ko.ts
+++ b/translations/qtwebengine_ko.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="ko_KR">
+<TS version="2.1" language="ko">
<context>
<name>QQuickWebEngineView</name>
<message>
@@ -21,7 +21,7 @@
</message>
<message>
<source>View Page Source</source>
- <translation>페이지 원본 보기</translation>
+ <translation>페이지 소스 보기</translation>
</message>
<message>
<source>Copy</source>
@@ -216,7 +216,7 @@
</message>
<message>
<source>&amp;View Page Source</source>
- <translation>페이지 원본 보기(&amp;V)</translation>
+ <translation>페이지 소스 보기(&amp;V)</translation>
</message>
<message>
<source>Are you sure you want to leave this page?</source>
diff --git a/translations/qtwebengine_ru.ts b/translations/qtwebengine_ru.ts
index 493da99..b7efbcb 100644
--- a/translations/qtwebengine_ru.ts
+++ b/translations/qtwebengine_ru.ts
@@ -173,6 +173,37 @@
</message>
</context>
<context>
+ <name>QQuickPdfDocument</name>
+ <message>
+ <source>no error</source>
+ <translation>нет ошибок</translation>
+ </message>
+ <message>
+ <source>data not yet available</source>
+ <translation>данные ещё недоступны</translation>
+ </message>
+ <message>
+ <source>file not found</source>
+ <translation>файл не найден</translation>
+ </message>
+ <message>
+ <source>invalid file format</source>
+ <translation>неверный формат файла</translation>
+ </message>
+ <message>
+ <source>incorrect password</source>
+ <translation>неверный пароль</translation>
+ </message>
+ <message>
+ <source>unsupported security scheme</source>
+ <translation>неподдерживаемая схема безопасности</translation>
+ </message>
+ <message>
+ <source>unknown error</source>
+ <translation>неизвестная ошибка</translation>
+ </message>
+</context>
+<context>
<name>QQuickWebEngineView</name>
<message>
<source>Stop</source>
@@ -338,64 +369,17 @@
<translation>Покинуть страницу? Сделанные изменения могут быть утеряны.</translation>
</message>
<message>
- <source>&amp;Back</source>
- <translation>&amp;Назад</translation>
- </message>
- <message>
- <source>&amp;Forward</source>
- <translation>&amp;Вперёд</translation>
- </message>
- <message>
- <source>&amp;Reload</source>
- <translation>&amp;Перезагрузить</translation>
- </message>
- <message>
<source>Select folder to upload</source>
<translation>Выберите каталог для передачи</translation>
</message>
</context>
<context>
- <name>QtWebEngineCore</name>
- <message>
- <source>Javascript Alert - %1</source>
- <translation>Извещение Javascript - %1</translation>
- </message>
- <message>
- <source>Javascript Confirm - %1</source>
- <translation>Подтверждение Javascript - %1</translation>
- </message>
- <message>
- <source>Javascript Prompt - %1</source>
- <translation>Приглашение Javascript - %1</translation>
- </message>
- <message>
- <source>Are you sure you want to leave this page?</source>
- <translation>Покинуть страницу?</translation>
- </message>
- <message>
- <source>Changes that you made may not be saved.</source>
- <translation>Внесённые изменения могут быть утеряны.</translation>
- </message>
-</context>
-<context>
<name>QtWebEnginePlugin</name>
<message>
- <source>Cannot create a separate instance of WebEngineDownloadItem</source>
- <translation>Невозможно создать отдельный экземпляр WebEngineDownloadItem</translation>
- </message>
- <message>
<source>Cannot create separate instance of WebEngineNewViewRequest</source>
<translation>Невозможно создать отдельный экземпляр WebEngineNewViewRequest</translation>
</message>
<message>
- <source>Cannot create a separate instance of NavigationHistory</source>
- <translation>Невозможно создать отдельный экземпляр NavigationHistory</translation>
- </message>
- <message>
- <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>
@@ -517,6 +501,26 @@
<context>
<name>UIDelegatesManager</name>
<message>
+ <source>Javascript Alert - %1</source>
+ <translation>Извещение Javascript - %1</translation>
+ </message>
+ <message>
+ <source>Javascript Confirm - %1</source>
+ <translation>Подтверждение Javascript - %1</translation>
+ </message>
+ <message>
+ <source>Javascript Prompt - %1</source>
+ <translation>Приглашение Javascript - %1</translation>
+ </message>
+ <message>
+ <source>Are you sure you want to leave this page?</source>
+ <translation>Покинуть страницу?</translation>
+ </message>
+ <message>
+ <source>Changes that you made may not be saved.</source>
+ <translation>Внесённые изменения могут быть утеряны.</translation>
+ </message>
+ <message>
<source>Connect to proxy &quot;%1&quot; using:</source>
<translation>Подключение к прокси «%1» с использованием:</translation>
</message>
diff --git a/translations/qtwebsockets_de.ts b/translations/qtwebsockets_de.ts
index 3a534b4..b3b7c6c 100644
--- a/translations/qtwebsockets_de.ts
+++ b/translations/qtwebsockets_de.ts
@@ -226,10 +226,18 @@
<translation>Server geschlossen.</translation>
</message>
<message>
+ <source>Header is too large.</source>
+ <translation>Der Header ist zu groß.</translation>
+ </message>
+ <message>
<source>Too many pending connections.</source>
<translation>Zu viele anstehende Verbindungen.</translation>
</message>
<message>
+ <source>Read handshake request header failed.</source>
+ <translation>Das Lesen des Headers der Handshake-Anforderung schlug fehl.</translation>
+ </message>
+ <message>
<source>Upgrade to WebSocket failed.</source>
<translation>Upgrade auf WebSocket fehlgeschlagen.</translation>
</message>
diff --git a/translations/qtwebsockets_ko.ts b/translations/qtwebsockets_ko.ts
index 6ca079a..f3cf5eb 100644
--- a/translations/qtwebsockets_ko.ts
+++ b/translations/qtwebsockets_ko.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="ko_KR">
+<TS version="2.1" language="ko">
<context>
<name>QQmlWebSocket</name>
<message>
@@ -31,7 +31,7 @@
</message>
<message>
<source>Invalid resource name.</source>
- <translation>자원 이름이 잘못되었습니다.</translation>
+ <translation>리소스 이름이 잘못되었습니다.</translation>
</message>
<message>
<source>SSL Sockets are not supported on this platform.</source>
diff --git a/translations/qtwebsockets_ru.ts b/translations/qtwebsockets_ru.ts
index 98aed10..b8aacd1 100644
--- a/translations/qtwebsockets_ru.ts
+++ b/translations/qtwebsockets_ru.ts
@@ -144,10 +144,6 @@
<context>
<name>QWebSocketFrame</name>
<message>
- <source>Timeout when reading data from socket.</source>
- <translation>Истекло время ожидания при чтении данных из сокета.</translation>
- </message>
- <message>
<source>Waiting for more data from socket.</source>
<translation>Ожидание данных из сокета.</translation>
</message>
@@ -230,10 +226,18 @@
<translation>Сервер закрыт.</translation>
</message>
<message>
+ <source>Header is too large.</source>
+ <translation>Слишком большой заголовок.</translation>
+ </message>
+ <message>
<source>Too many pending connections.</source>
<translation>Слишком много ожидающих подключений.</translation>
</message>
<message>
+ <source>Read handshake request header failed.</source>
+ <translation>Не удалось прочитать заголовок рукопожатия.</translation>
+ </message>
+ <message>
<source>Upgrade to WebSocket failed.</source>
<translation>Не удалось повысить до WebSocket.</translation>
</message>
diff --git a/translations/qtxmlpatterns_ca.ts b/translations/qtxmlpatterns_ca.ts
index 80be87c..c2f2a41 100644
--- a/translations/qtxmlpatterns_ca.ts
+++ b/translations/qtxmlpatterns_ca.ts
@@ -2,6 +2,31 @@
<!DOCTYPE TS>
<TS version="2.1" language="ca">
<context>
+ <name>QQuickXmlListModel</name>
+ <message>
+ <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
+ <translation>«%1» duplica un nom previ de rol i s&apos;inhabilitarà.</translation>
+ </message>
+ <message>
+ <source>invalid query: &quot;%1&quot;</source>
+ <translation>Consulta no vàlida: «%1»</translation>
+ </message>
+</context>
+<context>
+ <name>QQuickXmlListModelRole</name>
+ <message>
+ <source>An XmlRole query must not start with &apos;/&apos;</source>
+ <translation>Una consulta XmlRole no pot començar per «/»</translation>
+ </message>
+</context>
+<context>
+ <name>QQuickXmlRoleList</name>
+ <message>
+ <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
+ <translation>Una consulta XmlListModel ha de començar per «/» o «//»</translation>
+ </message>
+</context>
+<context>
<name>QXmlPatternistCLI</name>
<message>
<source>Warning in %1, at line %2, column %3: %4</source>
@@ -362,7 +387,7 @@
</message>
<message>
<source>In the replacement string, %1 can only be used to escape itself or %2, not %3</source>
- <translation>A la cadena de substitució, %1 només es pot usar per escapar-se a si mateix o a %2, no a %3</translation>
+ <translation>A la cadena de substitució, %1 només es pot usar per a escapar-se a si mateix o a %2, no a %3</translation>
</message>
<message>
<source>%1 matches newline characters</source>
@@ -918,7 +943,11 @@
</message>
<message>
<source>Variety of member types of %1 must be atomic.</source>
- <translation>Una varietat del tipus de membre de %1 ha de ser atòmic.</translation>
+ <translation type="vanished">Una varietat del tipus de membre de %1 ha de ser atòmic.</translation>
+ </message>
+ <message>
+ <source>Variety of member types of %1 must be atomic or union.</source>
+ <translation>Una varietat dels tipus de membre de %1 ha de ser atòmic o unió.</translation>
</message>
<message>
<source>%1 is not allowed to derive from %2 by list as the latter defines it as final.</source>
@@ -974,7 +1003,7 @@
</message>
<message>
<source>Complex type %1 has non-deterministic content.</source>
- <translation>El tipus complex %1 té un contingut no deterministic.</translation>
+ <translation>El tipus complex %1 té un contingut no determinista.</translation>
</message>
<message>
<source>Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3.</source>
@@ -1746,7 +1775,7 @@
</message>
<message>
<source>No schema defined for validation.</source>
- <translation>No s&apos;ha definit cap esquema per validar.</translation>
+ <translation>No s&apos;ha definit cap esquema per a validar.</translation>
</message>
<message>
<source>No definition for element %1 available.</source>
@@ -1810,7 +1839,7 @@
</message>
<message>
<source>Content of element %1 does not match defined value constraint.</source>
- <translation>El contingut de l&apos;element %1 no concorda amb la restricció de valor definida.</translation>
+ <translation>El contingut de l&apos;element %1 no concorda amb la restricció definida de valor.</translation>
</message>
<message>
<source>Element %1 contains not allowed child content.</source>
@@ -1854,7 +1883,7 @@
</message>
<message>
<source>Content of attribute %1 does not match defined value constraint.</source>
- <translation>El contingut de l&apos;atribut %1 no concorda amb la restricció de valor definida.</translation>
+ <translation>El contingut de l&apos;atribut %1 no concorda amb la restricció definida de valor.</translation>
</message>
<message>
<source>Non-unique value found for constraint %1.</source>
@@ -1881,6 +1910,10 @@
<translation>El camp %1 no té un tipus simple.</translation>
</message>
<message>
+ <source>Field %1 is missing its simple type.</source>
+ <translation>Al camp %1 manca el seu tipus simple.</translation>
+ </message>
+ <message>
<source>ID value &apos;%1&apos; is not unique.</source>
<translation>El valor ID «%1» no és únic.</translation>
</message>
diff --git a/translations/qtxmlpatterns_de.ts b/translations/qtxmlpatterns_de.ts
index e35c2bd..6d7fc39 100644
--- a/translations/qtxmlpatterns_de.ts
+++ b/translations/qtxmlpatterns_de.ts
@@ -1822,6 +1822,10 @@
<translation>Das Feld %1 hat keinen einfachen Typ.</translation>
</message>
<message>
+ <source>Field %1 is missing its simple type.</source>
+ <translation>Im Feld %1 fehlt der einfache Typ.</translation>
+ </message>
+ <message>
<source>ID value &apos;%1&apos; is not unique.</source>
<translation>Der ID-Wert &apos;%1&apos; ist nicht eindeutig.</translation>
</message>
diff --git a/translations/qtxmlpatterns_ko.ts b/translations/qtxmlpatterns_ko.ts
index f7fbd66..5265499 100644
--- a/translations/qtxmlpatterns_ko.ts
+++ b/translations/qtxmlpatterns_ko.ts
@@ -1,6 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="ko">
+<TS version="2.1" language="ko">
+<context>
+ <name>QQuickXmlListModel</name>
+ <message>
+ <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
+ <translation>&quot;%1&quot;에서 이전에 선언된 역할을 재정의하므로 비활성화되었습니다.</translation>
+ </message>
+ <message>
+ <source>invalid query: &quot;%1&quot;</source>
+ <translation>잘못된 질의: &quot;%1&quot;</translation>
+ </message>
+</context>
+<context>
+ <name>QQuickXmlListModelRole</name>
+ <message>
+ <source>An XmlRole query must not start with &apos;/&apos;</source>
+ <translation>XmlRole 질의는 &apos;/&apos;로 시작할 수 없음</translation>
+ </message>
+</context>
+<context>
+ <name>QQuickXmlRoleList</name>
+ <message>
+ <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
+ <translation>XmlListModel 질의는 &apos;/&apos; 또는 &quot;//&quot;로 시작해야 함</translation>
+ </message>
+</context>
<context>
<name>QXmlPatternistCLI</name>
<message>
@@ -36,7 +61,7 @@
</message>
<message>
<source>%1 is an unsupported encoding.</source>
- <translation>인코딩 %1은(는) 지원하지 않습니다.</translation>
+ <translation>%1 인코딩은 지원하지 않습니다.</translation>
</message>
<message>
<source>%1 contains octets which are disallowed in the requested encoding %2.</source>
@@ -44,7 +69,7 @@
</message>
<message>
<source>The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character.</source>
- <translation>인코딩 %3을(를) 사용하며 %2에 있는 코드포인트 %1은(는) 올바르지 않은 XML 문자입니다.</translation>
+ <translation>%3 인코딩을 사용하며 %2에 있는 코드포인트 %1은(는) 올바르지 않은 XML 문자입니다.</translation>
</message>
<message>
<source>Network timeout.</source>
@@ -80,7 +105,7 @@
</message>
<message>
<source>Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; </source>
- <translation>24시간제 시간 24:%1:%2.%3이(가) 올바르지 않습니다. 시간은 24이나 분, 초, 밀리초가 모두 0 이상입니다;</translation>
+ <translation>24시간제 시간 24:%1:%2.%3이(가) 올바르지 않습니다. 시간은 24이나 분, 초, 밀리초가 모두 0 이상입니다; </translation>
</message>
<message>
<source>Time %1:%2:%3.%4 is invalid.</source>
@@ -428,19 +453,19 @@
</message>
<message>
<source>Attribute %1 cannot appear on the element %2. Only the standard attributes can appear.</source>
- <translation>속성 %1이(가) 원소 %2에 사용될 수 없습니다. 표준 속성만 사용할 수 있습니다.</translation>
+ <translation>원소 %2에 속성 %1을(를) 사용할 수 없습니다. 표준 속성만 사용할 수 있습니다.</translation>
</message>
<message>
<source>Attribute %1 cannot appear on the element %2. Only %3 is allowed, and the standard attributes.</source>
- <translation>속성 %1이(가) 원소 %2에 사용될 수 없습니다. 속성 %3 및 표준 속성만 사용할 수 있습니다.</translation>
+ <translation>원소 %2에 속성 %1을(를) 사용할 수 없습니다. 속성 %3 및 표준 속성만 사용할 수 있습니다.</translation>
</message>
<message>
<source>Attribute %1 cannot appear on the element %2. Allowed is %3, %4, and the standard attributes.</source>
- <translation>속성 %1이(가) 원소 %2에 사용될 수 없습니다. 속성 %3, %4 및 표준 속성을 사용할 수 있습니다.</translation>
+ <translation>원소 %2에 속성 %1을(를) 사용할 수 없습니다. 속성 %3, %4 및 표준 속성을 사용할 수 있습니다.</translation>
</message>
<message>
<source>Attribute %1 cannot appear on the element %2. Allowed is %3, and the standard attributes.</source>
- <translation>속성 %1이(가) 원소 %2에 사용될 수 없습니다. 속성 %3 및 표준 속성을 사용할 수 있습니다.</translation>
+ <translation>원소 %2에 속성 %1을(를) 사용할 수 없습니다. 속성 %3 및 표준 속성을 사용할 수 있습니다.</translation>
</message>
<message>
<source>XSL-T attributes on XSL-T elements must be in the null namespace, not in the XSL-T namespace which %1 is.</source>
@@ -484,7 +509,7 @@
</message>
<message>
<source>Only one %1 declaration can occur in the query prolog.</source>
- <translation>쿼리 선두부에는 %1 선언이 하나만 올 수 있습니다.</translation>
+ <translation>질의 선두부에는 %1 선언이 하나만 올 수 있습니다.</translation>
</message>
<message>
<source>The initialization of variable %1 depends on itself</source>
@@ -500,8 +525,7 @@
</message>
<message>
<source>The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2.</source>
- <translation>
-인코딩 %1은(는) 올바르지 않습니다. 라틴 알파벳만 포함해야 하며, 공백이 들어가지 않아야 하며, 정규 표현식 %2와(과) 일치해야 합니다.</translation>
+ <translation>%1 인코딩은 올바르지 않습니다. 라틴 알파벳만 포함해야 하며, 공백이 들어가지 않아야 하며, 정규 표현식 %2와(과) 일치해야 합니다.</translation>
</message>
<message>
<source>No function with signature %1 is available</source>
@@ -657,11 +681,11 @@
</message>
<message>
<source>Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared).</source>
- <translation>네임스페이스 %1은(는) %2에만 바인딩할 수 있습니다 (미리 선언되어야 합니다).</translation>
+ <translation>네임스페이스 %1은(는) %2에만 바인딩할 수 있습니다(미리 선언해야 합니다).</translation>
</message>
<message>
<source>Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared).</source>
- <translation>접두사 %1은(는) %2에만 바인딩할 수 있습니다 (미리 선언되어야 합니다).</translation>
+ <translation>접두사 %1은(는) %2에만 바인딩할 수 있습니다(미리 선언해야 합니다).</translation>
</message>
<message>
<source>Two namespace declaration attributes have the same name: %1.</source>
@@ -689,7 +713,7 @@
</message>
<message>
<source>%1 is not an atomic type. Casting is only possible to atomic types.</source>
- <translation>%1은(는) 원자적 타입이 아닙니다. 원자적 타입으로만 변환할 수 있습니다.</translation>
+ <translation>%1은(는) 원자적 형식이 아닙니다. 원자적 형식으로만 변환할 수 있습니다.</translation>
</message>
<message>
<source>%1 is not a valid name for a processing-instruction.</source>
@@ -916,8 +940,8 @@
<translation>%1 형식의 항목의 파생형은 원자적이거나 공용체여야 합니다.</translation>
</message>
<message>
- <source>Variety of member types of %1 must be atomic.</source>
- <translation>%1 형식의 항목의 파생형은 원자적이어야 합니다.</translation>
+ <source>Variety of member types of %1 must be atomic or union.</source>
+ <translation>%1 형식의 항목의 파생형은 원자적이거나 공용체여야 합니다.</translation>
</message>
<message>
<source>%1 is not allowed to derive from %2 by list as the latter defines it as final.</source>
@@ -1325,7 +1349,7 @@
</message>
<message>
<source>%1 element is not allowed in this context.</source>
- <translation>이 컨텍스트에는 %1 원소가 허용되지 않습니다.</translation>
+ <translation>이 콘텍스트에는 %1 원소가 허용되지 않습니다.</translation>
</message>
<message>
<source>%1 attribute of %2 element has larger value than %3 attribute.</source>
@@ -1880,6 +1904,10 @@
<translation>필드 %1에 간단한 형식이 없습니다.</translation>
</message>
<message>
+ <source>Field %1 is missing its simple type.</source>
+ <translation>필드 %1에 간단한 형식이 없습니다.</translation>
+ </message>
+ <message>
<source>ID value &apos;%1&apos; is not unique.</source>
<translation>ID 값 &apos;%1&apos;이(가) 유일하지 않습니다.</translation>
</message>
diff --git a/translations/qtxmlpatterns_ru.ts b/translations/qtxmlpatterns_ru.ts
index 4e8eacd..074b3b5 100644
--- a/translations/qtxmlpatterns_ru.ts
+++ b/translations/qtxmlpatterns_ru.ts
@@ -860,10 +860,6 @@
<translation>Виды типов элементов %1 должны быть атомарными или объединениями.</translation>
</message>
<message>
- <source>Variety of member types of %1 must be atomic.</source>
- <translation>Виды внутренних типов %1 должны быть атомарными.</translation>
- </message>
- <message>
<source>Variety of member types of %1 must be atomic or union.</source>
<translation>Виды внутренних типов %1 должны быть атомарными или объединениями.</translation>
</message>
@@ -1828,6 +1824,10 @@
<translation>Поле %1 не имеет простого типа.</translation>
</message>
<message>
+ <source>Field %1 is missing its simple type.</source>
+ <translation>Для поля %1 отсутствует простой тип.</translation>
+ </message>
+ <message>
<source>ID value &apos;%1&apos; is not unique.</source>
<translation>Значение ID «%1» не уникально.</translation>
</message>