From 4a3d3dd61dfdb7f0f9c6a252b55787e50fe9dd74 Mon Sep 17 00:00:00 2001 From: Flohack74 Date: Sun, 4 Mar 2018 12:39:32 +0100 Subject: [PATCH 1/9] Debug cleanup --- telegram/app/telegram.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/telegram/app/telegram.cpp b/telegram/app/telegram.cpp index 7a9be580..d704d2c4 100644 --- a/telegram/app/telegram.cpp +++ b/telegram/app/telegram.cpp @@ -201,7 +201,6 @@ QSize Cutegram::imageSize(const QString &pt) return QSize(); QImage img(path); - qWarning() << "Image " << path << ", image size: " << img.size().width() << "x" << img.size().height(); return img.size(); } From e65084af18155385b45dc6a4378e75cddbf6ebf2 Mon Sep 17 00:00:00 2001 From: Flohack74 Date: Sun, 4 Mar 2018 12:45:17 +0100 Subject: [PATCH 2/9] Updating translations --- telegram/po/com.ubuntu.telegram.pot | 205 ++++++++++++++-------------- 1 file changed, 105 insertions(+), 100 deletions(-) diff --git a/telegram/po/com.ubuntu.telegram.pot b/telegram/po/com.ubuntu.telegram.pot index e1d7dfbb..c9a2070f 100644 --- a/telegram/po/com.ubuntu.telegram.pot +++ b/telegram/po/com.ubuntu.telegram.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-09 14:24+0100\n" +"POT-Creation-Date: 2018-03-04 12:43+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -110,8 +110,8 @@ msgstr "" #: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/IntroPageListModel.qml:17 #: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/TelegramHeader.qml:189 #: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/ui/dialogs/ConfirmationDialog.qml:8 -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/telegram.cpp:605 -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:101 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/telegram.cpp:604 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:105 #: /home/florian/UT-Apps/telegram-app/github/telegram/build_desktop/app/telegram.desktop.h:1 #: /home/florian/UT-Apps/telegram-app/github/telegram/build_desktop/scope/com.ubuntu.telegram_sctelegram.ini.h:1 msgid "Telegram" @@ -161,16 +161,17 @@ msgstr "" #: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountDialogPage.qml:33 #: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/ProfilePage.qml:60 -msgid "Channel Info" +msgid "Group Info" msgstr "" #: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountDialogPage.qml:33 #: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/ProfilePage.qml:60 -msgid "Group Info" +msgid "Channel Info" msgstr "" #: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountDialogPage.qml:33 -msgid "Profile Info" +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/ProfilePage.qml:60 +msgid "Contact Info" msgstr "" #: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountDialogPage.qml:44 @@ -178,17 +179,17 @@ msgid "Select all" msgstr "" #: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountDialogPage.qml:56 -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:239 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:238 msgid "Copy" msgstr "" #: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountDialogPage.qml:62 -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:261 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:260 msgid "Forward" msgstr "" #: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountDialogPage.qml:72 -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:225 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:224 msgid "Delete" msgstr "" @@ -209,102 +210,102 @@ msgstr "" msgid "Invalid password" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:53 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:54 #, qt-format msgid "You have invited %1 to join a secret chat." msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:55 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:56 #, qt-format msgid "%1 invited you to join a secret chat." msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:58 -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:289 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:59 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:307 msgid "You created the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:60 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:61 #, qt-format msgid "%1 created the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:66 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:67 #, qt-format msgid "You added %1" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:68 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:69 #, qt-format msgid "%1 added you" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:70 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:71 #, qt-format msgid "%1 joined the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:72 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:73 #, qt-format msgid "%1 added %2" msgstr "" #. TRANSLATORS: %1 is the person, who left the group chat. -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:78 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:79 #, qt-format msgid "%1 left the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:81 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:82 #, qt-format msgid "You removed %1" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:83 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:84 #, qt-format msgid "%1 removed you" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:85 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:86 #, qt-format msgid "%1 removed %2" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:93 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:94 #, qt-format msgid "You changed the group name to %1" msgstr "" #. TRANSLATORS: %1 is the person, who changed group name to title %2. -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:96 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:97 #, qt-format msgid "%1 changed the group name to %2" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:103 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:104 msgid "You changed the group photo" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:105 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:106 #, qt-format msgid "%1 changed the group photo" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:111 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:112 msgid "You removed the group photo" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:113 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:114 #, qt-format msgid "%1 removed the group photo" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:118 -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:321 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:119 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:339 msgid "You joined the group via invite link" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:120 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageAction.qml:121 #, qt-format msgid "%1 joined the group via invite link" msgstr "" @@ -318,31 +319,31 @@ msgstr "" msgid "New messages" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:245 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:244 msgid "Reply" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:252 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:251 msgid "Sticker Pack info" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:411 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:409 msgid "Secret chat requested." msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:423 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:421 msgid "" "Secret chat rejected or accepted from another device.\n" "Note that Android accepts secret chats automatically." msgstr "" #. TRANSLATORS: Button label to accept an incoming secret chat request. (Temporarily secret chats are automatically accepted.) -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:455 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:453 msgid "Accept" msgstr "" #. TRANSLATORS: Button label to reject an incoming secret chat request. (Temporarily secret chats are automatically accepted.) -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:469 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountMessageList.qml:467 msgid "Reject" msgstr "" @@ -765,10 +766,6 @@ msgstr "" msgid "Change Group Title" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/ProfilePage.qml:60 -msgid "Contact Info" -msgstr "" - #. TRANSLATORS: Placeholder for new group chat title #: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/ProfilePage.qml:180 msgid "New group chat title" @@ -883,7 +880,7 @@ msgstr "" #. TRANSLATORS: Used in attach menu, when sending a photo to the conversation. #: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/AttachPanel.qml:91 -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:276 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:294 msgid "Photo" msgstr "" @@ -966,98 +963,97 @@ msgstr "" msgid "Are you sure you want to clear history?" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:220 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:238 msgid "You: " msgstr "" #. TRANSLATORS: Indicates in a subtitle of a dialog list item that someone is typing. #. TRANSLATORS: Indicates in the chat header the contact is typing. -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:241 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:259 #: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/TelegramHeader.qml:86 msgid "typing..." msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:261 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:279 #, qt-format msgid "You changed the group title to %1" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:263 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:281 #, qt-format msgid "%1 changed the group title to %2" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:270 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:288 msgid "Voice message" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:272 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:290 msgid "Sticker" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:284 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:302 #, qt-format msgid "%1 joined your secret chat." msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:286 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:304 msgid "You joined the secret chat." msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:291 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:309 #, qt-format msgid "%1 created the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:297 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:315 #, qt-format msgid "You added %1" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:299 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:317 #, qt-format msgid "%1 added you" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:301 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:319 #, qt-format msgid "%1 joined the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:303 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:321 #, qt-format msgid "%1 added %2" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:308 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:326 #, qt-format msgid "%1 left the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:311 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:329 #, qt-format msgid "You removed %1" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:313 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:331 #, qt-format msgid "%1 removed you" msgstr "" #. TRANSLATORS: Notification message saying: person A removed person B (from a group) -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:315 -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:206 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:333 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:220 #, qt-format msgid "%1 removed %2" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:323 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/DialogsListItem.qml:341 #, qt-format msgid "%1 joined the group via invite link" msgstr "" -#. TRANSLATORS: %1 indicates contact from whom the message was frowarded from. -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/MessagesListItem.qml:211 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/MessagesListItem.qml:213 #, qt-format msgid "Forwarded from %1" msgstr "" @@ -1111,166 +1107,175 @@ msgid "h:mm:ss" msgstr "" #. TRANSLATORS: Format string: time. -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/telegram.cpp:287 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/telegram.cpp:286 msgid "HH:mm" msgstr "" #. TRANSLATORS: Format string: day and time (ex. Tue 21:30) -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/telegram.cpp:291 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/telegram.cpp:290 msgid "ddd HH:mm" msgstr "" #. TRANSLATORS: Format string: day and month (ex. 28 Feb) -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/telegram.cpp:295 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/telegram.cpp:294 msgid "dd MMM" msgstr "" #. TRANSLATORS: Format string: full date -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/telegram.cpp:298 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/telegram.cpp:297 msgid "dd MMM yy" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:110 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:114 msgid "sent you a message" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:114 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:118 msgid "sent you a photo" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:118 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:122 +msgid "sent you a sticker" +msgstr "" + +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:126 msgid "sent you a video" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:122 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:130 msgid "sent you a document" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:126 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:134 msgid "sent you a voice message" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:130 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:138 msgid "shared a contact with you" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:134 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:142 msgid "sent you a map" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:139 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:147 #, qt-format msgid "%1: %2" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:144 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:152 #, qt-format msgid "%1 sent a message to the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:149 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:157 #, qt-format msgid "%1 sent a photo to the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:154 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:162 +#, qt-format +msgid "%1 sent a sticker to the group" +msgstr "" + +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:168 #, qt-format msgid "%1 sent a video to the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:159 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:173 #, qt-format msgid "%1 sent a document to the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:164 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:178 #, qt-format msgid "%1 sent a voice message to the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:169 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:183 #, qt-format msgid "%1 sent a contact to the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:174 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:188 #, qt-format msgid "%1 sent a map to the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:179 -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:200 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:193 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:214 #, qt-format msgid "%1 invited you to the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:184 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:198 #, qt-format msgid "%1 changed group name" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:189 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:203 #, qt-format msgid "%1 changed group photo" msgstr "" #. TRANSLATORS: Notification message saying: person A invited person B (to a group) -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:195 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:209 #, qt-format msgid "%1 invited %2" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:211 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:225 #, qt-format msgid "%1 removed you from the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:216 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:230 #, qt-format msgid "%1 has left the group" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:221 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:235 #, qt-format msgid "%1 has returned to the group" msgstr "" #. TRANSLATORS: This format string tells location, like: @ McDonals, New York -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:226 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:240 #, qt-format msgid "@ %1" msgstr "" #. TRANSLATORS: This format string tells who has checked in (in a geographical location). -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:228 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:242 #, qt-format msgid "%1 has checked-in" msgstr "" #. TRANSLATORS: This format string tells who has just joined Telegram. -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:234 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:248 #, qt-format msgid "%1 joined Telegram!" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:239 -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:245 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:253 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:259 msgid "New login from unrecognized device" msgstr "" #. TRANSLATORS: This format string indicates new login of: (device name) at (location). -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:244 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:258 #, qt-format msgid "%1 @ %2" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:249 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:263 msgid "updated profile photo" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:254 -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:259 -#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:264 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:268 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:273 +#: /home/florian/UT-Apps/telegram-app/github/telegram/push/pushhelper.cpp:278 msgid "You have a new message" msgstr "" From 723dd5f35550badfe081f8bf6cd4c9cb3ab7920d Mon Sep 17 00:00:00 2001 From: Flohack74 Date: Sun, 4 Mar 2018 12:50:16 +0100 Subject: [PATCH 3/9] And again some translations update :) --- telegram/po/com.ubuntu.telegram.pot | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/telegram/po/com.ubuntu.telegram.pot b/telegram/po/com.ubuntu.telegram.pot index c9a2070f..c6204c82 100644 --- a/telegram/po/com.ubuntu.telegram.pot +++ b/telegram/po/com.ubuntu.telegram.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-04 12:43+0100\n" +"POT-Creation-Date: 2018-03-04 12:45+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -383,20 +383,30 @@ msgstr "" msgid "Select Chat" msgstr "" +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountSendMessage.qml:99 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountSendMessage.qml:110 +msgid "Unmute" +msgstr "" + +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountSendMessage.qml:99 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountSendMessage.qml:110 +msgid "Mute" +msgstr "" + #. TRANSLATORS: Placeholder for the message input text area. -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountSendMessage.qml:194 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountSendMessage.qml:220 msgid "Type message" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountSendMessage.qml:669 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountSendMessage.qml:695 msgid "Audio attachment not supported yet ;(" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountSendMessage.qml:671 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountSendMessage.qml:697 msgid "You have to press and hold the record icon" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountSendMessage.qml:765 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/AccountSendMessage.qml:792 msgid "Please grant microphone access on System Settings > Security & Privacy." msgstr "" @@ -1053,7 +1063,7 @@ msgstr "" msgid "%1 joined the group via invite link" msgstr "" -#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/MessagesListItem.qml:213 +#: /home/florian/UT-Apps/telegram-app/github/telegram/app/qml/components/MessagesListItem.qml:219 #, qt-format msgid "Forwarded from %1" msgstr "" From 8a05e49ae704135a157a2669f99cd6777809e0d1 Mon Sep 17 00:00:00 2001 From: Flohack74 Date: Sun, 4 Mar 2018 14:20:12 +0100 Subject: [PATCH 4/9] Fixing small bug with visibility of Avatar --- telegram/app/qml/components/MessagesListItem.qml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/telegram/app/qml/components/MessagesListItem.qml b/telegram/app/qml/components/MessagesListItem.qml index 33d7f76d..d0aef36f 100644 --- a/telegram/app/qml/components/MessagesListItem.qml +++ b/telegram/app/qml/components/MessagesListItem.qml @@ -128,8 +128,7 @@ ListItem { topMargin: units.gu(.5) } height: units.gu(5) - visible: message_item.visibleNames && !message.out && !(dialogIsChannel && !message_item.chat.megagroup) - + visible: message_item.visibleNames && !message.out && !(dialogIsChannel && !message_item.chat.megaGroup) telegram: telegramObject user: message_item.user isChat: false From 3424dcc3af643ad3bd240bb71db816b3f8772b91 Mon Sep 17 00:00:00 2001 From: Flohack74 Date: Sun, 4 Mar 2018 16:57:40 +0100 Subject: [PATCH 5/9] Experimental: Loading of messages starts earlier than on the hard end of the message list --- telegram/app/qml/AccountMessageList.qml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/telegram/app/qml/AccountMessageList.qml b/telegram/app/qml/AccountMessageList.qml index 9ff76a3b..335ac825 100644 --- a/telegram/app/qml/AccountMessageList.qml +++ b/telegram/app/qml/AccountMessageList.qml @@ -178,8 +178,15 @@ Rectangle { header: Item{ width: 4; height: units.dp(4) } footer: Item{ width: 4; height: units.dp(4) } - onAtYBeginningChanged: if( atYBeginning && contentHeight>height && - currentDialog != telegramObject.nullDialog ) messages_model.loadMore() +// onAtYBeginningChanged: if( atYBeginning && contentHeight>height && +// currentDialog != telegramObject.nullDialog ) + onContentYChanged: + if (contentHeight>height && (contentY - originY) * (height / contentHeight) < 250) + { + console.log("Reached loading window: ", (contentY - originY) * (height / contentHeight) ) + messages_model.loadMore() + } + section.property: "unreaded" section.criteria: ViewSection.FullString From 1338bcd3f5c9e1f10da020081a41245a6071d5ba Mon Sep 17 00:00:00 2001 From: Flohack74 Date: Mon, 5 Mar 2018 21:07:51 +0100 Subject: [PATCH 6/9] Making message boxes a bit bigger, we can use the space more efficiently --- telegram/app/qml/components/MessagesListItem.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telegram/app/qml/components/MessagesListItem.qml b/telegram/app/qml/components/MessagesListItem.qml index d0aef36f..3b0c38d3 100644 --- a/telegram/app/qml/components/MessagesListItem.qml +++ b/telegram/app/qml/components/MessagesListItem.qml @@ -26,7 +26,7 @@ ListItem { ? action_item.height : column.height + frameMargins*2 + textMargins*2 property real minimumHeight: contact_image.visible ? contact_image.height + units.gu(1) : 0 - property real maximumWidth: width * 0.75 - (contact_image.visible ? contact_image.width : 0) + property real maximumWidth: width * 0.85 - (contact_image.visible ? contact_image.width : 0) property real minimumWidth: 0 property real textMargins: units.dp(4) From a436ae7b7a310c080544e09516f8588bdc672387 Mon Sep 17 00:00:00 2001 From: Flohack74 Date: Mon, 5 Mar 2018 21:08:25 +0100 Subject: [PATCH 7/9] Versioning for 2.5.3 --- telegram/app/main.cpp | 2 +- telegram/app/qml/js/version.js | 2 +- telegram/manifest.json.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/telegram/app/main.cpp b/telegram/app/main.cpp index e7f806e2..525fc5af 100644 --- a/telegram/app/main.cpp +++ b/telegram/app/main.cpp @@ -27,7 +27,7 @@ int main(int argc, char *argv[]) AsemanApplication app(argc, argv); app.setApplicationName("Telegram"); app.setApplicationDisplayName("Telegram"); - app.setApplicationVersion("2.5.2.0"); + app.setApplicationVersion("2.5.3.0"); app.setOrganizationDomain("com.ubuntu.telegram"); app.setOrganizationName("com.ubuntu.telegram"); app.setWindowIcon(QIcon(":/qml/icons/telegram.png")); diff --git a/telegram/app/qml/js/version.js b/telegram/app/qml/js/version.js index 216c4dff..17341430 100644 --- a/telegram/app/qml/js/version.js +++ b/telegram/app/qml/js/version.js @@ -1 +1 @@ -var version = "2.5.2.0"; +var version = "2.5.3.0"; diff --git a/telegram/manifest.json.in b/telegram/manifest.json.in index 41b6e260..b2856ca3 100644 --- a/telegram/manifest.json.in +++ b/telegram/manifest.json.in @@ -21,6 +21,6 @@ "scope": "scope" } }, - "version": "2.5.2.0", + "version": "2.5.3.0", "maintainer": "UBports Telegram Team " } From 4b5fbeb16c9a27a730c95ea145e29def2cce76cc Mon Sep 17 00:00:00 2001 From: Flohack74 Date: Mon, 5 Mar 2018 21:08:50 +0100 Subject: [PATCH 8/9] Forgot to make the message reply item a bit smaller --- telegram/app/qml/MessageReplyItem.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telegram/app/qml/MessageReplyItem.qml b/telegram/app/qml/MessageReplyItem.qml index e88e714a..78fe987e 100644 --- a/telegram/app/qml/MessageReplyItem.qml +++ b/telegram/app/qml/MessageReplyItem.qml @@ -18,7 +18,7 @@ Item { property Message realMessage: (message && message.replyToMsgId != 0) ? telegram.message(message.replyToMsgId, dialog.peer.channelId) : replyMessage - property real maximumWidth: 100 + property real maximumWidth: 90 signal messageFocusRequest(int msgId, int channelId) From b5ec5f5f2dfbfaa39aceaba214051892e923d4f3 Mon Sep 17 00:00:00 2001 From: Flohack74 Date: Sat, 10 Mar 2018 17:21:16 +0100 Subject: [PATCH 9/9] Pushhelper: Was generating tons of debug output for nothing New style for the connectro icon: Exclamation mark during network reconnect. Prepare busy property New property enabled for the channel toolbar --- telegram/app/qml/AccountPage.qml | 2 +- telegram/app/qml/AccountSendMessage.qml | 2 +- telegram/app/qml/components/TelegramHeader.qml | 4 ++-- telegram/push/pushhelper.cpp | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/telegram/app/qml/AccountPage.qml b/telegram/app/qml/AccountPage.qml index baa8f478..0d3a573a 100644 --- a/telegram/app/qml/AccountPage.qml +++ b/telegram/app/qml/AccountPage.qml @@ -275,7 +275,7 @@ Page { extension: profiles.count > 1 ? sections : null trailingActionBar.actions: Action { visible: !telegram.connected || !Connectivity.online - iconName: !Connectivity.online? "sync-paused" : !telegram.connected? "sync-updating" : "ok" + iconName: telegram.busy? "sync-updating" : !telegram.connected? "sync-error" : "sync-paused" } } diff --git a/telegram/app/qml/AccountSendMessage.qml b/telegram/app/qml/AccountSendMessage.qml index 0348bc75..b65d187a 100644 --- a/telegram/app/qml/AccountSendMessage.qml +++ b/telegram/app/qml/AccountSendMessage.qml @@ -28,7 +28,7 @@ Rectangle { property int dialogId: isChannel ? currentDialog.peer.channelId : isChat ? currentDialog.peer.chatId : currentDialog.peer.userId property bool isMuted: telegramObject.userData.isMuted(dialogId) - property bool channelToolbar: isChannel && !chat.megaGroup && false //need to replace 'false' with the property saying if you can write messages to the channel or not + property bool channelToolbar: isChannel && !chat.megaGroup && !(chat.isCreator || chat.isEditor || chat.isModerator) signal accepted( string text, int inReplyTo ) signal copyRequest() diff --git a/telegram/app/qml/components/TelegramHeader.qml b/telegram/app/qml/components/TelegramHeader.qml index 4f50313a..272fcb2c 100644 --- a/telegram/app/qml/components/TelegramHeader.qml +++ b/telegram/app/qml/components/TelegramHeader.qml @@ -144,10 +144,10 @@ PageHeader { Rectangle { id: connectingIndicator anchors.fill: headerImage - visible: isConnecting || !Connectivity.online + visible: isConnecting || !Connectivity.online || telegram.busy color: "white" Icon { - name: isConnecting? "sync-updating" : "sync-paused" + name: telegram.busy? "sync-updating" : isConnecting? "sync-error" : "sync-paused" anchors.fill: parent } SequentialAnimation { diff --git a/telegram/push/pushhelper.cpp b/telegram/push/pushhelper.cpp index c3ea0d6a..3358ebea 100644 --- a/telegram/push/pushhelper.cpp +++ b/telegram/push/pushhelper.cpp @@ -84,6 +84,11 @@ QJsonObject PushHelper::pushToPostalMessage(const QJsonObject &push, QString &ta if (message.keys().contains("loc_key")) { key = message["loc_key"].toString(); // no-i18n } + + //Early bail-out: Telegram server just removes notification, message has been read elsewhere + if (key == "") + return QJsonObject(); + QJsonArray args; if (message.keys().contains("loc_args")) { args = message["loc_args"].toArray(); // no-i18n