projects
/
yandex-traffic
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f5d9739
)
Translate language names.
author
Max Lapan
<max.lapan@gmail.com>
Wed, 17 Mar 2010 16:56:27 +0000
(19:56 +0300)
committer
Max Lapan
<max.lapan@gmail.com>
Wed, 17 Mar 2010 16:56:27 +0000
(19:56 +0300)
settings.cpp
patch
|
blob
|
history
settings.hpp
patch
|
blob
|
history
settingsDialog.cpp
patch
|
blob
|
history
yandex-traffic-widget_ru.qm
patch
|
blob
|
history
yandex-traffic-widget_ru.ts
patch
|
blob
|
history
diff --git
a/settings.cpp
b/settings.cpp
index
de0be95
..
fd78526
100644
(file)
--- a/
settings.cpp
+++ b/
settings.cpp
@@
-4,6
+4,18
@@
#include "globals.hpp"
#include "globals.hpp"
+// --------------------------------------------------
+// Language
+// --------------------------------------------------
+QString Language::title () const
+{
+ return Settings::tr (_title.toUtf8 ());
+}
+
+
+// --------------------------------------------------
+// Settings
+// --------------------------------------------------
static Settings* _settings;
static Settings* _settings;
diff --git
a/settings.hpp
b/settings.hpp
index
2f71504
..
8b94063
100644
(file)
--- a/
settings.hpp
+++ b/
settings.hpp
@@
-17,8
+17,7
@@
public:
_alias (alias)
{};
_alias (alias)
{};
- QString title () const
- { return _title; };
+ QString title () const;
QString alias () const
{ return _alias; };
QString alias () const
{ return _alias; };
diff --git
a/settingsDialog.cpp
b/settingsDialog.cpp
index
c844415
..
7d7b739
100644
(file)
--- a/
settingsDialog.cpp
+++ b/
settingsDialog.cpp
@@
-38,7
+38,7
@@
SettingsDialog::SettingsDialog (Settings *settings)
void SettingsDialog::createLanguageButton (QBoxLayout *layout)
{
void SettingsDialog::createLanguageButton (QBoxLayout *layout)
{
- _languageButton = new QMaemo5ValueButton (tr ("Language"), this);
+ _languageButton = new QMaemo5ValueButton (tr ("Interface language"), this);
layout->addWidget (_languageButton);
#ifdef Q_WS_MAEMO_5
layout->addWidget (_languageButton);
#ifdef Q_WS_MAEMO_5
diff --git
a/yandex-traffic-widget_ru.qm
b/yandex-traffic-widget_ru.qm
index
c4c8c06
..
0e10b41
100644
(file)
Binary files a/yandex-traffic-widget_ru.qm and b/yandex-traffic-widget_ru.qm differ
diff --git
a/yandex-traffic-widget_ru.ts
b/yandex-traffic-widget_ru.ts
index
e5061d7
..
2faa161
100644
(file)
--- a/
yandex-traffic-widget_ru.ts
+++ b/
yandex-traffic-widget_ru.ts
@@
-104,6
+104,18
@@
<source>30 min</source>
<translation>30 мин</translation>
</message>
<source>30 min</source>
<translation>30 мин</translation>
</message>
+ <message>
+ <source>System</source>
+ <translation>Системный</translation>
+ </message>
+ <message>
+ <source>English</source>
+ <translation>Английский</translation>
+ </message>
+ <message>
+ <source>Russian</source>
+ <translation>Русский</translation>
+ </message>
</context>
<context>
<name>SettingsDialog</name>
</context>
<context>
<name>SettingsDialog</name>
@@
-183,6
+195,14
@@
<source>Update via:</source>
<translation>Обновлять через:</translation>
</message>
<source>Update via:</source>
<translation>Обновлять через:</translation>
</message>
+ <message>
+ <source>Language</source>
+ <translation type="obsolete">Язык интерфейса</translation>
+ </message>
+ <message>
+ <source>Interface language</source>
+ <translation>Язык интерфейса</translation>
+ </message>
</context>
<context>
<name>UpdateSettingsDialog</name>
</context>
<context>
<name>UpdateSettingsDialog</name>