Merge pull request #15 from molan-git/develop

1.0.3-7
2020-02-03 19:56:15 +01:00 · 2020-02-03 19:56:15 +01:00 · bc334e42f9
commit bc334e42f9
parent cff3d38d5b 4e1beaeb26
18 changed files with 79 additions and 16 deletions
--- a/qml/pages/Conversation.qml
+++ b/qml/pages/Conversation.qml
@ -207,7 +207,7 @@ Page {
 			text: description !== "" && (description.charAt(0) == '@'
 																	 || description.charAt(
 																		 0) == '#') ? description + ' ' : ''
-            height: Math.max(300, Math.min(900, implicitHeight))
+            height: Math.max(270, Math.min(900, implicitHeight))
            //height: implicitHeight
 			horizontalAlignment: Text.AlignLeft
            placeholderText: qsTr("What's on your mind?")
--- a/qml/pages/Settings.qml
+++ b/qml/pages/Settings.qml
@ -137,6 +137,12 @@ Page {
                            mastodon: "Quenti@framapiaf.org"
                            mail: ""
                        }
+                        ListElement {
+                            name: "Luchy Kon / dashinfantry"
+                            desc: qsTr("Chinese translation")
+                            mastodon: ""
+                            mail: "dashinfantry@gmail.com"
+                        }
                        ListElement {
                            name: "André Koot"
                            desc: qsTr("Dutch translation")
@ -149,6 +155,12 @@ Page {
                            mastodon: ""
                            mail: "carlosgonz@protonmail.com"
                        }
+                        ListElement {
+                            name: "Mohamed-Touhami MAHDI"
+                            desc: qsTr("Added README file")
+                            mastodon: "dragnucs@touha.me"
+                            mail: "touhami@touha.me"
+                        }
                    }

                    Item {
--- a/rpm/harbour-tooter.changes
+++ b/rpm/harbour-tooter.changes
@ -1,3 +1,6 @@
+* Thu Feb 03 2020 molan <mol_an@sunrise.ch> 1.0.3-7
+- Updated translations for new language strings
+
 * Thu Jan 30 2020 molan <mol_an@sunrise.ch> 1.0.3-6
 - Workaround for opening user profiles in toots
 - Show profile descriptions (Bio) with option to open them in Browser
--- a/rpm/harbour-tooter.spec
+++ b/rpm/harbour-tooter.spec
@ -14,7 +14,7 @@ Name:       harbour-tooter
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    Tooter
 Version:    1.0.3
-Release:    6
+Release:    7
 Group:      Qt/Qt
 License:    LICENSE
 URL:        http://example.org/
--- a/rpm/harbour-tooter.yaml
+++ b/rpm/harbour-tooter.yaml
@ -1,7 +1,7 @@
 Name: harbour-tooter
 Summary: Tooter
 Version: 1.0.3
-Release: 6
+Release: 7
 # The contents of the Group field should be one of the groups listed here:
 # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
 Group: Qt/Qt
--- a/translations/harbour-tooter-de.ts
+++ b/translations/harbour-tooter-de.ts
@ -13,7 +13,7 @@
    </message>
    <message>
        <source>boosted</source>
-        <translation>verstärkt</translation>
+        <translation>geboostet</translation>
    </message>
    <message>
        <source>said</source>
@ -135,7 +135,7 @@
    <name>MiniStatus</name>
    <message>
        <source>boosted</source>
-        <translation>verstärkt</translation>
+        <translation>geboostet</translation>
    </message>
    <message>
        <source>favourited</source>
@ -294,12 +294,16 @@
        <source>Added README file</source>
        <translation>README-Datei erstellt</translation>
    </message>
+    <message>
+        <source>Chinese translation</source>
+        <translation>Chinesische Übersetzung</translation>
+    </message>
 </context>
 <context>
    <name>Toot</name>
    <message>
        <source>boosted</source>
-        <translation>verstärkt</translation>
+        <translation>geboostet</translation>
    </message>
    <message>
        <source>favourited</source>
@ -314,11 +318,11 @@
    <name>VisualContainer</name>
    <message>
        <source>Unboost</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht boosten</translation>
    </message>
    <message>
        <source>Boost</source>
-        <translation type="unfinished"></translation>
+        <translation>Boosten</translation>
    </message>
    <message>
        <source>Unfavorite</source>
--- a/translations/harbour-tooter-el.ts
+++ b/translations/harbour-tooter-el.ts
@ -294,6 +294,10 @@
        <source>Added README file</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Chinese translation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Toot</name>
--- a/translations/harbour-tooter-es.ts
+++ b/translations/harbour-tooter-es.ts
@ -294,6 +294,10 @@
        <source>Added README file</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Chinese translation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Toot</name>
--- a/translations/harbour-tooter-fi.ts
+++ b/translations/harbour-tooter-fi.ts
@ -294,6 +294,10 @@
        <source>Added README file</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Chinese translation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Toot</name>
--- a/translations/harbour-tooter-fr.ts
+++ b/translations/harbour-tooter-fr.ts
@ -268,31 +268,31 @@
    </message>
    <message>
        <source>Load Images in Toots</source>
-        <translation type="unfinished"></translation>
+        <translation>Charger images dans pouets</translation>
    </message>
    <message>
        <source>Maintainer of this release</source>
-        <translation type="unfinished"></translation>
+        <translation>Développement de cette version</translation>
    </message>
    <message>
        <source>Visual identity</source>
-        <translation type="unfinished"></translation>
+        <translation type>Identité visuelle</translation>
    </message>
    <message>
        <source>Occitan &amp; French translation</source>
-        <translation type="unfinished"></translation>
+        <translation>Traduction français</translation>
    </message>
    <message>
        <source>Dutch translation</source>
-        <translation type="unfinished"></translation>
+        <translation>Traduction néerlandaise</translation>
    </message>
    <message>
        <source>Spanish translation</source>
-        <translation type="unfinished"></translation>
+        <translation>Traduction espagnole</translation>
    </message>
    <message>
-        <source>Added README file</source>
-        <translation type="unfinished"></translation>
+        <source>Chinese translation</source>
+        <translation>Traduction chinoise</translation>
    </message>
 </context>
 <context>
--- a/translations/harbour-tooter-nl.ts
+++ b/translations/harbour-tooter-nl.ts
@ -294,6 +294,10 @@
        <source>Added README file</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Chinese translation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Toot</name>
--- a/translations/harbour-tooter-nl_BE.ts
+++ b/translations/harbour-tooter-nl_BE.ts
@ -294,6 +294,10 @@
        <source>Added README file</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Chinese translation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Toot</name>
--- a/translations/harbour-tooter-oc.ts
+++ b/translations/harbour-tooter-oc.ts
@ -294,6 +294,10 @@
        <source>Added README file</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Chinese translation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Toot</name>
--- a/translations/harbour-tooter-pl.ts
+++ b/translations/harbour-tooter-pl.ts
@ -294,6 +294,10 @@
        <source>Added README file</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Chinese translation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Toot</name>
--- a/translations/harbour-tooter-ru.ts
+++ b/translations/harbour-tooter-ru.ts
@ -294,6 +294,10 @@
        <source>Added README file</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Chinese translation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Toot</name>
--- a/translations/harbour-tooter-sr.ts
+++ b/translations/harbour-tooter-sr.ts
@ -294,6 +294,10 @@
        <source>Added README file</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Chinese translation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Toot</name>
--- a/translations/harbour-tooter-sv.ts
+++ b/translations/harbour-tooter-sv.ts
@ -294,6 +294,10 @@
        <source>Added README file</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Chinese translation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Toot</name>
--- a/translations/harbour-tooter-zh_CN.ts
+++ b/translations/harbour-tooter-zh_CN.ts
@ -294,6 +294,10 @@
        <source>Added README file</source>
        <translation>已添加 README 文件</translation>
    </message>
+    <message>
+        <source>Chinese translation</source>
+        <translation>汉语翻译</translation>
+    </message>
 </context>
 <context>
    <name>Toot</name>