translation

MANIFEST.in

@@ -1,4 +1,5 @@
-recursive-include typetrainer *.glade
+recursive-include typetrainer *.glade *.mo
 include README.rst
 include LICENSE
 include CHANGES
+include run.py

i18n/messages.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: typetrainer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-31 12:36+1000\n"
+"POT-Creation-Date: 2011-01-31 14:37+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,27 +17,21 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../typetrainer/run.py:6
+#: ../typetrainer/run.py:7
 msgid "%prog [options] [file_with_words]"
 msgstr ""
 
-#: ../typetrainer/run.py:9
-#, python-format
+#: ../typetrainer/run.py:10
 msgid ""
-"Tutor maker to use (en.basic, en.advanced, ru.basic). Default is '%default'"
+"Tutor maker to use (en.basic, en.advanced, ru.basic). Default is en.basic"
 msgstr ""
 
-#: ../typetrainer/run.py:13
-#, python-format
-msgid "Onscreen keyboard type (n130, n130_sdfv). Default is %default"
-msgstr ""
-
-#: ../typetrainer/run.py:22
+#: ../typetrainer/run.py:29
 #, python-format
 msgid "Can't find [%s] tutor"
 msgstr ""
 
-#: ../typetrainer/run.py:24
+#: ../typetrainer/run.py:31
 #, python-format
 msgid "Can't read [%s]"
 msgstr ""
@@ -64,10 +58,22 @@ msgstr ""
 msgid "Choose file with words."
 msgstr ""
 
-#: ../typetrainer/ui/main.py:223
+#: ../typetrainer/ui/main.py:14
+msgid "ASDF zones"
+msgstr ""
+
+#: ../typetrainer/ui/main.py:15
+msgid "SDFV zones"
+msgstr ""
+
+#: ../typetrainer/ui/main.py:16
+msgid "Programmer Dvorak zones"
+msgstr ""
+
+#: ../typetrainer/ui/main.py:247
 msgid "Open file..."
 msgstr ""
 
-#: ../typetrainer/ui/main.py:242
+#: ../typetrainer/ui/main.py:266
 msgid "Opening..."
 msgstr ""

i18n/ru.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: typetrainer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-31 12:33+1000\n"
+"POT-Creation-Date: 2011-01-31 14:37+1000\n"
 "PO-Revision-Date: 2011-01-30 19:31+1000\n"
 "Last-Translator:  <bobrov@vl.ru>\n"
 "Language-Team: Russian\n"
@@ -19,29 +19,22 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../typetrainer/run.py:6
+#: ../typetrainer/run.py:7
 msgid "%prog [options] [file_with_words]"
 msgstr "%prog [options] [/путь/к/файлу/со/словами]"
 
-#: ../typetrainer/run.py:9
-#, python-format
+#: ../typetrainer/run.py:10
 msgid ""
-"Tutor maker to use (en.basic, en.advanced, ru.basic). Default is '%default'"
+"Tutor maker to use (en.basic, en.advanced, ru.basic). Default is en.basic"
 msgstr ""
-"Генератор упражнений (en.basic, en.advanced, ru.basic). По умолчанию "
-"'%default'"
-
-#: ../typetrainer/run.py:13
-#, python-format
-msgid "Onscreen keyboard type (n130, n130_sdfv). Default is %default"
-msgstr "Вид экранной клавиатуры (n130, n130_sdfv). По умолчанию %default"
+"Генератор упражнений (en.basic, en.advanced, ru.basic). По умолчанию en.basic"
 
-#: ../typetrainer/run.py:22
+#: ../typetrainer/run.py:29
 #, python-format
 msgid "Can't find [%s] tutor"
 msgstr "Не найден генератор упражнений [%s]"
 
-#: ../typetrainer/run.py:24
+#: ../typetrainer/run.py:31
 #, python-format
 msgid "Can't read [%s]"
 msgstr "Нельзя прочитать [%s]"
@@ -71,10 +64,22 @@ msgstr "Простой русский"
 msgid "Choose file with words."
 msgstr "Выбирите файл со словами."
 
-#: ../typetrainer/ui/main.py:223
+#: ../typetrainer/ui/main.py:14
+msgid "ASDF zones"
+msgstr "Зоны ФЫВА"
+
+#: ../typetrainer/ui/main.py:15
+msgid "SDFV zones"
+msgstr "Зоны ЫВАМ"
+
+#: ../typetrainer/ui/main.py:16
+msgid "Programmer Dvorak zones"
+msgstr "Зоны программерского Дворака"
+
+#: ../typetrainer/ui/main.py:247
 msgid "Open file..."
 msgstr "Открытие файла..."
 
-#: ../typetrainer/ui/main.py:242
+#: ../typetrainer/ui/main.py:266
 msgid "Opening..."
 msgstr "Открываю..."

i18n/update_pot.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-xgettext -j -L Python -k_ -kN_ -o messages.pot --package-name=typetrainer `find ../typetrainer -name '*.py'`
+xgettext -L Python -k_ -kN_ -o messages.pot --package-name=typetrainer `find ../typetrainer -name '*.py'`

typetrainer/run.py

@@ -7,11 +7,8 @@ def run():
     parser = OptionParser(usage=_("%prog [options] [file_with_words]"),
         version="%prog " + VERSION)
     parser.add_option("-t", "--tutor", dest="tutor",
-        help=_("Tutor maker to use (en.basic, en.advanced, ru.basic). Default is '%default'"),
+        help=_("Tutor maker to use (en.basic, en.advanced, ru.basic). Default is en.basic"),
         metavar="tutor")
-    parser.add_option("-k", "--keyboard", dest="keyboard", type='choice',
-        choices=['n130', 'n130_sdfv', 'n130_dvp'], metavar="keyboard",
-        help=_("Onscreen keyboard type (n130, n130_sdfv, n130_dvp). Default is %default"))
 
     options, args = parser.parse_args()
     config = Config()
@@ -20,9 +17,6 @@ def run():
     if options.tutor:
         config['TUTOR'] = options.tutor
 
-    if options.keyboard:
-        config['KEYBOARD'] = options.keyboard
-
     if args:
         config['FILE'] = args[0]