diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-10-17 12:22:49 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-10-17 12:22:49 -0300 |
| commit | 562c895eb7759bb4d3eaf32608c1f7fd82473fd7 (patch) | |
| tree | 902382e9c5b8ee427065361d37a2155102d63b6f | |
| parent | ab4d64199ed309dd3f2a55604d33a56c34fbe464 (diff) | |
| parent | 3af3481e5bb567d65bb9e33fba035120947a3671 (diff) | |
Merge remote-tracking branch 'kali/bug/update_lang_resources' into develop
| -rw-r--r-- | data/resources/locale.qrc | 4 | ||||
| -rw-r--r-- | data/ts/en_US.ts | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/data/resources/locale.qrc b/data/resources/locale.qrc index 47fb5243..ba466c36 100644 --- a/data/resources/locale.qrc +++ b/data/resources/locale.qrc @@ -1,6 +1,6 @@ <!DOCTYPE RCC><RCC version="1.0"> <qresource> -<file>../translations/es.qm</file> -<file>../translations/de.qm</file> +<file>../translations/vi.qm</file> +<file>../translations/en_GB.qm</file> </qresource> </RCC> diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts index 0cf4683b..64a400ba 100644 --- a/data/ts/en_US.ts +++ b/data/ts/en_US.ts @@ -1164,9 +1164,6 @@ </message> </context> <context> - <name>kls</name> -</context> -<context> <name>msg</name> <message> <location filename="../src/leap/bitmask/platform_init/initializers.py" line="93"/> |