From dbb8eecf292626a59b52d3c524d41f102716f235 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sun, 28 Jul 2019 16:16:02 +0200
Subject: [PATCH] media->file in error message, when image upload fails
---
resources/langs/nheko_de.ts | 23 ++++-------------------
resources/langs/nheko_el.ts | 23 ++++-------------------
resources/langs/nheko_en.ts | 23 ++++-------------------
resources/langs/nheko_fi.ts | 23 ++++-------------------
resources/langs/nheko_fr.ts | 23 ++++-------------------
resources/langs/nheko_nl.ts | 23 ++++-------------------
resources/langs/nheko_pl.ts | 27 ++++++---------------------
resources/langs/nheko_ru.ts | 27 ++++++---------------------
resources/langs/nheko_zh_CN.ts | 27 ++++++---------------------
src/dialogs/MemberList.cpp | 2 +-
src/dialogs/ReadReceipts.cpp | 2 +-
src/dialogs/RoomSettings.cpp | 6 +++---
src/dialogs/UserProfile.cpp | 2 +-
13 files changed, 48 insertions(+), 183 deletions(-)
diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts
index a3acae8ef..1f856b808 100644
--- a/resources/langs/nheko_de.ts
+++ b/resources/langs/nheko_de.ts
@@ -835,16 +835,11 @@ Medien-Größe: %2
<source>Close</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+11"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
- <location line="-55"/>
+ <location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@@ -952,12 +947,7 @@ Medien-Größe: %2
</translation>
</message>
<message>
- <location line="+71"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+69"/>
+ <location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -973,12 +963,12 @@ Medien-Größe: %2
</message>
<message>
<location line="+12"/>
- <source>The selected media is not an image</source>
+ <source>The selected file is not an image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
- <source>Error while reading media: %1</source>
+ <source>Error while reading file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1015,11 +1005,6 @@ Medien-Größe: %2
<source>Devices</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+39"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>emoji::Panel</name>
diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts
index 462f523eb..e50aadad7 100644
--- a/resources/langs/nheko_el.ts
+++ b/resources/langs/nheko_el.ts
@@ -833,16 +833,11 @@ Media size: %2
<source>Close</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+11"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
- <location line="-55"/>
+ <location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@@ -950,12 +945,7 @@ Media size: %2
</translation>
</message>
<message>
- <location line="+71"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+69"/>
+ <location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -971,12 +961,12 @@ Media size: %2
</message>
<message>
<location line="+12"/>
- <source>The selected media is not an image</source>
+ <source>The selected file is not an image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
- <source>Error while reading media: %1</source>
+ <source>Error while reading file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1013,11 +1003,6 @@ Media size: %2
<source>Devices</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+39"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>emoji::Panel</name>
diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts
index afd4c815e..e031c4ec0 100644
--- a/resources/langs/nheko_en.ts
+++ b/resources/langs/nheko_en.ts
@@ -833,16 +833,11 @@ Media size: %2
<source>Close</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+11"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
- <location line="-55"/>
+ <location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@@ -950,12 +945,7 @@ Media size: %2
</translation>
</message>
<message>
- <location line="+71"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+69"/>
+ <location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -971,12 +961,12 @@ Media size: %2
</message>
<message>
<location line="+12"/>
- <source>The selected media is not an image</source>
+ <source>The selected file is not an image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
- <source>Error while reading media: %1</source>
+ <source>Error while reading file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1013,11 +1003,6 @@ Media size: %2
<source>Devices</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+39"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>emoji::Panel</name>
diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts
index 789a4ebd9..2baba55db 100644
--- a/resources/langs/nheko_fi.ts
+++ b/resources/langs/nheko_fi.ts
@@ -833,16 +833,11 @@ Media size: %2
<source>Close</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+11"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
- <location line="-55"/>
+ <location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@@ -950,12 +945,7 @@ Media size: %2
</translation>
</message>
<message>
- <location line="+71"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+69"/>
+ <location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -971,12 +961,12 @@ Media size: %2
</message>
<message>
<location line="+12"/>
- <source>The selected media is not an image</source>
+ <source>The selected file is not an image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
- <source>Error while reading media: %1</source>
+ <source>Error while reading file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1013,11 +1003,6 @@ Media size: %2
<source>Devices</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+39"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>emoji::Panel</name>
diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts
index b8c0d6d92..355c43259 100644
--- a/resources/langs/nheko_fr.ts
+++ b/resources/langs/nheko_fr.ts
@@ -836,16 +836,11 @@ Taille du média : %2
<source>Close</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+11"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
- <location line="-55"/>
+ <location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@@ -953,12 +948,7 @@ Taille du média : %2
</translation>
</message>
<message>
- <location line="+71"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+69"/>
+ <location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -974,12 +964,12 @@ Taille du média : %2
</message>
<message>
<location line="+12"/>
- <source>The selected media is not an image</source>
+ <source>The selected file is not an image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
- <source>Error while reading media: %1</source>
+ <source>Error while reading file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1016,11 +1006,6 @@ Taille du média : %2
<source>Devices</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+39"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>emoji::Panel</name>
diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts
index b1be0135e..db56dc0fb 100644
--- a/resources/langs/nheko_nl.ts
+++ b/resources/langs/nheko_nl.ts
@@ -835,16 +835,11 @@ Mediagrootte: %2
<source>Close</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+11"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
- <location line="-55"/>
+ <location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@@ -952,12 +947,7 @@ Mediagrootte: %2
</translation>
</message>
<message>
- <location line="+71"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+69"/>
+ <location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -973,12 +963,12 @@ Mediagrootte: %2
</message>
<message>
<location line="+12"/>
- <source>The selected media is not an image</source>
+ <source>The selected file is not an image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
- <source>Error while reading media: %1</source>
+ <source>Error while reading file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1015,11 +1005,6 @@ Mediagrootte: %2
<source>Devices</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+39"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>emoji::Panel</name>
diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts
index 2f7c903c5..34a4ed264 100644
--- a/resources/langs/nheko_pl.ts
+++ b/resources/langs/nheko_pl.ts
@@ -835,16 +835,11 @@ Rozmiar multimediów: %2
<source>Close</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+11"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
- <location line="-55"/>
+ <location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@@ -955,12 +950,7 @@ Rozmiar multimediów: %2
</translation>
</message>
<message>
- <location line="+71"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+69"/>
+ <location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation>Nie udało się włączyć szyfrowania: %1</translation>
</message>
@@ -976,13 +966,13 @@ Rozmiar multimediów: %2
</message>
<message>
<location line="+12"/>
- <source>The selected media is not an image</source>
- <translation>Wybrany plik multimedialny nie jest obrazem</translation>
+ <source>The selected file is not an image</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
- <source>Error while reading media: %1</source>
- <translation>BÅ‚Ä…d odczytywania pliku: %1</translation>
+ <source>Error while reading file: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+35"/>
@@ -1018,11 +1008,6 @@ Rozmiar multimediów: %2
<source>Devices</source>
<translation>UrzÄ…dzenia</translation>
</message>
- <message>
- <location line="+39"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>emoji::Panel</name>
diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts
index 097067dbc..afe36ef94 100644
--- a/resources/langs/nheko_ru.ts
+++ b/resources/langs/nheko_ru.ts
@@ -836,16 +836,11 @@ Media size: %2
<source>Close</source>
<translation>Закрыть</translation>
</message>
- <message>
- <location line="+11"/>
- <source>ESC</source>
- <translation></translation>
- </message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
- <location line="-55"/>
+ <location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@@ -954,12 +949,7 @@ Media size: %2
</translation>
</message>
<message>
- <location line="+71"/>
- <source>ESC</source>
- <translation></translation>
- </message>
- <message>
- <location line="+69"/>
+ <location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation>Ðе удалоÑÑŒ включить шифрование: %1</translation>
</message>
@@ -975,13 +965,13 @@ Media size: %2
</message>
<message>
<location line="+12"/>
- <source>The selected media is not an image</source>
- <translation>Выбранное Ð¼ÐµÐ´Ð¸Ñ Ð½Ðµ ÑвлÑетÑÑ Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸ÐµÐ¼</translation>
+ <source>The selected file is not an image</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
- <source>Error while reading media: %1</source>
- <translation>Ошибка при чтении медиÑ: %1</translation>
+ <source>Error while reading file: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+35"/>
@@ -1017,11 +1007,6 @@ Media size: %2
<source>Devices</source>
<translation>УÑтройÑтва</translation>
</message>
- <message>
- <location line="+39"/>
- <source>ESC</source>
- <translation></translation>
- </message>
</context>
<context>
<name>emoji::Panel</name>
diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts
index 2481f9895..607b2ba95 100644
--- a/resources/langs/nheko_zh_CN.ts
+++ b/resources/langs/nheko_zh_CN.ts
@@ -835,16 +835,11 @@ Media size: %2
<source>Close</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+11"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
- <location line="-55"/>
+ <location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@@ -953,12 +948,7 @@ Media size: %2
</translation>
</message>
<message>
- <location line="+71"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+69"/>
+ <location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation>å¯ç”¨åŠ 密失败：%1</translation>
</message>
@@ -974,13 +964,13 @@ Media size: %2
</message>
<message>
<location line="+12"/>
- <source>The selected media is not an image</source>
- <translation>选择的媒体ä¸æ˜¯ä¸€ä¸ªå›¾åƒ</translation>
+ <source>The selected file is not an image</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
- <source>Error while reading media: %1</source>
- <translation>读å–媒体时失败：%1</translation>
+ <source>Error while reading file: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+35"/>
@@ -1016,11 +1006,6 @@ Media size: %2
<source>Devices</source>
<translation>设备</translation>
</message>
- <message>
- <location line="+39"/>
- <source>ESC</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>emoji::Panel</name>
diff --git a/src/dialogs/MemberList.cpp b/src/dialogs/MemberList.cpp
index 3b957c153..88a954038 100644
--- a/src/dialogs/MemberList.cpp
+++ b/src/dialogs/MemberList.cpp
@@ -126,7 +126,7 @@ MemberList::MemberList(const QString &room_id, QWidget *parent)
qCritical() << e.what();
}
- auto closeShortcut = new QShortcut(QKeySequence("ESC"), this);
+ auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this);
connect(closeShortcut, &QShortcut::activated, this, &MemberList::close);
connect(okBtn, &QPushButton::clicked, this, &MemberList::close);
}
diff --git a/src/dialogs/ReadReceipts.cpp b/src/dialogs/ReadReceipts.cpp
index 03ce3068c..5a0d98c78 100644
--- a/src/dialogs/ReadReceipts.cpp
+++ b/src/dialogs/ReadReceipts.cpp
@@ -133,7 +133,7 @@ ReadReceipts::ReadReceipts(QWidget *parent)
layout->addWidget(userList_);
layout->addLayout(buttonLayout);
- auto closeShortcut = new QShortcut(QKeySequence(tr("ESC")), this);
+ auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this);
connect(closeShortcut, &QShortcut::activated, this, &ReadReceipts::close);
connect(okBtn, &QPushButton::clicked, this, &ReadReceipts::close);
}
diff --git a/src/dialogs/RoomSettings.cpp b/src/dialogs/RoomSettings.cpp
index b2344f239..1fe5904bf 100644
--- a/src/dialogs/RoomSettings.cpp
+++ b/src/dialogs/RoomSettings.cpp
@@ -438,7 +438,7 @@ RoomSettings::RoomSettings(const QString &room_id, QWidget *parent)
resetErrorLabel();
});
- auto closeShortcut = new QShortcut(QKeySequence(tr("ESC")), this);
+ auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this);
connect(closeShortcut, &QShortcut::activated, this, &RoomSettings::close);
connect(okBtn, &QPushButton::clicked, this, &RoomSettings::close);
}
@@ -668,12 +668,12 @@ RoomSettings::updateAvatar()
QFile file{fileName, this};
if (format != "image") {
- displayErrorMessage(tr("The selected media is not an image"));
+ displayErrorMessage(tr("The selected file is not an image"));
return;
}
if (!file.open(QIODevice::ReadOnly)) {
- displayErrorMessage(tr("Error while reading media: %1").arg(file.errorString()));
+ displayErrorMessage(tr("Error while reading file: %1").arg(file.errorString()));
return;
}
diff --git a/src/dialogs/UserProfile.cpp b/src/dialogs/UserProfile.cpp
index b8040f9f3..6aea96a8c 100644
--- a/src/dialogs/UserProfile.cpp
+++ b/src/dialogs/UserProfile.cpp
@@ -183,7 +183,7 @@ UserProfile::UserProfile(QWidget *parent)
qRegisterMetaType<std::vector<DeviceInfo>>();
- auto closeShortcut = new QShortcut(QKeySequence(tr("ESC")), this);
+ auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this);
connect(closeShortcut, &QShortcut::activated, this, &UserProfile::close);
connect(okBtn, &QPushButton::clicked, this, &UserProfile::close);
}
--
GitLab