Merge lp:~shipilov555/openobject-client-kde/russian-support into lp:openobject-client-kde

Proposed by vrsb
Status: Needs review
Proposed branch: lp:~shipilov555/openobject-client-kde/russian-support
Merge into: lp:openobject-client-kde
Diff against target: 160 lines (+50/-4)
3 files modified
Koo/l10n/ru.po (+38/-2)
nsis/koo-installer.nsi (+9/-1)
po2ts.py (+3/-1)
To merge this branch: bzr merge lp:~shipilov555/openobject-client-kde/russian-support
Reviewer Review Type Date Requested Status
OpenObject KDE Client Team Pending
Review via email: mp+34721@code.launchpad.net

Description of the change

Added Russian language support in installator.
Translated qt menu and toolbar.

To post a comment you must log in.

Unmerged revisions

1559. By g.shipilov <g.shipilov@it1>

Russian

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Koo/l10n/ru.po'
2--- Koo/l10n/ru.po 2010-08-28 08:44:54 +0000
3+++ Koo/l10n/ru.po 2010-09-07 06:29:39 +0000
4@@ -8,13 +8,13 @@
5 "Project-Id-Version: openobject-client-kde\n"
6 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
7 "POT-Creation-Date: 2010-07-29 23:04+0200\n"
8-"PO-Revision-Date: 2010-08-27 07:13+0000\n"
9+"PO-Revision-Date: 2010-09-07 03:45+0000\n"
10 "Last-Translator: vrsb <Unknown>\n"
11 "Language-Team: Russian <ru@li.org>\n"
12 "MIME-Version: 1.0\n"
13 "Content-Type: text/plain; charset=UTF-8\n"
14 "Content-Transfer-Encoding: 8bit\n"
15-"X-Launchpad-Export-Date: 2010-08-28 01:48+0000\n"
16+"X-Launchpad-Export-Date: 2010-09-07 03:48+0000\n"
17 "X-Generator: Launchpad (build Unknown)\n"
18
19 #: Koo/Screen/Action.py:82 Koo/Screen/Action.py:90 Koo/Actions/Actions.py:100
20@@ -375,6 +375,14 @@
21 "very good performance and bleeding edge features.\n"
22 "</p>\n"
23 msgstr ""
24+"\n"
25+"<p>\n"
26+"<b>Welcome to Koo!</b>\n"
27+"</p>\n"
28+"<p>\n"
29+"Koo - клиент�ка� ча�ть мощного приложени� OpenERP, � отличной "
30+"производительно�тью и новейшим функционалом.\n"
31+"</p>\n"
32
33 #: Koo/Dialogs/TipOfTheDayDialog.py:45
34 msgid ""
35@@ -390,6 +398,17 @@
36 ", *, / and you can also use parenthesis.\n"
37 "</p>\n"
38 msgstr ""
39+"\n"
40+"<p>\n"
41+"<b>В�троенный калькул�тор</b>\n"
42+"</p>\n"
43+"<p>\n"
44+"Вам изве�тно, что чи�ловые пол� ввода можно и�пользовать как калькул�тор? "
45+"Перейдите к полю и введите <i>3+4*12</i>. �ажмите enter чтобы увидеть "
46+"результат или про�то �охраните форму. В любом �лучае результат по�вит�� в "
47+"той же форме. Разрешённые опрации: +, -, *, / также можно и�пользовать "
48+"�кобки.\n"
49+"</p>\n"
50
51 #: Koo/Dialogs/TipOfTheDayDialog.py:53
52 msgid ""
53@@ -403,6 +422,15 @@
54 "module and follow the instructions on how to configure it properly.\n"
55 "</p>\n"
56 msgstr ""
57+"\n"
58+"<p>\n"
59+"<b>Полнотек�товый пои�к</b>\n"
60+"</p>\n"
61+"<p>\n"
62+"Знаете ли вы, что можно и�кать любую запи�ь из базы данных из одной формы, "
63+"как в Гугле?�айдите и у�тановите модуль full_text_search module и �ледуйте "
64+"ин�трукци�м по его у�тановке.\n"
65+"</p>\n"
66
67 #: Koo/Dialogs/TipOfTheDayDialog.py:61
68 msgid ""
69@@ -416,6 +444,14 @@
70 "many times as you need.\n"
71 "</p>\n"
72 msgstr ""
73+"\n"
74+"<p>\n"
75+"<b>Эк�порт данных</b>\n"
76+"</p>\n"
77+"<p>\n"
78+"Данные можно легко �к�портировать. Выберите Форма -> Эк�порт данных. Вы "
79+"можете �охранить на�тройки �к�порта дл� по�ледующего и�пользовани�.\n"
80+"</p>\n"
81
82 #: Koo/Dialogs/DatabaseDialog.py:73 Koo/Dialogs/LoginDialog.py:85
83 msgid "Could not connect to server !"
84
85=== modified file 'Koo/l10n/ru/LC_MESSAGES/koo.mo'
86Binary files Koo/l10n/ru/LC_MESSAGES/koo.mo 2010-08-28 08:44:54 +0000 and Koo/l10n/ru/LC_MESSAGES/koo.mo 2010-09-07 06:29:39 +0000 differ
87=== modified file 'nsis/koo-installer.nsi'
88--- nsis/koo-installer.nsi 2010-06-27 15:11:13 +0000
89+++ nsis/koo-installer.nsi 2010-09-07 06:29:39 +0000
90@@ -118,6 +118,7 @@
91 !insertmacro MUI_LANGUAGE "German"
92 !insertmacro MUI_LANGUAGE "Italian"
93 !insertmacro MUI_LANGUAGE "Spanish"
94+ !insertmacro MUI_LANGUAGE "Russian"
95
96 ;--------------------------------
97 ;Installer Sections
98@@ -126,7 +127,9 @@
99 SelectLanguage:
100 Push ""
101 Push ${LANG_ENGLISH}
102- Push English
103+ Push "English"
104+ Push ${LANG_RUSSIAN}
105+ Push "Russian"
106 Push ${LANG_CATALAN}
107 Push "Catalan"
108 Push ${LANG_GERMAN}
109@@ -253,27 +256,32 @@
110 LangString SelectLanguageText ${LANG_SPANISH} "Por favor, seleccione el idioma para el instalador."
111 LangString SelectLanguageText ${LANG_ITALIAN} "Selezionare il linguaggio di installazione."
112 LangString SelectLanguageText ${LANG_GERMAN} "Bitte Installationssprache wählen"
113+LangString SelectLanguageText ${LANG_RUSSIAN} "Âûáåðèòå ÿçûê óñòàíîâêè"
114
115 LangString SelectLanguageTitleText ${LANG_ENGLISH} "Installer Language"
116 LangString SelectLanguageTitleText ${LANG_CATALAN} "Idioma de l'instal·ador"
117 LangString SelectLanguageTitleText ${LANG_SPANISH} "Idioma del instalador"
118 LangString SelectLanguageTitleText ${LANG_ITALIAN} "Lingua dell'installatore"
119 LangString SelectLanguageTitleText ${LANG_GERMAN} "Installationssprache"
120+LangString SelectLanguageTitleText ${LANG_RUSSIAN} "ßçûê èíñòàëëÿöèè"
121
122 LangString FinishPageText ${LANG_ENGLISH} "Start Koo"
123 LangString FinishPageText ${LANG_CATALAN} "Inicia el Koo"
124 LangString FinishPageText ${LANG_SPANISH} "Iniciar Koo"
125 LangString FinishPageText ${LANG_ITALIAN} "Avvia Koo"
126 LangString FinishPageText ${LANG_GERMAN} "Starte Koo"
127+LangString FinishPageText ${LANG_RUSSIAN} "Çàïóñòèòü Koo"
128
129 LangString DESC_SecKoo ${LANG_ENGLISH} "Koo."
130 LangString DESC_SecKoo ${LANG_CATALAN} "Koo."
131 LangString DESC_SecKoo ${LANG_SPANISH} "Koo."
132 LangString DESC_SecKoo ${LANG_ITALIAN} "Koo."
133 LangString DESC_SecKoo ${LANG_GERMAN} "Koo."
134+LangString DESC_SecKoo ${LANG_RUSSIAN} "Koo."
135
136 LangString CannotInstallText ${LANG_ENGLISH} "Can not install the Open ERP Client because a previous installation already exists on this system. Please uninstall your current installation and relaunch this setup wizard."
137 LangString CannotInstallText ${LANG_CATALAN} "No es pot instal·lar el Koo perquè ja hi ha instal·lada una versió anterior. Si us plau, desinstal·leu la versió actual i reinicieu aquest instal·lador."
138 LangString CannotInstallText ${LANG_SPANISH} "No se puede instalar Koo porqué ya hay instalada un versión anterior. Por favor, desinstale la versión actual y reinicie este instalador."
139 LangString CannotInstallText ${LANG_ITALIAN} "Impossibile installare il client OpenERP Koo. Una installazione precedente è presente nel sistema. Disinstallare la versione precedente prima di installare questa."
140 LangString CannotInstallText ${LANG_GERMAN} "Die OpenERP Anwendung kann nicht installiert werden, weil eine vorangegangene Installation bereits exisitiert. Bitte diese löschen und die Installation neu starten."
141+LangString CannotInstallText ${LANG_RUSSIAN} "Íå óäàëîñü çàïóñòèòü OpenERP, ò. ê. ýòà ïðîãðàììà óæå óñòàíîâëåíà. Ïîæàëóéñòà, óäàëèòå å¸ è ïåðåçàïóñòèòå óñòàíîâêó."
142
143=== modified file 'po2ts.py'
144--- po2ts.py 2010-02-24 01:40:24 +0000
145+++ po2ts.py 2010-09-07 06:29:39 +0000
146@@ -1,3 +1,4 @@
147+# -*- coding: utf-8 -*-
148 #!/usr/bin/python
149
150 import sys
151@@ -84,7 +85,8 @@
152
153 print "Writing %s" % new_filename
154 import codecs
155-f = codecs.open( new_filename, 'w', 'utf-8' )
156+f = codecs.open( new_filename, 'w' )
157+#f = codecs.open( new_filename, 'w', 'utf-8' )
158 #f.write( doc.toprettyxml(indent='\t') )
159 f.write( doc.toxml() )
160 f.close()