diff options
-rw-r--r-- | .tx/config | 4 | ||||
-rw-r--r-- | share/translations/CMakeLists.txt | 6 | ||||
-rw-r--r-- | share/translations/keepassxc_ar.ts (renamed from share/translations/keepassx_ar.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_bg.ts (renamed from share/translations/keepassx_bg.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_ca.ts (renamed from share/translations/keepassx_ca.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_cs.ts (renamed from share/translations/keepassx_cs.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_da.ts (renamed from share/translations/keepassx_da.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_de.ts (renamed from share/translations/keepassx_de.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_el.ts (renamed from share/translations/keepassx_el.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_en.ts (renamed from share/translations/keepassx_en.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_en_GB.ts (renamed from share/translations/keepassx_en_GB.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_en_US.ts (renamed from share/translations/keepassx_en_US.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_es.ts (renamed from share/translations/keepassx_es.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_et.ts (renamed from share/translations/keepassx_et.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_fi.ts (renamed from share/translations/keepassx_fi.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_fr.ts (renamed from share/translations/keepassx_fr.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_fr_CA.ts (renamed from share/translations/keepassx_fr_CA.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_he.ts (renamed from share/translations/keepassx_he.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_hr_HR.ts (renamed from share/translations/keepassx_hr_HR.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_hu.ts (renamed from share/translations/keepassx_hu.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_id.ts (renamed from share/translations/keepassx_id.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_it.ts (renamed from share/translations/keepassx_it.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_ja.ts (renamed from share/translations/keepassx_ja.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_ko.ts (renamed from share/translations/keepassx_ko.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_lt.ts (renamed from share/translations/keepassx_lt.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_nb.ts (renamed from share/translations/keepassx_nb.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_nl_NL.ts (renamed from share/translations/keepassx_nl_NL.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_pl.ts (renamed from share/translations/keepassx_pl.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_pt_BR.ts (renamed from share/translations/keepassx_pt_BR.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_pt_PT.ts (renamed from share/translations/keepassx_pt_PT.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_ro.ts (renamed from share/translations/keepassx_ro.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_ru.ts (renamed from share/translations/keepassx_ru.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_sk.ts (renamed from share/translations/keepassx_sk.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_sr.ts (renamed from share/translations/keepassx_sr.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_sv.ts (renamed from share/translations/keepassx_sv.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_th.ts (renamed from share/translations/keepassx_th.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_tr.ts (renamed from share/translations/keepassx_tr.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_uk.ts (renamed from share/translations/keepassx_uk.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_zh_CN.ts (renamed from share/translations/keepassx_zh_CN.ts) | 0 | ||||
-rw-r--r-- | share/translations/keepassxc_zh_TW.ts (renamed from share/translations/keepassx_zh_TW.ts) | 0 | ||||
-rw-r--r-- | src/core/Translator.cpp | 6 |
41 files changed, 8 insertions, 8 deletions
diff --git a/.tx/config b/.tx/config index 2092a4bb5..89bae6069 100644 --- a/.tx/config +++ b/.tx/config @@ -2,7 +2,7 @@ host = https://www.transifex.com [keepassxc.keepassxc] -source_file = share/translations/keepassx_en.ts -file_filter = share/translations/keepassx_<lang>.ts +source_file = share/translations/keepassxc_en.ts +file_filter = share/translations/keepassxc_<lang>.ts source_lang = en type = QT diff --git a/share/translations/CMakeLists.txt b/share/translations/CMakeLists.txt index 161b21ac1..bf1870042 100644 --- a/share/translations/CMakeLists.txt +++ b/share/translations/CMakeLists.txt @@ -15,8 +15,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. file(GLOB TRANSLATION_FILES *.ts) -get_filename_component(TRANSLATION_EN_ABS keepassx_en.ts ABSOLUTE) -list(REMOVE_ITEM TRANSLATION_FILES keepassx_en.ts) +get_filename_component(TRANSLATION_EN_ABS keepassxc_en.ts ABSOLUTE) +list(REMOVE_ITEM TRANSLATION_FILES keepassxc_en.ts) list(REMOVE_ITEM TRANSLATION_FILES ${TRANSLATION_EN_ABS}) message(STATUS "Including translations...\n") @@ -35,7 +35,7 @@ set(QM_FILES ${QM_FILES} ${QTBASE_TRANSLATIONS}) install(FILES ${QM_FILES} DESTINATION ${DATA_INSTALL_DIR}/translations) # Add keepassx_en.qm as a fallback for uncommon english locales -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/keepassx_en_US.qm DESTINATION ${DATA_INSTALL_DIR}/translations RENAME keepassx_en.qm) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/keepassxc_en_US.qm DESTINATION ${DATA_INSTALL_DIR}/translations RENAME keepassxc_en.qm) add_custom_target(translations DEPENDS ${QM_FILES}) add_dependencies(${PROGNAME} translations) diff --git a/share/translations/keepassx_ar.ts b/share/translations/keepassxc_ar.ts index a9a51e8ef..a9a51e8ef 100644 --- a/share/translations/keepassx_ar.ts +++ b/share/translations/keepassxc_ar.ts diff --git a/share/translations/keepassx_bg.ts b/share/translations/keepassxc_bg.ts index dafc63155..dafc63155 100644 --- a/share/translations/keepassx_bg.ts +++ b/share/translations/keepassxc_bg.ts diff --git a/share/translations/keepassx_ca.ts b/share/translations/keepassxc_ca.ts index 7103ca548..7103ca548 100644 --- a/share/translations/keepassx_ca.ts +++ b/share/translations/keepassxc_ca.ts diff --git a/share/translations/keepassx_cs.ts b/share/translations/keepassxc_cs.ts index 977c6d4f4..977c6d4f4 100644 --- a/share/translations/keepassx_cs.ts +++ b/share/translations/keepassxc_cs.ts diff --git a/share/translations/keepassx_da.ts b/share/translations/keepassxc_da.ts index a36f1e721..a36f1e721 100644 --- a/share/translations/keepassx_da.ts +++ b/share/translations/keepassxc_da.ts diff --git a/share/translations/keepassx_de.ts b/share/translations/keepassxc_de.ts index 7bc59a848..7bc59a848 100644 --- a/share/translations/keepassx_de.ts +++ b/share/translations/keepassxc_de.ts diff --git a/share/translations/keepassx_el.ts b/share/translations/keepassxc_el.ts index ae529682d..ae529682d 100644 --- a/share/translations/keepassx_el.ts +++ b/share/translations/keepassxc_el.ts diff --git a/share/translations/keepassx_en.ts b/share/translations/keepassxc_en.ts index 9733e330b..9733e330b 100644 --- a/share/translations/keepassx_en.ts +++ b/share/translations/keepassxc_en.ts diff --git a/share/translations/keepassx_en_GB.ts b/share/translations/keepassxc_en_GB.ts index 971fa59b3..971fa59b3 100644 --- a/share/translations/keepassx_en_GB.ts +++ b/share/translations/keepassxc_en_GB.ts diff --git a/share/translations/keepassx_en_US.ts b/share/translations/keepassxc_en_US.ts index 5a84be726..5a84be726 100644 --- a/share/translations/keepassx_en_US.ts +++ b/share/translations/keepassxc_en_US.ts diff --git a/share/translations/keepassx_es.ts b/share/translations/keepassxc_es.ts index 53ccf96b0..53ccf96b0 100644 --- a/share/translations/keepassx_es.ts +++ b/share/translations/keepassxc_es.ts diff --git a/share/translations/keepassx_et.ts b/share/translations/keepassxc_et.ts index 183d3fec6..183d3fec6 100644 --- a/share/translations/keepassx_et.ts +++ b/share/translations/keepassxc_et.ts diff --git a/share/translations/keepassx_fi.ts b/share/translations/keepassxc_fi.ts index 56919473b..56919473b 100644 --- a/share/translations/keepassx_fi.ts +++ b/share/translations/keepassxc_fi.ts diff --git a/share/translations/keepassx_fr.ts b/share/translations/keepassxc_fr.ts index 9a222c2f9..9a222c2f9 100644 --- a/share/translations/keepassx_fr.ts +++ b/share/translations/keepassxc_fr.ts diff --git a/share/translations/keepassx_fr_CA.ts b/share/translations/keepassxc_fr_CA.ts index 411798cd6..411798cd6 100644 --- a/share/translations/keepassx_fr_CA.ts +++ b/share/translations/keepassxc_fr_CA.ts diff --git a/share/translations/keepassx_he.ts b/share/translations/keepassxc_he.ts index 124d08201..124d08201 100644 --- a/share/translations/keepassx_he.ts +++ b/share/translations/keepassxc_he.ts diff --git a/share/translations/keepassx_hr_HR.ts b/share/translations/keepassxc_hr_HR.ts index fa654915c..fa654915c 100644 --- a/share/translations/keepassx_hr_HR.ts +++ b/share/translations/keepassxc_hr_HR.ts diff --git a/share/translations/keepassx_hu.ts b/share/translations/keepassxc_hu.ts index 5ee8fba22..5ee8fba22 100644 --- a/share/translations/keepassx_hu.ts +++ b/share/translations/keepassxc_hu.ts diff --git a/share/translations/keepassx_id.ts b/share/translations/keepassxc_id.ts index d940ddf4f..d940ddf4f 100644 --- a/share/translations/keepassx_id.ts +++ b/share/translations/keepassxc_id.ts diff --git a/share/translations/keepassx_it.ts b/share/translations/keepassxc_it.ts index 8ff48bb3d..8ff48bb3d 100644 --- a/share/translations/keepassx_it.ts +++ b/share/translations/keepassxc_it.ts diff --git a/share/translations/keepassx_ja.ts b/share/translations/keepassxc_ja.ts index fea16db01..fea16db01 100644 --- a/share/translations/keepassx_ja.ts +++ b/share/translations/keepassxc_ja.ts diff --git a/share/translations/keepassx_ko.ts b/share/translations/keepassxc_ko.ts index 22d434209..22d434209 100644 --- a/share/translations/keepassx_ko.ts +++ b/share/translations/keepassxc_ko.ts diff --git a/share/translations/keepassx_lt.ts b/share/translations/keepassxc_lt.ts index c46e2c593..c46e2c593 100644 --- a/share/translations/keepassx_lt.ts +++ b/share/translations/keepassxc_lt.ts diff --git a/share/translations/keepassx_nb.ts b/share/translations/keepassxc_nb.ts index a02c96403..a02c96403 100644 --- a/share/translations/keepassx_nb.ts +++ b/share/translations/keepassxc_nb.ts diff --git a/share/translations/keepassx_nl_NL.ts b/share/translations/keepassxc_nl_NL.ts index 5ad45f772..5ad45f772 100644 --- a/share/translations/keepassx_nl_NL.ts +++ b/share/translations/keepassxc_nl_NL.ts diff --git a/share/translations/keepassx_pl.ts b/share/translations/keepassxc_pl.ts index bb485b57d..bb485b57d 100644 --- a/share/translations/keepassx_pl.ts +++ b/share/translations/keepassxc_pl.ts diff --git a/share/translations/keepassx_pt_BR.ts b/share/translations/keepassxc_pt_BR.ts index 42da6d847..42da6d847 100644 --- a/share/translations/keepassx_pt_BR.ts +++ b/share/translations/keepassxc_pt_BR.ts diff --git a/share/translations/keepassx_pt_PT.ts b/share/translations/keepassxc_pt_PT.ts index 5def275a4..5def275a4 100644 --- a/share/translations/keepassx_pt_PT.ts +++ b/share/translations/keepassxc_pt_PT.ts diff --git a/share/translations/keepassx_ro.ts b/share/translations/keepassxc_ro.ts index 0c0f011ec..0c0f011ec 100644 --- a/share/translations/keepassx_ro.ts +++ b/share/translations/keepassxc_ro.ts diff --git a/share/translations/keepassx_ru.ts b/share/translations/keepassxc_ru.ts index 2a5404654..2a5404654 100644 --- a/share/translations/keepassx_ru.ts +++ b/share/translations/keepassxc_ru.ts diff --git a/share/translations/keepassx_sk.ts b/share/translations/keepassxc_sk.ts index 45c58d858..45c58d858 100644 --- a/share/translations/keepassx_sk.ts +++ b/share/translations/keepassxc_sk.ts diff --git a/share/translations/keepassx_sr.ts b/share/translations/keepassxc_sr.ts index eed84cbcb..eed84cbcb 100644 --- a/share/translations/keepassx_sr.ts +++ b/share/translations/keepassxc_sr.ts diff --git a/share/translations/keepassx_sv.ts b/share/translations/keepassxc_sv.ts index 00218a3c8..00218a3c8 100644 --- a/share/translations/keepassx_sv.ts +++ b/share/translations/keepassxc_sv.ts diff --git a/share/translations/keepassx_th.ts b/share/translations/keepassxc_th.ts index 46e044d68..46e044d68 100644 --- a/share/translations/keepassx_th.ts +++ b/share/translations/keepassxc_th.ts diff --git a/share/translations/keepassx_tr.ts b/share/translations/keepassxc_tr.ts index e4cb101f1..e4cb101f1 100644 --- a/share/translations/keepassx_tr.ts +++ b/share/translations/keepassxc_tr.ts diff --git a/share/translations/keepassx_uk.ts b/share/translations/keepassxc_uk.ts index e2d87b166..e2d87b166 100644 --- a/share/translations/keepassx_uk.ts +++ b/share/translations/keepassxc_uk.ts diff --git a/share/translations/keepassx_zh_CN.ts b/share/translations/keepassxc_zh_CN.ts index 1f7dd0ed4..1f7dd0ed4 100644 --- a/share/translations/keepassx_zh_CN.ts +++ b/share/translations/keepassxc_zh_CN.ts diff --git a/share/translations/keepassx_zh_TW.ts b/share/translations/keepassxc_zh_TW.ts index 8b51c6989..8b51c6989 100644 --- a/share/translations/keepassx_zh_TW.ts +++ b/share/translations/keepassxc_zh_TW.ts diff --git a/src/core/Translator.cpp b/src/core/Translator.cpp index d97a35dd1..ac2072bf4 100644 --- a/src/core/Translator.cpp +++ b/src/core/Translator.cpp @@ -69,9 +69,9 @@ bool Translator::installTranslator(const QStringList& languages, const QString& for (const auto& language : languages) { QLocale locale(language); QScopedPointer<QTranslator> translator(new QTranslator(qApp)); - if (translator->load(locale, "keepassx_", "", path)) { + if (translator->load(locale, "keepassxc_", "", path)) { return QCoreApplication::installTranslator(translator.take()); - } else if (translator->load(locale, "keepassx_", "", QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { + } else if (translator->load(locale, "keepassxc_", "", QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { return QCoreApplication::installTranslator(translator.take()); } } @@ -109,7 +109,7 @@ QList<QPair<QString, QString>> Translator::availableLanguages() QList<QPair<QString, QString>> languages; languages.append(QPair<QString, QString>("system", "System default")); - QRegularExpression regExp("^keepassx_([a-zA-Z_]+)\\.qm$", QRegularExpression::CaseInsensitiveOption); + QRegularExpression regExp("^keepassxc_([a-zA-Z_]+)\\.qm$", QRegularExpression::CaseInsensitiveOption); const QStringList fileList = QDir(resources()->dataPath("translations")).entryList(); for (const QString& filename : fileList) { QRegularExpressionMatch match = regExp.match(filename); |