Merge branch 'zelgadis_master'

diff --git a/autobuild/synfigstudio-linux-build.sh b/autobuild/synfigstudio-linux-build.sh
index 4eb951f..51ddb76 100644 (file)
--- a/autobuild/synfigstudio-linux-build.sh
+++ b/autobuild/synfigstudio-linux-build.sh
@@ -40,6 +40,8 @@
 # Build package from commit with "synfigstudio-0.62.00" tag
 #    ./synfigstudio-linux-build.sh package synfigstudio-0.62.00
 #
+# Note: Make sure to run "git clean -f -x -d" after you switch branches.
+#
 # = TODO =
 # - debuginfo packages
 
@@ -294,7 +296,7 @@ mkgit()
 
 mkETL()
 {
-if [ -d ${SYNFIG_REPO_DIR}/ETL/trunk ]; then
+if [ -f ${SYNFIG_REPO_DIR}/ETL/trunk/configure.ac ]; then
        pushd ${SYNFIG_REPO_DIR}/ETL/trunk
 else
        pushd ${SYNFIG_REPO_DIR}/ETL
@@ -311,7 +313,7 @@ if [[ $MODE != 'quick' ]]; then
        echo "Going to configure..."
        rm -f aclocal.m4
        autoreconf --install --force
-       bash ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include $DEBUG 
+       /bin/sh ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include $DEBUG 
 fi
 
 make -j2
@@ -322,7 +324,7 @@ popd
 
 mksynfig()
 {
-if [ -d ${SYNFIG_REPO_DIR}/synfig-core/trunk ]; then
+if [ -d ${SYNFIG_REPO_DIR}/synfig-core/trunk/configure.ac ]; then
        pushd ${SYNFIG_REPO_DIR}/synfig-core/trunk
 else
        pushd ${SYNFIG_REPO_DIR}/synfig-core
@@ -337,7 +339,7 @@ if [[ $MODE != 'quick' ]]; then
        sed -i 's/^AC_CONFIG_SUBDIRS(libltdl)$/m4_ifdef([_AC_SEEN_TAG(libltdl)], [], [AC_CONFIG_SUBDIRS(libltdl)])/' configure.ac || true
        sed -i 's/^# AC_CONFIG_SUBDIRS(libltdl)$/m4_ifdef([_AC_SEEN_TAG(libltdl)], [], [AC_CONFIG_SUBDIRS(libltdl)])/' configure.ac || true
        autoreconf --install --force
-       bash ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --enable-shared --with-magickpp --without-libavcodec $DEBUG  
+       /bin/sh ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --enable-shared --with-magickpp --without-libavcodec $DEBUG  
 fi
 
 #It looks like mod_libavcodec causes segfault on synfig-core when rendering to png.
@@ -359,7 +361,7 @@ popd
 
 mksynfigstudio()
 {
-if [ -d ${SYNFIG_REPO_DIR}/synfig-studio/trunk ]; then
+if [ -d ${SYNFIG_REPO_DIR}/synfig-studio/trunk/configure.ac ]; then
        pushd ${SYNFIG_REPO_DIR}/synfig-studio/trunk
 else
        pushd ${SYNFIG_REPO_DIR}/synfig-studio
@@ -369,7 +371,7 @@ fi
 
 if [[ $MODE != 'quick' ]]; then
        autoreconf --install --force
-       bash ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --enable-shared $DEBUG
+       /bin/sh ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --enable-shared $DEBUG
 fi
 
 make -j2
@@ -612,7 +614,7 @@ initialize()
                        echo 
                        #echo "http_proxy =====" $http_proxy
                        #env
-                       sudo apt-get update
+                       sudo apt-get update || true
                        sudo apt-get install -y $PKG_LIST
                fi
        else

diff --git a/synfig-core/build_tools/autorevision.sh b/synfig-core/build_tools/autorevision.sh
index c8f4cf2..e47de2b 100644 (file)
--- a/synfig-core/build_tools/autorevision.sh
+++ b/synfig-core/build_tools/autorevision.sh
@@ -15,7 +15,7 @@
 
 get_git_id(){
        export SCM=git
-       export REVISION_ID=`cd "$1"; git log --no-color -1 | head -n 1 | cut -f 2 -d ' '`
+       export REVISION_ID=`cd "$1"; git log --no-color -1 | head -n 1 | cut -f 2 -d ' ' | cut -c -6`
        export BRANCH="`cd "$1"; git branch -a --no-color --contains HEAD | sed -e s/\*\ // | sed -e s/\(no\ branch\)// | tr '\n' ' ' | tr -s ' ' | sed s/^' '//`"
        if ( echo $BRANCH | egrep origin/master > /dev/null ); then
                #give a priority to master branch

diff --git a/synfig-core/po/ru.po b/synfig-core/po/ru.po
index 4abcea2..87ed717 100755 (executable)
--- a/synfig-core/po/ru.po
+++ b/synfig-core/po/ru.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: Synfig Backend\n"
 "Report-Msgid-Bugs-To: http://synfig.org/Bugs\n"
 "POT-Creation-Date: 2009-10-07 01:26+0400\n"
-"PO-Revision-Date: 2010-01-18 20:40+0600\n"
+"PO-Revision-Date: 2010-05-09 08:20+0700\n"
 "Last-Translator: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>\n"
 "Language-Team: Russian <gnome-cyr@lists.gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -311,7 +311,7 @@ msgstr "Начертание не загружено, текст не будет
 
 #: ../src/modules/lyr_freetype/lyr_freetype.cpp:670
 msgid "Text too small, no text will be rendered."
-msgstr ""
+msgstr "Текст не будет визуализирован, т.к. размер текста слишком мал."
 
 #: ../src/modules/lyr_freetype/lyr_freetype.cpp:694
 msgid "Unable to set face size."
@@ -391,7 +391,7 @@ msgstr "Светимость"
 
 #: ../src/modules/lyr_std/bevel.cpp:387
 msgid "Solid"
-msgstr ""
+msgstr "Сплошной"
 
 #: ../src/modules/lyr_std/booleancurve.cpp:104
 msgid "Region Set"
@@ -436,7 +436,7 @@ msgstr "Импорт изображения"
 #: ../src/modules/lyr_std/import.cpp:138
 #, c-format
 msgid "Filename seems to already be set to \"%s\" (%s)"
-msgstr ""
+msgstr "Имя файла уже указано - \"%s\" (%s)"
 
 #: ../src/modules/lyr_std/import.cpp:209
 msgid "Filename"
@@ -852,7 +852,7 @@ msgstr "Список узлов кривой Безье"
 #: ../src/modules/lyr_std/curvewarp.cpp:406
 #: ../src/modules/mod_gradient/curvegradient.cpp:554
 msgid "Fast"
-msgstr ""
+msgstr "Быстро"
 
 #: ../src/modules/lyr_std/xorpattern.cpp:54
 msgid "XOR Pattern"
@@ -1144,15 +1144,15 @@ msgstr "Косинус"
 
 #: ../src/modules/mod_geometry/outline.cpp:70
 msgid "Outline"
-msgstr "Ð\90бÑ\80иÑ\81"
+msgstr "Ð\9aонÑ\82Ñ\83Ñ\80"
 
 #: ../src/modules/mod_geometry/outline.cpp:178
 msgid "No vertices in outline "
-msgstr "Ð\9dеÑ\82 веÑ\80Ñ\88ин в абÑ\80иÑ\81е"
+msgstr "Ð\9dеÑ\82 веÑ\80Ñ\88ин в конÑ\82Ñ\83Ñ\80е"
 
 #: ../src/modules/mod_geometry/outline.cpp:824
 msgid "Outline Width"
-msgstr "ТолÑ\89ина абÑ\80иÑ\81а"
+msgstr "ТолÑ\89ина конÑ\82Ñ\83Ñ\80а"
 
 #: ../src/modules/mod_geometry/outline.cpp:829
 msgid "Expand"
@@ -1253,7 +1253,7 @@ msgstr ""
 
 #: ../src/modules/mod_gif/trgt_gif.cpp:195
 msgid "Description not set!"
-msgstr ""
+msgstr "Описание не установлено!"
 
 #: ../src/modules/mod_gradient/conicalgradient.cpp:56
 msgid "Conical Gradient"
@@ -1289,7 +1289,7 @@ msgstr "Зигзаг"
 
 #: ../src/modules/mod_gradient/curvegradient.cpp:552
 msgid "Perpendicular"
-msgstr ""
+msgstr "Перпендикулярно"
 
 #: ../src/modules/mod_gradient/lineargradient.cpp:53
 msgid "Linear Gradient"
@@ -1419,7 +1419,7 @@ msgstr "Турбулентность"
 #: ../src/modules/mod_noise/main.cpp:66
 #: ../src/modules/mod_noise/valuenode_random.cpp:182
 msgid "Random"
-msgstr ""
+msgstr "Случайно"
 
 #: ../src/modules/mod_noise/noise.cpp:56
 msgid "Noise Gradient"
@@ -1440,7 +1440,7 @@ msgstr ""
 #: ../src/synfig/valuenode_scale.cpp:226 ../src/synfig/valuenode_step.cpp:216
 #: ../src/synfig/valuenode_timeloop.cpp:123
 msgid "Link"
-msgstr ""
+msgstr "Связь"
 
 #: ../src/modules/mod_noise/valuenode_random.cpp:251
 #: ../src/modules/mod_particle/plant.cpp:441
@@ -1518,7 +1518,7 @@ msgstr "Развернуть"
 
 #: ../src/modules/mod_particle/plant.cpp:432
 msgid "If enabled, render the plant in the opposite direction"
-msgstr ""
+msgstr "Если включено, то растение визуализируется в обратном направлении."
 
 #: ../src/modules/mod_particle/plant.cpp:436 ../src/synfig/valuenode.cpp:172
 #: ../src/synfig/valuenode_duplicate.cpp:123
@@ -1528,7 +1528,7 @@ msgstr "Шаг"
 
 #: ../src/modules/mod_particle/plant.cpp:437
 msgid "Measure of the distance between points when rendering"
-msgstr "Единица измерения расстояния между точками при рендеринге"
+msgstr "Единица измерения расстояния между точками при визуализации"
 
 #: ../src/modules/mod_particle/plant.cpp:442
 msgid "Used to seed the pseudo-random number generator"
@@ -1707,7 +1707,7 @@ msgstr "Точка фокусировки"
 
 #: ../src/synfig/layer_pastecanvas.cpp:152
 msgid "Point to remain fixed when zooming"
-msgstr ""
+msgstr "Центр масштабирования"
 
 #: ../src/synfig/layer_pastecanvas.cpp:163
 msgid "Current Time"
@@ -2502,7 +2502,7 @@ msgstr ""
 
 #: ../src/synfig/valuenode.cpp:154 ../src/synfig/valuenode_sine.cpp:109
 msgid "Sine"
-msgstr ""
+msgstr "Синус"
 
 #: ../src/synfig/valuenode.cpp:156 ../src/synfig/valuenode_timedswap.cpp:267
 msgid "Timed Swap"
@@ -2516,11 +2516,11 @@ msgstr ""
 
 #: ../src/synfig/valuenode.cpp:158 ../src/synfig/valuenode_exp.cpp:105
 msgid "Exponential"
-msgstr ""
+msgstr "Экспонента"
 
 #: ../src/synfig/valuenode.cpp:159 ../src/synfig/valuenode_add.cpp:230
 msgid "Add"
-msgstr "Ð\94обавиÑ\82Ñ\8c"
+msgstr "СÑ\83мма"
 
 #: ../src/synfig/valuenode.cpp:160
 #: ../src/synfig/valuenode_blinecalctangent.cpp:175
@@ -2538,11 +2538,11 @@ msgstr "Диапазон"
 
 #: ../src/synfig/valuenode.cpp:164 ../src/synfig/valuenode_switch.cpp:173
 msgid "Switch"
-msgstr ""
+msgstr "Переключатель"
 
 #: ../src/synfig/valuenode.cpp:165 ../src/synfig/valuenode_cos.cpp:108
 msgid "Cos"
-msgstr ""
+msgstr "Косинус"
 
 #: ../src/synfig/valuenode.cpp:166
 msgid "aTan2"
@@ -2554,7 +2554,7 @@ msgstr ""
 
 #: ../src/synfig/valuenode.cpp:169 ../src/synfig/valuenode_reciprocal.cpp:182
 msgid "Reciprocal"
-msgstr ""
+msgstr "Обратное значени"
 
 #: ../src/synfig/valuenode.cpp:171 ../src/synfig/valuenode_integer.cpp:186
 msgid "From Integer"
@@ -2563,7 +2563,7 @@ msgstr "Текст"
 #: ../src/synfig/valuenode.cpp:173
 #: ../src/synfig/valuenode_blinecalcwidth.cpp:146
 msgid "BLine Width"
-msgstr ""
+msgstr "Толщина кривой"
 
 #: ../src/synfig/valuenode.cpp:175
 msgid "Vector Angle"
@@ -2587,7 +2587,7 @@ msgstr "Цвет градиента"
 
 #: ../src/synfig/valuenode.cpp:180
 msgid "Dot Product"
-msgstr ""
+msgstr "Скалярное произведение"
 
 #: ../src/synfig/valuenode.cpp:181 ../src/synfig/valuenode_timestring.cpp:118
 msgid "Time String"
@@ -2614,14 +2614,13 @@ msgid "Logarithm"
 msgstr "Логарифм"
 
 #: ../src/synfig/valuenode.cpp:188
-#, fuzzy
 msgid "Greyed"
-msgstr "Ð\97еленый"
+msgstr "Ð\97аблокиÑ\80ованный"
 
 #: ../src/synfig/valuenode.cpp:189 ../src/synfig/valuenode_pow.cpp:123
 #: ../src/synfig/valuenode_pow.cpp:200
 msgid "Power"
-msgstr ""
+msgstr "Степень"
 
 #: ../src/synfig/valuenode.cpp:190 ../src/synfig/valuenode_compare.cpp:190
 msgid "Compare"
@@ -2685,14 +2684,12 @@ msgid "Scalar"
 msgstr ""
 
 #: ../src/synfig/valuenode_and.cpp:116 ../src/synfig/valuenode_or.cpp:116
-#, fuzzy
 msgid "Link1"
-msgstr "Ð\9aÑ\80иваÑ\8f"
+msgstr "СвÑ\8fзÑ\8c 1"
 
 #: ../src/synfig/valuenode_and.cpp:117 ../src/synfig/valuenode_or.cpp:117
-#, fuzzy
 msgid "Link2"
-msgstr "Ð\9aÑ\80иваÑ\8f"
+msgstr "СвÑ\8fзÑ\8c 2"
 
 #: ../src/synfig/valuenode_and.cpp:161
 msgid "AND"
@@ -3381,7 +3378,7 @@ msgstr ""
 
 #: ../src/tool/main.cpp:1415
 msgid "Rendering..."
-msgstr "РендеÑ\80инг..."
+msgstr "Ð\92изÑ\83ализаÑ\86иÑ\8f..."
 
 #: ../src/tool/main.cpp:1431
 msgid "Done."

diff --git a/synfig-studio/build_tools/autorevision.sh b/synfig-studio/build_tools/autorevision.sh
index d8a5c8b..517732b 100644 (file)
--- a/synfig-studio/build_tools/autorevision.sh
+++ b/synfig-studio/build_tools/autorevision.sh
@@ -15,7 +15,7 @@
 
 get_git_id(){
        export SCM=git
-       export REVISION_ID=`cd "$1"; git log --no-color -1 | head -n 1 | cut -f 2 -d ' '`
+       export REVISION_ID=`cd "$1"; git log --no-color -1 | head -n 1 | cut -f 2 -d ' ' | cut -c -6`
        export BRANCH="`cd "$1"; git branch -a --no-color --contains HEAD | sed -e s/\*\ // | sed -e s/\(no\ branch\)// | tr '\n' ' ' | tr -s ' ' | sed s/^' '//`"
        if ( echo $BRANCH | egrep origin/master > /dev/null ); then
                #give a priority to master branch

diff --git a/synfig-studio/po/ru.po b/synfig-studio/po/ru.po
index f2e4605..e2c5782 100755 (executable)
--- a/synfig-studio/po/ru.po
+++ b/synfig-studio/po/ru.po
@@ -1,10 +1,10 @@
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Synfig Studio\n"
 "Report-Msgid-Bugs-To: http://synfig.org/Bugs\n"
 "POT-Creation-Date: 2009-10-07 04:46+0400\n"
-"PO-Revision-Date: 2009-12-24 19:21+0500\n"
+"PO-Revision-Date: 2010-05-09 14:57+0700\n"
 "Last-Translator: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>\n"
 "Language-Team: Russian <gnome-cyr@lists.gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -55,7 +55,9 @@ msgstr "Участники проекта:"
 #. TRANSLATORS: change this to your name, separate multiple names with \n
 #: ../src/gtkmm/about.cpp:177
 msgid "translator-credits"
-msgstr "Александр Прокудин <alexandre.prokoudine@gmail.com>\nКонстантин Дмитриев <ksee.zelgadis@gmail.com>"
+msgstr ""
+"Александр Прокудин <alexandre.prokoudine@gmail.com>\n"
+"Константин Дмитриев <ksee.zelgadis@gmail.com>"
 
 #: ../src/gtkmm/about.cpp:204
 #, c-format
@@ -423,55 +425,55 @@ msgstr "Справочный диалог..."
 
 #: ../src/gtkmm/app.cpp:1231
 msgid "Init Tool Options..."
-msgstr "Параметры инструментов..."
+msgstr "Панель параметров инструментов..."
 
 #: ../src/gtkmm/app.cpp:1235
 msgid "Init History..."
-msgstr "Ð\98Ñ\81Ñ\82оÑ\80иÑ\8f действий..."
+msgstr "Ð\9fанелÑ\8c иÑ\81Ñ\82оÑ\80ии действий..."
 
 #: ../src/gtkmm/app.cpp:1239
 msgid "Init Canvases..."
-msgstr "ХолÑ\81Ñ\82Ñ\8b..."
+msgstr "Ð\9fанелÑ\8c Ñ\85олÑ\81Ñ\82ов..."
 
 #: ../src/gtkmm/app.cpp:1243
 msgid "Init Keyframes..."
-msgstr "Ð\9aлÑ\8eÑ\87евÑ\8bе кадÑ\80Ñ\8b..."
+msgstr "Ð\9fанелÑ\8c клÑ\8eÑ\87евÑ\8bÑ\85 кадÑ\80ов..."
 
 #: ../src/gtkmm/app.cpp:1247
 msgid "Init Layers..."
-msgstr "Слои..."
+msgstr "Ð\9fанелÑ\8c Ñ\81лоÑ\91в..."
 
 #: ../src/gtkmm/app.cpp:1251
 msgid "Init Params..."
-msgstr "Параметры..."
+msgstr "Панель свойств..."
 
 #: ../src/gtkmm/app.cpp:1255
 msgid "Init MetaData..."
-msgstr "Ð\9cеÑ\82аданнÑ\8bе..."
+msgstr "Ð\9fанелÑ\8c меÑ\82аданнÑ\8bÑ\85..."
 
 #: ../src/gtkmm/app.cpp:1259
 msgid "Init Children..."
-msgstr "Ð\9fоÑ\82омки..."
+msgstr "Ð\9fанелÑ\8c поÑ\82омков..."
 
 #: ../src/gtkmm/app.cpp:1263
 msgid "Init Info..."
-msgstr ""
+msgstr "Панель сведений..."
 
 #: ../src/gtkmm/app.cpp:1267
 msgid "Init Navigator..."
-msgstr "Ð\9dавигаÑ\82оÑ\80..."
+msgstr "Ð\9fанелÑ\8c навигаÑ\82оÑ\80а..."
 
 #: ../src/gtkmm/app.cpp:1271
 msgid "Init Timetrack..."
-msgstr "Ð\94оÑ\80ожка времени..."
+msgstr "Ð\9fанелÑ\8c Ñ\88калÑ\8b времени..."
 
 #: ../src/gtkmm/app.cpp:1275
 msgid "Init Curve Editor..."
-msgstr "РедакÑ\82оÑ\80 кÑ\80ивой..."
+msgstr "Ð\9fанелÑ\8c Ñ\80едакÑ\82оÑ\80а кÑ\80ивÑ\8bÑ\85..."
 
 #: ../src/gtkmm/app.cpp:1279
 msgid "Init Layer Groups..."
-msgstr "Ð\93Ñ\80Ñ\83ппÑ\8b Ñ\81лоев..."
+msgstr "Ð\9fанелÑ\8c гÑ\80Ñ\83пп..."
 
 #: ../src/gtkmm/app.cpp:1284
 msgid "Init Color Dialog..."
@@ -483,7 +485,7 @@ msgstr "Редактор градиентов..."
 
 #: ../src/gtkmm/app.cpp:1290
 msgid "Init DeviceTracker..."
-msgstr ""
+msgstr "Устройства ввода..."
 
 #: ../src/gtkmm/app.cpp:1293
 msgid "Init Tools..."
@@ -1170,7 +1172,8 @@ msgstr "Использовать только один поток"
 
 #: ../src/gtkmm/dialog_setup.cpp:83
 msgid "Restrict Real-Valued Ducks to Top Right Quadrant"
-msgstr "Ограничить верхним правым квадрантом уТочки, задающие числовое значением"
+msgstr ""
+"Ограничить верхним правым квадрантом уТочки, задающие числовое значением"
 
 #: ../src/gtkmm/dialog_setup.cpp:84
 msgid "Scale New Imported Images to Fit Canvas"
@@ -1474,7 +1477,8 @@ msgstr "Очистить историю"
 msgid ""
 "You will not be able to undo any changes that you have made!\n"
 "Are you sure you want to clear the undo stack?"
-msgstr "Вы не сможете отменить сделанные ранее изменения!\n"
+msgstr ""
+"Вы не сможете отменить сделанные ранее изменения!\n"
 "Уверены, что хотите очистить историю действий?"
 
 #: ../src/gtkmm/dock_history.cpp:284
@@ -1553,7 +1557,7 @@ msgstr "Создать новую запись в метаданных"
 
 #: ../src/gtkmm/dock_metadata.cpp:94
 msgid "Remove selected MetaData entry"
-msgstr ""
+msgstr "Удалить выбранную запись в метаданных"
 
 #: ../src/gtkmm/dock_navigator.cpp:496 ../src/gtkmm/iconcontroller.cpp:182
 msgid "Navigator"
@@ -1893,7 +1897,7 @@ msgstr ""
 
 #: ../src/gtkmm/instance.cpp:327
 msgid "File exists"
-msgstr ""
+msgstr "Файл существует"
 
 #: ../src/gtkmm/instance.cpp:482
 msgid "You must first add this composition to the repository"
@@ -2100,7 +2104,7 @@ msgstr "Значение"
 
 #: ../src/gtkmm/layertreestore.cpp:464
 msgid "Move Layers"
-msgstr ""
+msgstr "Переместить слои"
 
 #: ../src/gtkmm/main.cpp:74
 msgid "synfig studio is already running"
@@ -2518,7 +2522,7 @@ msgstr "Не удалось создать слой области"
 #: ../src/gtkmm/state_draw.cpp:1064 ../src/gtkmm/state_polygon.cpp:816
 #: ../src/gtkmm/state_rectangle.cpp:760 ../src/gtkmm/state_star.cpp:960
 msgid " Outline"
-msgstr "Контур"
+msgstr " Контур"
 
 #: ../src/gtkmm/state_bline.cpp:851 ../src/gtkmm/state_bline.cpp:874
 #: ../src/gtkmm/state_circle.cpp:960 ../src/gtkmm/state_circle.cpp:983
@@ -2530,11 +2534,11 @@ msgstr "Не удалось создать слой контура"
 
 #: ../src/gtkmm/state_bline.cpp:1259
 msgid "Unloop BLine"
-msgstr ""
+msgstr "Разомкнуть контур"
 
 #: ../src/gtkmm/state_bline.cpp:1263
 msgid "Loop BLine"
-msgstr ""
+msgstr "Замкнуть контур"
 
 #: ../src/gtkmm/state_bline.cpp:1268
 msgid "Delete Vertex"
@@ -2832,7 +2836,7 @@ msgstr "Радиус"
 
 #: ../src/gtkmm/state_smoothmove.cpp:204
 msgid "Smooth Move"
-msgstr ""
+msgstr "Деформация"
 
 #: ../src/gtkmm/state_star.cpp:440
 msgid "Regular Polygon"
@@ -3672,14 +3676,14 @@ msgstr "Дублируемый ключевой кадр"
 
 #: ../src/synfigapp/actions/keyframeduplicate.cpp:102
 msgid " (Duplicate)"
-msgstr ""
+msgstr " (Копия)"
 
 #: ../src/synfigapp/actions/keyframeduplicate.cpp:135
 #: ../src/synfigapp/actions/keyframeremove.cpp:120
 #: ../src/synfigapp/actions/keyframeset.cpp:377
 #: ../src/synfigapp/actions/keyframewaypointset.cpp:129
 msgid "Unable to find the given keyframe"
-msgstr ""
+msgstr "Невозможно найти указанный ключевой кадр"
 
 #: ../src/synfigapp/actions/keyframeremove.cpp:53
 msgid "Remove Keyframe"
@@ -3999,7 +4003,7 @@ msgstr ""
 
 #: ../src/synfigapp/actions/valuedescblinelink.cpp:59
 msgid "Link to BLine"
-msgstr ""
+msgstr "Привязать к кривой"
 
 #: ../src/synfigapp/actions/valuedescblinelink.cpp:82
 #: ../src/synfigapp/actions/valuedesclink.cpp:75
@@ -4105,7 +4109,7 @@ msgstr ""
 
 #: ../src/synfigapp/actions/valuedesclink.cpp:52
 msgid "Link"
-msgstr ""
+msgstr "Связь"
 
 #: ../src/synfigapp/actions/valuedesclink.cpp:112
 msgid "Cannot link two different exported values ('"
@@ -4203,7 +4207,8 @@ msgstr ""
 
 #: ../src/synfigapp/actions/valuedescset.cpp:542
 msgid "You must be in Animate-Editing-Mode to directly manipulate this value"
-msgstr "Для прямого редактирования этого значения необходимо быть в режиме анимации"
+msgstr ""
+"Для прямого редактирования этого значения необходимо быть в режиме анимации"
 
 #: ../src/synfigapp/actions/valuedescset.cpp:564
 msgid "Unsupported ValueDesc type"

diff --git a/synfig-studio/src/gtkmm/app.cpp b/synfig-studio/src/gtkmm/app.cpp
index 0068f86..d2d3443 100644 (file)
--- a/synfig-studio/src/gtkmm/app.cpp
+++ b/synfig-studio/src/gtkmm/app.cpp
@@ -1299,23 +1299,25 @@ App::App(int *argc, char ***argv):
                state_manager->add_state(&state_scale);
                state_manager->add_state(&state_rotate);
                studio_init_cb.task(_("Init ModMirror...")); module_list_.push_back(new ModMirror()); module_list_.back()->start();
-               if(!getenv("SYNFIG_DISABLE_WIDTH"  )) state_manager->add_state(&state_width); // Enabled since 0.61.09
 
-               /* new objects */
+               /* geometry */
                state_manager->add_state(&state_circle);
                state_manager->add_state(&state_rectangle);
                state_manager->add_state(&state_star);
                state_manager->add_state(&state_gradient);
                if(!getenv("SYNFIG_DISABLE_POLYGON")) state_manager->add_state(&state_polygon); // Enabled - for working without ducks
-               state_manager->add_state(&state_text);
+               
+               /* bline tools */
                state_manager->add_state(&state_bline);
                if(!getenv("SYNFIG_DISABLE_DRAW"   )) state_manager->add_state(&state_draw); // Enabled for now.  Let's see whether they're good enough yet.
-
-               /* other */
+               if(!getenv("SYNFIG_DISABLE_WIDTH"  )) state_manager->add_state(&state_width); // Enabled since 0.61.09
                state_manager->add_state(&state_fill);
                state_manager->add_state(&state_eyedrop);
-               state_manager->add_state(&state_zoom);
+               
+               /* other */
+               state_manager->add_state(&state_text);
                if(!getenv("SYNFIG_DISABLE_SKETCH" )) state_manager->add_state(&state_sketch);
+               state_manager->add_state(&state_zoom);
 
                studio_init_cb.task(_("Init ModPalette..."));
                module_list_.push_back(new ModPalette()); module_list_.back()->start();

diff --git a/synfig-studio/src/gtkmm/iconcontroller.cpp b/synfig-studio/src/gtkmm/iconcontroller.cpp
index 5104152..cfc7cb5 100644 (file)
--- a/synfig-studio/src/gtkmm/iconcontroller.cpp
+++ b/synfig-studio/src/gtkmm/iconcontroller.cpp
@@ -260,7 +260,7 @@ IconController::IconController(const synfig::String& /*basepath*/)
        INIT_STOCK_ICON_CLONE(cvs_revert,"gtk-revert",_("CVS Revert"));
 
        // Tools
-       INIT_STOCK_ICON(normal,"normal_icon."IMAGE_EXT,_("Normal Tool"));
+       INIT_STOCK_ICON(normal,"normal_icon."IMAGE_EXT,_("Transform Tool"));
        INIT_STOCK_ICON(transform,"transform_icon."IMAGE_EXT,_("Transform Tool"));
        INIT_STOCK_ICON(polygon,"polyline_icon."IMAGE_EXT,_("Polygon Tool"));
        INIT_STOCK_ICON(bline,"bline_icon."IMAGE_EXT,_("BLine Tool"));

diff --git a/synfig-studio/src/gtkmm/state_normal.cpp b/synfig-studio/src/gtkmm/state_normal.cpp
index d3d488b..e9667cc 100644 (file)
--- a/synfig-studio/src/gtkmm/state_normal.cpp
+++ b/synfig-studio/src/gtkmm/state_normal.cpp
@@ -231,7 +231,7 @@ StateNormal_Context::StateNormal_Context(CanvasView* canvas_view):
        duck_dragger_->canvas_view_=get_canvas_view();
 
        // Set up the tool options dialog
-       options_table.attach(*manage(new Gtk::Label(_("Normal Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+       options_table.attach(*manage(new Gtk::Label(_("Transform Tool"))),      0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
        options_table.attach(checkbutton_rotate,                                                        0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
        options_table.attach(checkbutton_scale,                                                 0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
        options_table.attach(checkbutton_constrain,                                                     0, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
@@ -313,7 +313,7 @@ StateNormal_Context::refresh_tool_options()
 {
        App::dialog_tool_options->clear();
        App::dialog_tool_options->set_widget(options_table);
-       App::dialog_tool_options->set_local_name(_("Normal Tool"));
+       App::dialog_tool_options->set_local_name(_("Transform Tool"));
        App::dialog_tool_options->set_name("normal");
 }