[Emc-developers] [PATCH] Update to Russian locale.

Thu, 28 Jan 2010 06:10:09 -0800 

diff --git a/src/po/ru.po b/src/po/ru.po
index 4612a3f..b666e9b 100644
--- a/src/po/ru.po
+++ b/src/po/ru.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: emc 2.2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-26 01:52+0300\n"
-"PO-Revision-Date: 2010-01-10 01:16+0300\n"
+"POT-Creation-Date: 2010-01-26 04:13+0300\n"
+"PO-Revision-Date: 2010-01-26 10:20+0300\n"
 "Last-Translator: Alexey Starikovskiy <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -21,60 +21,52 @@ msgstr ""
 #: hal/utils/meter.c:198
 #, c-format
 msgid "ERROR: '%s' is not a valid probe type\n"
-msgstr ""
+msgstr "ОШИБКА: '%s' неверный тип пробника\n"
 
 #: hal/utils/meter.c:206
 #, c-format
 msgid "ERROR: no pin/signal/parameter name\n"
-msgstr ""
+msgstr "ОШИБКА: не имя ноги, сигнала или параметра\n"
 
 #: hal/utils/meter.c:212
 #, c-format
 msgid ""
 "ERROR: -s option requires a probe type and a pin/signal/parameter name\n"
-msgstr ""
+msgstr "ОШИБКА: -s опция требует тип пробника и имя сигнала или входа\n"
 
 #: hal/utils/meter.c:238 ../tcl/tkemc.tcl:816
-#, fuzzy
 msgid "Hal Meter"
 msgstr "HAL-метр"
 
 #: hal/utils/meter.c:287
-#, fuzzy
 msgid "_Select"
 msgstr "Выбрать"
 
 #: hal/utils/meter.c:288
-#, fuzzy
 msgid "E_xit"
 msgstr "Выход"
 
 #: hal/utils/meter.c:336
 msgid "Select item to display"
-msgstr ""
+msgstr "Выберите объект для показа"
 
 #: hal/utils/meter.c:364
-#, fuzzy
 msgid "Select Item to Probe"
 msgstr "Выберите узел для показа"
 
 #: hal/utils/meter.c:639
-#, fuzzy
 msgid " _Pins "
-msgstr "Ножки:"
+msgstr "Ножки"
 
 #: hal/utils/meter.c:640
-#, fuzzy
 msgid " _Signals "
 msgstr "Сигналы"
 
 #: hal/utils/meter.c:641
-#, fuzzy
 msgid " Para_meters "
 msgstr "Параметры"
 
 #: hal/utils/meter.c:684
-#, fuzzy
 msgid "_Close"
 msgstr "Закрыть"
 
@@ -83,74 +75,68 @@ msgid ""
 "Usage:\n"
 "  halscope [-h] [-i infile] [-o outfile] [num_samples]\n"
 msgstr ""
+"Использование:\n"
+"  halscope [-h] [-i входной файл] [-o выходной файл] [количество точек]\n"
 
 #: hal/utils/scope.c:474 hal/utils/scope.c:501
-#, fuzzy
 msgid "Open Configuration File:"
 msgstr "Открыть файл конфигурации"
 
 #: hal/utils/scope.c:535
-#, fuzzy
 msgid "_Open Configuration..."
 msgstr "Открыть конфигурацию..."
 
 #: hal/utils/scope.c:541
-#, fuzzy
 msgid "_Save Configuration..."
 msgstr "Сохранить конфигурацию..."
 
 #: hal/utils/scope.c:550
 msgid "O_pen Data File..."
-msgstr ""
+msgstr "Открыть файл данных"
 
 #: hal/utils/scope.c:557
-#, fuzzy
 msgid "S_ave Data File..."
 msgstr "Сохранить файл данных"
 
 #: hal/utils/scope.c:566 ../share/axis/tcl/axis.tcl:91
-#, fuzzy
 msgid "_Quit"
 msgstr "Выход"
 
 #: hal/utils/scope.c:572
 msgid "_About Halscope"
-msgstr ""
+msgstr "О Halscope"
 
 #: hal/utils/scope.c:578 ../share/axis/tcl/axis.tcl:411
-#, fuzzy
 msgid "_File"
 msgstr "Файл"
 
 #: hal/utils/scope.c:582 ../share/axis/tcl/axis.tcl:423
-#, fuzzy
 msgid "_Help"
 msgstr "Помощь"
 
 #: hal/utils/scope.c:641
 msgid "HAL Oscilloscope"
-msgstr ""
+msgstr "HAL Осциллограф"
 
 #: hal/utils/scope.c:669
 msgid "Horizontal"
-msgstr ""
+msgstr "Горизонтальный"
 
 #: hal/utils/scope.c:677
-#, fuzzy
 msgid "Selected Channel"
 msgstr "Выбранный канал"
 
 #: hal/utils/scope.c:683
 msgid "Run Mode"
-msgstr ""
+msgstr "Режим работы"
 
 #: hal/utils/scope.c:686
 msgid "Trigger"
-msgstr ""
+msgstr "Запуск"
 
 #: hal/utils/scope.c:692
 msgid "Vertical"
-msgstr ""
+msgstr "Вертикальный"
 
 #: hal/utils/scope.c:700 ../share/axis/tcl/axis.tcl:133
 #: ../share/axis/tcl/axis.tcl:1156
@@ -159,7 +145,7 @@ msgstr "Стоп"
 
 #: hal/utils/scope.c:703
 msgid "Normal"
-msgstr ""
+msgstr "Нормальный"
 
 #: hal/utils/scope.c:706
 msgid "Single"
@@ -167,7 +153,7 @@ msgstr "Одиночный"
 
 #: hal/utils/scope.c:709
 msgid "Roll"
-msgstr ""
+msgstr "Прокрутить"
 
 #: hal/utils/scope_horiz.c:134
 msgid "Zoom"
@@ -175,17 +161,19 @@ msgstr "zoom"
 
 #: hal/utils/scope_horiz.c:135
 msgid " Pos "
-msgstr ""
+msgstr "Поз"
 
 #: hal/utils/scope_horiz.c:168
 msgid ""
 "----- Samples\n"
 "at ---- KHz"
 msgstr ""
+"----- Точки\n"
+"на ---- КГц"
 
 #: hal/utils/scope_horiz.c:463
 msgid "Realtime component not loaded"
-msgstr ""
+msgstr "Компонента реального времени не загружена"
 
 #: hal/utils/scope_horiz.c:464
 msgid ""
@@ -200,10 +188,20 @@ msgid ""
 "or\n"
 "Click 'Quit' to exit HALSCOPE"
 msgstr ""
+"HALSCOPE uses a realtime component called scope_rt'\n"
+"to sample signals for display.  It is not currently loaded\n"
+"and attempting to load it automatically failed.  More information\n"
+"may be available in the terminal where halscope was started.\n"
+"\n"
+"Please do one of the following:\n"
+"\n"
+"Load the component (using 'halcmd loadrt scope_rt'), then click 'OK'\n"
+"or\n"
+"Click 'Quit' to exit HALSCOPE"
 
 #: hal/utils/scope_horiz.c:500
 msgid "Realtime function not linked"
-msgstr ""
+msgstr "Функция не слинкована"
 
 #: hal/utils/scope_horiz.c:501
 msgid ""
@@ -217,10 +215,19 @@ msgid ""
 "or\n"
 "Click 'Quit' to exit HALSCOPE"
 msgstr ""
+"The HALSCOPE realtime sampling function\n"
+"must be called from a HAL thread in to\n"
+"determine the sampling rate.\n"
+"\n"
+"Please do one of the following:\n"
+"\n"
+"Select a thread name and multiplier then click 'OK'\n"
+"or\n"
+"Click 'Quit' to exit HALSCOPE"
 
 #: hal/utils/scope_horiz.c:508
 msgid "Select Sample Rate"
-msgstr ""
+msgstr "Выберите скорость отсчетов"
 
 #: hal/utils/scope_horiz.c:509
 msgid ""
@@ -228,6 +235,9 @@ msgid ""
 "or\n"
 "Click 'Quit' to exit HALSCOPE"
 msgstr ""
+"Выберите имя очереди и множитель 'OK'\n"
+"или\n"
+"Нажмите 'Quit' для выхода из HALSCOPE"
 
 #: hal/utils/scope_horiz.c:531
 msgid "Thread:"
@@ -247,11 +257,11 @@ msgstr "Поток"
 
 #: hal/utils/scope_horiz.c:564
 msgid "Period"
-msgstr ""
+msgstr "Период"
 
 #: hal/utils/scope_horiz.c:624
 msgid "Multiplier:"
-msgstr ""
+msgstr "Множитель:"
 
 #: hal/utils/scope_horiz.c:641
 msgid "Record Length"
@@ -260,27 +270,27 @@ msgstr "Длина записи"
 #: hal/utils/scope_horiz.c:647
 #, c-format
 msgid "%5d samples (1 channel)"
-msgstr ""
+msgstr "%5d замеров (1 канал)"
 
 #: hal/utils/scope_horiz.c:650
 #, c-format
 msgid "%5d samples (2 channels)"
-msgstr ""
+msgstr "%5d замеров (2 канала)"
 
 #: hal/utils/scope_horiz.c:654
 #, c-format
 msgid "%5d samples (4 channels)"
-msgstr ""
+msgstr "%5d замеров (4 канала)"
 
 #: hal/utils/scope_horiz.c:658
 #, c-format
 msgid "%5d samples (8 channels)"
-msgstr ""
+msgstr "%5d замеров (8 каналов)"
 
 #: hal/utils/scope_horiz.c:662
 #, c-format
 msgid "%5d samples (16 channels)"
-msgstr ""
+msgstr "%5d замеров (16 каналов)"
 
 #: hal/utils/scope_horiz.c:717 hal/utils/scope_horiz.c:763
 #: hal/utils/scope_horiz.c:978 hal/utils/scope_vert.c:760
@@ -296,13 +306,13 @@ msgstr ""
 #: emc/usr_intf/axis/scripts/axis.py:1903
 #: emc/usr_intf/axis/scripts/axis.py:1962
 #: emc/usr_intf/axis/scripts/axis.py:2218
-#: emc/usr_intf/axis/scripts/axis.py:3280
-#: emc/usr_intf/axis/scripts/axis.py:4035
+#: emc/usr_intf/axis/scripts/axis.py:3274
+#: emc/usr_intf/axis/scripts/axis.py:4029
 #: emc/usr_intf/axis/scripts/image-to-gcode.py:709
 #: ../lib/python/propertywindow.py:34 ../share/axis/tcl/axis.tcl:1677
 #: ../share/axis/tcl/axis.tcl:1714
 msgid "OK"
-msgstr "Правильно"
+msgstr "Да"
 
 #: hal/utils/scope_horiz.c:722 hal/utils/scope_horiz.c:763
 #: ../tcl/bin/emccalib.tcl:91 ../tcl/bin/halconfig.tcl:103
@@ -440,7 +450,7 @@ msgstr ""
 #: ../tcl/tkemc.tcl:465 ../tcl/tkemc.tcl:1380 ../tcl/tkemc.tcl:1449
 #: ../tcl/tkemc.tcl:1480 ../tcl/tkemc.tcl:1511 ../tcl/tkemc.tcl:2144
 #: emc/usr_intf/axis/scripts/axis.py:2219
-#: emc/usr_intf/axis/scripts/axis.py:2408
+#: emc/usr_intf/axis/scripts/axis.py:2402
 #: emc/usr_intf/axis/scripts/image-to-gcode.py:711
 msgid "Cancel"
 msgstr "Отмена"
@@ -754,7 +764,7 @@ msgstr ""
 "GPL версия 2"
 
 #: ../tcl/bin/genedit.tcl:197 ../tcl/mini.tcl:1373 ../tcl/mini.tcl:1775
-#: ../tcl/tkemc.tcl:505 emc/task/emctaskmain.cc:1940
+#: ../tcl/tkemc.tcl:505 emc/task/emctaskmain.cc:1937
 #, c-format, tcl-format
 msgid "can't open %s"
 msgstr "не могу открыть %s"
@@ -1527,7 +1537,7 @@ msgid "Restart"
 msgstr "Рестарт"
 
 #: ../tcl/mini.tcl:1711 ../tcl/mini.tcl:2823 ../tcl/mini.tcl:2882
-#: ../tcl/tkemc.tcl:519 emc/usr_intf/axis/scripts/axis.py:2711
+#: ../tcl/tkemc.tcl:519 emc/usr_intf/axis/scripts/axis.py:2705
 #: emc/usr_intf/axis/scripts/image-to-gcode.py:745
 msgid "All files"
 msgstr "Все файлы"
@@ -2050,8 +2060,8 @@ msgstr "авто"
 msgid "inches"
 msgstr "дюймы"
 
-#: ../tcl/tkemc.tcl:809 emc/usr_intf/axis/scripts/axis.py:2331
-#: emc/usr_intf/axis/scripts/axis.py:2478
+#: ../tcl/tkemc.tcl:809 emc/usr_intf/axis/scripts/axis.py:2325
+#: emc/usr_intf/axis/scripts/axis.py:2472
 #: emc/usr_intf/touchy/touchy.glade:5335
 #: emc/usr_intf/stepconf/stepconf.py:1499
 #: emc/usr_intf/stepconf/stepconf.py:2090
@@ -2678,7 +2688,7 @@ msgstr ""
 "%(error_str)s"
 
 #: emc/usr_intf/axis/scripts/axis.py:2117
-#: emc/usr_intf/axis/scripts/axis.py:3506 ../share/axis/tcl/axis.tcl:1049
+#: emc/usr_intf/axis/scripts/axis.py:3500 ../share/axis/tcl/axis.tcl:1049
 #: ../share/axis/tcl/axis.tcl:1051 ../share/axis/tcl/axis.tcl:2098
 msgid "Continuous"
 msgstr "Постоянный"
@@ -2687,109 +2697,109 @@ msgstr "Постоянный"
 msgid "T    Tool Table"
 msgstr "T Таблица инструментов"
 
-#: emc/usr_intf/axis/scripts/axis.py:2332
-#: emc/usr_intf/axis/scripts/axis.py:2482
+#: emc/usr_intf/axis/scripts/axis.py:2326
+#: emc/usr_intf/axis/scripts/axis.py:2476
 #: emc/usr_intf/stepconf/stepconf.py:1505
 #: emc/usr_intf/stepconf/stepconf.py:2104
 msgid "in"
 msgstr "дюйм"
 
-#: emc/usr_intf/axis/scripts/axis.py:2335
+#: emc/usr_intf/axis/scripts/axis.py:2329
 msgid " radius"
 msgstr "радиус"
 
-#: emc/usr_intf/axis/scripts/axis.py:2337
+#: emc/usr_intf/axis/scripts/axis.py:2331
 msgid " diameter"
 msgstr "диаметр"
 
-#: emc/usr_intf/axis/scripts/axis.py:2338
+#: emc/usr_intf/axis/scripts/axis.py:2332
 msgid "°"
 msgstr "°"
 
-#: emc/usr_intf/axis/scripts/axis.py:2344
+#: emc/usr_intf/axis/scripts/axis.py:2338
 msgid "Coordinate System:"
 msgstr "Координатная система:"
 
-#: emc/usr_intf/axis/scripts/axis.py:2367
+#: emc/usr_intf/axis/scripts/axis.py:2361
 msgid "Name:"
 msgstr "Имя:"
 
-#: emc/usr_intf/axis/scripts/axis.py:2367
+#: emc/usr_intf/axis/scripts/axis.py:2361
 msgid "Size:"
 msgstr "Размер:"
 
-#: emc/usr_intf/axis/scripts/axis.py:2368
+#: emc/usr_intf/axis/scripts/axis.py:2362
 msgid "Tool order:"
 msgstr "Номер инструмента:"
 
-#: emc/usr_intf/axis/scripts/axis.py:2368
+#: emc/usr_intf/axis/scripts/axis.py:2362
 msgid "Rapid distance:"
 msgstr "Расстояние быстрого хода:"
 
-#: emc/usr_intf/axis/scripts/axis.py:2369
+#: emc/usr_intf/axis/scripts/axis.py:2363
 msgid "Feed distance:"
 msgstr "Расстояние рабочего хода:"
 
-#: emc/usr_intf/axis/scripts/axis.py:2369
+#: emc/usr_intf/axis/scripts/axis.py:2363
 msgid "Total distance:"
 msgstr "Общее расстояние:"
 
-#: emc/usr_intf/axis/scripts/axis.py:2370
+#: emc/usr_intf/axis/scripts/axis.py:2364
 msgid "Run time:"
 msgstr "Время работы:"
 
-#: emc/usr_intf/axis/scripts/axis.py:2370
+#: emc/usr_intf/axis/scripts/axis.py:2364
 msgid "X bounds:"
 msgstr "границы по X:"
 
-#: emc/usr_intf/axis/scripts/axis.py:2371
+#: emc/usr_intf/axis/scripts/axis.py:2365
 msgid "Y bounds:"
 msgstr "границы по Y:"
 
-#: emc/usr_intf/axis/scripts/axis.py:2371
+#: emc/usr_intf/axis/scripts/axis.py:2365
 msgid "Z bounds:"
 msgstr "границы по Z:"
 
-#: emc/usr_intf/axis/scripts/axis.py:2372
+#: emc/usr_intf/axis/scripts/axis.py:2366
 msgid "A bounds:"
 msgstr "границы по A:"
 
-#: emc/usr_intf/axis/scripts/axis.py:2372
+#: emc/usr_intf/axis/scripts/axis.py:2366
 msgid "B bounds:"
 msgstr "границы по B:"
 
-#: emc/usr_intf/axis/scripts/axis.py:2373
+#: emc/usr_intf/axis/scripts/axis.py:2367
 msgid "C bounds:"
 msgstr "границы по C:"
 
-#: emc/usr_intf/axis/scripts/axis.py:2397
+#: emc/usr_intf/axis/scripts/axis.py:2391
 #, python-format
 msgid "Program exceeds machine minimum on axis %s"
 msgstr "Программа выходит за минимум оси %s"
 
-#: emc/usr_intf/axis/scripts/axis.py:2400
+#: emc/usr_intf/axis/scripts/axis.py:2394
 #, python-format
 msgid "Program exceeds machine maximum on axis %s"
 msgstr "Программа выходит за максимум оси %s"
 
-#: emc/usr_intf/axis/scripts/axis.py:2405
+#: emc/usr_intf/axis/scripts/axis.py:2399
 msgid "Program exceeds machine limits"
 msgstr "Программа выходит за пределы станка"
 
-#: emc/usr_intf/axis/scripts/axis.py:2408
+#: emc/usr_intf/axis/scripts/axis.py:2402
 msgid "Run Anyway"
 msgstr "Исполнить все равно"
 
-#: emc/usr_intf/axis/scripts/axis.py:2460
+#: emc/usr_intf/axis/scripts/axis.py:2454
 msgid "No file loaded"
 msgstr "Файл не загружен"
 
-#: emc/usr_intf/axis/scripts/axis.py:2468
+#: emc/usr_intf/axis/scripts/axis.py:2462
 #, python-format
 msgid "generated from %s"
 msgstr "получено из %s"
 
-#: emc/usr_intf/axis/scripts/axis.py:2474
+#: emc/usr_intf/axis/scripts/axis.py:2468
 #, python-format
 msgid ""
 "%(size)s bytes\n"
@@ -2798,83 +2808,83 @@ msgstr ""
 "%(size)s байт\n"
 "%(lines)s строк gcode"
 
-#: emc/usr_intf/axis/scripts/axis.py:2500
+#: emc/usr_intf/axis/scripts/axis.py:2494
 #, python-format
 msgid "%.1f minutes"
 msgstr "%.1f минут"
 
-#: emc/usr_intf/axis/scripts/axis.py:2502
+#: emc/usr_intf/axis/scripts/axis.py:2496
 #, python-format
 msgid "%d seconds"
 msgstr "%d секунд"
 
-#: emc/usr_intf/axis/scripts/axis.py:2510
+#: emc/usr_intf/axis/scripts/axis.py:2504
 #, python-format
 msgid "%(a)f to %(b)f = %(diff)f %(units)s"
 msgstr "%(a)f к %(b)f = %(diff)f %(units)s"
 
-#: emc/usr_intf/axis/scripts/axis.py:2511
+#: emc/usr_intf/axis/scripts/axis.py:2505
 msgid "G-Code Properties"
 msgstr "Свойства G-кода"
 
-#: emc/usr_intf/axis/scripts/axis.py:2709
+#: emc/usr_intf/axis/scripts/axis.py:2703
 msgid "All machinable files"
 msgstr "Все исполняемые файлы"
 
-#: emc/usr_intf/axis/scripts/axis.py:2710
-#: emc/usr_intf/axis/scripts/axis.py:3267
+#: emc/usr_intf/axis/scripts/axis.py:2704
+#: emc/usr_intf/axis/scripts/axis.py:3261
 msgid "rs274ngc files"
 msgstr "rs274ngc файлы"
 
-#: emc/usr_intf/axis/scripts/axis.py:2725
+#: emc/usr_intf/axis/scripts/axis.py:2719
 msgid "axis cannot accept remote command while running"
 msgstr ""
 
-#: emc/usr_intf/axis/scripts/axis.py:3112 ../share/axis/tcl/axis.tcl:1065
+#: emc/usr_intf/axis/scripts/axis.py:3106 ../share/axis/tcl/axis.tcl:1065
 msgid "Touch Off"
 msgstr "Задать отступ"
 
-#: emc/usr_intf/axis/scripts/axis.py:3113
+#: emc/usr_intf/axis/scripts/axis.py:3107
 #, python-format
 msgid "Enter %s coordinate relative to workpiece:"
 msgstr "Введите %s координату относительно заготовки:"
 
-#: emc/usr_intf/axis/scripts/axis.py:3279
+#: emc/usr_intf/axis/scripts/axis.py:3273
 msgid "Error saving file"
 msgstr "Ошибка при сохранении файла"
 
-#: emc/usr_intf/axis/scripts/axis.py:3644
+#: emc/usr_intf/axis/scripts/axis.py:3638
 #: emc/usr_intf/touchy/touchy.glade:1124
 msgid "Home All"
 msgstr "Все в начало"
 
-#: emc/usr_intf/axis/scripts/axis.py:3646
+#: emc/usr_intf/axis/scripts/axis.py:3640
 msgid "Home all axes [Ctrl-Home]"
 msgstr "Все оси в начало [Ctrl-Home]"
 
-#: emc/usr_intf/axis/scripts/axis.py:3649
+#: emc/usr_intf/axis/scripts/axis.py:3643
 msgid "Home All Axes"
 msgstr "Все оси в начало"
 
-#: emc/usr_intf/axis/scripts/axis.py:3654
+#: emc/usr_intf/axis/scripts/axis.py:3648
 msgid "Unhome All Axes"
 msgstr "Забыть начало всех осей"
 
-#: emc/usr_intf/axis/scripts/axis.py:3674
+#: emc/usr_intf/axis/scripts/axis.py:3668
 #, python-format
 msgid "Home Axis _%s"
 msgstr "Ось _%s в начало"
 
-#: emc/usr_intf/axis/scripts/axis.py:3676
+#: emc/usr_intf/axis/scripts/axis.py:3670
 #, python-format
 msgid "Unhome Axis _%s"
 msgstr "Забыть начало оси _%s"
 
-#: emc/usr_intf/axis/scripts/axis.py:3813
+#: emc/usr_intf/axis/scripts/axis.py:3807
 msgid "Run from here"
 msgstr "Исполнить отсюда"
 
-#: emc/usr_intf/axis/scripts/axis.py:4034
+#: emc/usr_intf/axis/scripts/axis.py:4028
 msgid "Error in ~/.axisrc"
 msgstr "Ошибка в ~/.axisrc"
 
@@ -5960,9 +5970,8 @@ msgid "Manual Spindle Stop"
 msgstr "Остановить шпиндель"
 
 #: emc/usr_intf/pncconf/pncconf.py:303
-#, fuzzy
 msgid "Spindle Up-To-Speed"
-msgstr "Обороты шпинделя:"
+msgstr "Шпинделя раскручен"
 
 #: emc/usr_intf/pncconf/pncconf.py:315
 msgid "Z Both Limit + Home"
@@ -6049,9 +6058,8 @@ msgid "X Encoder-I Phase"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:358
-#, fuzzy
 msgid "X Encoder-M Phase"
-msgstr "Шпиндель тормоз"
+msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:359
 msgid "Y Encoder-A Phase"
@@ -6066,9 +6074,8 @@ msgid "Y Encoder-I Phase"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:359
-#, fuzzy
 msgid "Y Encoder-M Phase"
-msgstr "Шпиндель тормоз"
+msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:360
 msgid "Z Encoder-A Phase"
@@ -6083,9 +6090,8 @@ msgid "Z Encoder-I Phase"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:360
-#, fuzzy
 msgid "Z Encoder-M Phase"
-msgstr "Шпиндель тормоз"
+msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:361
 msgid "A Encoder-A Phase"
@@ -6100,9 +6106,8 @@ msgid "A Encoder-I Phase"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:361
-#, fuzzy
 msgid "A Encoder-M Phase"
-msgstr "Шпиндель тормоз"
+msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:362
 msgid "Spindle Encoder-A Phase"
@@ -6117,9 +6122,8 @@ msgid "Spindle Encoder-I Phase"
 msgstr "Шпиндель тормоз"
 
 #: emc/usr_intf/pncconf/pncconf.py:362
-#, fuzzy
 msgid "Spindle Encoder-M Phase"
-msgstr "Шпиндель тормоз"
+msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:363
 msgid "X Hand Wheel-A Phase"
@@ -6302,34 +6306,28 @@ msgid "A reserved f"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:386
-#, fuzzy
 msgid "Spindle StepGen-Step"
-msgstr "X·Шаг"
+msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:386
-#, fuzzy
 msgid "Spindle StepGen-Direction"
-msgstr "X Направление"
+msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:386
-#, fuzzy
 msgid "Spindle reserved c"
-msgstr "Шпиндель назад:"
+msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:386
-#, fuzzy
 msgid "Spindle reserved d"
-msgstr "Шпиндель назад:"
+msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:386
-#, fuzzy
 msgid "Spindle reserved e"
-msgstr "Шпиндель назад:"
+msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:387
-#, fuzzy
 msgid "Spindle reserved f"
-msgstr "Шпиндель назад:"
+msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:436
 msgid "my_EMC_machine"
@@ -6492,14 +6490,12 @@ msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:2419
 #: emc/usr_intf/pncconf/pncconf.glade:36995
-#, fuzzy
 msgid "Help Pages"
-msgstr "Картинки глубины"
+msgstr "Страницы помощи"
 
 #: emc/usr_intf/pncconf/pncconf.py:2422
-#, fuzzy
 msgid "Help page is unavailable\n"
-msgstr "Детали не доступны."
+msgstr "Помощь не доступна\n"
 
 #: emc/usr_intf/pncconf/pncconf.py:2434
 msgid "EMC2 'PNCconf' configuration files"
@@ -6577,23 +6573,20 @@ msgid "Custom"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:3841
-#, fuzzy
 msgid "revolution / Step"
-msgstr "Установка направления"
+msgstr "оборотов/шаг"
 
 #: emc/usr_intf/pncconf/pncconf.py:3842
-#, fuzzy
 msgid "Steps / revolution"
-msgstr "шаг/дюйм"
+msgstr "шаг/оборот"
 
 #: emc/usr_intf/pncconf/pncconf.py:3844
 msgid "revolution / encoder pulse"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:3845
-#, fuzzy
 msgid "Encoder pulses / revolution"
-msgstr "Шаги мотора за оборот"
+msgstr "Шаги енкодера за оборот"
 
 #: emc/usr_intf/pncconf/pncconf.py:3846 emc/usr_intf/pncconf/pncconf.py:3885
 msgid "Reduction Ratio"
@@ -6609,9 +6602,8 @@ msgid "degrees / min"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:3888
-#, fuzzy
 msgid "degrees / sec²"
-msgstr "градусы/об."
+msgstr "градусы/сек²"
 
 #: emc/usr_intf/pncconf/pncconf.py:3892 emc/usr_intf/pncconf/pncconf.py:3899
 #: emc/usr_intf/pncconf/pncconf.py:3900 emc/usr_intf/pncconf/pncconf.py:4803
@@ -6651,9 +6643,8 @@ msgid "mm / min"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:3906
-#, fuzzy
 msgid "mm / sec²"
-msgstr "мм/с²"
+msgstr "мм/сек²"
 
 #: emc/usr_intf/pncconf/pncconf.py:3912
 msgid "mm / Step"
@@ -6683,9 +6674,8 @@ msgid "inches / min"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:3925
-#, fuzzy
 msgid "inches / sec²"
-msgstr "дюйм/с²"
+msgstr "дюйм/сек²"
 
 #: emc/usr_intf/pncconf/pncconf.py:3931
 msgid "inches / Step"
@@ -6712,18 +6702,16 @@ msgid "You need to designate an E-stop input pin for this ladder program."
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:4333
-#, fuzzy
 msgid ""
 "OK to replace existing custom ladder program?\n"
 "Existing Custom.clp will be                     renamed custom_backup.clp.\n"
 "Any existing file named -custom_backup.clp- will be lost. "
 msgstr ""
 "OK to replace existing custom ladder program?\n"
-"Existing Custom.clp will be renamed custom_backup.clp.\n"
+"Existing Custom.clp will be                     renamed custom_backup.clp.\n"
 "Any existing file named -custom_backup.clp- will be lost. "
 
 #: emc/usr_intf/pncconf/pncconf.py:4339
-#, fuzzy
 msgid ""
 "You edited a ladder program and have selected a different program to "
 "copy                     to your configuration file.\n"
@@ -6731,8 +6719,8 @@ msgid ""
 "\n"
 "Are you sure?  "
 msgstr ""
-"You edited a ladder program and have selected a different program to copy to "
-"your configuration file.\n"
+"You edited a ladder program and have selected a different program to "
+"copy                     to your configuration file.\n"
 "The edited program will be lost.\n"
 "\n"
 "Are you sure?  "
@@ -6762,9 +6750,8 @@ msgid "degrees / minute"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.py:4805
-#, fuzzy
 msgid "degrees / second²"
-msgstr "градусы/об."
+msgstr "градусы/сек²"
 
 #: emc/usr_intf/pncconf/pncconf.py:4808
 #: emc/usr_intf/pncconf/pncconf.glade:28998
@@ -6774,9 +6761,8 @@ msgid "mm / minute"
 msgstr "мм/мин"
 
 #: emc/usr_intf/pncconf/pncconf.py:4809
-#, fuzzy
 msgid "mm / second²"
-msgstr "мм/с²"
+msgstr "мм/сек²"
 
 #: emc/usr_intf/pncconf/pncconf.py:4812
 msgid "inches / minute"
@@ -6801,9 +6787,8 @@ msgid "EMC2 Point And Click Configuration"
 msgstr "Легкое конфигурирование EMC2 "
 
 #: emc/usr_intf/pncconf/pncconf.glade:23
-#, fuzzy
 msgid "EMC2  Configuration Wizard   Alpha Version"
-msgstr "Выбор конфигураций EMC"
+msgstr "Мастер конфигураций EMC (альфа)"
 
 #: emc/usr_intf/pncconf/pncconf.glade:24
 msgid ""
@@ -6904,9 +6889,8 @@ msgid "<b>I/O Control Ports/ Boards</b>"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.glade:957
-#, fuzzy
 msgid "External Controls"
-msgstr "Ручное управление"
+msgstr "внешнее управление"
 
 #: emc/usr_intf/pncconf/pncconf.glade:999
 msgid "Physical switches"
@@ -6943,12 +6927,10 @@ msgid "shared buttons for all axis"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.glade:1181
-#, fuzzy
 msgid "buttons for each axis"
-msgstr "Движение четвертой оси"
+msgstr "кнопки на каждой оси"
 
 #: emc/usr_intf/pncconf/pncconf.glade:1208
-#, fuzzy
 msgid "mm/min "
 msgstr "мм/мин"
 
@@ -6961,14 +6943,12 @@ msgid "Shared MPG / selectable axis"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.glade:1294
-#, fuzzy
 msgid "Mpg per axis"
-msgstr "Движение первой оси"
+msgstr "Шаговых генераторов на ось"
 
 #: emc/usr_intf/pncconf/pncconf.glade:1309
-#, fuzzy
 msgid "selectable MPG increments"
-msgstr "Выбрать шаг быстрого хода"
+msgstr "Выбираемые скорости генератора"
 
 #: emc/usr_intf/pncconf/pncconf.glade:1332
 #: emc/usr_intf/pncconf/pncconf.glade:1345
@@ -7016,19 +6996,16 @@ msgid " ab)"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.glade:1457
-#, fuzzy
 msgid " <b>b)</b>"
-msgstr "<b>Поиск начала</b>"
+msgstr "<b>b)</b>"
 
 #: emc/usr_intf/pncconf/pncconf.glade:1468
-#, fuzzy
 msgid " <b>a)</b>"
-msgstr "<b>Поиск начала</b>"
+msgstr " <b>a)</b>"
 
 #: emc/usr_intf/pncconf/pncconf.glade:1569
-#, fuzzy
 msgid " <b>c)</b>"
-msgstr "<b>Поиск начала</b>"
+msgstr " <b>c)</b>"
 
 #: emc/usr_intf/pncconf/pncconf.glade:1581
 msgid "<b>default</b>"
@@ -7047,43 +7024,40 @@ msgid "<b>Frontend</b>"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.glade:1870
-#, fuzzy
 msgid ""
 "Commanded\n"
 "Actual"
-msgstr "Заданная"
+msgstr ""
+"Заданная\n"
+"Настоящая"
 
 #: emc/usr_intf/pncconf/pncconf.glade:1883
-#, fuzzy
 msgid ""
 "Machine\n"
 "Relative\n"
-msgstr "Относительная"
+msgstr ""
+"Станочная\n"
+"Относительная\n"
 
 #: emc/usr_intf/pncconf/pncconf.glade:1921
-#, fuzzy
 msgid "Max Feed Override"
-msgstr "Изменить подачу:"
+msgstr "Изменить максимальную подачу:"
 
 #: emc/usr_intf/pncconf/pncconf.glade:1980
-#, fuzzy
 msgid "Min Spindle Override"
-msgstr "Скорость шпинделя:"
+msgstr "Минимальное изменение шпинделя"
 
 #: emc/usr_intf/pncconf/pncconf.glade:2004
-#, fuzzy
 msgid "Max Spindle Override "
-msgstr "Скорость шпинделя:"
+msgstr "Максимальное изменение шпинделя"
 
 #: emc/usr_intf/pncconf/pncconf.glade:2015
-#, fuzzy
 msgid "Position_feedback"
-msgstr "Позиция:"
+msgstr "Обратная связь по позиции"
 
 #: emc/usr_intf/pncconf/pncconf.glade:2026
-#, fuzzy
 msgid "Position_offset"
-msgstr "Позиция:"
+msgstr "Отступ позиции"
 
 #: emc/usr_intf/pncconf/pncconf.glade:2034
 msgid "<b>General GUI Defaults</b>"
@@ -7301,9 +7275,8 @@ msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.glade:3384
 #: emc/usr_intf/pncconf/pncconf.glade:14462
-#, fuzzy
 msgid "Mesa parport address:"
-msgstr "Адрес второго порта:"
+msgstr "Адрес порта MESA:"
 
 #: emc/usr_intf/pncconf/pncconf.glade:3396
 #: emc/usr_intf/pncconf/pncconf.glade:14353
@@ -7314,17 +7287,17 @@ msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.glade:3424
 #: emc/usr_intf/pncconf/pncconf.glade:14473
-#, fuzzy
 msgid "Total number of pins:"
-msgstr "Количество цифровых входов:"
+msgstr "Общее число контактов:"
 
 #: emc/usr_intf/pncconf/pncconf.glade:3471
 #: emc/usr_intf/pncconf/pncconf.glade:14520
-#, fuzzy
 msgid ""
 "Configuration\n"
 "     Page"
-msgstr "Установки *"
+msgstr ""
+"Страница\n"
+"установок"
 
 #: emc/usr_intf/pncconf/pncconf.glade:3584
 #: emc/usr_intf/pncconf/pncconf.glade:3598
@@ -8269,9 +8242,8 @@ msgid "Calculated Axis SCALE:"
 msgstr "Вычисленный масштаб оси:"
 
 #: emc/usr_intf/pncconf/pncconf.glade:28549
-#, fuzzy
 msgid "Motor RPM at max speed:"
-msgstr "Частота шагов на максимальной скорости:"
+msgstr "Обороты мотора на максимальной скорости:"
 
 #: emc/usr_intf/pncconf/pncconf.glade:28560
 msgid "RPM"
@@ -8330,9 +8302,8 @@ msgid "Home latch Velocity:"
 msgstr "Максимальная скорость на датчике начала"
 
 #: emc/usr_intf/pncconf/pncconf.glade:29197
-#, fuzzy
 msgid "Home Search Direction:"
-msgstr "Направление датчика начала"
+msgstr "Направление поиска начала:"
 
 #: emc/usr_intf/pncconf/pncconf.glade:29210
 msgid ""
@@ -8371,9 +8342,8 @@ msgid ""
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.glade:29558
-#, fuzzy
 msgid "I /O Info"
-msgstr "Инфо"
+msgstr "I/O инфо"
 
 #: emc/usr_intf/pncconf/pncconf.glade:29842
 msgid "Use PID Control"
@@ -8384,9 +8354,8 @@ msgid "rpm"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.glade:30128
-#, fuzzy
 msgid "rev / s²"
-msgstr "об/дюйм"
+msgstr "об/сек²"
 
 #: emc/usr_intf/pncconf/pncconf.glade:30475
 msgid "PWM 2:"
@@ -8409,12 +8378,10 @@ msgid "Max Motor RPM:"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.glade:30796
-#, fuzzy
 msgid "Max Pulse rate:"
 msgstr "Максимальная частота шагов:"
 
 #: emc/usr_intf/pncconf/pncconf.glade:30894
-#, fuzzy
 msgid "Advanced  Options"
 msgstr "Продвинутые настройки"
 
@@ -8511,18 +8478,16 @@ msgid "Add HAL components with this page."
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.glade:32056
-#, fuzzy
 msgid "Thread Command"
-msgstr "Команда:"
+msgstr "Команда потока:"
 
 #: emc/usr_intf/pncconf/pncconf.glade:32066
 msgid "Thread Speed"
 msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.glade:32116
-#, fuzzy
 msgid "Load Command "
-msgstr "Номер команды:"
+msgstr "Загрузить команду"
 
 #: emc/usr_intf/pncconf/pncconf.glade:32162
 msgid "Servo Thread"
@@ -8561,50 +8526,47 @@ msgstr "Инвертировать энкодер"
 
 #: emc/usr_intf/pncconf/pncconf.glade:32309
 msgid "Enable Amp"
-msgstr ""
+msgstr "Разрешить усилитель"
 
 #: emc/usr_intf/pncconf/pncconf.glade:32323
 msgid "Reset Encoder"
-msgstr ""
+msgstr "Сбросить энкодер"
 
 #: emc/usr_intf/pncconf/pncconf.glade:32351
-#, fuzzy
 msgid "Encoder Scale:"
-msgstr "Шпиндель тормоз"
+msgstr "Множитель энкодера:"
 
 #: emc/usr_intf/pncconf/pncconf.glade:32362
-#, fuzzy
 msgid "Dac Offset:"
-msgstr "Отступ:"
+msgstr "Отступ ЦАП:"
 
 #: emc/usr_intf/pncconf/pncconf.glade:32452
 msgid "Fast Dac Speed"
-msgstr ""
+msgstr "Быстрая скорость ЦАП"
 
 #: emc/usr_intf/pncconf/pncconf.glade:32467
 msgid "Slow Dac Speed"
-msgstr ""
+msgstr "Медленная скорость ЦАП"
 
 #: emc/usr_intf/pncconf/pncconf.glade:32616
 #: emc/usr_intf/pncconf/pncconf.glade:33712
 #: emc/usr_intf/pncconf/pncconf.glade:34805
 #: emc/usr_intf/pncconf/pncconf.glade:35898
 msgid "mm/minute"
-msgstr ""
+msgstr "мм/миннута"
 
 #: emc/usr_intf/pncconf/pncconf.glade:32650
 #: emc/usr_intf/pncconf/pncconf.glade:33745
 #: emc/usr_intf/pncconf/pncconf.glade:34838
 #: emc/usr_intf/pncconf/pncconf.glade:35931
 msgid "mm/minute^2"
-msgstr ""
+msgstr "мм/минута^2"
 
 #: emc/usr_intf/pncconf/pncconf.glade:32759
 #: emc/usr_intf/pncconf/pncconf.glade:33853
 #: emc/usr_intf/pncconf/pncconf.glade:34946
-#, fuzzy
 msgid "Enable"
-msgstr "X Разрешение"
+msgstr "Разрешение"
 
 #: emc/usr_intf/pncconf/pncconf.glade:32809
 #: emc/usr_intf/pncconf/pncconf.glade:33902
@@ -8618,7 +8580,7 @@ msgstr "секунды"
 #: emc/usr_intf/pncconf/pncconf.glade:35302
 #: emc/usr_intf/pncconf/pncconf.glade:36607
 msgid "DeadBand"
-msgstr ""
+msgstr "Дедбэнд"
 
 #: emc/usr_intf/pncconf/pncconf.glade:33298
 #: emc/usr_intf/pncconf/pncconf.glade:33589
@@ -8629,7 +8591,7 @@ msgstr ""
 #: emc/usr_intf/pncconf/pncconf.glade:36425
 #: emc/usr_intf/pncconf/pncconf.glade:36796
 msgid "Original"
-msgstr ""
+msgstr "Оригинал"
 
 #: emc/usr_intf/pncconf/pncconf.glade:33347
 #: emc/usr_intf/pncconf/pncconf.glade:34190
@@ -8661,15 +8623,14 @@ msgstr ""
 #: emc/usr_intf/pncconf/pncconf.glade:36346
 #: emc/usr_intf/pncconf/pncconf.glade:36784
 msgid "Current"
-msgstr ""
+msgstr "Текущий"
 
 #: emc/usr_intf/pncconf/pncconf.glade:33394
 #: emc/usr_intf/pncconf/pncconf.glade:34487
 #: emc/usr_intf/pncconf/pncconf.glade:35580
 #: emc/usr_intf/pncconf/pncconf.glade:36673
-#, fuzzy
 msgid "PID Tuning"
-msgstr "Сохранить настройку INI"
+msgstr "Настройка ПИД"
 
 #: emc/usr_intf/pncconf/pncconf.glade:33579
 #: emc/usr_intf/pncconf/pncconf.glade:34622
@@ -8696,7 +8657,6 @@ msgstr "Пауза шага:"
 #: emc/usr_intf/pncconf/pncconf.glade:34568
 #: emc/usr_intf/pncconf/pncconf.glade:35815
 #: emc/usr_intf/pncconf/pncconf.glade:36754
-#, fuzzy
 msgid "Step Time:"
 msgstr "Время шага:"
 
@@ -8704,9 +8664,8 @@ msgstr "Время шага:"
 #: emc/usr_intf/pncconf/pncconf.glade:34737
 #: emc/usr_intf/pncconf/pncconf.glade:35830
 #: emc/usr_intf/pncconf/pncconf.glade:36923
-#, fuzzy
 msgid "Step Timing"
-msgstr "Время шага:"
+msgstr "Время шага"
 
 #: emc/usr_intf/pncconf/pncconf.glade:33666
 msgid "X Axis"
@@ -8721,18 +8680,16 @@ msgid "Z Axis"
 msgstr "Ось Z"
 
 #: emc/usr_intf/pncconf/pncconf.glade:36039
-#, fuzzy
 msgid "enable"
-msgstr "имя"
+msgstr "разрешение"
 
 #: emc/usr_intf/pncconf/pncconf.glade:36944
 msgid "A Axis"
 msgstr "Ось A"
 
 #: emc/usr_intf/pncconf/pncconf.glade:37027
-#, fuzzy
 msgid "Text"
-msgstr "Проверка"
+msgstr "текст"
 
 #: emc/usr_intf/pncconf/pncconf.glade:37046
 msgid ""
@@ -8745,28 +8702,27 @@ msgstr ""
 
 #: emc/usr_intf/pncconf/pncconf.glade:37066
 msgid "Diagram"
-msgstr ""
+msgstr "Диаграмма"
 
 #: emc/usr_intf/pncconf/pncconf.glade:37187
 msgid "Motor steps per revolution:"
-msgstr ""
+msgstr "Шаги мотора на оборот:"
 
 #: emc/usr_intf/pncconf/pncconf.glade:37201
 msgid "Microstep Multiplication Factor:"
-msgstr ""
+msgstr "Множитель микрошага:"
 
 #: emc/usr_intf/pncconf/pncconf.glade:37215
-#, fuzzy
 msgid "Encoder lines per revolution:"
-msgstr "Циклы на оборот:"
+msgstr "Линий энкодера на оборот:"
 
 #: emc/usr_intf/pncconf/pncconf.glade:37225
 msgid "X 4 = Pulses/Rev"
-msgstr ""
+msgstr "X 4 = Импульсов/оборот"
 
 #: emc/usr_intf/pncconf/pncconf.glade:37268
 msgid "Worm turn ratio (Input:Outputl)"
-msgstr ""
+msgstr "Передача червяка (Вход:Выход)"
 
 #: emc/task/emctaskmain.cc:416 emc/task/emctaskmain.cc:449
 #, c-format
@@ -8837,19 +8793,19 @@ msgstr "не могу делать это (%s) в авто режиме с жд
 msgid "can't do that (%s) in MDI mode"
 msgstr "не могу делать это (%s) в MDI режиме"
 
-#: emc/task/emctaskmain.cc:1883
+#: emc/task/emctaskmain.cc:1880
 msgid "Can't switch mode while mode is AUTO and interpreter is not IDLE"
 msgstr "Не могу переключить режим из авто при не остановленном интерпретаторе"
 
-#: emc/task/emctaskmain.cc:1952
+#: emc/task/emctaskmain.cc:1949
 msgid "Can't issue MDI command when not homed"
 msgstr "Не могу исполнить команду MDI если не найдены начала"
 
-#: emc/task/emctaskmain.cc:1957
+#: emc/task/emctaskmain.cc:1954
 msgid "Must be in MDI mode to issue MDI command"
 msgstr "Должен быть в MDI режиме для исполнения команд MDI"
 
-#: emc/task/emctaskmain.cc:1986
+#: emc/task/emctaskmain.cc:1983
 msgid "Can't run a program when not homed"
 msgstr "Не могу исполнить программу если не найдены начала"
 
@@ -8879,24 +8835,20 @@ msgid "E word with no G76, M66, M67 or M68 to use it"
 msgstr "E слово вне G76, M66, M67 или M68"
 
 #: emc/rs274ngc/interp_check.cc:261
-#, fuzzy
 msgid "H word with no G43 or G76 to use it"
-msgstr "E слово вне G76 или M66"
+msgstr "H слово вне G43 или G76"
 
 #: emc/rs274ngc/interp_check.cc:267
-#, fuzzy
-msgid "I word with no G2, G3, G5, G5.1, G76, G87 or G43.1 to use it"
-msgstr "K слово без g2, g3, g33, g33.1, g76, g87 или g43.1 перед ним"
+msgid "I word with no G2, G3, G5, G5.1, G10, G76, G87 or G43.1 to use it"
+msgstr "I слово без G2, G3, G5, G5.1, g10, G76, G87 или G43.1 перед ним"
 
 #: emc/rs274ngc/interp_check.cc:273
-#, fuzzy
-msgid "J word with no G2, G3, G5, G5.1, G76 or G87 to use it"
-msgstr "J слово без g2, g3 или g87 перед ним"
+msgid "J word with no G2, G3, G5, G5.1, G10, G76 or G87 to use it"
+msgstr "J слово без G2, G3, G5, G5.1, G10, G76, G87 или G43.1 перед ним"
 
 #: emc/rs274ngc/interp_check.cc:279
-#, fuzzy
 msgid "K word with no G2, G3, G33, G33.1, G76, G87 or G43.1 to use it"
-msgstr "K слово без g2, g3, g33, g33.1, g76, g87 или g43.1 перед ним"
+msgstr "K слово без G2, G3, G33, G33.1, G76, G87 или G43.1 перед ним"
 
 #: emc/rs274ngc/interp_check.cc:289
 msgid ""
@@ -8956,8 +8908,8 @@ msgstr ""
 "может проникнуть без зареза"
 
 #: emc/rs274ngc/interp_convert.cc:1010 emc/rs274ngc/interp_convert.cc:1011
-#: emc/rs274ngc/interp_convert.cc:1012 emc/rs274ngc/interp_convert.cc:3209
-#: emc/rs274ngc/interp_convert.cc:3212 emc/rs274ngc/interp_convert.cc:3215
+#: emc/rs274ngc/interp_convert.cc:1012 emc/rs274ngc/interp_convert.cc:3234
+#: emc/rs274ngc/interp_convert.cc:3237 emc/rs274ngc/interp_convert.cc:3240
 #: emc/rs274ngc/interp_find.cc:97
 #, c-format
 msgid "Invalid absolute position %5.2f for wrapped rotary axis %c"
@@ -8995,125 +8947,123 @@ msgstr "G%d требует D слово как целое число"
 msgid "G%d with lathe tool, but plane is not G18"
 msgstr "G%d с токарным инструментом, но плоскость не G18"
 
-#: emc/rs274ngc/interp_convert.cc:2557
+#: emc/rs274ngc/interp_convert.cc:2571
 msgid "Cannot set motion output with cutter radius compensation on"
 msgstr ""
 "Не могу установить выход движения при включенной компенсации радиуса "
 "инструмента"
 
-#: emc/rs274ngc/interp_convert.cc:2558
+#: emc/rs274ngc/interp_convert.cc:2572
 msgid "No valid P word with M62"
 msgstr ""
 
-#: emc/rs274ngc/interp_convert.cc:2562
-#, fuzzy
+#: emc/rs274ngc/interp_convert.cc:2576
 msgid "Cannot set motion digital output with cutter radius compensation on"
 msgstr ""
 "Не могу установить выход движения при включенной компенсации радиуса "
 "инструмента"
 
-#: emc/rs274ngc/interp_convert.cc:2563
+#: emc/rs274ngc/interp_convert.cc:2577
 msgid "No valid P word with M63"
 msgstr ""
 
-#: emc/rs274ngc/interp_convert.cc:2567 emc/rs274ngc/interp_convert.cc:2572
-#, fuzzy
+#: emc/rs274ngc/interp_convert.cc:2581 emc/rs274ngc/interp_convert.cc:2586
 msgid "Cannot set auxiliary digital output with cutter radius compensation on"
 msgstr ""
 "Не могу установить дополнительный выход при включенной компенсации радиуса "
 "инструмента"
 
-#: emc/rs274ngc/interp_convert.cc:2568
+#: emc/rs274ngc/interp_convert.cc:2582
 msgid "No valid P word with M64"
 msgstr ""
 
-#: emc/rs274ngc/interp_convert.cc:2573
+#: emc/rs274ngc/interp_convert.cc:2587
 msgid "No valid P word with M65"
 msgstr ""
 
-#: emc/rs274ngc/interp_convert.cc:2617
+#: emc/rs274ngc/interp_convert.cc:2631
 msgid "Cannot wait for digital input with cutter radius compensation on"
 msgstr ""
 "Не могу ждать цифровой вход при включенной компенсации радиуса инструмента"
 
-#: emc/rs274ngc/interp_convert.cc:2629
+#: emc/rs274ngc/interp_convert.cc:2643
 msgid "Cannot wait for analog input with cutter radius compensation on"
 msgstr ""
 "Не могу ждать аналоговый вход при включенной компенсации радиуса инструмента"
 
-#: emc/rs274ngc/interp_convert.cc:2643
-#, fuzzy
+#: emc/rs274ngc/interp_convert.cc:2657
 msgid "Cannot set motion analog output with cutter radius compensation on"
 msgstr ""
-"Не могу установить выход движения при включенной компенсации радиуса "
+"Не могу установить аналоговый выход при включенной компенсации радиуса "
 "инструмента"
 
-#: emc/rs274ngc/interp_convert.cc:2644
+#: emc/rs274ngc/interp_convert.cc:2658
 msgid "Invalid analog index with M67"
 msgstr ""
 
-#: emc/rs274ngc/interp_convert.cc:2650
-#, fuzzy
+#: emc/rs274ngc/interp_convert.cc:2664
 msgid "Cannot set auxiliary analog output with cutter radius compensation on"
 msgstr ""
-"Не могу установить дополнительный выход при включенной компенсации радиуса "
-"инструмента"
+"Не могу установить дополнительный аналоговый выход при включенной "
+"компенсации радиуса инструмента"
 
-#: emc/rs274ngc/interp_convert.cc:2651
+#: emc/rs274ngc/interp_convert.cc:2665
 msgid "Invalid analog index with M68"
 msgstr ""
 
-#: emc/rs274ngc/interp_convert.cc:2662
+#: emc/rs274ngc/interp_convert.cc:2676
 msgid "Need positive Q-word to specify tool number with M61"
 msgstr "Нужно положительное Q-слово для обозначения номера инструмента с M61"
 
-#: emc/rs274ngc/interp_convert.cc:2735 emc/rs274ngc/interp_convert.cc:2752
-#: emc/rs274ngc/interp_convert.cc:2766 emc/rs274ngc/interp_convert.cc:2780
-#: emc/rs274ngc/interp_convert.cc:2794
+#: emc/rs274ngc/interp_convert.cc:2749 emc/rs274ngc/interp_convert.cc:2766
+#: emc/rs274ngc/interp_convert.cc:2780 emc/rs274ngc/interp_convert.cc:2794
+#: emc/rs274ngc/interp_convert.cc:2808
 msgid "Cannot enable overrides with cutter radius compensation on"
 msgstr ""
 "Не могу установить переопределения при включенной компенсации радиуса "
 "инструмента"
 
-#: emc/rs274ngc/interp_convert.cc:2742 emc/rs274ngc/interp_convert.cc:2757
-#: emc/rs274ngc/interp_convert.cc:2771 emc/rs274ngc/interp_convert.cc:2785
-#: emc/rs274ngc/interp_convert.cc:2799
+#: emc/rs274ngc/interp_convert.cc:2756 emc/rs274ngc/interp_convert.cc:2771
+#: emc/rs274ngc/interp_convert.cc:2785 emc/rs274ngc/interp_convert.cc:2799
+#: emc/rs274ngc/interp_convert.cc:2813
 msgid "Cannot disable overrides with cutter radius compensation on"
 msgstr ""
 "Не могу сбросить переопределения при включенной компенсации радиуса "
 "инструмента"
 
-#: emc/rs274ngc/interp_convert.cc:3035
+#: emc/rs274ngc/interp_convert.cc:3049
 msgid "Cannot change retract mode with cutter radius compensation on"
 msgstr ""
 "Не могу изменить режим возврата при включенной компенсации радиуса "
 "инструмента"
 
-#: emc/rs274ngc/interp_convert.cc:3896
+#: emc/rs274ngc/interp_convert.cc:3227
+msgid "I J words not allowed with G10 L2"
+msgstr "I J не разрешены вместе с G10 L2"
+
+#: emc/rs274ngc/interp_convert.cc:3921
 msgid "Cannot use G76 threading cycle with cutter radius compensation on"
 msgstr ""
 "Не могу использовать цикл резьбы G76 при включенной компенсации радиуса "
 "инструмента"
 
-#: emc/rs274ngc/interp_convert.cc:3899
+#: emc/rs274ngc/interp_convert.cc:3924
 msgid "In G76, I must not be 0"
 msgstr ""
 
-#: emc/rs274ngc/interp_convert.cc:3901
-#, fuzzy
+#: emc/rs274ngc/interp_convert.cc:3926
 msgid "In G76, J must be greater than 0"
-msgstr "Номер строки больше 99999"
+msgstr "В G76, J дожно быть больше 0"
 
-#: emc/rs274ngc/interp_convert.cc:3903
-#, fuzzy
+#: emc/rs274ngc/interp_convert.cc:3928
 msgid "In G76, K must be greater than J"
-msgstr "Номер строки больше 99999"
+msgstr "В G76, K дожно быть больше J"
 
-#: emc/rs274ngc/interp_convert.cc:4265
+#: emc/rs274ngc/interp_convert.cc:4290
 msgid "Zero degree inside corner is invalid for cutter compensation"
 msgstr "Нулевой внутренний угол неверен для компенсации радиуса инструмента"
 
-#: emc/rs274ngc/interp_convert.cc:4303 emc/rs274ngc/interp_convert.cc:4311
+#: emc/rs274ngc/interp_convert.cc:4328 emc/rs274ngc/interp_convert.cc:4336
 msgid ""
 "Arc to straight motion makes a corner the compensated tool can't fit in "
 "without gouging"
@@ -9121,17 +9071,21 @@ msgstr ""
 "Переход от арки к линейному ходу делает угол, который не может быть исполнен "
 "без зареза при включенной компенсации радиуса инструмента"
 
-#: emc/rs274ngc/interp_convert.cc:4395
+#: emc/rs274ngc/interp_convert.cc:4420
 msgid "Cannot change tools with cutter radius compensation on"
 msgstr ""
 "Не могу менять инструмент при включенной компенсации радиуса инструмента"
 
-#: emc/rs274ngc/interp_convert.cc:4505
+#: emc/rs274ngc/interp_convert.cc:4531
 msgid "Cannot change tool offset with cutter radius compensation on"
 msgstr ""
 "Не могу изменять отступ инструмента при включенной компенсации радиуса "
 "инструмента"
 
+#: emc/rs274ngc/interp_convert.cc:4557
+msgid "I K words not allowed with G43.1"
+msgstr "I K не разрешены вместе с G43.1"
+
 #: emc/rs274ngc/interp_queue.cc:539
 #, c-format
 msgid ""
@@ -9162,9 +9116,8 @@ msgid ""
 msgstr "Прямой переход в вогнутый угол не может быть достигнут без зареза"
 
 #: emc/rs274ngc/interp_find.cc:170
-#, fuzzy
 msgid "Cannot use polar coordinates with G53"
-msgstr "Нельзя двигать вращательные оси в G76"
+msgstr "Нельзя использовать полярные координаты с G53"
 
 #: emc/rs274ngc/interp_find.cc:262 emc/rs274ngc/interp_find.cc:267
 #: emc/rs274ngc/interp_find.cc:274 emc/rs274ngc/interp_find.cc:333
@@ -9202,7 +9155,7 @@ msgid "Cannot specify both polar coordinate and Y word"
 msgstr ""
 
 #: emc/rs274ngc/interp_internal.cc:175 emc/rs274ngc/interp_internal.cc:187
-#: emc/rs274ngc/interp_internal.cc:198
+#: emc/rs274ngc/interp_internal.cc:200
 msgid "Polar coordinates can only be used for motion"
 msgstr ""
 
@@ -9222,9 +9175,9 @@ msgid "Internal error: Could not assign #<%s>"
 msgstr ""
 
 #: emc/rs274ngc/interp_read.cc:2020
-#, fuzzy, c-format
+#, c-format
 msgid "Named parameter #<%s> not defined"
-msgstr "Поименованный параметр не определен"
+msgstr "Поименованный параметр #<%s> не определен"
 
 #: emc/rs274ngc/interp_read.cc:3284
 msgid "Multiple U words on one line"
@@ -9238,7 +9191,7 @@ msgstr "Много V на одной строке"
 msgid "Multiple W words on one line"
 msgstr "Много W на одной строке"
 
-#: emc/rs274ngc/rs274ngc_pre.cc:786
+#: emc/rs274ngc/rs274ngc_pre.cc:783
 msgid "Queue is not empty after tool change"
 msgstr "Очередь не пуста после смены инструмента"
 
@@ -9789,9 +9742,8 @@ msgid "Parameter number out of range"
 msgstr "Номер параметра вне диапазона"
 
 #: emc/rs274ngc/rs274ngc_return.hh:140
-#, fuzzy
 msgid "Parameter is readonly"
-msgstr "Файл параметров"
+msgstr "Параметр только для чтения"
 
 #: emc/rs274ngc/rs274ngc_return.hh:141
 msgid "Q word missing with g83"
@@ -9882,9 +9834,8 @@ msgid "Tool length offset index too big"
 msgstr "Отступ длины инструмента слишком большой"
 
 #: emc/rs274ngc/rs274ngc_return.hh:163
-#, fuzzy
 msgid "Pocket max too large"
-msgstr "Максимум инструмента слишком большой"
+msgstr "Максимум кармана слишком большой"
 
 #: emc/rs274ngc/rs274ngc_return.hh:164
 msgid "Tool radius index too big"

------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Emc-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/emc-developers






















					Reply via email to