Merge lp:~trb143/openlp/trans221 into lp:openlp/2.2

[Tim Bentley]

Fix Translations

[Tomas Groth (tomasgroth)]

review: Approve

[lp:~trb143/openlp/trans221]

2566. By Tim Bentley on 2015-10-23

Reset back as much as possible

2567. By Tim Bentley on 2015-10-23

Reset back as much as possible2

2568. By Tim Bentley on 2015-10-24

Next one

2569. By Tim Bentley on 2015-10-24

correct path

Unmerged revisions

=== modified file 'resources/i18n/de.ts'
--- resources/i18n/de.ts	2015-10-15 16:55:00 +0000
+++ resources/i18n/de.ts	2015-10-23 17:32:22 +0000
@@ -1,4 +1,5 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" sourcelanguage="" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage="">
 <context>
     <name>AlertsPlugin</name>
     <message>
@@ -96,14 +97,14 @@
     </message>
     <message>
         <location filename="openlp/plugins/alerts/forms/alertform.py" line="190"/>
-        <source>The alert text does not contain '&lt;&gt;'.
+        <source>The alert text does not contain &apos;&lt;&gt;&apos;.
 Do you want to continue anyway?</source>
         <translation>Der Hinweistext enthält nicht &apos;&lt;&gt;&apos;.
 Möchten Sie dennoch fortfahren?</translation>
     </message>
     <message>
         <location filename="openlp/plugins/alerts/forms/alertform.py" line="107"/>
-        <source>You haven't specified any text for your alert. 
+        <source>You haven&apos;t specified any text for your alert. 
 Please type in some text before clicking New.</source>
         <translation>Sie haben keinen Text für Ihren Hinweistext eingegeben.
 Bitte geben Sie etwas ein.</translation>
@@ -1778,7 +1779,10 @@
     <message numerus="yes">
         <location filename="openlp/plugins/custom/lib/mediaitem.py" line="186"/>
         <source>Are you sure you want to delete the %n selected custom slide(s)?</source>
-        <translation><numerusform>Soll die markierte Sonderfolie wirklich gelöscht werden?</numerusform><numerusform>Sollen die markierten %n Sonderfolien wirklich gelöscht werden?</numerusform></translation>
+        <translation>
+            <numerusform>Soll die markierte Sonderfolie wirklich gelöscht werden?</numerusform>
+            <numerusform>Sollen die markierten %n Sonderfolien wirklich gelöscht werden?</numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -2416,7 +2420,7 @@
 Find out more about OpenLP: http://openlp.org/
 
 OpenLP is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider volunteering by using the button below.</source>
-        <translation>OpenLP &lt;version&gt;&lt;revision&gt; - Open Lyrics Projection
+        <translation>OpenLP &lt;version&gt;&lt;revision&gt; - Open Source Lyrics Projection
 
 OpenLP ist ein freies Programm für Präsentationen in Kirchen. Es können Liedtexte, Bibelverse, Videos, Bilder und Präsentationen (wenn Impress, PowerPoint oder der PowerPoint Viewer installiert sind) mittels Beamer und Computer angezeigt werden.
 
@@ -2475,7 +2479,7 @@
         %s
     Japanese (ja)
         %s
-    Norwegian Bokmål (nb)
+    Norwegian Bokm&#xe5;l (nb)
         %s
     Dutch (nl)
         %s
@@ -2531,44 +2535,65 @@
 Übersetzer
     Afrikaans (af)
         %s
-    Deutsch (de)
-        %s
-    Englisch, Vereinigtes Königreich (en_GB)
-        %s
-    Englisch, Südafrika (en_ZA)
-        %s
-    Estnisch (et)
-        %s
-    Französisch (fr)
-        %s
-    Ungarisch (hu)
-        %s
-    Japanisch (ja)
-        %s
-    Norwegisch (nb)
-        %s
-    Niederländisch (nl)
-        %s
-    Portugiesisch, Brasilien (pt_BR)
-        %s
-    Russisch (ru)
+    Czech (cs)
+        %s
+    Danish (da)
+        %s
+    German (de)
+        %s
+    Greek (el)
+        %s
+    English, United Kingdom (en_GB)
+        %s
+    English, South Africa (en_ZA)
+        %s
+    Spanish (es)
+        %s
+    Estonian (et)
+        %s
+    Finnish (fi)
+        %s
+    French (fr)
+        %s
+    Hungarian (hu)
+        %s
+    Indonesian (id)
+        %s
+    Japanese (ja)
+        %s
+    Norwegian Bokmål (nb)
+        %s
+    Dutch (nl)
+        %s
+    Polish (pl)
+        %s
+    Portuguese, Brazil (pt_BR)
+        %s
+    Russian (ru)
+        %s
+    Swedish (sv)
+        %s
+    Tamil(Sri-Lanka) (ta_LK)
+        %s
+    Chinese(China) (zh_CN)
         %s
 
-Dokumentation
+Documentation
     %s
 
-Erstellt mit
+Built With
     Python: http://www.python.org/
-    Qt4: http://qt.nokia.com/
+    Qt4: http://qt.io
     PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro
-    Oxygen Icons: http://oxygen-icons.org/
+    Oxygen Icons: http://techbase.kde.org/Projects/Oxygen/
+    MuPDF: http://www.mupdf.com/
 
 Danke
-    »Denn so sehr hat Gott die Welt geliebt,
+    Denn so sehr hat Gott die Welt geliebt,
     daß er seinen eingeborenen Sohn
      hingegeben hat, damit alle, die an ihn
     glauben, nicht verloren gehen, sondern
-    ewiges Leben haben.«  -- Johannes 3, 16
+    ewiges Leben haben.  -- Johannes 3, 16
 
     Als Letztes, aber nicht zuletzt, geht unser
     Dank an Gott, unseren Vater, dafür, dass er
@@ -2580,8 +2605,8 @@
     </message>
     <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="270"/>
-        <source>Copyright © 2004-2015 %s
-Portions copyright © 2004-2015 %s</source>
+        <source>Copyright &#xa9; 2004-2015 %s
+Portions copyright &#xa9; 2004-2015 %s</source>
         <translation>Copyright © 2004-2015 %s
 Teil-Copyright © 2004-2015 %s</translation>
     </message>
@@ -3927,7 +3952,7 @@
 <context>
     <name>OpenLP.MainDisplay</name>
     <message>
-        <location filename="openlp/core/ui/maindisplay.py" line="213"/>
+        <location filename="openlp/core/ui/maindisplay.py" line="227"/>
         <source>OpenLP Display</source>
         <translation>OpenLP-Anzeige</translation>
     </message>
@@ -6949,7 +6974,7 @@
     </message>
     <message>
         <location filename="openlp/plugins/songs/lib/ui.py" line="37"/>
-        <source>©</source>
+        <source>&#xa9;</source>
         <comment>Copyright symbol.</comment>
         <translation>©</translation>
     </message>
@@ -9117,7 +9142,10 @@
     <message numerus="yes">
         <location filename="openlp/plugins/songs/lib/mediaitem.py" line="361"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
-        <translation><numerusform>Soll das markierte Lied wirklich gelöscht werden?</numerusform><numerusform>Sollen die markierten %n Lieder wirklich gelöscht werden?</numerusform></translation>
+        <translation>
+            <numerusform>Soll das markierte Lied wirklich gelöscht werden?</numerusform>
+            <numerusform>Sollen die markierten %n Lieder wirklich gelöscht werden?</numerusform>
+        </translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/lib/mediaitem.py" line="128"/>
@@ -9762,4 +9790,4 @@
         <translation>Es wurden keine Duplikate gefunden.</translation>
     </message>
 </context>
-</TS>
 \ No newline at end of file
+</TS>
 
=== modified file 'resources/i18n/et.ts'
--- resources/i18n/et.ts	2015-10-15 16:55:00 +0000
+++ resources/i18n/et.ts	2015-10-23 17:32:22 +0000
@@ -1,4 +1,5 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="et" sourcelanguage="" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="2.0" language="et" sourcelanguage="">
 <context>
     <name>AlertsPlugin</name>
     <message>
@@ -96,14 +97,14 @@
     </message>
     <message>
         <location filename="openlp/plugins/alerts/forms/alertform.py" line="190"/>
-        <source>The alert text does not contain '&lt;&gt;'.
+        <source>The alert text does not contain &apos;&lt;&gt;&apos;.
 Do you want to continue anyway?</source>
         <translation>Teate tekst ei sisalda &apos;&lt;&gt;&apos; märke.
 Kas tahad siiski jätkata?</translation>
     </message>
     <message>
         <location filename="openlp/plugins/alerts/forms/alertform.py" line="107"/>
-        <source>You haven't specified any text for your alert. 
+        <source>You haven&apos;t specified any text for your alert. 
 Please type in some text before clicking New.</source>
         <translation>Sa pole oma teatele teksti lisanud.
 Enne nupu Uus vajutamist sisesta mingi tekst.</translation>
@@ -1777,7 +1778,10 @@
     <message numerus="yes">
         <location filename="openlp/plugins/custom/lib/mediaitem.py" line="186"/>
         <source>Are you sure you want to delete the %n selected custom slide(s)?</source>
-        <translation><numerusform>Kas tahad kindlasti kustutada %n valitud kohandatud slaidi?</numerusform><numerusform>Kas tahad kindlasti kustutada %n valitud kohandatud slaidi?</numerusform></translation>
+        <translation>
+            <numerusform>Kas tahad kindlasti kustutada %n valitud kohandatud slaidi?</numerusform>
+            <numerusform>Kas tahad kindlasti kustutada %n valitud kohandatud slaidi?</numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -2415,7 +2419,7 @@
 Find out more about OpenLP: http://openlp.org/
 
 OpenLP is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider volunteering by using the button below.</source>
-        <translation>OpenLP &lt;version&gt;&lt;revision&gt; - avatud lähtekoodiga laulusõnade kuvaja
+        <translation>OpenLP &lt;version&gt;&lt;revision&gt; - Open Source Lyrics Projection
 
 OpenLP on tasuta kiriku esitlustarkvara või laulusõnade kuvaja, mis kuvab nii laule, piiblikohti, videoid, pilte ning isegi esitlusi (kui on paigaldatud Impress, PowerPoint või PowerPoint Viewer) kasutades selleks ainult arvutit ja projektorit.
 
@@ -2474,7 +2478,7 @@
         %s
     Japanese (ja)
         %s
-    Norwegian Bokmål (nb)
+    Norwegian Bokm&#xe5;l (nb)
         %s
     Dutch (nl)
         %s
@@ -2560,6 +2564,8 @@
 %s
 Hollandi (nl)
 %s
+Poola (pl)
+%s
 Portugali, Brasiilia (pt_BR)
 %s
 Vene (ru)
@@ -2575,11 +2581,11 @@
 %s
 
 Valmistamiseks kasutati
-Python: http://www.python.org
+Python: http://www.python.org/
 Qt4: http://qt.io
 PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro
-Oxygeni ikoonid: http://oxygen-icons.org
-MuPDF: http://www.mupdf.com
+Oxygeni ikoonid: http://techbase.kde.org/Projects/Oxygen/
+MuPDF: http://www.mupdf.com/
 
 Lõputänu
 &quot;Sest nõnda on Jumal maailma armastanud,
@@ -2595,8 +2601,8 @@
     </message>
     <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="270"/>
-        <source>Copyright © 2004-2015 %s
-Portions copyright © 2004-2015 %s</source>
+        <source>Copyright &#xa9; 2004-2015 %s
+Portions copyright &#xa9; 2004-2015 %s</source>
         <translation>Autoriõigus © 2004-2015 %s
 Osade autoriõigus © 2004-2015 %s</translation>
     </message>
@@ -3955,7 +3961,7 @@
 <context>
     <name>OpenLP.MainDisplay</name>
     <message>
-        <location filename="openlp/core/ui/maindisplay.py" line="213"/>
+        <location filename="openlp/core/ui/maindisplay.py" line="227"/>
         <source>OpenLP Display</source>
         <translation>OpenLP kuva</translation>
     </message>
@@ -5402,12 +5408,12 @@
     <message>
         <location filename="openlp/core/ui/projector/manager.py" line="476"/>
         <source>Delete projector (%s) %s?</source>
-        <translation type="unfinished"/>
+        <translation>Kas kustutada projektor (%s) %s?</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/projector/manager.py" line="478"/>
         <source>Are you sure you want to delete this projector?</source>
-        <translation type="unfinished"/>
+        <translation>Kas tahad kindlasti kustutada selle projektori?</translation>
     </message>
 </context>
 <context>
@@ -6978,7 +6984,7 @@
     </message>
     <message>
         <location filename="openlp/plugins/songs/lib/ui.py" line="37"/>
-        <source>©</source>
+        <source>&#xa9;</source>
         <comment>Copyright symbol.</comment>
         <translation>©</translation>
     </message>
@@ -9143,7 +9149,10 @@
     <message numerus="yes">
         <location filename="openlp/plugins/songs/lib/mediaitem.py" line="361"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
-        <translation><numerusform>Kas tahad kindlasti kustutada %n valitud laulu?</numerusform><numerusform>Kas tahad kindlasti kustutada %n valitud laulu?</numerusform></translation>
+        <translation>
+            <numerusform>Kas tahad kindlasti kustutada %n valitud laulu?</numerusform>
+            <numerusform>Kas tahad kindlasti kustutada %n valitud laulu?</numerusform>
+        </translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/lib/mediaitem.py" line="128"/>
@@ -9786,4 +9795,4 @@
         <translation>Andmebaasist ei leitud ühtegi dubleerivat laulu.</translation>
     </message>
 </context>
-</TS>
 \ No newline at end of file
+</TS>
 
=== modified file 'resources/i18n/zh_TW.ts'
--- resources/i18n/zh_TW.ts	2015-10-15 16:55:00 +0000
+++ resources/i18n/zh_TW.ts	2015-10-23 17:32:22 +0000
@@ -1,4 +1,5 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" sourcelanguage="" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="2.0" language="zh_TW" sourcelanguage="">
 <context>
     <name>AlertsPlugin</name>
     <message>
@@ -95,14 +96,14 @@
     </message>
     <message>
         <location filename="openlp/plugins/alerts/forms/alertform.py" line="190"/>
-        <source>The alert text does not contain '&lt;&gt;'.
+        <source>The alert text does not contain &apos;&lt;&gt;&apos;.
 Do you want to continue anyway?</source>
         <translation>警報訊息沒有包含&apos;&lt;&gt;&apos;，
 是否繼續？</translation>
     </message>
     <message>
         <location filename="openlp/plugins/alerts/forms/alertform.py" line="107"/>
-        <source>You haven't specified any text for your alert. 
+        <source>You haven&apos;t specified any text for your alert. 
 Please type in some text before clicking New.</source>
         <translation>您尚未在警報文字欄指定任何文字。
 請在新建前輸入一些文字。</translation>
@@ -1777,7 +1778,9 @@
     <message numerus="yes">
         <location filename="openlp/plugins/custom/lib/mediaitem.py" line="186"/>
         <source>Are you sure you want to delete the %n selected custom slide(s)?</source>
-        <translation><numerusform>您確定想要刪除這 %n 張選中的自訂幻燈片嗎?</numerusform></translation>
+        <translation>
+            <numerusform>您確定想要刪除這 %n 張選中的自訂幻燈片嗎?</numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -2417,13 +2420,13 @@
 Find out more about OpenLP: http://openlp.org/
 
 OpenLP is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider volunteering by using the button below.</source>
-        <translation>OpenLP &lt;version&gt;&lt;revision&gt; - 開放源碼歌詞投影
-
-OpenLP是一個免費的教會講道軟體或歌詞投影軟體，讓教會敬拜使用電腦及投影機來顯示歌詞、聖經經節、影片、圖片，甚至演講(如果已安?Impress, PowerPoint或PowerPoint Viewer)。
-
-查詢更多OpenLP訊息: http://openlp.org/
-
-OpenLP是由志願者編寫及維護。如果您想看到更多基督教軟體被編寫出來，請考慮點擊下面的按鈕來加入。</translation>
+        <translation>OpenLP &lt;version&gt;&lt;revision&gt; - Open Source Lyrics Projection
+
+OpenLP is free church presentation software, or lyrics projection software, used to display slides of songs, Bible verses, videos, images, and even presentations (if Impress, PowerPoint or PowerPoint Viewer is installed) for church worship using a computer and a data projector.
+
+Find out more about OpenLP: http://openlp.org/
+
+OpenLP is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider volunteering by using the button below.</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="663"/>
@@ -2476,6 +2479,88 @@
         %s
     Japanese (ja)
         %s
+    Norwegian Bokm&#xe5;l (nb)
+        %s
+    Dutch (nl)
+        %s
+    Polish (pl)
+        %s
+    Portuguese, Brazil (pt_BR)
+        %s
+    Russian (ru)
+        %s
+    Swedish (sv)
+        %s
+    Tamil(Sri-Lanka) (ta_LK)
+        %s
+    Chinese(China) (zh_CN)
+        %s
+
+Documentation
+    %s
+
+Built With
+    Python: http://www.python.org/
+    Qt4: http://qt.io
+    PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro
+    Oxygen Icons: http://techbase.kde.org/Projects/Oxygen/
+    MuPDF: http://www.mupdf.com/
+
+Final Credit
+    &quot;For God so loved the world that He gave
+    His one and only Son, so that whoever
+    believes in Him will not perish but inherit
+    eternal life.&quot;  -- John 3:16
+
+    And last but not least, final credit goes to
+    God our Father, for sending His Son to die
+    on the cross, setting us free from sin. We
+    bring this software to you for free because
+    He has set us free.</source>
+        <translation>Project Lead
+    %s
+
+Developers
+    %s
+
+Contributors
+    %s
+
+Testers
+    %s
+
+Packagers
+    %s
+
+Translators
+    Afrikaans (af)
+        %s
+    Czech (cs)
+        %s
+    Danish (da)
+        %s
+    German (de)
+        %s
+    Greek (el)
+        %s
+    English, United Kingdom (en_GB)
+        %s
+    English, South Africa (en_ZA)
+        %s
+    Spanish (es)
+        %s
+    Estonian (et)
+        %s
+    Finnish (fi)
+        %s
+    French (fr)
+        %s
+    Hungarian (hu)
+        %s
+    Indonesian (id)
+        %s
+    Japanese (ja)
+        %s
     Norwegian Bokmål (nb)
         %s
     Dutch (nl)
@@ -2513,94 +2598,12 @@
     God our Father, for sending His Son to die
     on the cross, setting us free from sin. We
     bring this software to you for free because
-    He has set us free.</source>
-        <translation>專案領導者
-%s
-
-開發群
-%s
-
-貢獻者
-%s
-
-測試群
-%s
-
-封裝
-%s
-
-翻譯群
-Afrikaans (af)
-%s
-Czech (cs)
-%s
-Danish (da)
-%s
-German (de)
-%s
-Greek (el)
-%s
-English, United Kingdom (en_GB)
-%s
-English, South Africa (en_ZA)
-%s
-Spanish (es)
-%s
-Estonian (et)
-%s
-Finnish (fi)
-%s
-French (fr)
-%s
-Hungarian (hu)
-%s
-Indonesian (id)
-%s
-Japanese (ja)
-%s
-Norwegian Bokmål (nb)
-%s
-Dutch (nl)
-%s
-Polish (pl)
-%s
-Portuguese, Brazil (pt_BR)
-%s
-Russian (ru)
-%s
-Swedish (sv)
-%s
-Tamil(Sri-Lanka) (ta_LK)
-%s
-Chinese(China) (zh_CN)
-%s
-Chinese(Taiwan) (zh_TW)
-%s
-
-文件
-%s
-
-建置於
-Python: http://www.python.org/
-Qt4: http://qt.io
-PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro
-Oxygen Icons: http://techbase.kde.org/Projects/Oxygen/
-MuPDF: http://www.mupdf.com/
-
-最後功勞-
-&quot;For God so loved the world that He gave
-His one and only Son, so that whoever
-believes in Him will not perish but inherit
-eternal life.&quot; -- John 3:16
-&quot;神愛世人，甚至將他的獨生子賜給他們，
-叫一切信他的，不致滅亡，反得永生。 &quot;-- 約翰福音 三:16
-
-最後但並非最不重要的，最終要歸於我們的父神，差祂的兒子死在十字架上，使我們赦免罪。我們把這個軟件給你自由，因祂已經給我們自由。</translation>
+    He has set us free.</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="270"/>
-        <source>Copyright © 2004-2015 %s
-Portions copyright © 2004-2015 %s</source>
+        <source>Copyright &#xa9; 2004-2015 %s
+Portions copyright &#xa9; 2004-2015 %s</source>
         <translation>Copyright © 2004-2015 %s⏎ 部分版權 © 2004-2015 %s</translation>
     </message>
 </context>
@@ -3952,7 +3955,7 @@
 <context>
     <name>OpenLP.MainDisplay</name>
     <message>
-        <location filename="openlp/core/ui/maindisplay.py" line="213"/>
+        <location filename="openlp/core/ui/maindisplay.py" line="227"/>
         <source>OpenLP Display</source>
         <translation>OpenLP 顯示</translation>
     </message>
@@ -5399,12 +5402,12 @@
     <message>
         <location filename="openlp/core/ui/projector/manager.py" line="476"/>
         <source>Delete projector (%s) %s?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/projector/manager.py" line="478"/>
         <source>Are you sure you want to delete this projector?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6975,7 +6978,7 @@
     </message>
     <message>
         <location filename="openlp/plugins/songs/lib/ui.py" line="37"/>
-        <source>©</source>
+        <source>&#xa9;</source>
         <comment>Copyright symbol.</comment>
         <translation>©</translation>
     </message>
@@ -9136,7 +9139,9 @@
     <message numerus="yes">
         <location filename="openlp/plugins/songs/lib/mediaitem.py" line="361"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
-        <translation><numerusform>您確定想要刪除這 %n 首選中的歌曲嗎？</numerusform></translation>
+        <translation>
+            <numerusform>您確定想要刪除這 %n 首選中的歌曲嗎？</numerusform>
+        </translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/lib/mediaitem.py" line="128"/>
@@ -9779,4 +9784,4 @@
         <translation>資料庫中找不到重複的歌曲。</translation>
     </message>
 </context>
-</TS>
 \ No newline at end of file
+</TS>