Merge pull request 'upstream_changes' (#11) from upstream_changes into master

Reviewed-on: #11

qml/components/InlineQuery.qml

@@ -40,7 +40,7 @@ Loader {
 
     property string chatId
     property string userName
-    property bool userNameIsValid: userName !== "" && inlineBotInformation && userName.toLowerCase() === inlineBotInformation.username.toLowerCase()
+    property bool userNameIsValid: userName !== "" && inlineBotInformation && userName.toLowerCase() === inlineBotInformation.usernames.editable_username.toLowerCase()
     property string query
     property int currentOffset: 0
     property string responseExtra: chatId+"|"+userName+"|"+query+"|"+currentOffset

qml/components/MessageListViewItem.qml

@@ -687,7 +687,7 @@ ListItem {
                             Image {
                                 id: emojiPicture
                                 source: Emoji.getEmojiPath(modelData)
-                                width: Theme.fontSizeLarge
+                                width: status === Image.Ready ? Theme.fontSizeLarge : 0
                                 height: Theme.fontSizeLarge
                             }
 

qml/components/MessageViaLabel.qml

@@ -31,12 +31,12 @@ Loader {
         property var botUserInformation: tdLibWrapper.getUserInformation(message.via_bot_user_id)
         color: Theme.secondaryColor
         font.pixelSize: Theme.fontSizeExtraSmall
-        text: qsTr("via %1", "message posted via bot user").arg("<a style=\"text-decoration: none; font-weight: bold; color:"+Theme.primaryColor+"\" href=\"userId://" + message.via_bot_user_id + "\">@" + Emoji.emojify(botUserInformation.username, font.pixelSize)+"</a>")
+        text: qsTr("via %1", "message posted via bot user").arg("<a style=\"text-decoration: none; font-weight: bold; color:"+Theme.primaryColor+"\" href=\"userId://" + message.via_bot_user_id + "\">@" + Emoji.emojify(botUserInformation.usernames.editable_username, font.pixelSize)+"</a>")
         textFormat: Text.RichText
         truncationMode: TruncationMode.Fade
         onLinkActivated: {
             if(link === "userId://" + message.via_bot_user_id && botUserInformation.type.is_inline) {
-                newMessageTextField.text = "@"+botUserInformation.username+" "
+                newMessageTextField.text = "@"+botUserInformation.usernames.editable_username+" "
                 newMessageTextField.cursorPosition = newMessageTextField.text.length
                 lostFocusTimer.start();
             }

qml/components/ReplyMarkupButtons.qml

@@ -60,12 +60,12 @@ Column {
                         },
                         inlineKeyboardButtonTypeSwitchInline: function() {
                             if(modelData.type.in_current_chat) {
-                                chatPage.setMessageText("@" + userInformation.username + " "+(modelData.type.query || ""))
+                                chatPage.setMessageText("@" + userInformation.usernames.editable_username + " "+(modelData.type.query || ""))
                             } else {
 
                                 pageStack.push(Qt.resolvedUrl("../pages/ChatSelectionPage.qml"), {
                                     myUserId: chatPage.myUserId,
-                                    payload: { neededPermissions: ["can_send_other_messages"], text:"@" + userInformation.username + " "+(modelData.type.query || "")},
+                                    payload: { neededPermissions: ["can_send_other_messages"], text:"@" + userInformation.usernames.editable_username + " "+(modelData.type.query || "")},
                                     state: "fillTextArea"
                                 })
                             }

qml/components/chatInformationPage/ChatInformationPageContent.qml

@@ -300,8 +300,8 @@ SilicaFlickable {
         }
         leftMargin: imageContainer.getEased((imageContainer.minDimension + Theme.paddingMedium), 0, imageContainer.tweenFactor) + Theme.horizontalPageMargin
         title: chatInformationPage.chatInformation.title !== "" ? Emoji.emojify(chatInformationPage.chatInformation.title, Theme.fontSizeLarge) : qsTr("Unknown")
-        description: ((chatInformationPage.isPrivateChat || chatInformationPage.isSecretChat) && chatInformationPage.privateChatUserInformation.username)
+        description: ((chatInformationPage.isPrivateChat || chatInformationPage.isSecretChat) && chatInformationPage.privateChatUserInformation.usernames.editable_username)
-            ? ("@"+chatInformationPage.privateChatUserInformation.username) : ""
+            ? ("@"+chatInformationPage.privateChatUserInformation.usernames.editable_username) : ""
     }
 
     SilicaFlickable {

qml/components/messageContent/MessageSticker.qml

@@ -27,7 +27,7 @@ MessageContentBase {
 
     property var stickerData: messageListItem ? messageListItem.myMessage.content.sticker : overlayFlickable.overlayMessage.content.sticker;
     readonly property bool asEmoji: appSettings.showStickersAsEmojis
-    readonly property bool animated: stickerData.type["@type"] === "stickerTypeAnimated" && appSettings.animateStickers
+    readonly property bool animated: stickerData.format["@type"] === "stickerFormatTgs" && appSettings.animateStickers
     readonly property bool stickerVisible: staticStickerLoader.item ? staticStickerLoader.item.visible :
         animatedStickerLoader.item ? animatedStickerLoader.item.visible : false
     readonly property bool isOwnSticker : messageListItem ? messageListItem.isOwnMessage : overlayFlickable.isOwnMessage

qml/components/settingsPage/SettingsSession.qml

@@ -30,37 +30,42 @@ AccordionItem {
         Column {
             id: activeSessionsItem
             bottomPadding: Theme.paddingMedium
-            property variant activeSessions;
+            property variant activeSessions
-            property bool loaded : false;
+            property int inactiveSessionsTtlDays
 
             Component.onCompleted: {
                 if (!activeSessions) {
                     tdLibWrapper.getActiveSessions();
-                } else {
-                    activeSessionsItem.loaded = true;
                 }
             }
 
             Connections {
                 target: tdLibWrapper
                 onSessionsReceived: {
-                    activeSessionsItem.activeSessions = sessions;
+                    activeSessionsItem.activeSessions = sessions
-                    activeSessionsItem.loaded = true;
+                    activeSessionsItem.inactiveSessionsTtlDays = inactive_session_ttl_days
                 }
                 onOkReceived: {
                     if (request === "terminateSession") {
                         appNotification.show(qsTr("Session was terminated"));
-                        activeSessionsItem.loaded = false;
                         tdLibWrapper.getActiveSessions();
                     }
                 }
             }
 
             Loader {
-                id: sessionInformationLoader
                 active: tdLibWrapper.authorizationState === TelegramAPI.AuthorizationReady
                 width: parent.width
                 sourceComponent: Component {
+                    Column {
+                        BusyIndicator {
+                            anchors.horizontalCenter: parent.horizontalCenter
+                            running: !activeSessionsListView.count && !activeSessionsItem.inactiveSessionsTtlDays
+                            size: BusyIndicatorSize.Medium
+                            visible: opacity > 0
+                            height: running ? implicitHeight : 0
+                        }
+
                         SilicaListView {
                             id: activeSessionsListView
                             width: parent.width
@@ -71,6 +76,7 @@ AccordionItem {
                                 width: parent.width
                                 color: Theme.primaryColor
                                 horizontalAlignment: Qt.AlignHCenter
+                                visible: activeSessionsListView.count > 0
                             }
                             delegate: ListItem {
                                 id: activeSessionListItem
@@ -111,9 +117,6 @@ AccordionItem {
                                         font.bold: true
                                         visible: modelData.is_current
                                         color: Theme.highlightColor
-                                    anchors {
-                                        horizontalCenter: parent.horizontalCenter
-                                    }
                                     }
 
                                     Label {
@@ -121,41 +124,28 @@ AccordionItem {
                                         text: modelData.application_name + " " + modelData.application_version
                                         font.pixelSize: Theme.fontSizeMedium
                                         font.bold: true
-                                    color: Theme.primaryColor
                                         maximumLineCount: 1
                                         elide: Text.ElideRight
-                                    anchors {
-                                        horizontalCenter: parent.horizontalCenter
-                                    }
                                     }
 
                                     Label {
                                         width: parent.width
                                         text: modelData.device_model + ", " + (modelData.platform + " " + modelData.system_version).trim()
                                         font.pixelSize: Theme.fontSizeSmall
-                                    color: Theme.primaryColor
                                         maximumLineCount: 1
                                         truncationMode: TruncationMode.Fade
-                                    anchors {
-                                        horizontalCenter: parent.horizontalCenter
-                                    }
                                     }
 
                                     Label {
                                         width: parent.width
                                         text: qsTr("Active since: %1, last online: %2").arg(Functions.getDateTimeTimepoint(modelData.log_in_date)).arg(Functions.getDateTimeElapsed(modelData.last_active_date))
                                         font.pixelSize: Theme.fontSizeExtraSmall
-                                    color: Theme.primaryColor
                                         maximumLineCount: 1
                                         truncationMode: TruncationMode.Fade
-                                    anchors {
-                                        horizontalCenter: parent.horizontalCenter
-                                    }
                                     }
                                 }
 
                                 Separator {
-                                id: separator
                                     anchors {
                                         bottom: parent.bottom
                                     }
@@ -164,7 +154,58 @@ AccordionItem {
                                     color: Theme.primaryColor
                                     horizontalAlignment: Qt.AlignHCenter
                                 }
+                            }
+                        }
 
+                        ComboBox {
+                            readonly property int ttl: activeSessionsItem.inactiveSessionsTtlDays
+                            label: qsTr("Terminate old sessions if inactive for")
+                            value: (currentItem && currentItem.text) ? currentItem.text : qsTr("%1 day(s)", "", ttl).arg(ttl)
+                            visible: ttl > 0
+                            menu: ContextMenu {
+                                id: ttlMenu
+                                MenuItem {
+                                    readonly property int days: 7
+                                    text: qsTr("1 week")
+                                    onClicked: tdLibWrapper.setInactiveSessionTtl(days)
+                                }
+                                MenuItem {
+                                    readonly property int days: 30
+                                    text: qsTr("1 month")
+                                    onClicked: tdLibWrapper.setInactiveSessionTtl(days)
+                                }
+                                MenuItem {
+                                    readonly property int days: 90
+                                    text: qsTr("3 months")
+                                    onClicked: tdLibWrapper.setInactiveSessionTtl(days)
+                                }
+                                MenuItem {
+                                    readonly property int days: 180
+                                    text: qsTr("6 months")
+                                    onClicked: tdLibWrapper.setInactiveSessionTtl(days)
+                                }
+                                MenuItem {
+                                    readonly property int days: 365
+                                    text: qsTr("1 year")
+                                    onClicked: tdLibWrapper.setInactiveSessionTtl(days)
+                                }
+                            }
+
+                            Component.onCompleted: updateSelection()
+
+                            onTtlChanged: updateSelection()
+
+                            function updateSelection() {
+                                var menuItems = ttlMenu.children
+                                var n = menuItems.length
+                                for (var i = 0; i < n; i++) {
+                                    if (menuItems[i].days === ttl) {
+                                        currentIndex = i
+                                        return
+                                    }
+                                }
+                                currentIndex = -1
+                            }
                         }
                     }
                 }

rpm/harbour-fernschreiber.spec

@@ -12,7 +12,7 @@ Name:       harbour-fernschreiber
 
 Summary:    Fernschreiber is a Telegram client for Aurora OS
 Version:    0.17
-Release:    4
+Release:    5
 Group:      Qt/Qt
 License:    LICENSE
 URL:        http://werkwolf.eu/

src/knownusersmodel.cpp

@@ -56,10 +56,10 @@ QVariant KnownUsersModel::data(const QModelIndex &index, int role) const
             case KnownUserRole::RoleDisplay: return requestedUser;
             case KnownUserRole::RoleUserId: return requestedUser.value("id");
             case KnownUserRole::RoleTitle: return QString(requestedUser.value("first_name").toString() + " " + requestedUser.value("last_name").toString()).trimmed();
-            case KnownUserRole::RoleUsername: return requestedUser.value("username");
+            case KnownUserRole::RoleUsername: return requestedUser.value("usernames").toMap().value("editable_username").toString();
-            case KnownUserRole::RoleUserHandle: return QString("@" + (requestedUser.value("username").toString().isEmpty() ? requestedUser.value("id").toString() : requestedUser.value("username").toString()));
+            case KnownUserRole::RoleUserHandle: return QString("@" + (requestedUser.value("usernames").toMap().value("editable_username").toString().isEmpty() ? requestedUser.value("id").toString() : requestedUser.value("usernames").toMap().value("editable_username").toString()));
             case KnownUserRole::RolePhotoSmall: return requestedUser.value("profile_photo").toMap().value("small");
-            case KnownUserRole::RoleFilter: return  QString(requestedUser.value("first_name").toString() + " " + requestedUser.value("last_name").toString() + " " + requestedUser.value("username").toString()).trimmed();
+            case KnownUserRole::RoleFilter: return  QString(requestedUser.value("first_name").toString() + " " + requestedUser.value("last_name").toString() + " " + requestedUser.value("usernames").toMap().value("editable_username").toString()).trimmed();
         }
     }
     return QVariant();

src/tdlibreceiver.cpp

@@ -712,8 +712,9 @@ void TDLibReceiver::processUpdateMessageInteractionInfo(const QVariantMap &recei
 
 void TDLibReceiver::processSessions(const QVariantMap &receivedInformation)
 {
+    int inactive_session_ttl_days = receivedInformation.value("inactive_session_ttl_days").toInt();
     QVariantList sessions = receivedInformation.value("sessions").toList();
-    emit sessionsReceived(sessions);
+    emit sessionsReceived(inactive_session_ttl_days, sessions);
 }
 
 void TDLibReceiver::processAvailableReactions(const QVariantMap &receivedInformation)

src/tdlibreceiver.h

@@ -101,7 +101,7 @@ signals:
     void userPrivacySettingRulesUpdated(const QVariantMap &updatedRules);
     void messageInteractionInfoUpdated(qlonglong chatId, qlonglong messageId, const QVariantMap &updatedInfo);
     void okReceived(const QString &request);
-    void sessionsReceived(const QVariantList &sessions);
+    void sessionsReceived(int inactive_session_ttl_days, const QVariantList &sessions);
     void availableReactionsReceived(qlonglong messageId, const QStringList &reactions);
     void chatUnreadMentionCountUpdated(qlonglong chatId, int unreadMentionCount);
     void chatUnreadReactionCountUpdated(qlonglong chatId, int unreadReactionCount);

src/tdlibwrapper.cpp

@@ -48,6 +48,8 @@ namespace {
     const QString LAST_NAME("last_name");
     const QString FIRST_NAME("first_name");
     const QString USERNAME("username");
+    const QString USERNAMES("usernames");
+    const QString EDITABLE_USERNAME("editable_username");
     const QString THREAD_ID("thread_id");
     const QString VALUE("value");
     const QString CHAT_LIST_TYPE("chat_list_type");
@@ -185,7 +187,7 @@ void TDLibWrapper::initializeTDLibReceiver() {
     connect(this->tdLibReceiver, SIGNAL(userPrivacySettingRulesUpdated(QVariantMap)), this, SLOT(handleUpdatedUserPrivacySettingRules(QVariantMap)));
     connect(this->tdLibReceiver, SIGNAL(messageInteractionInfoUpdated(qlonglong, qlonglong, QVariantMap)), this, SIGNAL(messageInteractionInfoUpdated(qlonglong, qlonglong, QVariantMap)));
     connect(this->tdLibReceiver, SIGNAL(okReceived(QString)), this, SIGNAL(okReceived(QString)));
-    connect(this->tdLibReceiver, SIGNAL(sessionsReceived(QVariantList)), this, SIGNAL(sessionsReceived(QVariantList)));
+    connect(this->tdLibReceiver, SIGNAL(sessionsReceived(int, QVariantList)), this, SIGNAL(sessionsReceived(int, QVariantList)));
     connect(this->tdLibReceiver, SIGNAL(availableReactionsReceived(qlonglong, QStringList)), this, SIGNAL(availableReactionsReceived(qlonglong, QStringList)));
     connect(this->tdLibReceiver, SIGNAL(chatUnreadMentionCountUpdated(qlonglong, int)), this, SIGNAL(chatUnreadMentionCountUpdated(qlonglong, int)));
     connect(this->tdLibReceiver, SIGNAL(chatUnreadReactionCountUpdated(qlonglong, int)), this, SIGNAL(chatUnreadReactionCountUpdated(qlonglong, int)));
@@ -411,19 +413,10 @@ QVariantMap TDLibWrapper::newSendMessageRequest(qlonglong chatId, qlonglong repl
     request.insert(_TYPE, "sendMessage");
     request.insert(CHAT_ID, chatId);
     if (replyToMessageId) {
-        if (versionNumber > VERSION_NUMBER(1,8,14)) {
         QVariantMap replyTo;
-            if (versionNumber > VERSION_NUMBER(1,8,20)) {
         replyTo.insert(_TYPE, TYPE_INPUT_MESSAGE_REPLY_TO_MESSAGE);
-            } else {
-                replyTo.insert(_TYPE, TYPE_MESSAGE_REPLY_TO_MESSAGE);
-            }
-            replyTo.insert(CHAT_ID, chatId);
         replyTo.insert(MESSAGE_ID, replyToMessageId);
         request.insert(REPLY_TO, replyTo);
-        } else {
-            request.insert(REPLY_TO_MESSAGE_ID, replyToMessageId);
-        }
     }
     return request;
 }
@@ -1527,6 +1520,14 @@ void TDLibWrapper::setNetworkType(NetworkType networkType)
     this->sendRequest(requestObject);
 }
 
+void TDLibWrapper::setInactiveSessionTtl(int days)
+{
+    QVariantMap requestObject;
+    requestObject.insert(_TYPE, "setInactiveSessionTtl");
+    requestObject.insert("inactive_session_ttl_days", days);
+    this->sendRequest(requestObject);
+}
+
 void TDLibWrapper::searchEmoji(const QString &queryString)
 {
     LOG("Searching emoji" << queryString);
@@ -1838,9 +1839,9 @@ void TDLibWrapper::handleUserUpdated(const QVariantMap &userInformation)
         this->userInformation = userInformation;
         emit ownUserUpdated(userInformation);
     }
-    LOG("User information updated:" << userInformation.value(USERNAME).toString() << userInformation.value(FIRST_NAME).toString() << userInformation.value(LAST_NAME).toString());
+    LOG("User information updated:" << userInformation.value(USERNAMES).toMap().value(EDITABLE_USERNAME).toString() << userInformation.value(FIRST_NAME).toString() << userInformation.value(LAST_NAME).toString());
     this->allUsers.insert(updatedUserId, userInformation);
-    this->allUserNames.insert(userInformation.value(USERNAME).toString(), userInformation);
+    this->allUserNames.insert(userInformation.value(USERNAMES).toMap().value(EDITABLE_USERNAME).toString(), userInformation);
     emit userUpdated(updatedUserId, userInformation);
 }
 
@@ -1854,7 +1855,7 @@ void TDLibWrapper::handleUserStatusUpdated(const QString &userId, const QVariant
     QVariantMap updatedUserInformation = this->allUsers.value(userId).toMap();
     updatedUserInformation.insert(STATUS, userStatusInformation);
     this->allUsers.insert(userId, updatedUserInformation);
-    this->allUserNames.insert(userInformation.value(USERNAME).toString(), userInformation);
+    this->allUserNames.insert(userInformation.value(USERNAMES).toMap().value(EDITABLE_USERNAME).toString(), userInformation);
     emit userUpdated(userId, updatedUserInformation);
 }
 

src/tdlibwrapper.h

@@ -251,6 +251,7 @@ public:
     Q_INVOKABLE void getPageSource(const QString &address);
     Q_INVOKABLE void setMessageReaction(qlonglong chatId, qlonglong messageId, const QString &reaction);
     Q_INVOKABLE void setNetworkType(NetworkType networkType);
+    Q_INVOKABLE void setInactiveSessionTtl(int days);
 
     // Others (candidates for extraction ;))
     Q_INVOKABLE void searchEmoji(const QString &queryString);
@@ -331,7 +332,7 @@ signals:
     void userPrivacySettingUpdated(UserPrivacySetting setting, UserPrivacySettingRule rule);
     void messageInteractionInfoUpdated(qlonglong chatId, qlonglong messageId, const QVariantMap &updatedInfo);
     void okReceived(const QString &request);
-    void sessionsReceived(const QVariantList &sessions);
+    void sessionsReceived(int inactive_session_ttl_days, const QVariantList &sessions);
     void openFileExternally(const QString &filePath);
     void availableReactionsReceived(qlonglong messageId, const QStringList &reactions);
     void chatUnreadMentionCountUpdated(qlonglong chatId, int unreadMentionCount);

translations/harbour-fernschreiber-de.ts

@@ -1704,6 +1704,37 @@
         <source>Sessions</source>
         <translation>Sitzungen</translation>
     </message>
+    <message>
+        <source>Terminate old sessions if inactive for</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 day(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>1 week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 year</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsStorage</name>

translations/harbour-fernschreiber-en.ts

@@ -1706,6 +1706,37 @@ messages</numerusform>
         <source>Active since: %1, last online: %2</source>
         <translation>Active since: %1, last online: %2</translation>
     </message>
+    <message>
+        <source>Terminate old sessions if inactive for</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 day(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>1 week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 year</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsStorage</name>

translations/harbour-fernschreiber-es.ts

@@ -1704,6 +1704,37 @@
         <source>Active since: %1, last online: %2</source>
         <translation>Activo desde: %1, último en línea: %2</translation>
     </message>
+    <message>
+        <source>Terminate old sessions if inactive for</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 day(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>1 week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 year</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsStorage</name>

translations/harbour-fernschreiber-fi.ts

@@ -1705,6 +1705,37 @@
         <source>Active since: %1, last online: %2</source>
         <translation>Aktiivinen %1 alkaen, viimeksi paikalla: %2</translation>
     </message>
+    <message>
+        <source>Terminate old sessions if inactive for</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 day(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>1 week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 year</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsStorage</name>

translations/harbour-fernschreiber-fr.ts

@@ -1704,6 +1704,37 @@
         <source>Active since: %1, last online: %2</source>
         <translation>Actif depuis : %1, en ligne : %2</translation>
     </message>
+    <message>
+        <source>Terminate old sessions if inactive for</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 day(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>1 week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 year</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsStorage</name>

translations/harbour-fernschreiber-hu.ts

@@ -1677,6 +1677,36 @@
         <source>Active since: %1, last online: %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Terminate old sessions if inactive for</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 day(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>1 week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 year</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsStorage</name>

translations/harbour-fernschreiber-it.ts

@@ -1704,6 +1704,37 @@
         <source>Active since: %1, last online: %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Terminate old sessions if inactive for</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 day(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>1 week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 year</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsStorage</name>

translations/harbour-fernschreiber-pl.ts

@@ -1731,6 +1731,38 @@
         <source>Active since: %1, last online: %2</source>
         <translation>Aktywny od: %1, ostatnio aktywny: %2</translation>
     </message>
+    <message>
+        <source>Terminate old sessions if inactive for</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 day(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>1 week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 year</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsStorage</name>

translations/harbour-fernschreiber-ru.ts

@@ -1734,6 +1734,38 @@
         <source>Active since: %1, last online: %2</source>
         <translation>Активен с: %1, был онлайн: %2</translation>
     </message>
+    <message>
+        <source>Terminate old sessions if inactive for</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 day(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>1 week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 year</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsStorage</name>

translations/harbour-fernschreiber-sk.ts

@@ -1731,6 +1731,38 @@
         <source>Active since: %1, last online: %2</source>
         <translation>Aktívna od: %1, naposledy pripojená: %2</translation>
     </message>
+    <message>
+        <source>Terminate old sessions if inactive for</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 day(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>1 week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 year</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsStorage</name>

translations/harbour-fernschreiber-sv.ts

@@ -1704,6 +1704,37 @@
         <source>Active since: %1, last online: %2</source>
         <translation>Aktiv sedan: %1, senast online: %2</translation>
     </message>
+    <message>
+        <source>Terminate old sessions if inactive for</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 day(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>1 week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 year</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsStorage</name>

translations/harbour-fernschreiber-zh_CN.ts

@@ -1678,6 +1678,36 @@
         <source>Active since: %1, last online: %2</source>
         <translation>活跃时间: %1, 上次在线: %2</translation>
     </message>
+    <message>
+        <source>Terminate old sessions if inactive for</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 day(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>1 week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 year</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsStorage</name>

translations/harbour-fernschreiber.ts

@@ -1704,6 +1704,37 @@
         <source>Active since: %1, last online: %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Terminate old sessions if inactive for</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 day(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>1 week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6 months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 year</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsStorage</name>