Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Adam <dev@robert-adam.de>2021-04-16 18:33:47 +0300
committerGitHub <noreply@github.com>2021-04-16 18:33:47 +0300
commitae3cc1ea692b8377dacd85e8dab71cff8827a5b6 (patch)
tree0ee0c0795c3c89d960439001c9933d89cf650d3b /src/mumble/mumble_bg.ts
parentc10d636cef79b07784318671df97dba6c1af2b83 (diff)
parentaffc426c5a0871611940bd5adee9f25da068e1d0 (diff)
Merge PR #4929: FIX(client): CrashReporter considering 2xx codes as errors
Apparently nobody has told Qt that 2xx HTTP status codes are considered success. Therefore checking QNetworkReply::error() in order to check whether the transfer was successful, does not work. Instead this commit makes sure that the raw HTTP status code is checked instead and if it is in range [200,299], the sending of the report is considered a success. Furthermore this commit reworks the Strings displayed to the user as these were excessively long. These formulations have been replaced with (hopefully) more concise versions. Fixes #4928
Diffstat (limited to 'src/mumble/mumble_bg.ts')
-rw-r--r--src/mumble/mumble_bg.ts16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mumble/mumble_bg.ts b/src/mumble/mumble_bg.ts
index c4c627535..4f3c1690e 100644
--- a/src/mumble/mumble_bg.ts
+++ b/src/mumble/mumble_bg.ts
@@ -3192,14 +3192,6 @@ Label of the server. This is what the server will be named like in your server l
<translation>Качването на данните за срива е неуспешно</translation>
</message>
<message>
- <source>We&apos;re really sorry, but it appears the crash upload has failed with error %1 %2. Please inform a developer.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>This really isn&apos;t funny, but apparently there&apos;s a bug in the crash reporting code, and we&apos;ve failed to upload the report. You may inform a developer about error %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Uploading crash report</source>
<translation>Качване на доклада</translation>
</message>
@@ -3207,6 +3199,14 @@ Label of the server. This is what the server will be named like in your server l
<source>Abort upload</source>
<translation>Прекратяване на качването</translation>
</message>
+ <message>
+ <source>HTTP error %1: &quot;%2&quot;</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Internal error encountered in CrashReporter.cpp: Received network reply does not contain an HTTP status code. Please inform a developer about error code %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Database</name>