OpenLP

Merge lp:~trb143/openlp/trans1001-24 into lp:openlp/2.4

  1. trans1001-24
  2. Merge into 2.4
Proposed by Tim Bentley
Status: Merged
Merged at revision: 2665
Proposed branch: lp:~trb143/openlp/trans1001-24
Merge into: lp:openlp/2.4
Diff against target: 204 lines (+27/-25)
2 files modified
resources/i18n/ko.ts (+22/-22)
resources/i18n/ru.ts (+5/-3)
To merge this branch: bzr merge lp:~trb143/openlp/trans1001-24
Reviewer Review Type Date Requested Status
Tomas Groth Approve
Review via email: mp+314549@code.launchpad.net

Description of the change

More Translations

To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'resources/i18n/ko.ts'
2--- resources/i18n/ko.ts 2016-05-25 19:11:36 +0000
3+++ resources/i18n/ko.ts 2017-01-11 17:28:57 +0000
4@@ -8741,7 +8741,7 @@
5 <message>
6 <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="1066"/>
7 <source>File not found</source>
8- <translation type="unfinished"/>
9+ <translation>파일을 찾지 못함</translation>
10 </message>
11 <message>
12 <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="1066"/>
13@@ -9129,7 +9129,7 @@
14 <message>
15 <location filename="../../openlp/plugins/songs/forms/mediafilesdialog.py" line="66"/>
16 <source>Select one or more audio files from the list below, and click OK to import them into this song.</source>
17- <translation type="unfinished"/>
18+ <translation>하나 또는 여러개의 오디오 파일을 이하 리스트에서 선택하고 OK를 클릭하여 노래들을 가져옵니다.</translation>
19 </message>
20 </context>
21 <context>
22@@ -9137,7 +9137,7 @@
23 <message>
24 <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="142"/>
25 <source>Titles</source>
26- <translation type="unfinished"/>
27+ <translation>제목</translation>
28 </message>
29 <message>
30 <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="142"/>
31@@ -9152,7 +9152,7 @@
32 <message>
33 <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="142"/>
34 <source>Entire Song</source>
35- <translation type="unfinished"/>
36+ <translation>전체 노래</translation>
37 </message>
38 <message>
39 <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="132"/>
40@@ -9168,12 +9168,12 @@
41 <message>
42 <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="142"/>
43 <source>Search Titles...</source>
44- <translation type="unfinished"/>
45+ <translation>제목 검색</translation>
46 </message>
47 <message>
48 <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="142"/>
49 <source>Search Entire Song...</source>
50- <translation type="unfinished"/>
51+ <translation>전체 노래 검색</translation>
52 </message>
53 <message>
54 <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="142"/>
55@@ -9183,7 +9183,7 @@
56 <message>
57 <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="142"/>
58 <source>Search Authors...</source>
59- <translation type="unfinished"/>
60+ <translation>작곡자 검색</translation>
61 </message>
62 <message>
63 <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="364"/>
64@@ -9225,7 +9225,7 @@
65 <message>
66 <location filename="../../openlp/plugins/songs/lib/importers/opensong.py" line="139"/>
67 <source>Invalid OpenSong song file. Missing song tag.</source>
68- <translation type="unfinished"/>
69+ <translation>유효하지 않은 OpenSong 파일. Tag 유실.</translation>
70 </message>
71 </context>
72 <context>
73@@ -9233,7 +9233,7 @@
74 <message>
75 <location filename="../../openlp/plugins/songs/lib/importers/powersong.py" line="99"/>
76 <source>No songs to import.</source>
77- <translation type="unfinished"/>
78+ <translation>아무 노래도 가져오지 않음.</translation>
79 </message>
80 <message>
81 <location filename="../../openlp/plugins/songs/lib/importers/powersong.py" line="146"/>
82@@ -9327,7 +9327,7 @@
83 <message>
84 <location filename="../../openlp/plugins/songs/lib/importers/openoffice.py" line="86"/>
85 <source>File not found</source>
86- <translation type="unfinished"/>
87+ <translation>파일을 찾지 못함</translation>
88 </message>
89 </context>
90 <context>
91@@ -9335,22 +9335,22 @@
92 <message>
93 <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="229"/>
94 <source>Could not add your author.</source>
95- <translation type="unfinished"/>
96+ <translation>작성자를 추가할 수 없습니다.</translation>
97 </message>
98 <message>
99 <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="232"/>
100 <source>This author already exists.</source>
101- <translation type="unfinished"/>
102+ <translation>작성자가 이미 추가되어 있습니다.</translation>
103 </message>
104 <message>
105 <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="245"/>
106 <source>Could not add your topic.</source>
107- <translation type="unfinished"/>
108+ <translation>주제를 추가하지 못함</translation>
109 </message>
110 <message>
111 <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="248"/>
112 <source>This topic already exists.</source>
113- <translation type="unfinished"/>
114+ <translation>이 주제는 이미 존재합니다.</translation>
115 </message>
116 <message>
117 <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="262"/>
118@@ -9365,27 +9365,27 @@
119 <message>
120 <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="369"/>
121 <source>Could not save your changes.</source>
122- <translation type="unfinished"/>
123+ <translation>변경된 사항을 저장할 수 없습니다.</translation>
124 </message>
125 <message>
126 <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="309"/>
127 <source>Could not save your modified author, because the author already exists.</source>
128- <translation type="unfinished"/>
129+ <translation>변경된 작성자를 저장할 수 없습니다. 이미 작성자가 존재합니다.</translation>
130 </message>
131 <message>
132 <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="341"/>
133 <source>Could not save your modified topic, because it already exists.</source>
134- <translation type="unfinished"/>
135+ <translation>변경된 주제를 저장할 수 없습니다. 주제가 이미 존재합니다.</translation>
136 </message>
137 <message>
138 <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="466"/>
139 <source>Delete Author</source>
140- <translation type="unfinished"/>
141+ <translation>작성자 삭제</translation>
142 </message>
143 <message>
144 <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="466"/>
145 <source>Are you sure you want to delete the selected author?</source>
146- <translation type="unfinished"/>
147+ <translation>모든 선택된 저자를 삭제하는 것이 확실합니까?</translation>
148 </message>
149 <message>
150 <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="466"/>
151@@ -9395,12 +9395,12 @@
152 <message>
153 <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="478"/>
154 <source>Delete Topic</source>
155- <translation type="unfinished"/>
156+ <translation>주제 삭제</translation>
157 </message>
158 <message>
159 <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="478"/>
160 <source>Are you sure you want to delete the selected topic?</source>
161- <translation type="unfinished"/>
162+ <translation>선택된 주제를 삭제하는 것이 확실합니까?</translation>
163 </message>
164 <message>
165 <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="478"/>
166@@ -9410,7 +9410,7 @@
167 <message>
168 <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="489"/>
169 <source>Delete Book</source>
170- <translation>선경 삭제하기</translation>
171+ <translation>성경 삭제하기</translation>
172 </message>
173 <message>
174 <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="489"/>
175
176=== modified file 'resources/i18n/ru.ts'
177--- resources/i18n/ru.ts 2016-05-25 19:11:36 +0000
178+++ resources/i18n/ru.ts 2017-01-11 17:28:57 +0000
179@@ -7997,12 +7997,12 @@
180 <message>
181 <location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="198"/>
182 <source>iOS App</source>
183- <translation type="unfinished"/>
184+ <translation>iOS App</translation>
185 </message>
186 <message>
187 <location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="199"/>
188 <source>Scan the QR code or click &lt;a href=&quot;%s&quot;&gt;download&lt;/a&gt; to install the iOS app from the App Store.</source>
189- <translation type="unfinished"/>
190+ <translation>Просканируйте QR-код или нажмите &lt;a href=&quot;%s&quot;&gt;скачать&lt;/a&gt;, чтобы установить приложение для iOS из App Store.</translation>
191 </message>
192 </context>
193 <context>
194@@ -8791,7 +8791,9 @@
195 <source>Unable to find the following file:
196 %s
197 Do you want to remove the entry from the song?</source>
198- <translation type="unfinished"/>
199+ <translation>Неудалось найти указанный файл:
200+%s
201+Хотите удалить эту запись из Песни?</translation>
202 </message>
203 </context>
204 <context>

Subscribers

People subscribed via source and target branches

to all changes: