Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
	src/plugins/qmltooling/qmldbg_ost/qostdevice.h

1 files changed, 415 insertions, 0 deletions

diff --git a/translations/qvfb_ko.ts b/translations/qvfb_ko.ts
new file mode 100644
index 0000000..3d34090
--- /dev/null
+++ b/translations/qvfb_ko.ts
@@ -0,0 +1,415 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="ko_KR">
+<context>
+    <name>AnimationSaveWidget</name>
+    <message>
+        <source>Record</source>
+        <translation>녹화</translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation>초기화</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>저장</translation>
+    </message>
+    <message>
+        <source>Save in MPEG format (requires netpbm package installed)</source>
+        <translation>MPEG로 저장 (netpbm 패키지가 필요함)</translation>
+    </message>
+    <message>
+        <source>Click record to begin recording.</source>
+        <translation>녹화를 누르면 녹화를 시작합니다.</translation>
+    </message>
+    <message>
+        <source>Finished saving.</source>
+        <translation>저장하였습니다.</translation>
+    </message>
+    <message>
+        <source>Paused. Click record to resume, or save if done.</source>
+        <translation>일시 정지됨. 녹화 단추를 누르면 다시 시작하며, 끝났으면 저장하십시오.</translation>
+    </message>
+    <message>
+        <source>Pause</source>
+        <translation>일시 정지</translation>
+    </message>
+    <message>
+        <source>Recording...</source>
+        <translation>녹화 중...</translation>
+    </message>
+    <message>
+        <source>Saving... </source>
+        <translation>저장 중...</translation>
+    </message>
+    <message>
+        <source>Save animation...</source>
+        <translation>애니메이션 저장 중...</translation>
+    </message>
+    <message>
+        <source>Save canceled.</source>
+        <translation>저장이 취소되었습니다.</translation>
+    </message>
+    <message>
+        <source>Save failed!</source>
+        <translation>저장에 실패하였습니다!</translation>
+    </message>
+</context>
+<context>
+    <name>Config</name>
+    <message>
+        <source>Configure</source>
+        <translation>설정</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>크기</translation>
+    </message>
+    <message>
+        <source>176x220 &quot;SmartPhone&quot;</source>
+        <translation>176x220 &quot;스마트폰&quot;</translation>
+    </message>
+    <message>
+        <source>240x320 &quot;PDA&quot;</source>
+        <translation>240x320 &quot;PDA&quot;</translation>
+    </message>
+    <message>
+        <source>320x240 &quot;TV&quot; / &quot;QVGA&quot;</source>
+        <translation>320x240 &quot;TV&quot; / &quot;QVGA&quot;</translation>
+    </message>
+    <message>
+        <source>640x480 &quot;VGA&quot;</source>
+        <translation>640x480 &quot;VGA&quot;</translation>
+    </message>
+    <message>
+        <source>800x480</source>
+        <translation>800x480</translation>
+    </message>
+    <message>
+        <source>800x600</source>
+        <translation>800x600</translation>
+    </message>
+    <message>
+        <source>1024x768</source>
+        <translation>1024x768</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation>사용자 정의</translation>
+    </message>
+    <message>
+        <source>Depth</source>
+        <translation>색 농도</translation>
+    </message>
+    <message>
+        <source>1 bit monochrome</source>
+        <translation>1비트 단색</translation>
+    </message>
+    <message>
+        <source>2 bit grayscale</source>
+        <translation>2비트 그레이스케일</translation>
+    </message>
+    <message>
+        <source>4 bit grayscale</source>
+        <translation>4비트 그레이스케일</translation>
+    </message>
+    <message>
+        <source>8 bit</source>
+        <translation>8비트</translation>
+    </message>
+    <message>
+        <source>12 (16) bit</source>
+        <translation>12(16)비트</translation>
+    </message>
+    <message>
+        <source>15 bit</source>
+        <translation>15비트</translation>
+    </message>
+    <message>
+        <source>16 bit</source>
+        <translation>16비트</translation>
+    </message>
+    <message>
+        <source>18 bit</source>
+        <translation>18비트</translation>
+    </message>
+    <message>
+        <source>24 bit</source>
+        <translation>24비트</translation>
+    </message>
+    <message>
+        <source>32 bit</source>
+        <translation>32비트</translation>
+    </message>
+    <message>
+        <source>32 bit ARGB</source>
+        <translation>32비트 ARGB</translation>
+    </message>
+    <message>
+        <source>Swap red and blue channels</source>
+        <translation>빨간색과 파란색 채널 바꾸기</translation>
+    </message>
+    <message>
+        <source>BGR format</source>
+        <translation>BGR 형식</translation>
+    </message>
+    <message>
+        <source>Skin</source>
+        <translation>스킨</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <source>Emulate touch screen (no mouse move)</source>
+        <translation>터치스크린 흉내내기 (마우스 이동 없음)</translation>
+    </message>
+    <message>
+        <source>Emulate LCD screen (Only with fixed zoom of 3.0 times magnification)</source>
+        <translation>LCD 스크린 흉내내기 (3배 확대로 고정됨)</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth &lt;i&gt;above&lt;/i&gt;. You may freely modify the Gamma &lt;i&gt;below&lt;/i&gt;.</source>
+        <translation>&lt;p&gt;&lt;i&gt;위&lt;/i&gt;에 있는 크기나 색 농도 설정을 바꾸면 가상 프레임버퍼를 사용하는 프로그램이 종료됩니다. &lt;i&gt;아래&lt;/i&gt;에 있는 감마 설정은 영향을 받지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Gamma</source>
+        <translation>감마</translation>
+    </message>
+    <message>
+        <source>Blue</source>
+        <translation>파란색</translation>
+    </message>
+    <message>
+        <source>1.0</source>
+        <translation>1.0</translation>
+    </message>
+    <message>
+        <source>Green</source>
+        <translation>녹색</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation>모두</translation>
+    </message>
+    <message>
+        <source>Red</source>
+        <translation>빨간색</translation>
+    </message>
+    <message>
+        <source>Set all to 1.0</source>
+        <translation>모두 1.0으로 설정</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>확인(&amp;O)</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>취소(&amp;C)</translation>
+    </message>
+</context>
+<context>
+    <name>DeviceSkin</name>
+    <message>
+        <source>The image file &apos;%1&apos; could not be loaded.</source>
+        <translation>그림 파일 &apos;%1&apos;을(를) 불러올 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>The skin directory &apos;%1&apos; does not contain a configuration file.</source>
+        <translation>스킨 디렉터리 &apos;%1&apos;에 설정 파일이 없습니다.</translation>
+    </message>
+    <message>
+        <source>The skin configuration file &apos;%1&apos; could not be opened.</source>
+        <translation>스킨 설정 파일 &apos;%1&apos;을(를) 열 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>The skin configuration file &apos;%1&apos; could not be read: %2</source>
+        <translation>스킨 설정 파일 &apos;%1&apos;을(를) 읽을 수 없습니다: %2</translation>
+    </message>
+    <message>
+        <source>Syntax error: %1</source>
+        <translation>문법 오류: %1</translation>
+    </message>
+    <message>
+        <source>The skin &quot;up&quot; image file &apos;%1&apos; does not exist.</source>
+        <translation>스킨 &quot;up&quot; 그림 파일 &apos;%1&apos;이(가) 존재하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>The skin &quot;down&quot; image file &apos;%1&apos; does not exist.</source>
+        <translation>스킨 &quot;down&quot; 그림 파일 &apos;%1&apos;이(가) 존재하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>The skin &quot;closed&quot; image file &apos;%1&apos; does not exist.</source>
+        <translation>스킨 &quot;closed&quot; 그림 파일 &apos;%1&apos;이(가) 존재하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>The skin cursor image file &apos;%1&apos; does not exist.</source>
+        <translation>스킨 커서 그림 파일 &apos;%1&apos;이(가) 존재하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Syntax error in area definition: %1</source>
+        <translation>영역 지정 문법 오류: %1</translation>
+    </message>
+    <message>
+        <source>Mismatch in number of areas, expected %1, got %2.</source>
+        <translation>영역 개수 오류가 일치하지 않음. %1개를 예상하였으나 %2개가 들어옴.</translation>
+    </message>
+</context>
+<context>
+    <name>QVFb</name>
+    <message>
+        <source>&amp;File</source>
+        <translation>파일(&amp;F)</translation>
+    </message>
+    <message>
+        <source>&amp;Configure...</source>
+        <translation>설정(&amp;C)...</translation>
+    </message>
+    <message>
+        <source>&amp;Save image...</source>
+        <translation>그림 저장(&amp;S)...</translation>
+    </message>
+    <message>
+        <source>&amp;Animation...</source>
+        <translation>애니메이션(&amp;A)...</translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation>끝내기(&amp;Q)</translation>
+    </message>
+    <message>
+        <source>&amp;View</source>
+        <translation>보기(&amp;V)</translation>
+    </message>
+    <message>
+        <source>Show &amp;Cursor</source>
+        <translation>커서 보이기(&amp;C)</translation>
+    </message>
+    <message>
+        <source>&amp;Refresh Rate...</source>
+        <translation>갱신 주기(&amp;R)...</translation>
+    </message>
+    <message>
+        <source>&amp;No rotation</source>
+        <translation>회전 없음(&amp;N)</translation>
+    </message>
+    <message>
+        <source>&amp;90° rotation</source>
+        <translation>90° 회전(&amp;9)</translation>
+    </message>
+    <message>
+        <source>1&amp;80° rotation</source>
+        <translation>180° 회전(&amp;8)</translation>
+    </message>
+    <message>
+        <source>2&amp;70° rotation</source>
+        <translation>270° 회전(&amp;7)</translation>
+    </message>
+    <message>
+        <source>Zoom scale &amp;0.5</source>
+        <translation>0.5배로 축소(&amp;0)</translation>
+    </message>
+    <message>
+        <source>Zoom scale 0.7&amp;5</source>
+        <translation>0.75배로 축소 (&amp;5)</translation>
+    </message>
+    <message>
+        <source>Zoom scale &amp;1</source>
+        <translation>1배로 크기 조정 (&amp;1)</translation>
+    </message>
+    <message>
+        <source>Zoom scale &amp;2</source>
+        <translation>2배로 확대(&amp;2)</translation>
+    </message>
+    <message>
+        <source>Zoom scale &amp;3</source>
+        <translation>3배로 확대(&amp;3)</translation>
+    </message>
+    <message>
+        <source>Zoom scale &amp;4</source>
+        <translation>4배로 확대(&amp;4)</translation>
+    </message>
+    <message>
+        <source>Zoom &amp;scale...</source>
+        <translation>크기 조정(&amp;S)...</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>도움말(&amp;H)</translation>
+    </message>
+    <message>
+        <source>&amp;About...</source>
+        <translation>정보(&amp;A)...</translation>
+    </message>
+    <message>
+        <source>Save Main Screen image</source>
+        <translation>주 화면 그림 저장</translation>
+    </message>
+    <message>
+        <source>snapshot.png</source>
+        <translation>snapshot.png</translation>
+    </message>
+    <message>
+        <source>Portable Network Graphics (*.png)</source>
+        <translation>Portable Network Graphics (*.png)</translation>
+    </message>
+    <message>
+        <source>Save Main Screen Image</source>
+        <translation>주 화면 그림 저장</translation>
+    </message>
+    <message>
+        <source>Save failed. Check that you have permission to write to the target directory.</source>
+        <translation>저장하는 데 실패하였습니다. 대상 디렉터리에 쓰기 권한이 있는지 확인하십시오.</translation>
+    </message>
+    <message>
+        <source>Save Second Screen image</source>
+        <translation>두 번째 화면 그림 저장</translation>
+    </message>
+    <message>
+        <source>Save Second Screen Image</source>
+        <translation>두 번째 화면 그림 저장</translation>
+    </message>
+    <message>
+        <source>About QVFB</source>
+        <translation>QVFB 정보</translation>
+    </message>
+    <message>
+        <source>&lt;h2&gt;The Qt for Embedded Linux Virtual X11 Framebuffer&lt;/h2&gt;&lt;p&gt;This application runs under Qt for X11, emulating a simple framebuffer, which the Qt for Embedded Linux server and clients can attach to just as if it was a hardware Linux framebuffer. &lt;p&gt;With the aid of this development tool, you can develop Qt for Embedded  Linux applications under X11 without having to switch to a virtual console. This means you can comfortably use your other development tools such as GUI profilers and debuggers.</source>
+        <translation>&lt;h2&gt;Qt for Embedded Linux 가상 X11 프레임버퍼&lt;/h2&gt;&lt;p&gt;이 프로그램은 Qt for X11 하에서 실행되며, Qt for Embedded Linux 서버 및 클라이언트가 하드웨어 리눅스 프레임버퍼처럼 사용할 수 있습니다.&lt;p&gt;이 도구를 사용하면 Qt for Embedded Linux 프로그램을 가상 콘솔 전환 없이 X11에서 개발할 수 있으며, GUI 프로파일러나 디버거를 사용할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation>찾아보기...</translation>
+    </message>
+    <message>
+        <source>Load Custom Skin...</source>
+        <translation>사용자 정의 스킨 불러오기...</translation>
+    </message>
+    <message>
+        <source>All QVFB Skins (*.skin)</source>
+        <translation>모든 QVFB 스킨 (*.skin)</translation>
+    </message>
+</context>
+<context>
+    <name>QVFbRateDialog</name>
+    <message>
+        <source>Target frame rate:</source>
+        <translation>대상 프레임 레이트:</translation>
+    </message>
+    <message>
+        <source>%1fps</source>
+        <translation>%1fps</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>확인</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>취소</translation>
+    </message>
+</context>
+</TS>