[dasher] Updated Serbian translation

From: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <mirosnik src gnome org>
To: commits-list gnome org
Cc:
Subject: [dasher] Updated Serbian translation
Date: Thu, 1 Mar 2012 11:07:48 +0000 (UTC)
commit 1707d1dcf2b13d8db0d7fb2e1280b219416b09b2
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Thu Mar 1 12:08:09 2012 +0100

    Updated Serbian translation

 po/sr.po       |  712 ++++++++++++++++++++++++++++++++++----------------------
 po/sr latin po |  712 ++++++++++++++++++++++++++++++++++----------------------
 2 files changed, 856 insertions(+), 568 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 716a389..eda9285 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -4,30 +4,29 @@
 # Maintainer: ÐÐÐÐÐÐ ÐÐÐÐÐ <dsegan gmx net>
 # Reviewed on 2005-07-15 by: ÐÐÐÑ ÐÐÑÑÐÑÐÐÐÑ <igor prevod org>
 # ÐÐÐÐÐÐÐÐ Ð. ÐÑÐÐÐÑÐÐÐÑ <slobo akrep be>, 2010.
-# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011.
+# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: dasher\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=dasher&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-08-23 14:32+0000\n"
-"PO-Revision-Date: 2011-07-21 14:54+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=dasher";
+"&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-01-03 21:30+0000\n"
+"PO-Revision-Date: 2012-03-01 12:06+0200\n"
 "Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
-"Language-Team: gnom prevod org\n"
+"Language-Team: Serbian <gnom prevod org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"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"
-"X-Generator: Virtaal 0.7.0\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
 #. Note to translators: This is the name of the dasher program as it appears
 #. in a window title.
-#: ../Data/dasher.desktop.in.in.h:1 ../Data/GUI/dasher.traditional.ui.h:6
-#: ../Data/GUI/dashermaemo.ui.h:1 ../Data/GUI/dashermaemofullscreen.ui.h:2
-#: ../Src/Gtk2/dasher_main.cpp:900
+#: ../Data/dasher.desktop.in.in.h:1 ../Data/GUI/dashermaemofullscreen.ui.h:2
+#: ../Data/GUI/dashermaemo.ui.h:1 ../Data/GUI/dasher.traditional.ui.h:6
+#: ../Src/Gtk2/dasher_main.cpp:899
 msgid "Dasher"
 msgstr "ÐÑÑÐÑÐÐÐ"
 
@@ -37,18 +36,209 @@ msgstr "ÐÐÐÑÐÑÐ ÑÐÐÑÑ ÐÐÐ ÑÐÐÑÑÐÐÐ ÑÐÑÑÐÑÑÑÐ"
 
 #: ../Data/dasher.desktop.in.in.h:3
 msgid "Predictive text entry"
-msgstr "ÐÑÐÐÐÐÑÐÑÐ ÑÐÐÑÐ ÑÐÐÑÑÐ"
+msgstr "ÐÐÐÑ ÐÑÐÐÐÐÐÐÐÐÐ ÑÐÐÑÑÐ"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:1
+#: ../Data/GUI/dasher.traditional.ui.h:4
+msgid "Copy _All"
+msgstr "ÐÐÐÐÐÐ _ÑÐÐ"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:3
+msgid "Large"
+msgstr "ÐÐÐÐÐÐ"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:4
+msgid "Normal"
+msgstr "ÐÐÐÑÐÐ"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:5 ../Data/GUI/dashermaemo.ui.h:5
+#: ../Src/Gtk2/dasher_editor_internal.cpp:813
+#: ../Src/Gtk2/dasher_editor_internal.cpp:847 ../Src/Gtk2/dasher_main.cpp:914
+msgid "Select File"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑ"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:6 ../Data/GUI/dashermaemo.ui.h:6
+msgid "Select Font"
+msgstr "ÐÐÐÐÐÑÐ ÑÐÐÐÐÐ ÐÐÐ"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:7
+msgid "Very Large"
+msgstr "ÐÐÐÐÐ ÐÐÐÐÐÐ"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:8
+msgid "_About"
+msgstr "_Ð ÐÑÐÐÑÐÐÑ"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:9
+msgid "_Dasher Font"
+msgstr "_ÐÐÐÐÐÐ ÐÐÐ ÐÑÑÐÑÐÐÐÐ"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:10
+msgid "_Dasher Font Size"
+msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐ _ÐÑÑÐÑÐÐÐÐ"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:11
+#: ../Data/GUI/dasher.traditional.ui.h:20
+msgid "_Edit"
+msgstr "_ÐÑÐÑÐÐÐÑÐ"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:12
+msgid "_Edit Font"
+msgstr "Ð_ÑÐÐÐ ÑÐÐÐÐÐ ÐÐÐ"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:13
+#: ../Data/GUI/dasher.traditional.ui.h:21
+msgid "_File"
+msgstr "_ÐÐÑÐÑÐÐÐ"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:14
+#: ../Data/GUI/dasher.traditional.ui.h:23
+msgid "_Help"
+msgstr "_ÐÐÐÐÑ"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:15
+msgid "_Options"
+msgstr "_ÐÐÐÑÑÐÐÑÑÐ"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:16
+msgid "_Reset fonts"
+msgstr "_ÐÑÐÑÐ ÑÐÐÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../Data/GUI/dasher.preferences.ui.h:1
 #: ../Data/GUI/dashermaemo.preferences.ui.h:1
+#: ../Data/GUI/dasher.preferences.ui.h:1
 msgid "<b>Adaptation</b>"
 msgstr "<b>ÐÑÐÐÐÐÐÑÐÐÐÑÐ</b>"
 
-#: ../Data/GUI/dasher.preferences.ui.h:2
 #: ../Data/GUI/dashermaemo.preferences.ui.h:2
+#: ../Data/GUI/dasher.preferences.ui.h:2
 msgid "<b>Alphabet Selection</b>"
 msgstr "<b>ÐÐÐÐÑ ÐÐÑÐÐ</b>"
 
+#: ../Data/GUI/dashermaemo.preferences.ui.h:3
+msgid "<b>Color Scheme</b>"
+msgstr "<b>ÐÐÑÐ</b>"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:4
+msgid "<b>Display Size</b>"
+msgstr "<b>ÐÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐ</b>"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:5
+#: ../Data/GUI/dasher.preferences.ui.h:13
+msgid "<b>Language Model</b>"
+msgstr "<b>ÐÐÐÐÐ ÑÐÐÐÐÐ</b>"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:6
+msgid "<b>Orientation</b>"
+msgstr "<b>ÐÑÐÐÑÐÑÐ</b>"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:7
+#: ../Data/GUI/dasher.preferences.ui.h:14
+msgid "<b>Smoothing</b>"
+msgstr "<b>ÐÐÐÐÑÐÐÐÑÐ</b>"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:8
+#: ../Data/GUI/dasher.preferences.ui.h:15
+msgid "<b>Speed</b>"
+msgstr "<b>ÐÑÐÐÐÐ</b>"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:9
+#: ../Data/GUI/dasher.preferences.ui.h:18
+msgid "Adapt speed automatically"
+msgstr "ÐÐÐÐÑÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐ ÐÑÐÐÐÑ"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:10
+msgid "Alphabet"
+msgstr "ÐÐÑÐÐ"
+
+#. The default display orientation for the selected alphabet, i.e., left to right for English, right to left for Arabic, etc.
+#: ../Data/GUI/dashermaemo.preferences.ui.h:11
+#: ../Data/GUI/dasher.preferences.ui.h:20
+msgid "Alphabet Default"
+msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐ"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:12
+msgid "Bottom to Top"
+msgstr "ÐÐÐÐÐÐ ÐÐ ÐÐÑÐ"
+
+#. The way in which you would like to control dasher, e.g., using buttons for up/down, buttons for select, etc.
+#: ../Data/GUI/dashermaemo.preferences.ui.h:14
+msgid "Control"
+msgstr "ÐÐÑÐÐÑÐÑÐ"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:15
+msgid "Custom"
+msgstr "ÐÑÐÐÐÐÐÑÐÐ"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:16
+#: ../Data/GUI/dasher.preferences.ui.h:32
+msgid "Custom colour scheme:"
+msgstr "ÐÑÐÐÐÐÐÑÐÐ ÐÐÑÐ:"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:17
+#: ../Data/GUI/dasher.preferences.ui.h:33
+msgid "Dasher Preferences"
+msgstr "ÐÐÑÑÐÐÐÐ ÐÑÑÐÑÐÐÐÐ"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:18
+msgid "Enlarge input window"
+msgstr "ÐÐÐÐÑÐÑ ÐÑÐÐÐÑ ÐÐ ÑÐÐÑ"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:19
+#: ../Data/GUI/dasher.preferences.ui.h:43
+msgid "Japanese"
+msgstr "ÐÐÐÐÐÑÐÐ"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:20
+#: ../Data/GUI/dasher.preferences.ui.h:44
+msgid "Language model adapts as you write."
+msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÐ ÑÐ ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÑÐÑÐ."
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:21
+msgid "Left to Right"
+msgstr "ÐÐÐÐÐ ÐÐ ÐÐÑÐÐ"
+
+#. PPM = Prediction by Partial Match, a statistical language model.
+#: ../Data/GUI/dashermaemo.preferences.ui.h:22
+#: ../Data/GUI/dasher.preferences.ui.h:47
+msgid "Mixture model (PPM/dictionary)"
+msgstr "ÐÐÑÐÐÐ ÐÐÐÐÐ (ÐÐÐ/ÑÐÑÐÐÐ)"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:23
+msgid "Prediction"
+msgstr "ÐÑÐÐÐÐÑÐÑÐ"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:24
+msgid "Right to Left"
+msgstr "ÐÐ ÐÐÑÐÐ ÐÐ ÐÐÐÐ"
+
+#. PPM = Prediction by Partial Match, a statistical language model.
+#: ../Data/GUI/dashermaemo.preferences.ui.h:25
+#: ../Data/GUI/dasher.preferences.ui.h:60
+msgid "Standard letter-based PPM"
+msgstr "ÐÑÐÐÐÐÑÐÐÐ ÐÐÐ ÐÐÑÐÐÐÐÐ ÐÐ ÐÐÑÐÑ"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:26
+msgid "Top to Bottom"
+msgstr "ÐÐÐÐÐÐ ÐÐ ÐÐÐÐ"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:27
+msgid "View"
+msgstr "ÐÑÐÐÐÐÐ"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:28
+#: ../Data/GUI/dasher.preferences.ui.h:71
+msgid "Word-based model"
+msgstr "ÐÐÐÐÐ ÐÐÑÐÐÐÐÐ ÐÐ ÑÐÑÐÐÐ"
+
+#. Abbreviation for Preferences
+#: ../Data/GUI/dashermaemo.ui.h:3
+msgid "P"
+msgstr "Ð"
+
+#: ../Data/GUI/dashermaemo.ui.h:4 ../Data/GUI/dasher.traditional.ui.h:11
+msgid "Please Waitâ"
+msgstr "ÐÐÑÐÐÐÑÑÐ..."
+
 # bug: View the Options or Options of the View
 #: ../Data/GUI/dasher.preferences.ui.h:3
 msgid "<b>Appearance Options</b>"
@@ -73,7 +263,7 @@ msgstr "<b>ÐÑÐÐ ÑÐÑÐÐÑÐÑÐ</b>"
 
 #: ../Data/GUI/dasher.preferences.ui.h:9
 msgid "<b>Dasher Font</b>"
-msgstr "<b>ÐÑÑÐÑÐÐÐÐÐ ÑÐÐÑ</b>"
+msgstr "<b>ÐÐÑÐÐ ÐÑÑÐÑÐÐÐÐ</b>"
 
 #: ../Data/GUI/dasher.preferences.ui.h:10
 msgid "<b>Direction</b>"
@@ -81,27 +271,12 @@ msgstr "<b>ÐÑÐÐÑÐÑÐ</b>"
 
 #: ../Data/GUI/dasher.preferences.ui.h:11
 msgid "<b>Editor Font</b>"
-msgstr "<b>ÐÐÐÑ ÑÑÐÑÐÐÐÑÐ</b>"
+msgstr "<b>ÐÐÑÐÐ ÑÑÐÑÐÐÐÑÐ</b>"
 
 #: ../Data/GUI/dasher.preferences.ui.h:12
 msgid "<b>Input Device</b>"
 msgstr "<b>ÐÐÐÐÐÐ ÑÑÐÑÐÑ</b>"
 
-#: ../Data/GUI/dasher.preferences.ui.h:13
-#: ../Data/GUI/dashermaemo.preferences.ui.h:5
-msgid "<b>Language Model</b>"
-msgstr "<b>ÐÐÐÐÐ ÑÐÐÐÐÐ</b>"
-
-#: ../Data/GUI/dasher.preferences.ui.h:14
-#: ../Data/GUI/dashermaemo.preferences.ui.h:7
-msgid "<b>Smoothing</b>"
-msgstr "<b>ÐÐÐÐÑÐÐÐÑÐ</b>"
-
-#: ../Data/GUI/dasher.preferences.ui.h:15
-#: ../Data/GUI/dashermaemo.preferences.ui.h:8
-msgid "<b>Speed</b>"
-msgstr "<b>ÐÑÐÐÐÐ</b>"
-
 #: ../Data/GUI/dasher.preferences.ui.h:16
 msgid "<b>Starting and Stopping</b>"
 msgstr "<b>ÐÐÐÑÐÑÐÑÐ Ð ÐÐÑÑÑÐÐÑÐÑÐ</b>"
@@ -110,17 +285,6 @@ msgstr "<b>ÐÐÐÑÐÑÐÑÐ Ð ÐÐÑÑÑÐÐÑÐÑÐ</b>"
 msgid "A_pplication"
 msgstr "_ÐÑÐÐÑÐÐ"
 
-#: ../Data/GUI/dasher.preferences.ui.h:18
-#: ../Data/GUI/dashermaemo.preferences.ui.h:9
-msgid "Adapt speed automatically"
-msgstr "ÐÐÐÐÑÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐ ÐÑÐÐÐÑ"
-
-#. The default display orientation for the selected alphabet, i.e., left to right for English, right to left for Arabic, etc.
-#: ../Data/GUI/dasher.preferences.ui.h:20
-#: ../Data/GUI/dashermaemo.preferences.ui.h:11
-msgid "Alphabet Default"
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐ"
-
 #: ../Data/GUI/dasher.preferences.ui.h:21
 msgid "Always Bottom-to-Top"
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÑÐ"
@@ -159,16 +323,6 @@ msgstr "ÐÐÐÐÐ ÑÐÑÐÐÑÐÑÐ"
 msgid "Copy All on stop"
 msgstr "ÐÐÐÐÐÐ ÑÐÐ ÐÑÐ ÐÐÑÑÑÐÐÑÐÑÑ"
 
-#: ../Data/GUI/dasher.preferences.ui.h:32
-#: ../Data/GUI/dashermaemo.preferences.ui.h:16
-msgid "Custom colour scheme:"
-msgstr "ÐÑÐÐÐÐÐÑÐÐ ÐÐÑÐ:"
-
-#: ../Data/GUI/dasher.preferences.ui.h:33
-#: ../Data/GUI/dashermaemo.preferences.ui.h:17
-msgid "Dasher Preferences"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÑÐÑÐÐÐÐ"
-
 #: ../Data/GUI/dasher.preferences.ui.h:34
 msgid "Direct entry"
 msgstr "ÐÐÑÐÐÑÐÐ ÑÐÐÑ"
@@ -205,25 +359,9 @@ msgstr "ÐÐÑÑÑÐ ÐÐÑÐÐÐÐ ÐÐÐÐÑÐ"
 msgid "Increase line thickness"
 msgstr "ÐÐÐÐÑÐÑ ÐÐÐÑÐÐÑ ÐÐÐÐÑÐ"
 
-#: ../Data/GUI/dasher.preferences.ui.h:43
-#: ../Data/GUI/dashermaemo.preferences.ui.h:19
-msgid "Japanese"
-msgstr "ÐÐÐÐÐÑÐÐ"
-
-#: ../Data/GUI/dasher.preferences.ui.h:44
-#: ../Data/GUI/dashermaemo.preferences.ui.h:20
-msgid "Language model adapts as you write."
-msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÐ ÑÐ ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÑÐÑÐ."
-
 #: ../Data/GUI/dasher.preferences.ui.h:45
 msgid "Large font "
-msgstr "ÐÐÐÐÐÐ ÑÐÐÑ "
-
-#. PPM = Prediction by Partial Match, a statistical language model.
-#: ../Data/GUI/dasher.preferences.ui.h:47
-#: ../Data/GUI/dashermaemo.preferences.ui.h:22
-msgid "Mixture model (PPM/dictionary)"
-msgstr "ÐÐÑÐÐÐ ÐÐÐÐÐ (ÐÐÐ/ÑÐÑÐÐÐ)"
+msgstr "ÐÐÐÐÐÐ ÐÐÑÐÐ "
 
 #: ../Data/GUI/dasher.preferences.ui.h:48
 msgid "Options"
@@ -269,12 +407,6 @@ msgstr "ÐÐÐÐÐÐÑÐ ÑÐÑÐ ÑÐÐ ÐÑ ÐÐÐÐÑÐÑÐ"
 msgid "Stand-alone"
 msgstr "ÐÐÐÐÑÑÐÐÐÐ"
 
-#. PPM = Prediction by Partial Match, a statistical language model.
-#: ../Data/GUI/dasher.preferences.ui.h:60
-#: ../Data/GUI/dashermaemo.preferences.ui.h:25
-msgid "Standard letter-based PPM"
-msgstr "ÐÑÐÐÐÐÑÐÐÐ ÐÐÐ ÐÐÑÐÐÐÐÐ ÐÐ ÐÐÑÐÑ"
-
 #: ../Data/GUI/dasher.preferences.ui.h:61
 msgid "Start on left mouse button"
 msgstr "ÐÐÑÐÐ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐ"
@@ -310,11 +442,6 @@ msgstr ""
 msgid "Very large font"
 msgstr "ÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÑ"
 
-#: ../Data/GUI/dasher.preferences.ui.h:71
-#: ../Data/GUI/dashermaemo.preferences.ui.h:28
-msgid "Word-based model"
-msgstr "ÐÐÐÐÐ ÐÐÑÐÐÐÐÐ ÐÐ ÑÐÑÐÐÐ"
-
 #: ../Data/GUI/dasher.preferences.ui.h:72
 msgid "_Appearance"
 msgstr "_ÐÐÐÐÐÐ"
@@ -335,11 +462,6 @@ msgstr "ÐÐÑÐÐ:"
 msgid "Copy"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../Data/GUI/dasher.traditional.ui.h:4
-#: ../Data/GUI/dashermaemofullscreen.ui.h:1
-msgid "Copy _All"
-msgstr "ÐÐÐÐÐÐ _ÑÐÐ"
-
 #: ../Data/GUI/dasher.traditional.ui.h:5
 msgid "Cut"
 msgstr "ÐÑÐÑÐ"
@@ -360,10 +482,6 @@ msgstr "ÐÑÐÐÑÐ ÐÐÑÐÑÐÐÑ"
 msgid "Paste"
 msgstr "ÐÐÐÑÐ"
 
-#: ../Data/GUI/dasher.traditional.ui.h:11 ../Data/GUI/dashermaemo.ui.h:4
-msgid "Please Waitâ"
-msgstr "ÐÐÑÐÐÐÑÑÐ..."
-
 #: ../Data/GUI/dasher.traditional.ui.h:12
 msgid "Pr_eferencesâ"
 msgstr "_ÐÐÑÑÐÐÐÐ..."
@@ -372,7 +490,7 @@ msgstr "_ÐÐÑÑÐÐÐÐ..."
 msgid "Preferences"
 msgstr "ÐÐÑÑÐÐÐÐ"
 
-#: ../Data/GUI/dasher.traditional.ui.h:14 ../Src/Gtk2/dasher_main.cpp:993
+#: ../Data/GUI/dasher.traditional.ui.h:14 ../Src/Gtk2/dasher_main.cpp:992
 msgid "Quit"
 msgstr "ÐÐÐÑÐ"
 
@@ -396,137 +514,22 @@ msgstr "_Ð ÐÑÐÐÑÐÐÑâ"
 msgid "_Contentsâ"
 msgstr "_ÐÐÐÑÐÐÑâ"
 
-#: ../Data/GUI/dasher.traditional.ui.h:20
-#: ../Data/GUI/dashermaemofullscreen.ui.h:11
-msgid "_Edit"
-msgstr "_ÐÑÐÑÐÐÐÑÐ"
-
-#: ../Data/GUI/dasher.traditional.ui.h:21
-#: ../Data/GUI/dashermaemofullscreen.ui.h:13
-msgid "_File"
-msgstr "_ÐÐÑÐÑÐÐÐ"
-
 #: ../Data/GUI/dasher.traditional.ui.h:22
 msgid "_Game Mode"
 msgstr "ÐÐÐÐÐ _ÐÐÑÐ"
 
-#: ../Data/GUI/dasher.traditional.ui.h:23
-#: ../Data/GUI/dashermaemofullscreen.ui.h:14
-msgid "_Help"
-msgstr "_ÐÐÐÐÑ"
-
 #: ../Data/GUI/dasher.traditional.ui.h:24
 msgid "_Import Training Textâ"
 msgstr "_ÐÐÐÐÐ ÑÐÐÑÑ ÐÐ ÑÐÐÐÐÐÐÐÑÐâ"
 
-#. Abbreviation for Preferences
-#: ../Data/GUI/dashermaemo.ui.h:3
-msgid "P"
-msgstr "Ð"
-
-#: ../Data/GUI/dashermaemo.ui.h:5 ../Data/GUI/dashermaemofullscreen.ui.h:5
-#: ../Src/Gtk2/dasher_editor_internal.cpp:812
-#: ../Src/Gtk2/dasher_editor_internal.cpp:846 ../Src/Gtk2/dasher_main.cpp:915
-msgid "Select File"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑ"
-
-#: ../Data/GUI/dashermaemo.ui.h:6 ../Data/GUI/dashermaemofullscreen.ui.h:6
-msgid "Select Font"
-msgstr "ÐÐÐÐÐÑÐ ÑÐÐÐÐÐ ÐÐÐ"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:3
-msgid "<b>Color Scheme</b>"
-msgstr "<b>ÐÐÑÐ</b>"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:4
-msgid "<b>Display Size</b>"
-msgstr "<b>ÐÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐ</b>"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:6
-msgid "<b>Orientation</b>"
-msgstr "<b>ÐÑÐÐÑÐÑÐ</b>"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:10
-msgid "Alphabet"
-msgstr "ÐÐÑÐÐ"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:12
-msgid "Bottom to Top"
-msgstr "ÐÐÐÐÐÐ ÐÐ ÐÐÑÐ"
-
-#. The way in which you would like to control dasher, e.g., using buttons for up/down, buttons for select, etc.
-#: ../Data/GUI/dashermaemo.preferences.ui.h:14
-msgid "Control"
-msgstr "ÐÐÑÐÐÑÐÑÐ"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:15
-msgid "Custom"
-msgstr "ÐÑÐÐÐÐÐÑÐÐ"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:18
-msgid "Enlarge input window"
-msgstr "ÐÐÐÐÑÐÑ ÐÑÐÐÐÑ ÐÐ ÑÐÐÑ"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:21
-msgid "Left to Right"
-msgstr "ÐÐÐÐÐ ÐÐ ÐÐÑÐÐ"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:23
-msgid "Prediction"
-msgstr "ÐÑÐÐÐÐÑÐÑÐ"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:24
-msgid "Right to Left"
-msgstr "ÐÐ ÐÐÑÐÐ ÐÐ ÐÐÐÐ"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:26
-msgid "Top to Bottom"
-msgstr "ÐÐÐÐÐÐ ÐÐ ÐÐÐÐ"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:27
-msgid "View"
-msgstr "ÐÑÐÐÐÐÐ"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:3
-msgid "Large"
-msgstr "ÐÐÐÐÐÐ"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:4
-msgid "Normal"
-msgstr "ÐÐÐÑÐÐ"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:7
-msgid "Very Large"
-msgstr "ÐÐÐÐÐ ÐÐÐÐÐÐ"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:8
-msgid "_About"
-msgstr "_Ð ÐÑÐÐÑÐÐÑ"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:9
-msgid "_Dasher Font"
-msgstr "_ÐÐÐÐÐÐ ÐÐÐ ÐÐ ÐÑÑÐÑÐÐÐÐ"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:10
-msgid "_Dasher Font Size"
-msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐ _ÐÑÑÐÑÐÐÐÐ"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:12
-msgid "_Edit Font"
-msgstr "Ð_ÑÐÐÐ ÑÐÐÐÐÐ ÐÐÐ"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:15
-msgid "_Options"
-msgstr "_ÐÐÐÑÑÐÐÑÑÐ"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:16
-msgid "_Reset fonts"
-msgstr "_ÐÑÐÑÐ ÑÐÐÐÐÐ ÐÐÐÐÐÐ"
-
-#: ../Src/DasherCore/AbstractXMLParser.cpp:40
+#. think XML_LChar==char, depends on preprocessor variables...
+#. /TRANSLATORS: the first string is the error message from the XML Parser;
+#. / the second is the URL of the file we're trying to read.
+#: ../Src/DasherCore/AbstractXMLParser.cpp:63
 #, c-format
-msgid "XML Error %s in file %s somewhere in block: %s"
-msgstr "ÐÐÐ ÐÑÐÑÐÐ â%sâ Ñ ÐÐÑÐÑÐÑÐ â%sâ ÑÐÐÐ ÐÐÐÐÐ Ñ ÐÐÐÐÑ: %s"
+#| msgid "XML Error %s in file %s somewhere in block: %s"
+msgid "XML Error %s in file %s "
+msgstr "ÐÐÑÐÐ ÐÑÐÑÐÐ â%sâ Ñ ÐÐÑÐÑÐÑÐ â%sâ"
 
 #: ../Src/DasherCore/Alphabet/AlphabetMap.cpp:116
 #, c-format
@@ -545,7 +548,7 @@ msgstr "ÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ-8 ÐÐÐÐ â0x%xâ"
 #. /TRANSLATORS: the string "GameTextFile" is the name of a setting in gsettings
 #. / (or equivalent), and should not be translated. The %s is the value of that
 #. / setting (this message displayed only if the user has provided a value)
-#: ../Src/DasherCore/AlphabetManager.cpp:162
+#: ../Src/DasherCore/AlphabetManager.cpp:213
 #, c-format
 msgid ""
 "Note: GameTextFile setting specifies game sentences file '%s' but this does "
@@ -557,14 +560,16 @@ msgstr ""
 #. TRANSLATORS: The number of time steps over which to perform the zooming motion in button mode.
 #: ../Src/DasherCore/AlternatingDirectMode.cpp:28
 #: ../Src/DasherCore/ButtonMode.cpp:28 ../Src/DasherCore/CompassMode.cpp:28
-msgid "Zoom steps"
-msgstr "ÐÐÑÐÑÐ ÑÐÐÑÐÑÐ"
+#: ../Src/DasherCore/StylusFilter.cpp:11
+#| msgid "Factor by which to zoom in"
+msgid "Frames over which to perform zoom"
+msgstr "ÐÑÐÑ ÐÐÐÑÐÐÐ ÐÑÐÐÐ ÐÐÑÐÑ ÑÐ ÑÐÐÑÐÐÐ"
 
 #. TRANSLATORS: Intercept keyboard events for 'special' keys even when the Dasher window doesn't have keyboard focus.
 #: ../Src/DasherCore/AlternatingDirectMode.cpp:30
 #: ../Src/DasherCore/ButtonMode.cpp:39 ../Src/DasherCore/CompassMode.cpp:32
 msgid "Global keyboard grab"
-msgstr "ÐÐÐÑÐÑ ÑÐ ÑÐÑÑÐÑÑÑÐ"
+msgstr "ÐÐÐÑÐÑÐ ÑÐ ÑÐÑÑÐÑÑÑÐ"
 
 #. menu
 #: ../Src/DasherCore/AlternatingDirectMode.cpp:34
@@ -586,8 +591,9 @@ msgid "Scan time in menu mode (0 to not scan)"
 msgstr "ÐÑÐÐÐ ÑÐÐÐÐÑÐÑÐ Ñ ÑÐÐÐÐÑ ÐÐÐÐÑÐÐÐÐ (0 â ÐÑÐÑÑÑÑÑÐ)"
 
 #: ../Src/DasherCore/ButtonMode.cpp:30
-msgid "Number of boxes"
-msgstr "ÐÑÐÑ ÐÑÑÐÑÐ"
+#| msgid "Number of boxes"
+msgid "Number of forward boxes"
+msgstr "ÐÑÐÑ ÐÑÑÐÑÐ ÐÐ ÐÐÐÑÐÐ"
 
 #: ../Src/DasherCore/ButtonMode.cpp:31
 msgid "Safety margin"
@@ -636,9 +642,13 @@ msgstr "ÐÐÑÐÐ ÑÐÐÑÐÑÐ"
 msgid "Compass Mode"
 msgstr "ÐÐÐÐÐ ÐÑÑÐÐÐ"
 
+#: ../Src/DasherCore/ControlManager.cpp:249
+msgid "Done"
+msgstr "ÐÑÐÑÐÐÐ"
+
 #. /TRANSLATORS: %s is the name of the alphabet; the string "GameTextFile"
 #. / refers to a setting name in gsettings or equivalent, and should not be translated.
-#: ../Src/DasherCore/DasherInterfaceBase.cpp:306
+#: ../Src/DasherCore/DasherInterfaceBase.cpp:315
 #, c-format
 msgid ""
 "Could not find game sentences file for %s - check alphabet definition, or "
@@ -647,16 +657,16 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÑÐÐÐÐ ÐÐÑÐ ÐÐ â%sâ â ÐÑÐÐÐÑÐÑÐ ÐÐÑÐÐÐÑÐÑÑ "
 "ÐÐÑÐÐÐÑÐ, ÐÐÐ ÐÑÐÐÐÑÐÑÐ ÐÐÐÑÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÑÐ ÐÐÑÐ"
 
-#: ../Src/DasherCore/DasherInterfaceBase.cpp:785
+#: ../Src/DasherCore/DasherInterfaceBase.cpp:790
 msgid "Normal Control"
 msgstr "ÐÐÐÐÑÐÑÐÐÐ ÐÐÐÑÑÐÐÐ"
 
 #. TODO: specialist factory for button mode
-#: ../Src/DasherCore/DasherInterfaceBase.cpp:801
+#: ../Src/DasherCore/DasherInterfaceBase.cpp:806
 msgid "Menu Mode"
 msgstr "ÐÐÐÐÐ ÐÐÐÐÑÐÐÐÐ"
 
-#: ../Src/DasherCore/DasherInterfaceBase.cpp:802
+#: ../Src/DasherCore/DasherInterfaceBase.cpp:807
 msgid "Direct Mode"
 msgstr "ÐÐÑÐÐÑÐÐ ÑÐÐÐÐ"
 
@@ -680,25 +690,136 @@ msgid ""
 "Screen geometry (mostly for tall thin screens) - 0=old-style, 1=square no-"
 "xhair, 2=squish, 3=squish+log"
 msgstr ""
+"ÐÐÐÐÐ ÐÐÑÐÐÐ (ÐÐÑÑÐÑÑÐ ÐÐ ÐÐÑÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐÐ) â 0=ÑÑÐÑÐ ÑÑÐÐ, 1=ÐÐÐÐÑÐÑ ÐÐÐ "
+"Ñ-ÐÐÐÑÐ, 2=, 3=+ÐÐÐÐÐÐÐ"
 
 #: ../Src/DasherCore/DefaultFilter.cpp:18
 msgid ""
 "Shape type: 0=disjoint rects, 1=overlapping, 2=triangles, 3=trunc-tris, "
 "4=quadrics, 5=circles"
 msgstr ""
+"ÐÑÑÑÐ ÑÐÐÑÑÐ: 0=ÑÐÐÐÐÐÑÐÐÐ ÐÑÐÐÐÑÐÐÐÐÐÑÐ, 1=ÐÑÐÐÐÐÐÐÑÐ, 2=ÑÑÐÑÐÐÐÐÐ, "
+"3=ÐÐÑÑÐÑÐÐÐ-ÑÑÐÑÐÐÐÐÐ, 4=ÐÐÐÐÑÐÑÐÐ, 5=ÐÑÑÐÐÐÐ"
 
-#. 1. Look for system training text...
-#: ../Src/DasherCore/NodeCreationManager.cpp:81
-msgid "Training on System Text"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÑÑÑ ÑÐÑÑÐÐÐ"
+#: ../Src/DasherCore/DefaultFilter.cpp:19
+msgid ""
+"Distance from right-hand-side Y-axis, at which maximum speed is reached. "
+"(2048=xhair)"
+msgstr ""
+"ÐÐÑÑÐÑÐÑÐ ÐÐ Y-ÐÑÐ ÑÐ ÑÑÑÐÐÐ ÐÐÑÐÐ ÑÑÐÐ, ÐÐ ÐÐÑÐÑ ÑÐ ÐÐÑÑÐÐÐÑÑÐ ÐÐÑÐÐÑÐ "
+"ÐÑÐÐÐÐ. (2048=Ñ-ÐÐÐÑÐ)"
+
+#: ../Src/DasherCore/DefaultFilter.cpp:20
+msgid "Hold right mouse button / key 1 to go 3/4 faster"
+msgstr "ÐÑÐÐ ÐÐÑÐÐ ÐÑÐÐÐ ÐÐÑÐ / ÑÐÑÑÐÑ 1 ÐÐ ÐÐ ÐÑÐÐ 3/4 ÐÑÐÐ"
+
+#: ../Src/DasherCore/DefaultFilter.cpp:21
+msgid "Use exact computation of per-frame movement (slower)"
+msgstr "ÐÐÑÐÑÑÐ ÑÐÑÐÐ ÐÐÑÐÑÑÐÐÐÐÑÐ ÐÐÐÑÐÑÐ ÐÐ-ÐÐÐÐÑ (ÑÐÐÑÐÑÐ)"
+
+#: ../Src/DasherCore/DemoFilter.cpp:15
+msgid "Demo Mode (no input)"
+msgstr "ÐÐÐÐÐ ÐÑÐÐÐ (ÐÐÐ ÑÐÐÑÐ)"
+
+#: ../Src/DasherCore/GameModule.cpp:8
+msgid "Filename of sentences to enter"
+msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÑÐÐÐÑÐ ÐÐ ÑÐÐÑ"
 
-#. 2. Now add in any user-provided individual training text...
-#: ../Src/DasherCore/NodeCreationManager.cpp:83
+#: ../Src/DasherCore/GameModule.cpp:9
+msgid "Distance of sentence from center to decide user needs help"
+msgstr ""
+"ÐÐÑÑÐÑÐÑÐ ÑÐÑÐÐÐÑÐ ÐÐ ÑÐÐÑÑÐ ÐÐ ÐÐ ÐÐÐÑÑÐÐ ÐÐ ÑÐ ÐÐÑÐÑÐÐÐÑ ÐÐÑÑÐÐÐÐ ÐÐÐÐÑ"
+
+#: ../Src/DasherCore/GameModule.cpp:10
+msgid "Time for which user must need help before help drawn"
+msgstr "ÐÑÐÐÐ ÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐÑ ÐÐÑÐ ÐÐÑÑÐÐÐÑÐ ÐÐÐÐÑ ÐÑÐ ÐÐÐÐÐÐÑÐ Ñ ÑÑÑÐÑÑ"
+
+#: ../Src/DasherCore/GameModule.cpp:11
+msgid "When we give help, show the shortest path to the target sentence?"
+msgstr ""
+"ÐÐÐÐ ÐÑÑÐÐÐÐ ÐÐÐÐÑ, ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑÑ ÐÐÐÐÑ ÐÐ ÑÐÑÐÐ ÑÐÑÐÐÐÑÐ?"
+
+#: ../Src/DasherCore/MandarinAlphMgr.cpp:176
+#: ../Src/DasherCore/RoutingAlphMgr.cpp:128
+#, c-format
+#| msgid ""
+#| "Warning: faulty alphabet definition, escape sequence %s must be a single "
+#| "unicode character. This may worsen Dasher's text prediction."
+msgid ""
+"Warning: faulty alphabet definition: training-start delimiter %s must be a "
+"single unicode character. May be unable to process training file."
+msgstr ""
+"ÐÐÐÐÐÑÐÑÐ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ, ÐÑÐÐÐÑÐÐÐ ÐÐÐÑÐÑÐÑÐ ÑÐÐÐÐÐÐÐÑÐ â%"
+"sâ ÐÐÑÐ ÐÐÑÐ ÑÐÐÐÑÑÐÐÐÐ ÐÐÐÐ ÑÐÐÐÐÐÐ. ÐÐÐÐ ÐÐÑÐ Ñ ÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐ "
+"ÐÐÑÐÑÐÐÑ ÑÐÐÐÐÐÐÐÑÐ."
+
+#: ../Src/DasherCore/MandarinAlphMgr.cpp:186
+#, c-format
+msgid ""
+"Warning: training file contains character '%s' as member of group '%s', but "
+"no group of that name contains the character; ignoring group specifier"
+msgstr ""
+"ÐÐÐÐÐÑÐÑÐ: ÐÐÑÐÑÐÐÐ ÑÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐ â%sâ ÐÐÐ ÑÐÐÐÐ ÐÑÑÐÐ â%sâ, ÐÐÐ "
+"ÐÐÑÐÐÐÐ ÐÑÑÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐ; ÐÐÐÐÐÐÑÑÑÐÐ ÐÐÑÐÐÐÐÐÐ ÐÑÑÐÐ"
+
+#: ../Src/DasherCore/MandarinAlphMgr.cpp:199
+#, c-format
+msgid ""
+"Warning: training file contains character '%s' as member of group '%s', but "
+"no group of that name contains the character. Dasher will not be able to "
+"learn how you want to write this character."
+msgstr ""
+"ÐÐÐÐÐÑÐÑÐ: ÐÐÑÐÑÐÐÐ ÑÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐ â%sâ ÐÐÐ ÑÐÐÐÐ ÐÑÑÐÐ â%sâ, ÐÐÐ "
+"ÐÐÑÐÐÐÐ ÐÑÑÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐ. ÐÑÑÐÑÐÐÐ ÐÐÑÐ ÐÐÑÐ Ñ ÐÐÐÑÑÐÐÑÑÐ "
+"ÐÐ ÐÐÑÑÐ ÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ ÑÐÑ ÐÐÐÐ."
+
+#: ../Src/DasherCore/MandarinAlphMgr.cpp:200
+#: ../Src/DasherCore/RoutingAlphMgr.cpp:147
+#, c-format
+msgid ""
+"Warning: training file contains character '%s' as member of group '%s', but "
+"alphabet contains several such groups. Dasher will not be able to learn how "
+"you want to write this character."
+msgstr ""
+"ÐÐÐÐÐÑÐÑÐ: ÐÐÑÐÑÐÐÐ ÑÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐ â%sâ ÐÐÐ ÑÐÐÐÐ ÐÑÑÐÐ â%sâ, ÐÐÐ "
+"ÐÐÑÐÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ ÐÑÑÐÐ. ÐÑÑÐÑÐÐÐ ÐÐÑÐ ÐÐÑÐ Ñ ÐÐÐÑÑÐÐÑÑÐ ÐÐ "
+"ÐÐÑÑÐ ÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ ÑÐÑ ÐÐÐÐ."
+
+#: ../Src/DasherCore/MandarinAlphMgr.cpp:220
+#: ../Src/DasherCore/RoutingAlphMgr.cpp:164
+#, c-format
+msgid ""
+"Warning: in training file, annotation '<%s>' is followed by another "
+"annotation and will be ignored"
+msgstr ""
+"ÐÐÐÐÐÑÐÑÐ: Ñ ÐÐÑÐÑÐÑÐ ÑÐÐÐÐÐÐÐÑÐ, ÐÐ ÐÑÐÐÐÐÐÑÐÐÐ â<%s>â ÑÐÐÐÐ ÐÑÑÐÐ "
+"ÐÑÐÐÐÐÐÑÐÐ Ð ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÐÐÐÑÐÐÐ"
+
+#. /TRANSLATORS: first string will be the filename; after the end of the string,
+#. / some number of output (e.g. Chinese) characters will be appended,
+#. / the number of which is the integer here
+#: ../Src/DasherCore/MandarinAlphMgr.cpp:244
+#, c-format
+msgid ""
+"In file %s, the following %i symbols appeared without annotations saying how "
+"they should be entered, but each can be entered in several ways. Dasher will "
+"not be able to learn how you want to enter these symbols:"
+msgstr ""
+"Ð ÐÐÑÐÑÐÑÐ â%sâ, ÐÑÐÑÐÑÐÑ %i ÑÐÐÐÐÐÐ ÑÐ ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐ "
+"ÐÐÐÐ ÐÐ ÑÑÐÐÐÐÐ ÐÐ ÐÑÐÑ ÑÐÐÑÐÐÐ, ÐÐÐ ÑÐÐÐÐ ÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÐ "
+"ÐÐÑÐÐÐ. ÐÑÑÐÑÐÐÐ ÐÐÑÐ ÐÐÑÐ Ñ ÐÐÐÑÑÐÐÑÑÐ ÐÐ ÐÐÑÑÐ ÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÑÐÑÐ ÑÐ "
+"ÑÐÐÐÐÐÐ:"
+
+#: ../Src/DasherCore/NodeCreationManager.cpp:33
 msgid "Training on User Text"
 msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÑÑÑ ÐÐÑÐÑÐÐÐÐ"
 
+#: ../Src/DasherCore/NodeCreationManager.cpp:33
+msgid "Training on System Text"
+msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÑÑÑ ÑÐÑÑÐÐÐ"
+
 #. /TRANSLATORS: These 3 messages will be displayed when the user has just chosen a new alphabet. The %s parameter will be the name of the alphabet.
-#: ../Src/DasherCore/NodeCreationManager.cpp:85
+#: ../Src/DasherCore/NodeCreationManager.cpp:101
 #, c-format
 msgid ""
 "No user training text found - if you have written in \"%s\" before, this "
@@ -707,7 +828,7 @@ msgstr ""
 "ÐÐÐÐ ÐÐÑÐÑÐÐÑÐÐÐ ÑÐÐÑÑÐ ÐÐ ÑÐÐÐÐÐÐÐÑÐ â ÐÐÐ ÑÑÐ ÑÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ â%sâ, ÑÐ "
 "ÐÐÐÑÐ ÐÐ ÐÑÑÐÑÐÐÐ ÐÐÐÐÐ ÐÐ ÑÑÐ ÐÐ ÐÑÐÑÑÐÐÐÐÑ ÑÐÑÐÑÐ."
 
-#: ../Src/DasherCore/NodeCreationManager.cpp:86
+#: ../Src/DasherCore/NodeCreationManager.cpp:102
 #, c-format
 msgid ""
 "No training text (user or system) found for \"%s\". Dasher will still work "
@@ -719,7 +840,7 @@ msgstr ""
 "ÐÑÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÑ ÑÐÐÑÑÐ ÐÐ ÑÐÐÐÐÐÐÐÑÐ ÑÐ ÐÑÑÐÑÐÐÐÐÐÐÐ ÐÐÐ ÑÐÑÑÐ, ÐÐÐ ÐÐ "
 "ÑÐÐÐ ÐÐÐÑÐÐÐÑÐ ÑÐÐÐÐ."
 
-#: ../Src/DasherCore/NodeCreationManager.cpp:97
+#: ../Src/DasherCore/NodeCreationManager.cpp:108
 #, c-format
 msgid ""
 "\"%s\" does not specify training file. Dasher will work but entry will be "
@@ -731,7 +852,6 @@ msgstr ""
 #. TRANSLATORS: The time for which a button must be held before it counts as a 'long' (rather than short) press.
 #: ../Src/DasherCore/OneButtonDynamicFilter.cpp:31
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:32
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:35
 msgid "Long press time"
 msgstr "ÐÑÐÐÐ ÐÑÐÐÐ ÐÑÐÑÐÑÐÐ"
 
@@ -747,7 +867,7 @@ msgstr "ÐÐÐÐÑÑÐ ÐÐÐÑÐÑÐÐ ÐÑÐÐÐ ÐÑÐÑÐÐÐÐ"
 
 #: ../Src/DasherCore/OneButtonDynamicFilter.cpp:36
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:43
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:38
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:37
 msgid "Slow startup"
 msgstr "ÐÐÐÑÐ ÐÐÐÑÐÑÐÑÐ"
 
@@ -758,19 +878,19 @@ msgstr "ÐÑÐÐÐ ÐÐÐÑÐÑÐÑÐ"
 
 #: ../Src/DasherCore/OneButtonDynamicFilter.cpp:38
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:46
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:40
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:39
 msgid "Percentage by which to automatically increase speed"
 msgstr "ÐÑÐÑÐÐÐÑ ÐÐ ÐÐÐÐ ÑÐ ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐÐÐ"
 
 #: ../Src/DasherCore/OneButtonDynamicFilter.cpp:39
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:47
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:41
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:40
 msgid "Time after which to automatically increase speed (secs)"
 msgstr "ÐÑÐÐÐ ÐÐÐÐÐ ÐÐÐÐ ÑÐ ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐÐÐ (Ñ ÑÐÐÑÐÐÐÐÐ)"
 
 #: ../Src/DasherCore/OneButtonDynamicFilter.cpp:40
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:48
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:42
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:41
 msgid "Percentage by which to decrease speed upon reverse"
 msgstr "ÐÑÐÑÐÐÐÑ ÐÐ ÐÐÑÐ ÑÐ ÑÐÐÑÑÑÐ ÐÑÐÐÐÐ ÐÐÐÐÐ ÐÑÐÑÐÑÐ"
 
@@ -778,17 +898,17 @@ msgstr "ÐÑÐÑÐÐÐÑ ÐÐ ÐÐÑÐ ÑÐ ÑÐÐÑÑÑÐ ÐÑÐÐÐÐ ÐÐÐÐ
 msgid "One Button Dynamic Mode"
 msgstr "ÐÐÐÐÐÐÑÐÐ ÑÐÐÐÐ ÑÐÐÐÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../Src/DasherCore/OneButtonFilter.cpp:11
+#: ../Src/DasherCore/OneButtonFilter.cpp:12
 msgid "Scan time (each direction), in ms"
 msgstr "ÐÑÐÐÐ ÑÑÐÐÐÑÐ (ÐÐ ÑÐÐÐÐ ÑÐÐÑ), Ñ ÐÐÐÐÑÐÐÑÐÐÐÐÐ"
 
-#: ../Src/DasherCore/OneButtonFilter.cpp:12
+#: ../Src/DasherCore/OneButtonFilter.cpp:13
 msgid "Factor by which to zoom in"
 msgstr "ÐÐÐÑÐÑ ÐÐ ÐÐÑÐ ÑÐ ÑÐÐÑÐÐÐ"
 
-#: ../Src/DasherCore/OneButtonFilter.cpp:13
+#: ../Src/DasherCore/OneButtonFilter.cpp:14
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:45
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:43
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:42
 msgid "Lag before user actually pushes button (ms)"
 msgstr "ÐÐÑÐÐ ÐÑÐ ÐÐÐÐ ÑÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐÑÑÐ ÐÑÐÑÐÑÐÐ ÐÑÐÐÐ (ms)"
 
@@ -797,13 +917,22 @@ msgstr "ÐÐÑÐÐ ÐÑÐ ÐÐÐÐ ÑÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐÑÑÐ ÐÑÐÑ
 msgid "One Dimensional Mode"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐ"
 
-#: ../Src/DasherCore/SettingsStore.cpp:82
+#: ../Src/DasherCore/RoutingAlphMgr.cpp:146
+#, c-format
+msgid ""
+"Warning: training file contains character '%s' as member of group '%s', but "
+"no group of that name contains the character. Ignoring group specifier."
+msgstr ""
+"ÐÐÐÐÐÑÐÑÐ: ÐÐÑÐÑÐÐÐ ÑÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐ â%sâ ÐÐÐ ÑÐÐÐÐ ÐÑÑÐÐ â%sâ, ÐÐÐ "
+"ÐÐÑÐÐÐÐ ÐÑÑÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐ. ÐÐÐÐÐÐÑÑÑÐÐ ÐÐÑÐÐÐÐÐÐ ÐÑÑÐÐ."
+
+#: ../Src/DasherCore/SettingsStore.cpp:75
 #: ../Src/Gtk2/DasherAppSettings.cpp:540 ../Src/Gtk2/DasherAppSettings.cpp:574
 #: ../Src/Gtk2/DasherAppSettings.cpp:578
 msgid "true"
 msgstr "ÑÐÑÐÐ"
 
-#: ../Src/DasherCore/SettingsStore.cpp:84
+#: ../Src/DasherCore/SettingsStore.cpp:77
 #: ../Src/Gtk2/DasherAppSettings.cpp:542 ../Src/Gtk2/DasherAppSettings.cpp:574
 #: ../Src/Gtk2/DasherAppSettings.cpp:578
 msgid "false"
@@ -812,14 +941,14 @@ msgstr "ÐÐÑÐÑÐÐ"
 #. Note to translators: This message will be output for a command line
 #. with "--options foo=VAL" and foo is a boolean valued parameter, but
 #. "VAL" is not true or false.
-#: ../Src/DasherCore/SettingsStore.cpp:90
+#: ../Src/DasherCore/SettingsStore.cpp:83
 #: ../Src/Gtk2/DasherAppSettings.cpp:545
 msgid "boolean value must be specified as 'true' or 'false'."
 msgstr "ÐÑÑÐÐÐÑÐÑÐÐ ÐÑÐÐÐÐÑÑÐ ÑÐ ÐÐÐÐÑÑ ÐÐÐ âÑÐÑÐÐâ Ð âÐÐÑÐÑÐÐâ."
 
 #. Note to translators: This is output when command line "--options" doesn't
 #. specify a known option.
-#: ../Src/DasherCore/SettingsStore.cpp:110
+#: ../Src/DasherCore/SettingsStore.cpp:103
 msgid "unknown option, use \"--help-options\" for more information."
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐ, ÐÑÐÐÐÑÑÐ â--help-optionsâ ÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ."
 
@@ -887,12 +1016,16 @@ msgstr "ÐÑÐÑÐÐ ÑÐÐÑÐ ÑÑÐÑÐÐÑÐ ÐÑÑÐÑÐÐÐÐ: â%sâ: %
 msgid "Dasher socket input: failed to launch reader thread."
 msgstr "ÐÐÐÑ ÑÑÐÑÐÐÑÐ ÐÑÑÐÑÐÐÐÐ : ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑ ÑÐÑÐÑÐ."
 
+#: ../Src/DasherCore/StylusFilter.cpp:10
+msgid "Max time for a 'tap' (anything longer is held)"
+msgstr "ÐÐÑÐÐÑÐ ÐÑÐÐÐ ÐÐ âÐÑÐÐÐâ (ÑÐÐ ÐÑÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ)"
+
 #: ../Src/DasherCore/StylusFilter.h:12
 msgid "Stylus Control"
 msgstr "ÐÐÐÐÑÑÐ ÐÐÐÑÑÐÐÐ"
 
 #. no context switch commands will be executed!
-#: ../Src/DasherCore/Trainer.cpp:32
+#: ../Src/DasherCore/Trainer.cpp:34
 #, c-format
 msgid ""
 "Warning: faulty alphabet definition, escape sequence %s must be a single "
@@ -901,20 +1034,11 @@ msgstr ""
 "ÐÐÐÐÐÑÐÑÐ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÐÑÐÑÐ ÐÐÑÐÐÐÑÐ, ÐÐÐÐÑÐ ÐÐÑÐÐ â%sâ ÐÐÑÐ ÐÐÑÐ "
 "ÑÐÐÐÑÑÐÐÐÐ ÐÐÐÐ ÑÐÐÐÐÐÐ. ÐÑÐ ÐÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÑÑÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÑÐÑÐ ÑÐÐÑÑÐ."
 
-#: ../Src/DasherCore/Trainer.cpp:122
-#, c-format
-msgid "Unable to open file \"%f\" for reading"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑ â%fâ ÐÐ ÑÐÑÐÑÐ"
-
-#: ../Src/DasherCore/Trainer.cpp:173
+#: ../Src/DasherCore/Trainer.cpp:101
 #, c-format
-msgid "Training file contains unknown source alphabet character %s"
-msgstr "ÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐÐÐ ÐÐÑÐÐÐÑÐ â%sâ"
-
-#: ../Src/DasherCore/Trainer.cpp:183
-#, c-format
-msgid "Training file contains unknown target alphabet character %s"
-msgstr "ÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ ÑÐÑÐÐ ÐÐÐÐ ÐÐÑÐÐÐÑÐ â%sâ"
+#| msgid "Unable to open file \"%f\" for reading"
+msgid "Unable to open file \"%s\" for reading"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑ â%sâ ÐÐ ÑÐÑÐÑÐ"
 
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:30
 msgid "Button offset"
@@ -928,7 +1052,7 @@ msgstr "ÐÑÐÐÐ ÐÐÑÐÑÑÑÑÐÐÑ ÐÑÐÑÐÑÐÐ"
 
 #. TRANSLATORS: Backoff = reversing in Dasher to correct mistakes. This allows a single button to be dedicated to activating backoff, rather than using multiple presses of other buttons, and another to be dedicated to starting and stopping. 'Button' in this context is a physical hardware device, not a UI element.
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:37
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:37
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:36
 msgid "Enable backoff and start/stop buttons"
 msgstr "ÐÐÐÐÑÑÐ ÐÑÐÐÐÐ ÑÐÐÐÑÐÐÐ ÐÑÐÑÐÐÐÐ Ð ÐÐÑÐÐ/ÐÐÑÑÑÐÐÐ"
 
@@ -954,22 +1078,30 @@ msgstr "ÐÐÐÐÑÐÑ ÑÐÐÑÐÐÐ (ÐÑÑÐÐÐ) ÐÑÐÐÐÑÐ"
 #. divisor
 #. step
 #: ../Src/DasherCore/TwoPushDynamicFilter.cpp:31
-msgid "Distance for 1st button UP"
-msgstr "ÐÐÐÑÐÐÐÑÑ ÐÐ ÐÑÐÐ ÐÑÐÐÐ ÐÐÐÐ"
+msgid "Distance between down markers (long gap)"
+msgstr "ÐÐÑÑÐÑÐÑÐ ÐÐÐÐÑÑ ÐÐÑÐÑ ÐÐÐÐÐÐÐÐÐÑÐ (ÐÑÐÐ ÑÐÑÐÐÑÐÐ)"
 
 #: ../Src/DasherCore/TwoPushDynamicFilter.cpp:32
-msgid "Distance for 1st button DOWN"
-msgstr "ÐÐÐÑÐÐÐÑÑ ÐÐ ÐÑÐÐ ÐÑÐÐÐ ÐÐÐÐ"
+msgid "Distance between up markers, as percentage of long gap"
+msgstr "ÐÐÑÑÐÑÐÑÐ ÐÐÐÐÑÑ ÐÐÑÑÐÑ ÐÐÐÐÐÐÐÐÐÑÐ, ÐÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐÐ ÑÐÑÐÐÑÐÐÐ"
 
 #: ../Src/DasherCore/TwoPushDynamicFilter.cpp:33
 msgid "Tolerance for inaccurate timing of button pushes (in ms)"
 msgstr "ÐÐÐÑÐÐÐÐÑÐ ÐÐÐÑÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÑÐÑÐÑÐÐ ÐÑÐÐÐÐÐ (Ñ ms)"
 
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:39
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:34
+msgid ""
+"Use push and release times of single press rather than push times of two "
+"presses"
+msgstr ""
+"ÐÐÑÐÑÑÐ ÐÑÐÐÐÐÐ ÐÑÑÐÑÐ Ð ÐÑÐÑÑÑÐÑÐ ÑÐÐÐÐÐ ÐÑÐÑÐÑÐÐ ÑÐÐÑÑÐ ÐÑÐÐÐÐÐ ÐÑÑÐÑÐ ÐÐÐ "
+"ÐÑÐÑÐÑÐÐ"
+
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:38
 msgid "Slow startup time"
 msgstr "ÐÑÐÐÐ ÐÐ ÑÐÐÑÐ ÐÐÐÑÐÑÐÑÐ"
 
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:47
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:46
 msgid "Two-push Dynamic Mode (New One Button)"
 msgstr "ÐÐÐÐÐÐÑÐÐ ÑÐÐÐÐ ÐÐÐ ÐÐÐÐÐ (ÐÐÐÐ ÐÑÐÐÐ)"
 
@@ -1005,7 +1137,7 @@ msgstr "ÐÐÐÐÑÐÐÐÑÑ ÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ â=â."
 msgid "Invalid option string specified"
 msgstr "ÐÐÑ ÑÐ ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../Src/Gtk2/dasher_main.cpp:621
+#: ../Src/Gtk2/dasher_main.cpp:620
 msgid ""
 "Welcome to Dasher Game Mode! Game Mode is a fun way to practice entering "
 "text in Dasher. Please select a training text to play with:"
@@ -1014,19 +1146,19 @@ msgstr ""
 "ÑÐÐÑÐÑÐ ÑÐÐÑÑÐ Ñ ÐÑÑÐÑÐÐÐÑ. ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÑ ÐÐ ÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÑÐÑÐ "
 "ÐÐÑÐÑÑÐÑÐ ÐÐ ÐÐÑÑ:"
 
-#: ../Src/Gtk2/dasher_main.cpp:623
+#: ../Src/Gtk2/dasher_main.cpp:622
 msgid "Use Default"
 msgstr "ÐÐÑÐÑÑÐ ÐÑÐÐÐÐÐ"
 
-#: ../Src/Gtk2/dasher_main.cpp:624
+#: ../Src/Gtk2/dasher_main.cpp:623
 msgid "Choose File..."
 msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑ..."
 
-#: ../Src/Gtk2/dasher_main.cpp:625
+#: ../Src/Gtk2/dasher_main.cpp:624
 msgid "Cancel"
 msgstr "ÐÐÐÐÑÑÐ"
 
-#: ../Src/Gtk2/dasher_main.cpp:648
+#: ../Src/Gtk2/dasher_main.cpp:647
 msgid ""
 "Are you sure you wish to turn off game mode? All unsaved changes will be "
 "lost."
@@ -1034,7 +1166,7 @@ msgstr ""
 "ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÑÑÑÐÑÐ ÑÐÐÐÐ ÐÐÑÐ? ÐÐÐ ÐÐÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐ "
 "ÑÐ ÐÐÑÐ ÐÐÐÑÐÑÐÐÐ."
 
-#: ../Src/Gtk2/dasher_main.cpp:955
+#: ../Src/Gtk2/dasher_main.cpp:954
 #, c-format
 msgid ""
 "Do you want to save your changes to %s?\n"
@@ -1045,7 +1177,7 @@ msgstr ""
 "\n"
 "ÐÐÐÐÐÐÐ ÐÑ ÐÐ ÑÐÑÑÐÐÑÐ, ÐÐÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÑÐÐÐ."
 
-#: ../Src/Gtk2/dasher_main.cpp:962
+#: ../Src/Gtk2/dasher_main.cpp:961
 msgid ""
 "Do you want to save your changes?\n"
 "\n"
@@ -1055,31 +1187,31 @@ msgstr ""
 "\n"
 "ÐÐÐÐÐÐÐ ÐÑ ÐÐ ÑÐÑÑÐÐÑÐ, ÐÐÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÑÐÐÐ."
 
-#: ../Src/Gtk2/dasher_main.cpp:968
+#: ../Src/Gtk2/dasher_main.cpp:967
 msgid "Don't save"
 msgstr "ÐÐ ÑÑÐÐÑ"
 
-#: ../Src/Gtk2/dasher_main.cpp:969 ../Src/Gtk2/dasher_main.cpp:992
+#: ../Src/Gtk2/dasher_main.cpp:968 ../Src/Gtk2/dasher_main.cpp:991
 msgid "Don't quit"
 msgstr "ÐÐ ÐÐÐÐÐÐ"
 
-#: ../Src/Gtk2/dasher_main.cpp:970
+#: ../Src/Gtk2/dasher_main.cpp:969
 msgid "Save and quit"
 msgstr "ÐÐÑÑÐÐÑ Ð ÐÐÐÑÐ"
 
-#: ../Src/Gtk2/dasher_main.cpp:989
+#: ../Src/Gtk2/dasher_main.cpp:988
 msgid "Are you sure you wish to quit?"
 msgstr "ÐÐ ÐÐ ÑÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐ?"
 
-#: ../Src/Gtk2/dasher_main.cpp:1031
+#: ../Src/Gtk2/dasher_main.cpp:1030
 msgid "Unable to open help file"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÐ ÐÐÐÐÑ"
 
-#: ../Src/Gtk2/dasher_main.cpp:1083
+#: ../Src/Gtk2/dasher_main.cpp:1082
 msgid "Dasher is a predictive text entry application"
 msgstr "ÐÑÑÐÑÐÐÐ ÑÐÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐÐ ÑÐÐÑÐÑÐ ÑÐÐÑÑÐ"
 
-#: ../Src/Gtk2/dasher_main.cpp:1088
+#: ../Src/Gtk2/dasher_main.cpp:1087
 msgid "translator-credits"
 msgstr ""
 "ÐÐÐÐÐÐ ÐÐÐÐÐ <danilo gnome org>\n"
@@ -1150,6 +1282,21 @@ msgstr "ÐÐÐÑ ÐÐ â--optionsâ."
 msgid "- A text input application honouring accessibility"
 msgstr "â ÐÑÐÐÑÐÐ ÐÐ ÐÑÐÑÑÑÐÐÑÐÐÑÐ ÑÐÐÑ ÑÐÐÑÑÐ"
 
+#~ msgid "Zoom steps"
+#~ msgstr "ÐÐÑÐÑÐ ÑÐÐÑÐÑÐ"
+
+#~ msgid "Training file contains unknown source alphabet character %s"
+#~ msgstr "ÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐÐÐ ÐÐÑÐÐÐÑÐ â%sâ"
+
+#~ msgid "Training file contains unknown target alphabet character %s"
+#~ msgstr "ÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ ÑÐÑÐÐ ÐÐÐÐ ÐÐÑÐÐÐÑÐ â%sâ"
+
+#~ msgid "Distance for 1st button UP"
+#~ msgstr "ÐÐÐÑÐÐÐÑÑ ÐÐ ÐÑÐÐ ÐÑÐÐÐ ÐÐÐÐ"
+
+#~ msgid "Distance for 1st button DOWN"
+#~ msgstr "ÐÐÐÑÐÐÐÑÑ ÐÐ ÐÑÐÐ ÐÑÐÐÐ ÐÐÐÐ"
+
 #~ msgid "A_ppend to file"
 #~ msgstr "_ÐÐÐÐÑ Ñ ÐÐÑÐÑÐÐÑ"
 
@@ -1377,9 +1524,6 @@ msgstr "â ÐÑÐÐÑÐÐ ÐÐ ÐÑÐÑÑÑÐÐÑÐÐÑÐ ÑÐÐÑ ÑÐÐÑÑÐ
 #~ msgid "Distance from centerline for start on mouse position:"
 #~ msgstr "ÐÐÑÑÐÑÐÑÐ ÐÐ ÑÑÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐÑÐ:"
 
-#~ msgid "Done"
-#~ msgstr "ÐÑÐÑÐÐÐ"
-
 #~ msgid "Down/3:"
 #~ msgstr "ÐÐÐÐ/3:"
 
diff --git a/po/sr latin po b/po/sr latin po
index 72055e1..e15a792 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -4,30 +4,29 @@
 # Maintainer: Danilo Åegan <dsegan gmx net>
 # Reviewed on 2005-07-15 by: Igor NestoroviÄ <igor prevod org>
 # Slobodan D. SredojeviÄ <slobo akrep be>, 2010.
-# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011.
+# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: dasher\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=dasher&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-08-23 14:32+0000\n"
-"PO-Revision-Date: 2011-07-21 14:54+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=dasher";
+"&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-01-03 21:30+0000\n"
+"PO-Revision-Date: 2012-03-01 12:06+0200\n"
 "Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
-"Language-Team: gnom prevod org\n"
+"Language-Team: Serbian <gnom prevod org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"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"
-"X-Generator: Virtaal 0.7.0\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
 #. Note to translators: This is the name of the dasher program as it appears
 #. in a window title.
-#: ../Data/dasher.desktop.in.in.h:1 ../Data/GUI/dasher.traditional.ui.h:6
-#: ../Data/GUI/dashermaemo.ui.h:1 ../Data/GUI/dashermaemofullscreen.ui.h:2
-#: ../Src/Gtk2/dasher_main.cpp:900
+#: ../Data/dasher.desktop.in.in.h:1 ../Data/GUI/dashermaemofullscreen.ui.h:2
+#: ../Data/GUI/dashermaemo.ui.h:1 ../Data/GUI/dasher.traditional.ui.h:6
+#: ../Src/Gtk2/dasher_main.cpp:899
 msgid "Dasher"
 msgstr "JuriÅnik"
 
@@ -37,18 +36,209 @@ msgstr "Unosite tekst bez upotrebe tastature"
 
 #: ../Data/dasher.desktop.in.in.h:3
 msgid "Predictive text entry"
-msgstr "PredviÄanje unosa teksta"
+msgstr "Unos predvidivog teksta"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:1
+#: ../Data/GUI/dasher.traditional.ui.h:4
+msgid "Copy _All"
+msgstr "UmnoÅi _sve"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:3
+msgid "Large"
+msgstr "Veliko"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:4
+msgid "Normal"
+msgstr "ObiÄno"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:5 ../Data/GUI/dashermaemo.ui.h:5
+#: ../Src/Gtk2/dasher_editor_internal.cpp:813
+#: ../Src/Gtk2/dasher_editor_internal.cpp:847 ../Src/Gtk2/dasher_main.cpp:914
+msgid "Select File"
+msgstr "Izaberi datoteku"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:6 ../Data/GUI/dashermaemo.ui.h:6
+msgid "Select Font"
+msgstr "Izaberi slovni lik"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:7
+msgid "Very Large"
+msgstr "Veoma velika"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:8
+msgid "_About"
+msgstr "_O programu"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:9
+msgid "_Dasher Font"
+msgstr "_Slovni lik JuriÅnika"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:10
+msgid "_Dasher Font Size"
+msgstr "VeliÄina slovnog lika _JuriÅnika"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:11
+#: ../Data/GUI/dasher.traditional.ui.h:20
+msgid "_Edit"
+msgstr "_UreÄivanje"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:12
+msgid "_Edit Font"
+msgstr "U_redi slovni lik"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:13
+#: ../Data/GUI/dasher.traditional.ui.h:21
+msgid "_File"
+msgstr "_Datoteka"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:14
+#: ../Data/GUI/dasher.traditional.ui.h:23
+msgid "_Help"
+msgstr "_PomoÄ"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:15
+msgid "_Options"
+msgstr "_MoguÄnosti"
+
+#: ../Data/GUI/dashermaemofullscreen.ui.h:16
+msgid "_Reset fonts"
+msgstr "_Vrati slovne likove"
 
-#: ../Data/GUI/dasher.preferences.ui.h:1
 #: ../Data/GUI/dashermaemo.preferences.ui.h:1
+#: ../Data/GUI/dasher.preferences.ui.h:1
 msgid "<b>Adaptation</b>"
 msgstr "<b>PrilagoÄavanje</b>"
 
-#: ../Data/GUI/dasher.preferences.ui.h:2
 #: ../Data/GUI/dashermaemo.preferences.ui.h:2
+#: ../Data/GUI/dasher.preferences.ui.h:2
 msgid "<b>Alphabet Selection</b>"
 msgstr "<b>Izbor pisma</b>"
 
+#: ../Data/GUI/dashermaemo.preferences.ui.h:3
+msgid "<b>Color Scheme</b>"
+msgstr "<b>Boje</b>"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:4
+msgid "<b>Display Size</b>"
+msgstr "<b>VeliÄina prikaza</b>"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:5
+#: ../Data/GUI/dasher.preferences.ui.h:13
+msgid "<b>Language Model</b>"
+msgstr "<b>Model jezika</b>"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:6
+msgid "<b>Orientation</b>"
+msgstr "<b>Usmerenje</b>"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:7
+#: ../Data/GUI/dasher.preferences.ui.h:14
+msgid "<b>Smoothing</b>"
+msgstr "<b>UmekÅavanje</b>"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:8
+#: ../Data/GUI/dasher.preferences.ui.h:15
+msgid "<b>Speed</b>"
+msgstr "<b>Brzina</b>"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:9
+#: ../Data/GUI/dasher.preferences.ui.h:18
+msgid "Adapt speed automatically"
+msgstr "Samostalno prilagodi brzinu"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:10
+msgid "Alphabet"
+msgstr "Pismo"
+
+#. The default display orientation for the selected alphabet, i.e., left to right for English, right to left for Arabic, etc.
+#: ../Data/GUI/dashermaemo.preferences.ui.h:11
+#: ../Data/GUI/dasher.preferences.ui.h:20
+msgid "Alphabet Default"
+msgstr "Podrazumevano pismo"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:12
+msgid "Bottom to Top"
+msgstr "Odozdo na gore"
+
+#. The way in which you would like to control dasher, e.g., using buttons for up/down, buttons for select, etc.
+#: ../Data/GUI/dashermaemo.preferences.ui.h:14
+msgid "Control"
+msgstr "Upravljanje"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:15
+msgid "Custom"
+msgstr "Proizvoljno"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:16
+#: ../Data/GUI/dasher.preferences.ui.h:32
+msgid "Custom colour scheme:"
+msgstr "Proizvoljne boje:"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:17
+#: ../Data/GUI/dasher.preferences.ui.h:33
+msgid "Dasher Preferences"
+msgstr "Postavke JuriÅnika"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:18
+msgid "Enlarge input window"
+msgstr "PoveÄaj prozor za unos"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:19
+#: ../Data/GUI/dasher.preferences.ui.h:43
+msgid "Japanese"
+msgstr "Japanski"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:20
+#: ../Data/GUI/dasher.preferences.ui.h:44
+msgid "Language model adapts as you write."
+msgstr "JeziÄki model se prilagoÄava kako piÅete."
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:21
+msgid "Left to Right"
+msgstr "Sleva na desno"
+
+#. PPM = Prediction by Partial Match, a statistical language model.
+#: ../Data/GUI/dashermaemo.preferences.ui.h:22
+#: ../Data/GUI/dasher.preferences.ui.h:47
+msgid "Mixture model (PPM/dictionary)"
+msgstr "MeÅani model (PPM/reÄnik)"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:23
+msgid "Prediction"
+msgstr "PredviÄanje"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:24
+msgid "Right to Left"
+msgstr "Sa desna na levo"
+
+#. PPM = Prediction by Partial Match, a statistical language model.
+#: ../Data/GUI/dashermaemo.preferences.ui.h:25
+#: ../Data/GUI/dasher.preferences.ui.h:60
+msgid "Standard letter-based PPM"
+msgstr "Standardni PPM zasnovan na pismu"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:26
+msgid "Top to Bottom"
+msgstr "Odozgo na dole"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:27
+msgid "View"
+msgstr "Pregled"
+
+#: ../Data/GUI/dashermaemo.preferences.ui.h:28
+#: ../Data/GUI/dasher.preferences.ui.h:71
+msgid "Word-based model"
+msgstr "Model zasnovan na reÄima"
+
+#. Abbreviation for Preferences
+#: ../Data/GUI/dashermaemo.ui.h:3
+msgid "P"
+msgstr "P"
+
+#: ../Data/GUI/dashermaemo.ui.h:4 ../Data/GUI/dasher.traditional.ui.h:11
+msgid "Please Waitâ"
+msgstr "SaÄekajte..."
+
 # bug: View the Options or Options of the View
 #: ../Data/GUI/dasher.preferences.ui.h:3
 msgid "<b>Appearance Options</b>"
@@ -73,7 +263,7 @@ msgstr "<b>Stil upravljanja</b>"
 
 #: ../Data/GUI/dasher.preferences.ui.h:9
 msgid "<b>Dasher Font</b>"
-msgstr "<b>JuriÅnikov font</b>"
+msgstr "<b>Pismo JuriÅnika</b>"
 
 #: ../Data/GUI/dasher.preferences.ui.h:10
 msgid "<b>Direction</b>"
@@ -81,27 +271,12 @@ msgstr "<b>Usmerenje</b>"
 
 #: ../Data/GUI/dasher.preferences.ui.h:11
 msgid "<b>Editor Font</b>"
-msgstr "<b>Font ureÄivaÄa</b>"
+msgstr "<b>Pismo ureÄivaÄa</b>"
 
 #: ../Data/GUI/dasher.preferences.ui.h:12
 msgid "<b>Input Device</b>"
 msgstr "<b>Ulazni ureÄaj</b>"
 
-#: ../Data/GUI/dasher.preferences.ui.h:13
-#: ../Data/GUI/dashermaemo.preferences.ui.h:5
-msgid "<b>Language Model</b>"
-msgstr "<b>Model jezika</b>"
-
-#: ../Data/GUI/dasher.preferences.ui.h:14
-#: ../Data/GUI/dashermaemo.preferences.ui.h:7
-msgid "<b>Smoothing</b>"
-msgstr "<b>UmekÅavanje</b>"
-
-#: ../Data/GUI/dasher.preferences.ui.h:15
-#: ../Data/GUI/dashermaemo.preferences.ui.h:8
-msgid "<b>Speed</b>"
-msgstr "<b>Brzina</b>"
-
 #: ../Data/GUI/dasher.preferences.ui.h:16
 msgid "<b>Starting and Stopping</b>"
 msgstr "<b>Pokretanje i zaustavljanje</b>"
@@ -110,17 +285,6 @@ msgstr "<b>Pokretanje i zaustavljanje</b>"
 msgid "A_pplication"
 msgstr "_Program"
 
-#: ../Data/GUI/dasher.preferences.ui.h:18
-#: ../Data/GUI/dashermaemo.preferences.ui.h:9
-msgid "Adapt speed automatically"
-msgstr "Samostalno prilagodi brzinu"
-
-#. The default display orientation for the selected alphabet, i.e., left to right for English, right to left for Arabic, etc.
-#: ../Data/GUI/dasher.preferences.ui.h:20
-#: ../Data/GUI/dashermaemo.preferences.ui.h:11
-msgid "Alphabet Default"
-msgstr "Podrazumevano pismo"
-
 #: ../Data/GUI/dasher.preferences.ui.h:21
 msgid "Always Bottom-to-Top"
 msgstr "Uvek odozdo na gore"
@@ -159,16 +323,6 @@ msgstr "ReÅim upravljanja"
 msgid "Copy All on stop"
 msgstr "UmnoÅi sve pri zaustavljanju"
 
-#: ../Data/GUI/dasher.preferences.ui.h:32
-#: ../Data/GUI/dashermaemo.preferences.ui.h:16
-msgid "Custom colour scheme:"
-msgstr "Proizvoljne boje:"
-
-#: ../Data/GUI/dasher.preferences.ui.h:33
-#: ../Data/GUI/dashermaemo.preferences.ui.h:17
-msgid "Dasher Preferences"
-msgstr "Postavke JuriÅnika"
-
 #: ../Data/GUI/dasher.preferences.ui.h:34
 msgid "Direct entry"
 msgstr "Direktan unos"
@@ -205,25 +359,9 @@ msgstr "UkljuÄi naredbe govora"
 msgid "Increase line thickness"
 msgstr "PoveÄaj debljinu linije"
 
-#: ../Data/GUI/dasher.preferences.ui.h:43
-#: ../Data/GUI/dashermaemo.preferences.ui.h:19
-msgid "Japanese"
-msgstr "Japanski"
-
-#: ../Data/GUI/dasher.preferences.ui.h:44
-#: ../Data/GUI/dashermaemo.preferences.ui.h:20
-msgid "Language model adapts as you write."
-msgstr "JeziÄki model se prilagoÄava kako piÅete."
-
 #: ../Data/GUI/dasher.preferences.ui.h:45
 msgid "Large font "
-msgstr "Veliki font "
-
-#. PPM = Prediction by Partial Match, a statistical language model.
-#: ../Data/GUI/dasher.preferences.ui.h:47
-#: ../Data/GUI/dashermaemo.preferences.ui.h:22
-msgid "Mixture model (PPM/dictionary)"
-msgstr "MeÅani model (PPM/reÄnik)"
+msgstr "Veliko pismo "
 
 #: ../Data/GUI/dasher.preferences.ui.h:48
 msgid "Options"
@@ -269,12 +407,6 @@ msgstr "Izgovara reÄi Äim ih napiÅete"
 msgid "Stand-alone"
 msgstr "Samostalno"
 
-#. PPM = Prediction by Partial Match, a statistical language model.
-#: ../Data/GUI/dasher.preferences.ui.h:60
-#: ../Data/GUI/dashermaemo.preferences.ui.h:25
-msgid "Standard letter-based PPM"
-msgstr "Standardni PPM zasnovan na pismu"
-
 #: ../Data/GUI/dasher.preferences.ui.h:61
 msgid "Start on left mouse button"
 msgstr "PoÄni na pritisak levog dugmeta miÅa"
@@ -310,11 +442,6 @@ msgstr ""
 msgid "Very large font"
 msgstr "Veoma veliki font"
 
-#: ../Data/GUI/dasher.preferences.ui.h:71
-#: ../Data/GUI/dashermaemo.preferences.ui.h:28
-msgid "Word-based model"
-msgstr "Model zasnovan na reÄima"
-
 #: ../Data/GUI/dasher.preferences.ui.h:72
 msgid "_Appearance"
 msgstr "_Izgled"
@@ -335,11 +462,6 @@ msgstr "Pismo:"
 msgid "Copy"
 msgstr "UmnoÅi"
 
-#: ../Data/GUI/dasher.traditional.ui.h:4
-#: ../Data/GUI/dashermaemofullscreen.ui.h:1
-msgid "Copy _All"
-msgstr "UmnoÅi _sve"
-
 #: ../Data/GUI/dasher.traditional.ui.h:5
 msgid "Cut"
 msgstr "Iseci"
@@ -360,10 +482,6 @@ msgstr "Otvori datoteku"
 msgid "Paste"
 msgstr "Ubaci"
 
-#: ../Data/GUI/dasher.traditional.ui.h:11 ../Data/GUI/dashermaemo.ui.h:4
-msgid "Please Waitâ"
-msgstr "SaÄekajte..."
-
 #: ../Data/GUI/dasher.traditional.ui.h:12
 msgid "Pr_eferencesâ"
 msgstr "_Postavke..."
@@ -372,7 +490,7 @@ msgstr "_Postavke..."
 msgid "Preferences"
 msgstr "Postavke"
 
-#: ../Data/GUI/dasher.traditional.ui.h:14 ../Src/Gtk2/dasher_main.cpp:993
+#: ../Data/GUI/dasher.traditional.ui.h:14 ../Src/Gtk2/dasher_main.cpp:992
 msgid "Quit"
 msgstr "IzaÄi"
 
@@ -396,137 +514,22 @@ msgstr "_O programuâ"
 msgid "_Contentsâ"
 msgstr "_SadrÅajâ"
 
-#: ../Data/GUI/dasher.traditional.ui.h:20
-#: ../Data/GUI/dashermaemofullscreen.ui.h:11
-msgid "_Edit"
-msgstr "_UreÄivanje"
-
-#: ../Data/GUI/dasher.traditional.ui.h:21
-#: ../Data/GUI/dashermaemofullscreen.ui.h:13
-msgid "_File"
-msgstr "_Datoteka"
-
 #: ../Data/GUI/dasher.traditional.ui.h:22
 msgid "_Game Mode"
 msgstr "ReÅim _igre"
 
-#: ../Data/GUI/dasher.traditional.ui.h:23
-#: ../Data/GUI/dashermaemofullscreen.ui.h:14
-msgid "_Help"
-msgstr "_PomoÄ"
-
 #: ../Data/GUI/dasher.traditional.ui.h:24
 msgid "_Import Training Textâ"
 msgstr "_Uvezi tekst za uveÅbavanjeâ"
 
-#. Abbreviation for Preferences
-#: ../Data/GUI/dashermaemo.ui.h:3
-msgid "P"
-msgstr "P"
-
-#: ../Data/GUI/dashermaemo.ui.h:5 ../Data/GUI/dashermaemofullscreen.ui.h:5
-#: ../Src/Gtk2/dasher_editor_internal.cpp:812
-#: ../Src/Gtk2/dasher_editor_internal.cpp:846 ../Src/Gtk2/dasher_main.cpp:915
-msgid "Select File"
-msgstr "Izaberi datoteku"
-
-#: ../Data/GUI/dashermaemo.ui.h:6 ../Data/GUI/dashermaemofullscreen.ui.h:6
-msgid "Select Font"
-msgstr "Izaberi slovni lik"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:3
-msgid "<b>Color Scheme</b>"
-msgstr "<b>Boje</b>"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:4
-msgid "<b>Display Size</b>"
-msgstr "<b>VeliÄina prikaza</b>"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:6
-msgid "<b>Orientation</b>"
-msgstr "<b>Usmerenje</b>"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:10
-msgid "Alphabet"
-msgstr "Pismo"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:12
-msgid "Bottom to Top"
-msgstr "Odozdo na gore"
-
-#. The way in which you would like to control dasher, e.g., using buttons for up/down, buttons for select, etc.
-#: ../Data/GUI/dashermaemo.preferences.ui.h:14
-msgid "Control"
-msgstr "Upravljanje"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:15
-msgid "Custom"
-msgstr "Proizvoljno"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:18
-msgid "Enlarge input window"
-msgstr "PoveÄaj prozor za unos"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:21
-msgid "Left to Right"
-msgstr "Sleva na desno"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:23
-msgid "Prediction"
-msgstr "PredviÄanje"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:24
-msgid "Right to Left"
-msgstr "Sa desna na levo"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:26
-msgid "Top to Bottom"
-msgstr "Odozgo na dole"
-
-#: ../Data/GUI/dashermaemo.preferences.ui.h:27
-msgid "View"
-msgstr "Pregled"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:3
-msgid "Large"
-msgstr "Veliko"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:4
-msgid "Normal"
-msgstr "ObiÄno"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:7
-msgid "Very Large"
-msgstr "Veoma velika"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:8
-msgid "_About"
-msgstr "_O programu"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:9
-msgid "_Dasher Font"
-msgstr "_Slovni lik za JuriÅnika"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:10
-msgid "_Dasher Font Size"
-msgstr "VeliÄina slovnog lika _JuriÅnika"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:12
-msgid "_Edit Font"
-msgstr "U_redi slovni lik"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:15
-msgid "_Options"
-msgstr "_MoguÄnosti"
-
-#: ../Data/GUI/dashermaemofullscreen.ui.h:16
-msgid "_Reset fonts"
-msgstr "_Vrati slovne likove"
-
-#: ../Src/DasherCore/AbstractXMLParser.cpp:40
+#. think XML_LChar==char, depends on preprocessor variables...
+#. /TRANSLATORS: the first string is the error message from the XML Parser;
+#. / the second is the URL of the file we're trying to read.
+#: ../Src/DasherCore/AbstractXMLParser.cpp:63
 #, c-format
-msgid "XML Error %s in file %s somewhere in block: %s"
-msgstr "HML greÅka â%sâ u datoteci â%sâ tamo negde u bloku: %s"
+#| msgid "XML Error %s in file %s somewhere in block: %s"
+msgid "XML Error %s in file %s "
+msgstr "iKsML greÅka â%sâ u datoteci â%sâ"
 
 #: ../Src/DasherCore/Alphabet/AlphabetMap.cpp:116
 #, c-format
@@ -545,7 +548,7 @@ msgstr "Äitam neispravan UTF-8 znak â0x%xâ"
 #. /TRANSLATORS: the string "GameTextFile" is the name of a setting in gsettings
 #. / (or equivalent), and should not be translated. The %s is the value of that
 #. / setting (this message displayed only if the user has provided a value)
-#: ../Src/DasherCore/AlphabetManager.cpp:162
+#: ../Src/DasherCore/AlphabetManager.cpp:213
 #, c-format
 msgid ""
 "Note: GameTextFile setting specifies game sentences file '%s' but this does "
@@ -557,14 +560,16 @@ msgstr ""
 #. TRANSLATORS: The number of time steps over which to perform the zooming motion in button mode.
 #: ../Src/DasherCore/AlternatingDirectMode.cpp:28
 #: ../Src/DasherCore/ButtonMode.cpp:28 ../Src/DasherCore/CompassMode.cpp:28
-msgid "Zoom steps"
-msgstr "Koraci uveÄanja"
+#: ../Src/DasherCore/StylusFilter.cpp:11
+#| msgid "Factor by which to zoom in"
+msgid "Frames over which to perform zoom"
+msgstr "Broj kadrova preko kojih se uveÄava"
 
 #. TRANSLATORS: Intercept keyboard events for 'special' keys even when the Dasher window doesn't have keyboard focus.
 #: ../Src/DasherCore/AlternatingDirectMode.cpp:30
 #: ../Src/DasherCore/ButtonMode.cpp:39 ../Src/DasherCore/CompassMode.cpp:32
 msgid "Global keyboard grab"
-msgstr "Hvataj sa tastature"
+msgstr "Hvatanje sa tastature"
 
 #. menu
 #: ../Src/DasherCore/AlternatingDirectMode.cpp:34
@@ -586,8 +591,9 @@ msgid "Scan time in menu mode (0 to not scan)"
 msgstr "Vreme skeniranja u reÅimu izbornika (0 â iskljuÄuje)"
 
 #: ../Src/DasherCore/ButtonMode.cpp:30
-msgid "Number of boxes"
-msgstr "Broj kuÄica"
+#| msgid "Number of boxes"
+msgid "Number of forward boxes"
+msgstr "Broj kuÄica za napred"
 
 #: ../Src/DasherCore/ButtonMode.cpp:31
 msgid "Safety margin"
@@ -636,9 +642,13 @@ msgstr "Desno uveÄanje"
 msgid "Compass Mode"
 msgstr "ReÅim busole"
 
+#: ../Src/DasherCore/ControlManager.cpp:249
+msgid "Done"
+msgstr "UraÄeno"
+
 #. /TRANSLATORS: %s is the name of the alphabet; the string "GameTextFile"
 #. / refers to a setting name in gsettings or equivalent, and should not be translated.
-#: ../Src/DasherCore/DasherInterfaceBase.cpp:306
+#: ../Src/DasherCore/DasherInterfaceBase.cpp:315
 #, c-format
 msgid ""
 "Could not find game sentences file for %s - check alphabet definition, or "
@@ -647,16 +657,16 @@ msgstr ""
 "Ne mogu da pronaÄem datoteku iskaza igre za â%sâ â proverite definiciju "
 "alfabeta, ili prepiÅite pdeÅavanjima iz datoteke teksta igre"
 
-#: ../Src/DasherCore/DasherInterfaceBase.cpp:785
+#: ../Src/DasherCore/DasherInterfaceBase.cpp:790
 msgid "Normal Control"
 msgstr "UobiÄajene kontrole"
 
 #. TODO: specialist factory for button mode
-#: ../Src/DasherCore/DasherInterfaceBase.cpp:801
+#: ../Src/DasherCore/DasherInterfaceBase.cpp:806
 msgid "Menu Mode"
 msgstr "ReÅim izbornika"
 
-#: ../Src/DasherCore/DasherInterfaceBase.cpp:802
+#: ../Src/DasherCore/DasherInterfaceBase.cpp:807
 msgid "Direct Mode"
 msgstr "Direktan reÅim"
 
@@ -680,25 +690,136 @@ msgid ""
 "Screen geometry (mostly for tall thin screens) - 0=old-style, 1=square no-"
 "xhair, 2=squish, 3=squish+log"
 msgstr ""
+"Oblik ekrana (najÄeÅÄe za visoke tanke ekrane) â 0=stari stil, 1=kvadrat bez "
+"h-vlasi, 2=, 3=+dnevnik"
 
 #: ../Src/DasherCore/DefaultFilter.cpp:18
 msgid ""
 "Shape type: 0=disjoint rects, 1=overlapping, 2=triangles, 3=trunc-tris, "
 "4=quadrics, 5=circles"
 msgstr ""
+"Vrsta figure: 0=razdvojeni pravougaonici, 1=preklapanje, 2=trouglovi, "
+"3=zarubljeni-trouglovi, 4=kvadratni, 5=krugovi"
 
-#. 1. Look for system training text...
-#: ../Src/DasherCore/NodeCreationManager.cpp:81
-msgid "Training on System Text"
-msgstr "UveÅbavanje na tekstu sistema"
+#: ../Src/DasherCore/DefaultFilter.cpp:19
+msgid ""
+"Distance from right-hand-side Y-axis, at which maximum speed is reached. "
+"(2048=xhair)"
+msgstr ""
+"Odstojanje od Y-ose sa strane desne ruke, na kojoj je dostignuta najveÄa "
+"brzina. (2048=h-vlasi)"
+
+#: ../Src/DasherCore/DefaultFilter.cpp:20
+msgid "Hold right mouse button / key 1 to go 3/4 faster"
+msgstr "DrÅi desno dugme miÅa / taster 1 da bi iÅao 3/4 brÅe"
+
+#: ../Src/DasherCore/DefaultFilter.cpp:21
+msgid "Use exact computation of per-frame movement (slower)"
+msgstr "Koristi taÄno izraÄunavanje pokreta po-kadar (sporije)"
+
+#: ../Src/DasherCore/DemoFilter.cpp:15
+msgid "Demo Mode (no input)"
+msgstr "ReÅim probe (bez unosa)"
+
+#: ../Src/DasherCore/GameModule.cpp:8
+msgid "Filename of sentences to enter"
+msgstr "Naziv datoteke reÄenica za unos"
 
-#. 2. Now add in any user-provided individual training text...
-#: ../Src/DasherCore/NodeCreationManager.cpp:83
+#: ../Src/DasherCore/GameModule.cpp:9
+msgid "Distance of sentence from center to decide user needs help"
+msgstr ""
+"Odstojanje reÄenice od centra da bi odluÄio da je korisniku potrebna pomoÄ"
+
+#: ../Src/DasherCore/GameModule.cpp:10
+msgid "Time for which user must need help before help drawn"
+msgstr "Vreme za koje korisniku mora zatrebati pomoÄ pre pomaganja u crtanju"
+
+#: ../Src/DasherCore/GameModule.cpp:11
+msgid "When we give help, show the shortest path to the target sentence?"
+msgstr ""
+"Kada pruÅamo pomoÄ, da li da prikaÅemo najkraÄu pomoÄ do ciljne reÄenice?"
+
+#: ../Src/DasherCore/MandarinAlphMgr.cpp:176
+#: ../Src/DasherCore/RoutingAlphMgr.cpp:128
+#, c-format
+#| msgid ""
+#| "Warning: faulty alphabet definition, escape sequence %s must be a single "
+#| "unicode character. This may worsen Dasher's text prediction."
+msgid ""
+"Warning: faulty alphabet definition: training-start delimiter %s must be a "
+"single unicode character. May be unable to process training file."
+msgstr ""
+"Upozorenje: neispravna odrednica alfabeta, graniÄnik pokretanja uveÅbavanja â%"
+"sâ mora biti samostalni znak unikoda. MoÅe biti u neprilici da obradi "
+"datoteku uveÅbavanja."
+
+#: ../Src/DasherCore/MandarinAlphMgr.cpp:186
+#, c-format
+msgid ""
+"Warning: training file contains character '%s' as member of group '%s', but "
+"no group of that name contains the character; ignoring group specifier"
+msgstr ""
+"Upozorenje: datoteka uveÅbavanja sadrÅi znak â%sâ kao Älana grupe â%sâ, ali "
+"nijedna grupa takvog naziva ne sadrÅi znak; zanemarujem odrednika grupe"
+
+#: ../Src/DasherCore/MandarinAlphMgr.cpp:199
+#, c-format
+msgid ""
+"Warning: training file contains character '%s' as member of group '%s', but "
+"no group of that name contains the character. Dasher will not be able to "
+"learn how you want to write this character."
+msgstr ""
+"Upozorenje: datoteka uveÅbavanja sadrÅi znak â%sâ kao Älana grupe â%sâ, ali "
+"nijedna grupa takvog naziva ne sadrÅi znak. JuriÅnik neÄe biti u moguÄnosti "
+"da nauÄi kako Åelite da ispiÅete taj znak."
+
+#: ../Src/DasherCore/MandarinAlphMgr.cpp:200
+#: ../Src/DasherCore/RoutingAlphMgr.cpp:147
+#, c-format
+msgid ""
+"Warning: training file contains character '%s' as member of group '%s', but "
+"alphabet contains several such groups. Dasher will not be able to learn how "
+"you want to write this character."
+msgstr ""
+"Upozorenje: datoteka uveÅbavanja sadrÅi znak â%sâ kao Älana grupe â%sâ, ali "
+"alfabet sadrÅi nekoliko takvih grupa. JuriÅnik neÄe biti u moguÄnosti da "
+"nauÄi kako Åelite da ispiÅete taj znak."
+
+#: ../Src/DasherCore/MandarinAlphMgr.cpp:220
+#: ../Src/DasherCore/RoutingAlphMgr.cpp:164
+#, c-format
+msgid ""
+"Warning: in training file, annotation '<%s>' is followed by another "
+"annotation and will be ignored"
+msgstr ""
+"Upozorenje: u datoteci uveÅbavanja, za pribeleÅkom â<%s>â sledi druga "
+"pribeleÅka i zato Äe biti zanemarena"
+
+#. /TRANSLATORS: first string will be the filename; after the end of the string,
+#. / some number of output (e.g. Chinese) characters will be appended,
+#. / the number of which is the integer here
+#: ../Src/DasherCore/MandarinAlphMgr.cpp:244
+#, c-format
+msgid ""
+"In file %s, the following %i symbols appeared without annotations saying how "
+"they should be entered, but each can be entered in several ways. Dasher will "
+"not be able to learn how you want to enter these symbols:"
+msgstr ""
+"U datoteci â%sâ, prateÄih %i simbola se pojavilo bez pribeleÅki govoreÄi "
+"kako bi trebali da budu uneÅeni, ali svaki moÅe biti uneÅen na nekoliko "
+"naÄina. JuriÅnik neÄe biti u moguÄnosti da nauÄi kako Åelite da unesete te "
+"simbole:"
+
+#: ../Src/DasherCore/NodeCreationManager.cpp:33
 msgid "Training on User Text"
 msgstr "UveÅbavanje na tekstu korisnika"
 
+#: ../Src/DasherCore/NodeCreationManager.cpp:33
+msgid "Training on System Text"
+msgstr "UveÅbavanje na tekstu sistema"
+
 #. /TRANSLATORS: These 3 messages will be displayed when the user has just chosen a new alphabet. The %s parameter will be the name of the alphabet.
-#: ../Src/DasherCore/NodeCreationManager.cpp:85
+#: ../Src/DasherCore/NodeCreationManager.cpp:101
 #, c-format
 msgid ""
 "No user training text found - if you have written in \"%s\" before, this "
@@ -707,7 +828,7 @@ msgstr ""
 "Nema korisniÄkog teksta za uveÅbavanje â ako ste ranije pisali na â%sâ, to "
 "znaÄi da JuriÅnik moÅda ne uÄi iz prethodnih sesija."
 
-#: ../Src/DasherCore/NodeCreationManager.cpp:86
+#: ../Src/DasherCore/NodeCreationManager.cpp:102
 #, c-format
 msgid ""
 "No training text (user or system) found for \"%s\". Dasher will still work "
@@ -719,7 +840,7 @@ msgstr ""
 "preuzmete datoteku teksta za uveÅbavanje sa JuriÅnikovog veb sajta, ili da "
 "sami izgradite jedan."
 
-#: ../Src/DasherCore/NodeCreationManager.cpp:97
+#: ../Src/DasherCore/NodeCreationManager.cpp:108
 #, c-format
 msgid ""
 "\"%s\" does not specify training file. Dasher will work but entry will be "
@@ -731,7 +852,6 @@ msgstr ""
 #. TRANSLATORS: The time for which a button must be held before it counts as a 'long' (rather than short) press.
 #: ../Src/DasherCore/OneButtonDynamicFilter.cpp:31
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:32
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:35
 msgid "Long press time"
 msgstr "Vreme dugog pritiska"
 
@@ -747,7 +867,7 @@ msgstr "OmoguÄi povratno dugme ispravki"
 
 #: ../Src/DasherCore/OneButtonDynamicFilter.cpp:36
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:43
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:38
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:37
 msgid "Slow startup"
 msgstr "Sporo pokretanje"
 
@@ -758,19 +878,19 @@ msgstr "Vreme pokretanja"
 
 #: ../Src/DasherCore/OneButtonDynamicFilter.cpp:38
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:46
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:40
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:39
 msgid "Percentage by which to automatically increase speed"
 msgstr "Procenat do koga se automatski poveÄava brzina"
 
 #: ../Src/DasherCore/OneButtonDynamicFilter.cpp:39
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:47
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:41
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:40
 msgid "Time after which to automatically increase speed (secs)"
 msgstr "Vreme nakon koga se automatski poveÄava brzina (u sekundama)"
 
 #: ../Src/DasherCore/OneButtonDynamicFilter.cpp:40
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:48
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:42
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:41
 msgid "Percentage by which to decrease speed upon reverse"
 msgstr "Procenat za koji se smanjuje brzina nakon vraÄanja"
 
@@ -778,17 +898,17 @@ msgstr "Procenat za koji se smanjuje brzina nakon vraÄanja"
 msgid "One Button Dynamic Mode"
 msgstr "DinamiÄki reÅim jednog dugmeta"
 
-#: ../Src/DasherCore/OneButtonFilter.cpp:11
+#: ../Src/DasherCore/OneButtonFilter.cpp:12
 msgid "Scan time (each direction), in ms"
 msgstr "Vreme traÅenja (za svaki smer), u milisekundama"
 
-#: ../Src/DasherCore/OneButtonFilter.cpp:12
+#: ../Src/DasherCore/OneButtonFilter.cpp:13
 msgid "Factor by which to zoom in"
 msgstr "Faktor za koji se uveÄava"
 
-#: ../Src/DasherCore/OneButtonFilter.cpp:13
+#: ../Src/DasherCore/OneButtonFilter.cpp:14
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:45
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:43
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:42
 msgid "Lag before user actually pushes button (ms)"
 msgstr "Pauza pre nego Åto korisnik zaista pritisne dugme (ms)"
 
@@ -797,13 +917,22 @@ msgstr "Pauza pre nego Åto korisnik zaista pritisne dugme (ms)"
 msgid "One Dimensional Mode"
 msgstr "Jednodimenzioni reÅim"
 
-#: ../Src/DasherCore/SettingsStore.cpp:82
+#: ../Src/DasherCore/RoutingAlphMgr.cpp:146
+#, c-format
+msgid ""
+"Warning: training file contains character '%s' as member of group '%s', but "
+"no group of that name contains the character. Ignoring group specifier."
+msgstr ""
+"Upozorenje: datoteka uveÅbavanja sadrÅi znak â%sâ kao Älana grupe â%sâ, ali "
+"nijedna grupa takvog naziva ne sadrÅi znak. Zanemarujem odrednika grupe."
+
+#: ../Src/DasherCore/SettingsStore.cpp:75
 #: ../Src/Gtk2/DasherAppSettings.cpp:540 ../Src/Gtk2/DasherAppSettings.cpp:574
 #: ../Src/Gtk2/DasherAppSettings.cpp:578
 msgid "true"
 msgstr "taÄno"
 
-#: ../Src/DasherCore/SettingsStore.cpp:84
+#: ../Src/DasherCore/SettingsStore.cpp:77
 #: ../Src/Gtk2/DasherAppSettings.cpp:542 ../Src/Gtk2/DasherAppSettings.cpp:574
 #: ../Src/Gtk2/DasherAppSettings.cpp:578
 msgid "false"
@@ -812,14 +941,14 @@ msgstr "netaÄno"
 #. Note to translators: This message will be output for a command line
 #. with "--options foo=VAL" and foo is a boolean valued parameter, but
 #. "VAL" is not true or false.
-#: ../Src/DasherCore/SettingsStore.cpp:90
+#: ../Src/DasherCore/SettingsStore.cpp:83
 #: ../Src/Gtk2/DasherAppSettings.cpp:545
 msgid "boolean value must be specified as 'true' or 'false'."
 msgstr "istinitosne vrednosti se zadaju kao âtaÄnoâ i ânetaÄnoâ."
 
 #. Note to translators: This is output when command line "--options" doesn't
 #. specify a known option.
-#: ../Src/DasherCore/SettingsStore.cpp:110
+#: ../Src/DasherCore/SettingsStore.cpp:103
 msgid "unknown option, use \"--help-options\" for more information."
 msgstr "nepoznata opcija, probajte â--help-optionsâ za viÅe podataka."
 
@@ -887,12 +1016,16 @@ msgstr "GreÅka unosa utiÄnice JuriÅnika: â%sâ: %s"
 msgid "Dasher socket input: failed to launch reader thread."
 msgstr "Unos utiÄnice JuriÅnika : nisam uspeo da pokrenem nit ÄitaÄa."
 
+#: ../Src/DasherCore/StylusFilter.cpp:10
+msgid "Max time for a 'tap' (anything longer is held)"
+msgstr "NajveÄe vreme za âlupniâ (sve duÅe biÄe zadrÅano)"
+
 #: ../Src/DasherCore/StylusFilter.h:12
 msgid "Stylus Control"
 msgstr "Iglaste kontrole"
 
 #. no context switch commands will be executed!
-#: ../Src/DasherCore/Trainer.cpp:32
+#: ../Src/DasherCore/Trainer.cpp:34
 #, c-format
 msgid ""
 "Warning: faulty alphabet definition, escape sequence %s must be a single "
@@ -901,20 +1034,11 @@ msgstr ""
 "Upozorenje: neispravna definicija alfabeta, beÅeÄi izraz â%sâ mora biti "
 "samostalni znak unikoda. Åto moÅe pogorÅati JuriÅnikovo predviÄanje teksta."
 
-#: ../Src/DasherCore/Trainer.cpp:122
-#, c-format
-msgid "Unable to open file \"%f\" for reading"
-msgstr "Ne mogu da otvorim datoteku â%fâ za Äitanje"
-
-#: ../Src/DasherCore/Trainer.cpp:173
+#: ../Src/DasherCore/Trainer.cpp:101
 #, c-format
-msgid "Training file contains unknown source alphabet character %s"
-msgstr "Datoteka za uveÅbavanje sadrÅi nepoznati izvorni znak alfabeta â%sâ"
-
-#: ../Src/DasherCore/Trainer.cpp:183
-#, c-format
-msgid "Training file contains unknown target alphabet character %s"
-msgstr "Datoteka za uveÅbavanje sadrÅi nepoznati ciljni znak alfabeta â%sâ"
+#| msgid "Unable to open file \"%f\" for reading"
+msgid "Unable to open file \"%s\" for reading"
+msgstr "Ne mogu da otvorim datoteku â%sâ za Äitanje"
 
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:30
 msgid "Button offset"
@@ -928,7 +1052,7 @@ msgstr "Vreme viÅestrukih pritiska"
 
 #. TRANSLATORS: Backoff = reversing in Dasher to correct mistakes. This allows a single button to be dedicated to activating backoff, rather than using multiple presses of other buttons, and another to be dedicated to starting and stopping. 'Button' in this context is a physical hardware device, not a UI element.
 #: ../Src/DasherCore/TwoButtonDynamicFilter.cpp:37
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:37
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:36
 msgid "Enable backoff and start/stop buttons"
 msgstr "OmoguÄi dugmad reverzne ispravke i poÄni/zaustavi"
 
@@ -954,22 +1078,30 @@ msgstr "Pomeraj spoljnog (drugog) dugmeta"
 #. divisor
 #. step
 #: ../Src/DasherCore/TwoPushDynamicFilter.cpp:31
-msgid "Distance for 1st button UP"
-msgstr "Udaljenost za prvo dugme GORE"
+msgid "Distance between down markers (long gap)"
+msgstr "Rastojanje izmeÄu donjih obeleÅivaÄa (dugi raskorak)"
 
 #: ../Src/DasherCore/TwoPushDynamicFilter.cpp:32
-msgid "Distance for 1st button DOWN"
-msgstr "Udaljenost za prvo dugme DOLE"
+msgid "Distance between up markers, as percentage of long gap"
+msgstr "Rastojanje izmeÄu gornjih obeleÅivaÄa, kao procenat dugog raskoraka"
 
 #: ../Src/DasherCore/TwoPushDynamicFilter.cpp:33
 msgid "Tolerance for inaccurate timing of button pushes (in ms)"
 msgstr "Razumevanje nepreciznog vremena pritiska dugmadi (u ms)"
 
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:39
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:34
+msgid ""
+"Use push and release times of single press rather than push times of two "
+"presses"
+msgstr ""
+"Koristi vremena guranja i otpuÅtanja jednog pritiska umesto vremena guranja dva "
+"pritiska"
+
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:38
 msgid "Slow startup time"
 msgstr "Vreme za sporo pokretanje"
 
-#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:47
+#: ../Src/DasherCore/TwoPushDynamicFilter.cpp:46
 msgid "Two-push Dynamic Mode (New One Button)"
 msgstr "DinamiÄki reÅim dva klika (novo dugme)"
 
@@ -1005,7 +1137,7 @@ msgstr "podeÅavanju opcija nedostaje â=â."
 msgid "Invalid option string specified"
 msgstr "Dat je neispravna niska opcije"
 
-#: ../Src/Gtk2/dasher_main.cpp:621
+#: ../Src/Gtk2/dasher_main.cpp:620
 msgid ""
 "Welcome to Dasher Game Mode! Game Mode is a fun way to practice entering "
 "text in Dasher. Please select a training text to play with:"
@@ -1014,19 +1146,19 @@ msgstr ""
 "unoÅenje teksta u JuriÅniku. Izaberite tekst za uveÅbavanje koji Äete "
 "koristiti za igru:"
 
-#: ../Src/Gtk2/dasher_main.cpp:623
+#: ../Src/Gtk2/dasher_main.cpp:622
 msgid "Use Default"
 msgstr "Koristi osnovno"
 
-#: ../Src/Gtk2/dasher_main.cpp:624
+#: ../Src/Gtk2/dasher_main.cpp:623
 msgid "Choose File..."
 msgstr "Izaberi datoteku..."
 
-#: ../Src/Gtk2/dasher_main.cpp:625
+#: ../Src/Gtk2/dasher_main.cpp:624
 msgid "Cancel"
 msgstr "PoniÅti"
 
-#: ../Src/Gtk2/dasher_main.cpp:648
+#: ../Src/Gtk2/dasher_main.cpp:647
 msgid ""
 "Are you sure you wish to turn off game mode? All unsaved changes will be "
 "lost."
@@ -1034,7 +1166,7 @@ msgstr ""
 "Da li ste sigurni da Åelite da iskljuÄite reÅim igre? Sve nesaÄuvane izmene "
 "Äe biti izgubljene."
 
-#: ../Src/Gtk2/dasher_main.cpp:955
+#: ../Src/Gtk2/dasher_main.cpp:954
 #, c-format
 msgid ""
 "Do you want to save your changes to %s?\n"
@@ -1045,7 +1177,7 @@ msgstr ""
 "\n"
 "Ukoliko ih ne saÄuvate, one Äe biti izgubljene."
 
-#: ../Src/Gtk2/dasher_main.cpp:962
+#: ../Src/Gtk2/dasher_main.cpp:961
 msgid ""
 "Do you want to save your changes?\n"
 "\n"
@@ -1055,31 +1187,31 @@ msgstr ""
 "\n"
 "Ukoliko ih ne saÄuvate, one Äe biti izgubljene."
 
-#: ../Src/Gtk2/dasher_main.cpp:968
+#: ../Src/Gtk2/dasher_main.cpp:967
 msgid "Don't save"
 msgstr "Ne Äuvaj"
 
-#: ../Src/Gtk2/dasher_main.cpp:969 ../Src/Gtk2/dasher_main.cpp:992
+#: ../Src/Gtk2/dasher_main.cpp:968 ../Src/Gtk2/dasher_main.cpp:991
 msgid "Don't quit"
 msgstr "Ne izlazi"
 
-#: ../Src/Gtk2/dasher_main.cpp:970
+#: ../Src/Gtk2/dasher_main.cpp:969
 msgid "Save and quit"
 msgstr "SaÄuvaj i izaÄi"
 
-#: ../Src/Gtk2/dasher_main.cpp:989
+#: ../Src/Gtk2/dasher_main.cpp:988
 msgid "Are you sure you wish to quit?"
 msgstr "Da li sigurno Åelite da izaÄete?"
 
-#: ../Src/Gtk2/dasher_main.cpp:1031
+#: ../Src/Gtk2/dasher_main.cpp:1030
 msgid "Unable to open help file"
 msgstr "Ne mogu da otvorim datoteku za pomoÄ"
 
-#: ../Src/Gtk2/dasher_main.cpp:1083
+#: ../Src/Gtk2/dasher_main.cpp:1082
 msgid "Dasher is a predictive text entry application"
 msgstr "JuriÅnik sluÅi za predvidivo unoÅenje teksta"
 
-#: ../Src/Gtk2/dasher_main.cpp:1088
+#: ../Src/Gtk2/dasher_main.cpp:1087
 msgid "translator-credits"
 msgstr ""
 "Danilo Åegan <danilo gnome org>\n"
@@ -1150,6 +1282,21 @@ msgstr "Opis za â--optionsâ."
 msgid "- A text input application honouring accessibility"
 msgstr "â Program za pristupaÄniji unos teksta"
 
+#~ msgid "Zoom steps"
+#~ msgstr "Koraci uveÄanja"
+
+#~ msgid "Training file contains unknown source alphabet character %s"
+#~ msgstr "Datoteka za uveÅbavanje sadrÅi nepoznati izvorni znak alfabeta â%sâ"
+
+#~ msgid "Training file contains unknown target alphabet character %s"
+#~ msgstr "Datoteka za uveÅbavanje sadrÅi nepoznati ciljni znak alfabeta â%sâ"
+
+#~ msgid "Distance for 1st button UP"
+#~ msgstr "Udaljenost za prvo dugme GORE"
+
+#~ msgid "Distance for 1st button DOWN"
+#~ msgstr "Udaljenost za prvo dugme DOLE"
+
 #~ msgid "A_ppend to file"
 #~ msgstr "_Dodaj u datoteku"
 
@@ -1377,9 +1524,6 @@ msgstr "â Program za pristupaÄniji unos teksta"
 #~ msgid "Distance from centerline for start on mouse position:"
 #~ msgstr "Rastojanje od srediÅnje linije za poÄetak kod poloÅaja miÅa:"
 
-#~ msgid "Done"
-#~ msgstr "UraÄeno"
-
 #~ msgid "Down/3:"
 #~ msgstr "Dole/3:"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]