From 9384da4f428b0f2ce3172f32c34e342e53f235ac Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Fri, 31 Jan 2020 11:01:08 +0100 Subject: [PATCH 1/7] Adjust TextArea height --- qml/pages/Conversation.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/Conversation.qml b/qml/pages/Conversation.qml index fd8672d..fce4817 100644 --- 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?") From cfe158d92e6b2153ae253b78afdebb6e04a1f097 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Fri, 31 Jan 2020 11:01:30 +0100 Subject: [PATCH 2/7] Add contributor --- qml/pages/Settings.qml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/qml/pages/Settings.qml b/qml/pages/Settings.qml index 4eb6527..ef0ce22 100644 --- 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 { From aacbb35103fa275cf0b4897133612ebdf7b62cd3 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Fri, 31 Jan 2020 11:15:44 +0100 Subject: [PATCH 3/7] Updated translation files --- translations/harbour-tooter-de.ts | 14 +++++++++----- translations/harbour-tooter-el.ts | 4 ++++ translations/harbour-tooter-es.ts | 4 ++++ translations/harbour-tooter-fi.ts | 4 ++++ translations/harbour-tooter-fr.ts | 16 ++++++++-------- translations/harbour-tooter-nl.ts | 4 ++++ translations/harbour-tooter-nl_BE.ts | 4 ++++ translations/harbour-tooter-oc.ts | 4 ++++ translations/harbour-tooter-pl.ts | 4 ++++ translations/harbour-tooter-ru.ts | 4 ++++ translations/harbour-tooter-sr.ts | 4 ++++ translations/harbour-tooter-sv.ts | 4 ++++ translations/harbour-tooter-zh_CN.ts | 4 ++++ 13 files changed, 61 insertions(+), 13 deletions(-) diff --git a/translations/harbour-tooter-de.ts b/translations/harbour-tooter-de.ts index ca0ef13..62f0a6e 100644 --- a/translations/harbour-tooter-de.ts +++ b/translations/harbour-tooter-de.ts @@ -13,7 +13,7 @@ boosted - verstärkt + geboostet said @@ -135,7 +135,7 @@ MiniStatus boosted - verstärkt + geboostet favourited @@ -294,12 +294,16 @@ Added README file README-Datei erstellt + + Chinese translation + Chinesische Übersetzung + Toot boosted - verstärkt + geboostet favourited @@ -314,11 +318,11 @@ VisualContainer Unboost - + Nicht boosten Boost - + Boosten Unfavorite diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-el.ts index ad98c84..b4edd31 100644 --- a/translations/harbour-tooter-el.ts +++ b/translations/harbour-tooter-el.ts @@ -294,6 +294,10 @@ Added README file + + Chinese translation + + Toot diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts index e543c91..1fa0f80 100644 --- a/translations/harbour-tooter-es.ts +++ b/translations/harbour-tooter-es.ts @@ -294,6 +294,10 @@ Added README file + + Chinese translation + + Toot diff --git a/translations/harbour-tooter-fi.ts b/translations/harbour-tooter-fi.ts index e0f151b..d15d70b 100644 --- a/translations/harbour-tooter-fi.ts +++ b/translations/harbour-tooter-fi.ts @@ -294,6 +294,10 @@ Added README file + + Chinese translation + + Toot diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts index b1ca757..b1d54b0 100644 --- a/translations/harbour-tooter-fr.ts +++ b/translations/harbour-tooter-fr.ts @@ -268,31 +268,31 @@ Load Images in Toots - + Charger images dans pouets Maintainer of this release - + Développement de cette version Visual identity - + Identité visuelle Occitan & French translation - + Traduction français Dutch translation - + Traduction néerlandaise Spanish translation - + Traduction espagnole - Added README file - + Chinese translation + Traduction chinoise diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-nl.ts index 64991ef..896915a 100644 --- a/translations/harbour-tooter-nl.ts +++ b/translations/harbour-tooter-nl.ts @@ -294,6 +294,10 @@ Added README file + + Chinese translation + + Toot diff --git a/translations/harbour-tooter-nl_BE.ts b/translations/harbour-tooter-nl_BE.ts index 2b7cc75..b246e6c 100644 --- a/translations/harbour-tooter-nl_BE.ts +++ b/translations/harbour-tooter-nl_BE.ts @@ -294,6 +294,10 @@ Added README file + + Chinese translation + + Toot diff --git a/translations/harbour-tooter-oc.ts b/translations/harbour-tooter-oc.ts index 6adc797..4969598 100644 --- a/translations/harbour-tooter-oc.ts +++ b/translations/harbour-tooter-oc.ts @@ -294,6 +294,10 @@ Added README file + + Chinese translation + + Toot diff --git a/translations/harbour-tooter-pl.ts b/translations/harbour-tooter-pl.ts index bb427e2..458d9cc 100644 --- a/translations/harbour-tooter-pl.ts +++ b/translations/harbour-tooter-pl.ts @@ -294,6 +294,10 @@ Added README file + + Chinese translation + + Toot diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-ru.ts index f1559f1..eadd6e9 100644 --- a/translations/harbour-tooter-ru.ts +++ b/translations/harbour-tooter-ru.ts @@ -294,6 +294,10 @@ Added README file + + Chinese translation + + Toot diff --git a/translations/harbour-tooter-sr.ts b/translations/harbour-tooter-sr.ts index 007e282..4d4bb43 100644 --- a/translations/harbour-tooter-sr.ts +++ b/translations/harbour-tooter-sr.ts @@ -294,6 +294,10 @@ Added README file + + Chinese translation + + Toot diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-sv.ts index 8a6f8fa..7dfde30 100644 --- a/translations/harbour-tooter-sv.ts +++ b/translations/harbour-tooter-sv.ts @@ -294,6 +294,10 @@ Added README file + + Chinese translation + + Toot diff --git a/translations/harbour-tooter-zh_CN.ts b/translations/harbour-tooter-zh_CN.ts index 253d2c7..382ad50 100644 --- a/translations/harbour-tooter-zh_CN.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -294,6 +294,10 @@ Added README file + + Chinese translation + 汉语翻译 + Toot From 2db684eaf97c9122bd22927855bf5bc90bf9a092 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Fri, 31 Jan 2020 11:17:24 +0100 Subject: [PATCH 4/7] Updated translation files From c8815c0a3b55ed2907faf4533466f331a5f705d2 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Fri, 31 Jan 2020 11:21:57 +0100 Subject: [PATCH 5/7] Updated harbour-tooter-zh_CN.ts --- translations/harbour-tooter-zh_CN.ts | 36 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/translations/harbour-tooter-zh_CN.ts b/translations/harbour-tooter-zh_CN.ts index 382ad50..423eba0 100644 --- a/translations/harbour-tooter-zh_CN.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -36,31 +36,31 @@ Tap to insert - 点击插入 + 点击以插入 Write your warning here - + 在此编写你的警告信息 Public - + 公共区域 Unlisted - + 不公开 Followers-only - + 仅关注者 Direct - + 私信 What's on your mind? - + 有何想法? @@ -97,7 +97,7 @@ Enter a valid Mastodon instance URL - + 输入一个有效的 Mastodon 实例 URL @@ -217,11 +217,11 @@ Bio - + Bio Open Profile in Browser - + 在浏览器打开个人简介 @@ -268,33 +268,33 @@ Load Images in Toots - + Maintainer of this release - + 该发布的维护者 Visual identity - + 视觉识别 Occitan & French translation - + 奥克西坦语及法语翻译 Dutch translation - + 尼德兰语翻译 Spanish translation - + 西班牙语翻译 Added README file - + 已添加 README 文件 - + Chinese translation 汉语翻译 From b03c7263c963a3b038d3c13cc7e14d78e4edc782 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Fri, 31 Jan 2020 11:24:11 +0100 Subject: [PATCH 6/7] Update harbour-tooter-zh_CN.ts --- translations/harbour-tooter-zh_CN.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/harbour-tooter-zh_CN.ts b/translations/harbour-tooter-zh_CN.ts index 423eba0..af3aa97 100644 --- a/translations/harbour-tooter-zh_CN.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -294,7 +294,7 @@ Added README file 已添加 README 文件 - + Chinese translation 汉语翻译 From a577111642ac2ad1095e5f73d80bbb839dfa7a50 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 3 Feb 2020 19:53:36 +0100 Subject: [PATCH 7/7] 1.0.3-7 --- rpm/harbour-tooter.changes | 3 +++ rpm/harbour-tooter.spec | 2 +- rpm/harbour-tooter.yaml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rpm/harbour-tooter.changes b/rpm/harbour-tooter.changes index 0ea64c3..1c662cd 100644 --- a/rpm/harbour-tooter.changes +++ b/rpm/harbour-tooter.changes @@ -1,3 +1,6 @@ +* Thu Feb 03 2020 molan 1.0.3-7 +- Updated translations for new language strings + * Thu Jan 30 2020 molan 1.0.3-6 - Workaround for opening user profiles in toots - Show profile descriptions (Bio) with option to open them in Browser diff --git a/rpm/harbour-tooter.spec b/rpm/harbour-tooter.spec index cb08f7e..f37454f 100644 --- 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/ diff --git a/rpm/harbour-tooter.yaml b/rpm/harbour-tooter.yaml index 46b3515..af717af 100644 --- 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