Skip to content

Commit 5c3e5d1

Browse files
Kvel2DKvel2D
committed
fix arch and file type translations
QT_TRANSLATE_NOOP doesn't work for some reason
1 parent 8dca8c8 commit 5c3e5d1

File tree

5 files changed

+94
-102
lines changed

5 files changed

+94
-102
lines changed

‎app/architecture.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@ QStringList architecture_strings(const Architecture architecture) {
5555

5656
QString architecture_name(const Architecture architecture) {
5757
switch (architecture) {
58-
case Architecture_ALL: return QT_TRANSLATE_NOOP("arch", "All");
59-
case Architecture_X86_64: return QT_TRANSLATE_NOOP("arch", "AMD 64bit");
60-
case Architecture_X86: return QT_TRANSLATE_NOOP("arch", "Intel 32bit");
61-
case Architecture_ARM: return QT_TRANSLATE_NOOP("arch", "ARM v7");
62-
case Architecture_AARCH64: return QT_TRANSLATE_NOOP("arch", "AArch64");
63-
case Architecture_MIPSEL: return QT_TRANSLATE_NOOP("arch", "MIPS");
64-
case Architecture_RISCV64: return QT_TRANSLATE_NOOP("arch", "RiscV64");
65-
case Architecture_E2K: return QT_TRANSLATE_NOOP("arch", "Elbrus");
66-
case Architecture_PPC64LE: return QT_TRANSLATE_NOOP("arch", "PowerPC");
67-
case Architecture_UNKNOWN: return QT_TRANSLATE_NOOP("arch", "Unknown");
58+
case Architecture_ALL: return QObject::tr("All");
59+
case Architecture_X86_64: return QObject::tr("AMD 64bit");
60+
case Architecture_X86: return QObject::tr("Intel 32bit");
61+
case Architecture_ARM: return QObject::tr("ARM v7");
62+
case Architecture_AARCH64: return QObject::tr("AArch64");
63+
case Architecture_MIPSEL: return QObject::tr("MIPS");
64+
case Architecture_RISCV64: return QObject::tr("RiscV64");
65+
case Architecture_E2K: return QObject::tr("Elbrus");
66+
case Architecture_PPC64LE: return QObject::tr("PowerPC");
67+
case Architecture_UNKNOWN: return QObject::tr("Unknown");
6868
case Architecture_COUNT: return QString();
6969
}
7070
return QString();

‎app/file_type.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ QStringList file_type_strings(const FileType file_type) {
3333

3434
QString file_type_name(const FileType file_type) {
3535
switch (file_type) {
36-
case FileType_ISO: return QT_TRANSLATE_NOOP("file type", "ISO DVD");
37-
case FileType_TAR: return QT_TRANSLATE_NOOP("file type", "TAR Archive");
38-
case FileType_TAR_GZ: return QT_TRANSLATE_NOOP("file type", "GZIP TAR Archive");
39-
case FileType_TAR_XZ: return QT_TRANSLATE_NOOP("file type", "LZMA TAR Archive");
40-
case FileType_IMG: return QT_TRANSLATE_NOOP("file type", "IMG");
41-
case FileType_IMG_GZ: return QT_TRANSLATE_NOOP("file type", "GZIP IMG");
42-
case FileType_IMG_XZ: return QT_TRANSLATE_NOOP("file type", "LZMA IMG");
43-
case FileType_RECOVERY_TAR: return QT_TRANSLATE_NOOP("file type", "Recovery TAR Archive");
44-
case FileType_UNKNOWN: return QT_TRANSLATE_NOOP("file type", "Unknown");
36+
case FileType_ISO: return QObject::tr("ISO DVD");
37+
case FileType_TAR: return QObject::tr("TAR Archive");
38+
case FileType_TAR_GZ: return QObject::tr("GZIP TAR Archive");
39+
case FileType_TAR_XZ: return QObject::tr("LZMA TAR Archive");
40+
case FileType_IMG: return QObject::tr("IMG");
41+
case FileType_IMG_GZ: return QObject::tr("GZIP IMG");
42+
case FileType_IMG_XZ: return QObject::tr("LZMA IMG");
43+
case FileType_RECOVERY_TAR: return QObject::tr("Recovery TAR Archive");
44+
case FileType_UNKNOWN: return QObject::tr("Unknown");
4545
case FileType_COUNT: return QString();
4646
}
4747
return QString();

‎app/file_type.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#ifndef FILE_TYPE_H
2424
#define FILE_TYPE_H
2525

26-
#include <QObject>
2726
#include <QList>
2827
#include <QString>
2928

‎translations/ru.qm‎

-45 Bytes
Binary file not shown.

‎translations/ru.ts‎

Lines changed: 75 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,81 @@
188188
<translation>UDisks2 отсутствует, или к нему нет доступа на вашей системе.</translation>
189189
</message>
190190
</context>
191+
<context>
192+
<name>QObject</name>
193+
<message>
194+
<source>All</source>
195+
<translation>Все</translation>
196+
</message>
197+
<message>
198+
<source>AMD 64bit</source>
199+
<translation>AMD 64bit</translation>
200+
</message>
201+
<message>
202+
<source>Intel 32bit</source>
203+
<translation>Intel 32bit</translation>
204+
</message>
205+
<message>
206+
<source>ARM v7</source>
207+
<translation>ARM v7</translation>
208+
</message>
209+
<message>
210+
<source>AArch64</source>
211+
<translation>AArch64</translation>
212+
</message>
213+
<message>
214+
<source>MIPS</source>
215+
<translation>MIPS</translation>
216+
</message>
217+
<message>
218+
<source>RiscV64</source>
219+
<translation>RiscV64</translation>
220+
</message>
221+
<message>
222+
<source>Elbrus</source>
223+
<translation>Эльбрус</translation>
224+
</message>
225+
<message>
226+
<source>PowerPC</source>
227+
<translation>PowerPC</translation>
228+
</message>
229+
<message>
230+
<source>Unknown</source>
231+
<translation>Unknown</translation>
232+
</message>
233+
<message>
234+
<source>ISO DVD</source>
235+
<translation>ISO DVD</translation>
236+
</message>
237+
<message>
238+
<source>TAR Archive</source>
239+
<translation>TAR архив</translation>
240+
</message>
241+
<message>
242+
<source>GZIP TAR Archive</source>
243+
<translation>GZIP TAR архив</translation>
244+
</message>
245+
<message>
246+
<source>LZMA TAR Archive</source>
247+
<translation>LZMA TAR архив</translation>
248+
</message>
249+
<message>
250+
<source>IMG</source>
251+
<translation>IMG</translation>
252+
</message>
253+
<message>
254+
<source>GZIP IMG</source>
255+
<translation>GZIP IMG</translation>
256+
</message>
257+
<message>
258+
<source>LZMA IMG</source>
259+
<translation>LZMA IMG</translation>
260+
</message>
261+
<message>
262+
<source>Recovery TAR Archive</source>
263+
<translation>Recovery TAR архив</translation>
264+
</message>
265+
</context>
191266
<context>
192267
<name>Release</name>
193268
<message>
@@ -381,88 +456,6 @@
381456
<translation>Не удалось разблокировать диск</translation>
382457
</message>
383458
</context>
384-
<context>
385-
<name>arch</name>
386-
<message>
387-
<source>All</source>
388-
<translation>Все</translation>
389-
</message>
390-
<message>
391-
<source>AMD 64bit</source>
392-
<translation>AMD 64bit</translation>
393-
</message>
394-
<message>
395-
<source>Intel 32bit</source>
396-
<translation>Intel 32bit</translation>
397-
</message>
398-
<message>
399-
<source>ARM v7</source>
400-
<translation>ARM v7</translation>
401-
</message>
402-
<message>
403-
<source>AArch64</source>
404-
<translation>AArch64</translation>
405-
</message>
406-
<message>
407-
<source>MIPS</source>
408-
<translation>MIPS</translation>
409-
</message>
410-
<message>
411-
<source>RiscV64</source>
412-
<translation>RiscV64</translation>
413-
</message>
414-
<message>
415-
<source>Elbrus</source>
416-
<translation>Эльбрус</translation>
417-
</message>
418-
<message>
419-
<source>PowerPC</source>
420-
<translation>PowerPC</translation>
421-
</message>
422-
<message>
423-
<source>Unknown</source>
424-
<translation>Unknown</translation>
425-
</message>
426-
</context>
427-
<context>
428-
<name>file type</name>
429-
<message>
430-
<source>ISO DVD</source>
431-
<translation>ISO DVD</translation>
432-
</message>
433-
<message>
434-
<source>TAR Archive</source>
435-
<translation>TAR архив</translation>
436-
</message>
437-
<message>
438-
<source>GZIP TAR Archive</source>
439-
<translation>GZIP TAR архив</translation>
440-
</message>
441-
<message>
442-
<source>LZMA TAR Archive</source>
443-
<translation>LZMA TAR архив</translation>
444-
</message>
445-
<message>
446-
<source>IMG</source>
447-
<translation>IMG</translation>
448-
</message>
449-
<message>
450-
<source>GZIP IMG</source>
451-
<translation>GZIP IMG</translation>
452-
</message>
453-
<message>
454-
<source>LZMA IMG</source>
455-
<translation>LZMA IMG</translation>
456-
</message>
457-
<message>
458-
<source>Recovery TAR Archive</source>
459-
<translation>Recovery TAR архив</translation>
460-
</message>
461-
<message>
462-
<source>Unknown</source>
463-
<translation>Unknown</translation>
464-
</message>
465-
</context>
466459
<context>
467460
<name>main</name>
468461
<message>

0 commit comments

Comments
 (0)