summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-11-14 17:32:46 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-11-14 17:32:46 +0000
commit2e2690f32680b388bee9c629ad832e9d32c28016 (patch)
tree83bd548194d712639cd60a3bd63d83db11c5da43
parentadding default width (diff)
parentFix erase mode in no overlap mode, pointed by Ivan Louette (diff)
downloadinkscape-2e2690f32680b388bee9c629ad832e9d32c28016.tar.gz
inkscape-2e2690f32680b388bee9c629ad832e9d32c28016.zip
update to trunk
(bzr r14422.3.9)
-rw-r--r--po/ru.po3837
-rw-r--r--src/gradient-chemistry.cpp4
-rw-r--r--src/gradient-drag.cpp6
-rw-r--r--src/graphlayout.cpp2
-rw-r--r--src/live_effects/lpe-bspline.cpp24
-rw-r--r--src/object-snapper.cpp2
-rw-r--r--src/path-chemistry.cpp12
-rw-r--r--src/persp3d.cpp8
-rw-r--r--src/selcue.cpp6
-rw-r--r--src/sp-clippath.cpp2
-rw-r--r--src/sp-mask.cpp2
-rw-r--r--src/sp-mask.h8
-rw-r--r--src/sp-pattern.cpp6
-rw-r--r--src/ui/dialog/filter-effects-dialog.cpp6
-rw-r--r--src/ui/dialog/find.cpp16
-rw-r--r--src/ui/dialog/grid-arrange-tab.cpp6
-rw-r--r--src/ui/dialog/objects.cpp2
-rw-r--r--src/ui/dialog/polar-arrange-tab.cpp2
-rw-r--r--src/ui/tools/connector-tool.cpp2
-rw-r--r--src/ui/tools/gradient-tool.cpp4
-rw-r--r--src/ui/tools/spray-tool.cpp38
-rw-r--r--src/ui/tools/tweak-tool.cpp2
-rw-r--r--src/widgets/fill-style.cpp6
-rw-r--r--src/widgets/spiral-toolbar.cpp4
-rw-r--r--src/widgets/spray-toolbar.cpp6
-rw-r--r--src/widgets/text-toolbar.cpp10
26 files changed, 2260 insertions, 1763 deletions
diff --git a/po/ru.po b/po/ru.po
index 040d3829d..9a7ba30d4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,23 +7,24 @@
# Alexey Remizov <alexey@remizov.pp.ru>, 2004.
# bulia byak <buliabyak@users.sf.net>, 2004.
# Александр Прокудин <alexandre.prokoudine@gmail.com>, 2004-2015, 2015.
+# Alexandre Prokoudine <alexandre.prokoudine@gmail.com>, 2015.
#
+#: ../src/ui/dialog/clonetiler.cpp:1010
msgid ""
msgstr ""
-"Project-Id-Version: Inkscape 0.91\n"
+"Project-Id-Version: Inkscape 0.92\n"
"Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2015-09-10 11:16+0200\n"
-"PO-Revision-Date: 2015-01-26 04:17+0300\n"
-"Last-Translator: Александр Прокудин <alexandre.prokoudine@gmail.com>\n"
+"POT-Creation-Date: 2015-11-14 13:55+0300\n"
+"PO-Revision-Date: 2015-11-14 14:16+0300\n"
+"Last-Translator: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>\n"
"Language-Team: русский <>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.6\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); 10<=4 && (n%100<10 || n"
-"%100>=20) ? 1 : 2);\n"
+"X-Generator: Gtranslator 2.91.7\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
"X-Poedit-Language: Russian\n"
#: ../inkscape.desktop.in.h:1
@@ -44,6 +45,10 @@ msgstr ""
"Создание и редактирование масштабируемой векторной графики в формате SVG"
#: ../inkscape.desktop.in.h:5
+msgid "image;editor;vector;drawing;"
+msgstr ""
+
+#: ../inkscape.desktop.in.h:6
msgid "New Drawing"
msgstr "Новый рисунок"
@@ -670,8 +675,7 @@ msgstr "Чёрная дыра"
#: ../share/filters/filters.svg.h:279 ../share/filters/filters.svg.h:835
#: ../share/filters/filters.svg.h:839 ../share/filters/filters.svg.h:843
#: ../src/extension/internal/filter/morphology.h:76
-#: ../src/extension/internal/filter/morphology.h:203
-#: ../src/filter-enums.cpp:32
+#: ../src/extension/internal/filter/morphology.h:203 ../src/filter-enums.cpp:32
msgid "Morphology"
msgstr "Морфология"
@@ -1085,8 +1089,8 @@ msgstr "Черный свет"
#: ../src/extension/internal/filter/paint.h:717
#: ../src/extension/internal/filter/shadows.h:73
#: ../src/extension/internal/filter/transparency.h:345
-#: ../src/filter-enums.cpp:67 ../src/ui/dialog/clonetiler.cpp:830
-#: ../src/ui/dialog/clonetiler.cpp:981
+#: ../src/filter-enums.cpp:67 ../src/ui/dialog/clonetiler.cpp:828
+#: ../src/ui/dialog/clonetiler.cpp:979
#: ../src/ui/dialog/document-properties.cpp:164
#: ../share/extensions/color_HSL_adjust.inx.h:20
#: ../share/extensions/color_blackandwhite.inx.h:3
@@ -1108,7 +1112,7 @@ msgstr "Черный свет"
#: ../share/extensions/color_removered.inx.h:2
#: ../share/extensions/color_replace.inx.h:6
#: ../share/extensions/color_rgbbarrel.inx.h:2
-#: ../share/extensions/interp_att_g.inx.h:19
+#: ../share/extensions/interp_att_g.inx.h:21
msgid "Color"
msgstr "Цвет"
@@ -3395,1056 +3399,1056 @@ msgstr "Ткань (растровая текстура)"
msgid "Old paint (bitmap)"
msgstr "Старая краска (растровая текстура)"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:2
msgctxt "Symbol"
-msgid "AIGA Symbol Signs"
-msgstr "Пиктограммы AIGA"
+msgid "United States National Park Service Map Symbols"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:3 ../share/symbols/symbols.h:4
-#: ../share/symbols/symbols.h:281 ../share/symbols/symbols.h:282
msgctxt "Symbol"
-msgid "Telephone"
-msgstr "Телефон"
+msgid "Airport"
+msgstr "Аэропорт"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:5 ../share/symbols/symbols.h:6
msgctxt "Symbol"
-msgid "Mail"
-msgstr "Почтамт"
+msgid "Amphitheatre"
+msgstr "Амфитеатр"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:7 ../share/symbols/symbols.h:8
msgctxt "Symbol"
-msgid "Currency Exchange"
-msgstr "Обмен валют"
+msgid "Bicycle Trail"
+msgstr "Велодорожка"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:9 ../share/symbols/symbols.h:10
msgctxt "Symbol"
-msgid "Currency Exchange - Euro"
-msgstr "Обмен валют - евро"
+msgid "Boat Launch"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:11 ../share/symbols/symbols.h:12
msgctxt "Symbol"
-msgid "Cashier"
-msgstr "Касса"
+msgid "Boat Tour"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:13 ../share/symbols/symbols.h:14
-#: ../share/symbols/symbols.h:213 ../share/symbols/symbols.h:214
msgctxt "Symbol"
-msgid "First Aid"
-msgstr "Первая помощь"
+msgid "Bus Stop"
+msgstr "Автобусная остановка"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:15 ../share/symbols/symbols.h:16
msgctxt "Symbol"
-msgid "Lost and Found"
-msgstr "Бюро находок"
+msgid "Campfire"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:17 ../share/symbols/symbols.h:18
+#, fuzzy
msgctxt "Symbol"
-msgid "Coat Check"
-msgstr "Гардероб"
+msgid "Campground"
+msgstr "Закругление концов"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:19 ../share/symbols/symbols.h:20
msgctxt "Symbol"
-msgid "Baggage Lockers"
-msgstr "Камеры хранения"
+msgid "CanoeAccess"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:21 ../share/symbols/symbols.h:22
msgctxt "Symbol"
-msgid "Escalator"
-msgstr "Эскалатор "
+msgid "Crosscountry Ski Trail"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:23 ../share/symbols/symbols.h:24
msgctxt "Symbol"
-msgid "Escalator Down"
-msgstr "Эскалатор вниз"
+msgid "Downhill Skiing"
+msgstr "Лыжный спуск"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:25 ../share/symbols/symbols.h:26
msgctxt "Symbol"
-msgid "Escalator Up"
-msgstr "Эскалатор вверх"
+msgid "Drinking Water"
+msgstr "Питьевая вода"
+#. Symbols: ./MapSymbolsNPS.svg
#. Symbols: ./AigaSymbols.svg
#: ../share/symbols/symbols.h:27 ../share/symbols/symbols.h:28
+#: ../share/symbols/symbols.h:172 ../share/symbols/symbols.h:173
msgctxt "Symbol"
-msgid "Stairs"
-msgstr "Лестница"
+msgid "First Aid"
+msgstr "Первая помощь"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:29 ../share/symbols/symbols.h:30
msgctxt "Symbol"
-msgid "Stairs Down"
-msgstr "Лестница вниз"
+msgid "Fishing"
+msgstr "Рыбалка"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:31 ../share/symbols/symbols.h:32
msgctxt "Symbol"
-msgid "Stairs Up"
-msgstr "Лестница вверх"
+msgid "Food Service"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:33 ../share/symbols/symbols.h:34
msgctxt "Symbol"
-msgid "Elevator"
-msgstr "Лифт"
+msgid "Four Wheel Drive Road"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:35 ../share/symbols/symbols.h:36
msgctxt "Symbol"
-msgid "Toilets - Men"
-msgstr "Туалет - для мужчин"
+msgid "Gas Station"
+msgstr "Автозаправка"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:37 ../share/symbols/symbols.h:38
+#, fuzzy
msgctxt "Symbol"
-msgid "Toilets - Women"
-msgstr "Туалет - для женщин"
+msgid "Golfing"
+msgstr "Цветопроба"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:39 ../share/symbols/symbols.h:40
msgctxt "Symbol"
-msgid "Toilets"
-msgstr "Туалет"
+msgid "Horseback Riding"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:41 ../share/symbols/symbols.h:42
msgctxt "Symbol"
-msgid "Nursery"
-msgstr "Комната матери и ребёнка"
+msgid "Hospital"
+msgstr "Больница"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:43 ../share/symbols/symbols.h:44
msgctxt "Symbol"
-msgid "Drinking Fountain"
-msgstr "Питьевой фонтанчик"
+msgid "Ice Skating"
+msgstr "Каток"
+#. Symbols: ./MapSymbolsNPS.svg
#. Symbols: ./AigaSymbols.svg
#: ../share/symbols/symbols.h:45 ../share/symbols/symbols.h:46
+#: ../share/symbols/symbols.h:206 ../share/symbols/symbols.h:207
msgctxt "Symbol"
-msgid "Waiting Room"
-msgstr "Зал ожидания"
+msgid "Information"
+msgstr "Справочная"
-#. Symbols: ./AigaSymbols.svg
#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:47 ../share/symbols/symbols.h:48
-#: ../share/symbols/symbols.h:231 ../share/symbols/symbols.h:232
msgctxt "Symbol"
-msgid "Information"
-msgstr "Справочная"
+msgid "Litter Receptacle"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:49 ../share/symbols/symbols.h:50
msgctxt "Symbol"
-msgid "Hotel Information"
+msgid "Lodging"
msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:51 ../share/symbols/symbols.h:52
msgctxt "Symbol"
-msgid "Air Transportation"
-msgstr "Аэропорт"
+msgid "Marina"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:53 ../share/symbols/symbols.h:54
msgctxt "Symbol"
-msgid "Heliport"
-msgstr "Вертолётная площадка"
+msgid "Motorbike Trail"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:55 ../share/symbols/symbols.h:56
+#, fuzzy
msgctxt "Symbol"
-msgid "Taxi"
-msgstr "Такси"
+msgid "Radiator Water"
+msgstr "Насыщенность"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:57 ../share/symbols/symbols.h:58
msgctxt "Symbol"
-msgid "Bus"
-msgstr "Автобус"
+msgid "Recycling"
+msgstr ""
+#. Symbols: ./MapSymbolsNPS.svg
#. Symbols: ./AigaSymbols.svg
#: ../share/symbols/symbols.h:59 ../share/symbols/symbols.h:60
-#, fuzzy
+#: ../share/symbols/symbols.h:258 ../share/symbols/symbols.h:259
msgctxt "Symbol"
-msgid "Ground Transportation"
-msgstr "Преобразование"
+msgid "Parking"
+msgstr "Парковка"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:61 ../share/symbols/symbols.h:62
#, fuzzy
msgctxt "Symbol"
-msgid "Rail Transportation"
-msgstr "Преобразование"
+msgid "Pets On Leash"
+msgstr "_Разместить по контуру"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:63 ../share/symbols/symbols.h:64
#, fuzzy
msgctxt "Symbol"
-msgid "Water Transportation"
-msgstr "Преобразование"
+msgid "Picnic Area"
+msgstr "Сплошной цвет"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:65 ../share/symbols/symbols.h:66
msgctxt "Symbol"
-msgid "Car Rental"
-msgstr "Прокат автомобилей"
+msgid "Post Office"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:67 ../share/symbols/symbols.h:68
+#, fuzzy
msgctxt "Symbol"
-msgid "Restaurant"
-msgstr "Ресторан"
+msgid "Ranger Station"
+msgstr "Смежный"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:69 ../share/symbols/symbols.h:70
+#, fuzzy
msgctxt "Symbol"
-msgid "Coffeeshop"
-msgstr "Кофейня"
+msgid "RV Campground"
+msgstr "Закругление концов"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:71 ../share/symbols/symbols.h:72
msgctxt "Symbol"
-msgid "Bar"
-msgstr "Бар"
+msgid "Restrooms"
+msgstr "Туалеты"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:73 ../share/symbols/symbols.h:74
+#, fuzzy
msgctxt "Symbol"
-msgid "Shops"
-msgstr "Магазины"
+msgid "Sailing"
+msgstr "Прокрутка"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:75 ../share/symbols/symbols.h:76
msgctxt "Symbol"
-msgid "Barber Shop - Beauty Salon"
-msgstr "Парикмахерская - Салон красоты"
+msgid "Sanitary Disposal Station"
+msgstr "Удаление отходов с санитарной обработкой"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:77 ../share/symbols/symbols.h:78
+#, fuzzy
msgctxt "Symbol"
-msgid "Barber Shop"
-msgstr "Парикмахерская"
+msgid "Scuba Diving"
+msgstr "Деление"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:79 ../share/symbols/symbols.h:80
msgctxt "Symbol"
-msgid "Beauty Salon"
-msgstr "Салон красоты"
+msgid "Self Guided Trail"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:81 ../share/symbols/symbols.h:82
+#, fuzzy
msgctxt "Symbol"
-msgid "Ticket Purchase"
-msgstr "Билетная касса"
+msgid "Shelter"
+msgstr "фильтр"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:83 ../share/symbols/symbols.h:84
msgctxt "Symbol"
-msgid "Baggage Check In"
-msgstr "Сдача багажа"
+msgid "Showers"
+msgstr "Душевая"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:85 ../share/symbols/symbols.h:86
+#, fuzzy
msgctxt "Symbol"
-msgid "Baggage Claim"
-msgstr "Получение багажа"
+msgid "Sledding"
+msgstr "Затенение"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:87 ../share/symbols/symbols.h:88
msgctxt "Symbol"
-msgid "Customs"
-msgstr "Таможня"
+msgid "SnowmobileTrail"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:89 ../share/symbols/symbols.h:90
msgctxt "Symbol"
-msgid "Immigration"
-msgstr "Паспортный контроль"
+msgid "Stable"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:91 ../share/symbols/symbols.h:92
msgctxt "Symbol"
-msgid "Departing Flights"
-msgstr "Зал вылета"
+msgid "Store"
+msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:93 ../share/symbols/symbols.h:94
msgctxt "Symbol"
-msgid "Arriving Flights"
-msgstr "Зал прилета"
+msgid "Swimming"
+msgstr ""
+#. Symbols: ./MapSymbolsNPS.svg
#. Symbols: ./AigaSymbols.svg
#: ../share/symbols/symbols.h:95 ../share/symbols/symbols.h:96
+#: ../share/symbols/symbols.h:162 ../share/symbols/symbols.h:163
msgctxt "Symbol"
-msgid "Smoking"
-msgstr "Комната курения"
+msgid "Telephone"
+msgstr "Телефон"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:97 ../share/symbols/symbols.h:98
msgctxt "Symbol"
-msgid "No Smoking"
+msgid "Emergency Telephone"
msgstr ""
-#. Symbols: ./AigaSymbols.svg
#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:99 ../share/symbols/symbols.h:100
-#: ../share/symbols/symbols.h:245 ../share/symbols/symbols.h:246
+#, fuzzy
msgctxt "Symbol"
-msgid "Parking"
-msgstr ""
+msgid "Trailhead"
+msgstr "Брейлева азбука"
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:101 ../share/symbols/symbols.h:102
msgctxt "Symbol"
-msgid "No Parking"
+msgid "Wheelchair Accessible"
msgstr ""
-#. Symbols: ./AigaSymbols.svg
+#. Symbols: ./MapSymbolsNPS.svg
#: ../share/symbols/symbols.h:103 ../share/symbols/symbols.h:104
msgctxt "Symbol"
-msgid "No Dogs"
-msgstr ""
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:105 ../share/symbols/symbols.h:106
-msgctxt "Symbol"
-msgid "No Entry"
-msgstr "Входа нет"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:107 ../share/symbols/symbols.h:108
-msgctxt "Symbol"
-msgid "Exit"
-msgstr "Выход"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:109 ../share/symbols/symbols.h:110
-msgctxt "Symbol"
-msgid "Fire Extinguisher"
-msgstr "Огнетушитель"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:111 ../share/symbols/symbols.h:112
-msgctxt "Symbol"
-msgid "Right Arrow"
-msgstr "Стрелка вправо"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:113 ../share/symbols/symbols.h:114
-msgctxt "Symbol"
-msgid "Forward and Right Arrow"
-msgstr "Стрелка вперёд и вправо"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:115 ../share/symbols/symbols.h:116
-msgctxt "Symbol"
-msgid "Up Arrow"
-msgstr "Стрелка вверх"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:117 ../share/symbols/symbols.h:118
-msgctxt "Symbol"
-msgid "Forward and Left Arrow"
-msgstr "Стрелка вперёд и влево"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:119 ../share/symbols/symbols.h:120
-msgctxt "Symbol"
-msgid "Left Arrow"
-msgstr "Стрелка влево"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:121 ../share/symbols/symbols.h:122
-msgctxt "Symbol"
-msgid "Left and Down Arrow"
-msgstr "Стрелка влево и вниз"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:123 ../share/symbols/symbols.h:124
-msgctxt "Symbol"
-msgid "Down Arrow"
-msgstr "Стрелка вниз"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:125 ../share/symbols/symbols.h:126
-msgctxt "Symbol"
-msgid "Right and Down Arrow"
-msgstr "Стрелка вправо и вниз"
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:127 ../share/symbols/symbols.h:128
-msgctxt "Symbol"
-msgid "NPS Wheelchair Accessible - 1996"
-msgstr ""
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:129 ../share/symbols/symbols.h:130
-msgctxt "Symbol"
-msgid "NPS Wheelchair Accessible"
-msgstr ""
-
-#. Symbols: ./AigaSymbols.svg
-#: ../share/symbols/symbols.h:131 ../share/symbols/symbols.h:132
-msgctxt "Symbol"
-msgid "New Wheelchair Accessible"
-msgstr ""
-
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:133
-msgctxt "Symbol"
-msgid "Word Balloons"
-msgstr ""
-
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:134
-msgctxt "Symbol"
-msgid "Thought Balloon"
-msgstr ""
-
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:135
-msgctxt "Symbol"
-msgid "Dream Speaking"
-msgstr ""
-
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:136
-#, fuzzy
-msgctxt "Symbol"
-msgid "Rounded Balloon"
-msgstr "Скруглённое"
-
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:137
-#, fuzzy
-msgctxt "Symbol"
-msgid "Squared Balloon"
-msgstr "Квадратные"
-
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:138
-msgctxt "Symbol"
-msgid "Over the Phone"
+msgid "Wind Surfing"
msgstr ""
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:139
+#. Symbols: ./MapSymbolsNPS.svg
+#: ../share/symbols/symbols.h:105
msgctxt "Symbol"
-msgid "Hip Balloon"
+msgid "Blank"
msgstr ""
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:140
-#, fuzzy
-msgctxt "Symbol"
-msgid "Circle Balloon"
-msgstr "Окружность"
-
-#. Symbols: ./BalloonSymbols.svg
-#: ../share/symbols/symbols.h:141
-msgctxt "Symbol"
-msgid "Exclaim Balloon"
-msgstr "Восклицание"
-
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:142
+#: ../share/symbols/symbols.h:106
msgctxt "Symbol"
msgid "Flow Chart Shapes"
msgstr "Символы блок-схем"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:143
+#: ../share/symbols/symbols.h:107
msgctxt "Symbol"
msgid "Process"
msgstr "Процесс"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:144
+#: ../share/symbols/symbols.h:108
msgctxt "Symbol"
msgid "Input/Output"
msgstr "Ввод и вывод"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:145
+#: ../share/symbols/symbols.h:109
msgctxt "Symbol"
msgid "Document"
msgstr "Документ"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:146
+#: ../share/symbols/symbols.h:110
msgctxt "Symbol"
msgid "Manual Operation"
msgstr ""
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:147
+#: ../share/symbols/symbols.h:111
msgctxt "Symbol"
msgid "Preparation"
msgstr "Подготовка"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:148
+#: ../share/symbols/symbols.h:112
msgctxt "Symbol"
msgid "Merge"
msgstr "Объединение"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:149
+#: ../share/symbols/symbols.h:113
msgctxt "Symbol"
msgid "Decision"
msgstr "Решение"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:150
+#: ../share/symbols/symbols.h:114
msgctxt "Symbol"
msgid "Magnetic Tape"
msgstr "Магнитная плёнка"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:151
+#: ../share/symbols/symbols.h:115
msgctxt "Symbol"
msgid "Display"
msgstr ""
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:152
+#: ../share/symbols/symbols.h:116
msgctxt "Symbol"
msgid "Auxiliary Operation"
msgstr ""
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:153
+#: ../share/symbols/symbols.h:117
#, fuzzy
msgctxt "Symbol"
msgid "Manual Input"
msgstr "Импорт EMF"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:154
+#: ../share/symbols/symbols.h:118
#, fuzzy
msgctxt "Symbol"
msgid "Extract"
msgstr "Извлечь"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:155
+#: ../share/symbols/symbols.h:119
msgctxt "Symbol"
msgid "Terminal/Interrupt"
msgstr ""
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:156
+#: ../share/symbols/symbols.h:120
msgctxt "Symbol"
msgid "Punched Card"
msgstr ""
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:157
+#: ../share/symbols/symbols.h:121
msgctxt "Symbol"
msgid "Punch Tape"
msgstr ""
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:158
+#: ../share/symbols/symbols.h:122
msgctxt "Symbol"
msgid "Online Storage"
msgstr ""
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:159
+#: ../share/symbols/symbols.h:123
msgctxt "Symbol"
msgid "Keying"
msgstr ""
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:160
+#: ../share/symbols/symbols.h:124
msgctxt "Symbol"
msgid "Sort"
msgstr ""
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:161
+#: ../share/symbols/symbols.h:125
#, fuzzy
msgctxt "Symbol"
msgid "Connector"
msgstr "Соединительные линии"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:162
+#: ../share/symbols/symbols.h:126
#, fuzzy
msgctxt "Symbol"
msgid "Off-Page Connector"
msgstr "Соединительные линии"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:163
+#: ../share/symbols/symbols.h:127
msgctxt "Symbol"
msgid "Transmittal Tape"
msgstr ""
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:164
+#: ../share/symbols/symbols.h:128
msgctxt "Symbol"
msgid "Communication Link"
msgstr ""
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:165
+#: ../share/symbols/symbols.h:129
#, fuzzy
msgctxt "Symbol"
msgid "Collate"
msgstr "Chocolate 1"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:166
+#: ../share/symbols/symbols.h:130
msgctxt "Symbol"
msgid "Comment/Annotation"
msgstr "Комментарий или аннотация"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:167
+#: ../share/symbols/symbols.h:131
msgctxt "Symbol"
msgid "Core"
msgstr ""
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:168
+#: ../share/symbols/symbols.h:132
msgctxt "Symbol"
msgid "Predefined Process"
msgstr ""
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:169
+#: ../share/symbols/symbols.h:133
msgctxt "Symbol"
msgid "Magnetic Disk (Database)"
msgstr "Магнитный диск (база данных)"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:170
+#: ../share/symbols/symbols.h:134
msgctxt "Symbol"
msgid "Magnetic Drum (Direct Access)"
msgstr "Магнитный барабан (прямой доступ)"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:171
+#: ../share/symbols/symbols.h:135
msgctxt "Symbol"
msgid "Offline Storage"
msgstr ""
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:172
+#: ../share/symbols/symbols.h:136
msgctxt "Symbol"
msgid "Logical Or"
msgstr "Логическое ИЛИ"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:173
+#: ../share/symbols/symbols.h:137
msgctxt "Symbol"
msgid "Logical And"
msgstr "Логические И"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:174
+#: ../share/symbols/symbols.h:138
msgctxt "Symbol"
msgid "Delay"
msgstr "Задержка"
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:175
+#: ../share/symbols/symbols.h:139
msgctxt "Symbol"
msgid "Loop Limit Begin"
msgstr ""
#. Symbols: ./FlowSymbols.svg
-#: ../share/symbols/symbols.h:176
+#: ../share/symbols/symbols.h:140
msgctxt "Symbol"
msgid "Loop Limit End"
msgstr ""
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:141
+msgctxt "Symbol"
+msgid "Word Balloons"
+msgstr ""
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:142
+msgctxt "Symbol"
+msgid "Thought Balloon"
+msgstr ""
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:143
+msgctxt "Symbol"
+msgid "Dream Speaking"
+msgstr ""
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:144
+#, fuzzy
+msgctxt "Symbol"
+msgid "Rounded Balloon"
+msgstr "Скруглённое"
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:145
+#, fuzzy
+msgctxt "Symbol"
+msgid "Squared Balloon"
+msgstr "Квадратные"
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:146
+msgctxt "Symbol"
+msgid "Over the Phone"
+msgstr ""
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:147
+msgctxt "Symbol"
+msgid "Hip Balloon"
+msgstr ""
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:148
+#, fuzzy
+msgctxt "Symbol"
+msgid "Circle Balloon"
+msgstr "Окружность"
+
+#. Symbols: ./BalloonSymbols.svg
+#: ../share/symbols/symbols.h:149
+msgctxt "Symbol"
+msgid "Exclaim Balloon"
+msgstr "Восклицание"
+
#. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:177
+#: ../share/symbols/symbols.h:150
#, fuzzy
msgctxt "Symbol"
msgid "Logic Symbols"
msgstr "Кхмерские символы"
#. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:178
+#: ../share/symbols/symbols.h:151
msgctxt "Symbol"
msgid "Xnor Gate"
msgstr ""
#. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:179
+#: ../share/symbols/symbols.h:152
msgctxt "Symbol"
msgid "Xor Gate"
msgstr ""
#. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:180
+#: ../share/symbols/symbols.h:153
msgctxt "Symbol"
msgid "Nor Gate"
msgstr ""
#. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:181
+#: ../share/symbols/symbols.h:154
msgctxt "Symbol"
msgid "Or Gate"
msgstr ""
#. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:182
+#: ../share/symbols/symbols.h:155
msgctxt "Symbol"
msgid "Nand Gate"
msgstr ""
#. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:183
+#: ../share/symbols/symbols.h:156
msgctxt "Symbol"
msgid "And Gate"
msgstr ""
#. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:184
+#: ../share/symbols/symbols.h:157
msgctxt "Symbol"
msgid "Buffer"
msgstr ""
#. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:185
+#: ../share/symbols/symbols.h:158
msgctxt "Symbol"
msgid "Not Gate"
msgstr ""
#. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:186
+#: ../share/symbols/symbols.h:159
msgctxt "Symbol"
msgid "Buffer Small"
msgstr ""
#. Symbols: ./LogicSymbols.svg
-#: ../share/symbols/symbols.h:187
+#: ../share/symbols/symbols.h:160
msgctxt "Symbol"
msgid "Not Gate Small"
msgstr ""
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:188
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:161
msgctxt "Symbol"
-msgid "United States National Park Service Map Symbols"
-msgstr ""
+msgid "AIGA Symbol Signs"
+msgstr "Пиктограммы AIGA"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:189 ../share/symbols/symbols.h:190
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:164 ../share/symbols/symbols.h:165
msgctxt "Symbol"
-msgid "Airport"
-msgstr "Аэропорт"
+msgid "Mail"
+msgstr "Почтамт"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:191 ../share/symbols/symbols.h:192
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:166 ../share/symbols/symbols.h:167
msgctxt "Symbol"
-msgid "Amphitheatre"
-msgstr "Амфитеатр"
+msgid "Currency Exchange"
+msgstr "Обмен валют"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:193 ../share/symbols/symbols.h:194
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:168 ../share/symbols/symbols.h:169
msgctxt "Symbol"
-msgid "Bicycle Trail"
-msgstr "Велодорожка"
+msgid "Currency Exchange - Euro"
+msgstr "Обмен валют - евро"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:195 ../share/symbols/symbols.h:196
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:170 ../share/symbols/symbols.h:171
msgctxt "Symbol"
-msgid "Boat Launch"
-msgstr ""
+msgid "Cashier"
+msgstr "Касса"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:197 ../share/symbols/symbols.h:198
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:174 ../share/symbols/symbols.h:175
msgctxt "Symbol"
-msgid "Boat Tour"
-msgstr ""
+msgid "Lost and Found"
+msgstr "Бюро находок"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:199 ../share/symbols/symbols.h:200
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:176 ../share/symbols/symbols.h:177
msgctxt "Symbol"
-msgid "Bus Stop"
-msgstr "Автобусная остановка"
+msgid "Coat Check"
+msgstr "Гардероб"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:201 ../share/symbols/symbols.h:202
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:178 ../share/symbols/symbols.h:179
msgctxt "Symbol"
-msgid "Campfire"
-msgstr ""
+msgid "Baggage Lockers"
+msgstr "Камеры хранения"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:203 ../share/symbols/symbols.h:204
-#, fuzzy
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:180 ../share/symbols/symbols.h:181
msgctxt "Symbol"
-msgid "Campground"
-msgstr "Закругление концов"
+msgid "Escalator"
+msgstr "Эскалатор "
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:205 ../share/symbols/symbols.h:206
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:182 ../share/symbols/symbols.h:183
msgctxt "Symbol"
-msgid "CanoeAccess"
-msgstr ""
+msgid "Escalator Down"
+msgstr "Эскалатор вниз"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:207 ../share/symbols/symbols.h:208
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:184 ../share/symbols/symbols.h:185
msgctxt "Symbol"
-msgid "Crosscountry Ski Trail"
-msgstr ""
+msgid "Escalator Up"
+msgstr "Эскалатор вверх"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:209 ../share/symbols/symbols.h:210
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:186 ../share/symbols/symbols.h:187
msgctxt "Symbol"
-msgid "Downhill Skiing"
-msgstr "Лыжный спуск"
+msgid "Stairs"
+msgstr "Лестница"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:211 ../share/symbols/symbols.h:212
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:188 ../share/symbols/symbols.h:189
msgctxt "Symbol"
-msgid "Drinking Water"
-msgstr "Питьевая вода"
+msgid "Stairs Down"
+msgstr "Лестница вниз"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:215 ../share/symbols/symbols.h:216
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:190 ../share/symbols/symbols.h:191
msgctxt "Symbol"
-msgid "Fishing"
-msgstr "Рыбалка"
+msgid "Stairs Up"
+msgstr "Лестница вверх"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:217 ../share/symbols/symbols.h:218
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:192 ../share/symbols/symbols.h:193
msgctxt "Symbol"
-msgid "Food Service"
-msgstr ""
+msgid "Elevator"
+msgstr "Лифт"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:219 ../share/symbols/symbols.h:220
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:194 ../share/symbols/symbols.h:195
msgctxt "Symbol"
-msgid "Four Wheel Drive Road"
-msgstr ""
+msgid "Toilets - Men"
+msgstr "Туалет - для мужчин"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:221 ../share/symbols/symbols.h:222
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:196 ../share/symbols/symbols.h:197
msgctxt "Symbol"
-msgid "Gas Station"
-msgstr "Автозаправка"
+msgid "Toilets - Women"
+msgstr "Туалет - для женщин"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:223 ../share/symbols/symbols.h:224
-#, fuzzy
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:198 ../share/symbols/symbols.h:199
msgctxt "Symbol"
-msgid "Golfing"
-msgstr "Цветопроба"
+msgid "Toilets"
+msgstr "Туалет"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:225 ../share/symbols/symbols.h:226
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:200 ../share/symbols/symbols.h:201
msgctxt "Symbol"
-msgid "Horseback Riding"
-msgstr ""
+msgid "Nursery"
+msgstr "Комната матери и ребёнка"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:227 ../share/symbols/symbols.h:228
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:202 ../share/symbols/symbols.h:203
msgctxt "Symbol"
-msgid "Hospital"
-msgstr "Больница"
+msgid "Drinking Fountain"
+msgstr "Питьевой фонтанчик"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:229 ../share/symbols/symbols.h:230
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:204 ../share/symbols/symbols.h:205
msgctxt "Symbol"
-msgid "Ice Skating"
-msgstr "Каток"
+msgid "Waiting Room"
+msgstr "Зал ожидания"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:233 ../share/symbols/symbols.h:234
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:208 ../share/symbols/symbols.h:209
msgctxt "Symbol"
-msgid "Litter Receptacle"
+msgid "Hotel Information"
msgstr ""
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:235 ../share/symbols/symbols.h:236
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:210 ../share/symbols/symbols.h:211
msgctxt "Symbol"
-msgid "Lodging"
-msgstr ""
+msgid "Air Transportation"
+msgstr "Аэропорт"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:237 ../share/symbols/symbols.h:238
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:212 ../share/symbols/symbols.h:213
msgctxt "Symbol"
-msgid "Marina"
-msgstr ""
+msgid "Heliport"
+msgstr "Вертолётная площадка"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:239 ../share/symbols/symbols.h:240
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:214 ../share/symbols/symbols.h:215
msgctxt "Symbol"
-msgid "Motorbike Trail"
-msgstr ""
+msgid "Taxi"
+msgstr "Такси"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:241 ../share/symbols/symbols.h:242
-#, fuzzy
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:216 ../share/symbols/symbols.h:217
msgctxt "Symbol"
-msgid "Radiator Water"
-msgstr "Насыщенность"
+msgid "Bus"
+msgstr "Автобус"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:243 ../share/symbols/symbols.h:244
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:218 ../share/symbols/symbols.h:219
+#, fuzzy
msgctxt "Symbol"
-msgid "Recycling"
-msgstr ""
+msgid "Ground Transportation"
+msgstr "Преобразование"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:247 ../share/symbols/symbols.h:248
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:220 ../share/symbols/symbols.h:221
#, fuzzy
msgctxt "Symbol"
-msgid "Pets On Leash"
-msgstr "_Разместить по контуру"
+msgid "Rail Transportation"
+msgstr "Преобразование"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:249 ../share/symbols/symbols.h:250
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:222 ../share/symbols/symbols.h:223
#, fuzzy
msgctxt "Symbol"
-msgid "Picnic Area"
-msgstr "Сплошной цвет"
+msgid "Water Transportation"
+msgstr "Преобразование"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:251 ../share/symbols/symbols.h:252
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:224 ../share/symbols/symbols.h:225
msgctxt "Symbol"
-msgid "Post Office"
-msgstr ""
+msgid "Car Rental"
+msgstr "Прокат автомобилей"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:253 ../share/symbols/symbols.h:254
-#, fuzzy
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:226 ../share/symbols/symbols.h:227
msgctxt "Symbol"
-msgid "Ranger Station"
-msgstr "Смежный"
+msgid "Restaurant"
+msgstr "Ресторан"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:255 ../share/symbols/symbols.h:256
-#, fuzzy
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:228 ../share/symbols/symbols.h:229
msgctxt "Symbol"
-msgid "RV Campground"
-msgstr "Закругление концов"
+msgid "Coffeeshop"
+msgstr "Кофейня"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:257 ../share/symbols/symbols.h:258
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:230 ../share/symbols/symbols.h:231
msgctxt "Symbol"
-msgid "Restrooms"
-msgstr "Туалеты"
+msgid "Bar"
+msgstr "Бар"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:259 ../share/symbols/symbols.h:260
-#, fuzzy
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:232 ../share/symbols/symbols.h:233
msgctxt "Symbol"
-msgid "Sailing"
-msgstr "Прокрутка"
+msgid "Shops"
+msgstr "Магазины"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:261 ../share/symbols/symbols.h:262
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:234 ../share/symbols/symbols.h:235
msgctxt "Symbol"
-msgid "Sanitary Disposal Station"
-msgstr "Удаление отходов с санитарной обработкой"
+msgid "Barber Shop - Beauty Salon"
+msgstr "Парикмахерская - Салон красоты"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:263 ../share/symbols/symbols.h:264
-#, fuzzy
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:236 ../share/symbols/symbols.h:237
msgctxt "Symbol"
-msgid "Scuba Diving"
-msgstr "Деление"
+msgid "Barber Shop"
+msgstr "Парикмахерская"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:265 ../share/symbols/symbols.h:266
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:238 ../share/symbols/symbols.h:239
msgctxt "Symbol"
-msgid "Self Guided Trail"
-msgstr ""
+msgid "Beauty Salon"
+msgstr "Салон красоты"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:267 ../share/symbols/symbols.h:268
-#, fuzzy
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:240 ../share/symbols/symbols.h:241
msgctxt "Symbol"
-msgid "Shelter"
-msgstr "фильтр"
+msgid "Ticket Purchase"
+msgstr "Билетная касса"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:269 ../share/symbols/symbols.h:270
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:242 ../share/symbols/symbols.h:243
msgctxt "Symbol"
-msgid "Showers"
-msgstr "Душевая"
+msgid "Baggage Check In"
+msgstr "Сдача багажа"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:271 ../share/symbols/symbols.h:272
-#, fuzzy
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:244 ../share/symbols/symbols.h:245
msgctxt "Symbol"
-msgid "Sledding"
-msgstr "Затенение"
+msgid "Baggage Claim"
+msgstr "Получение багажа"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:273 ../share/symbols/symbols.h:274
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:246 ../share/symbols/symbols.h:247
msgctxt "Symbol"
-msgid "SnowmobileTrail"
-msgstr ""
+msgid "Customs"
+msgstr "Таможня"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:275 ../share/symbols/symbols.h:276
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:248 ../share/symbols/symbols.h:249
msgctxt "Symbol"
-msgid "Stable"
-msgstr ""
+msgid "Immigration"
+msgstr "Паспортный контроль"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:277 ../share/symbols/symbols.h:278
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:250 ../share/symbols/symbols.h:251
msgctxt "Symbol"
-msgid "Store"
+msgid "Departing Flights"
+msgstr "Зал вылета"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:252 ../share/symbols/symbols.h:253
+msgctxt "Symbol"
+msgid "Arriving Flights"
+msgstr "Зал прилета"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:254 ../share/symbols/symbols.h:255
+msgctxt "Symbol"
+msgid "Smoking"
+msgstr "Комната курения"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:256 ../share/symbols/symbols.h:257
+msgctxt "Symbol"
+msgid "No Smoking"
msgstr ""
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:279 ../share/symbols/symbols.h:280
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:260 ../share/symbols/symbols.h:261
msgctxt "Symbol"
-msgid "Swimming"
+msgid "No Parking"
msgstr ""
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:283 ../share/symbols/symbols.h:284
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:262 ../share/symbols/symbols.h:263
msgctxt "Symbol"
-msgid "Emergency Telephone"
+msgid "No Dogs"
msgstr ""
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:285 ../share/symbols/symbols.h:286
-#, fuzzy
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:264 ../share/symbols/symbols.h:265
msgctxt "Symbol"
-msgid "Trailhead"
-msgstr "Брейлева азбука"
+msgid "No Entry"
+msgstr "Входа нет"
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:287 ../share/symbols/symbols.h:288
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:266 ../share/symbols/symbols.h:267
msgctxt "Symbol"
-msgid "Wheelchair Accessible"
+msgid "Exit"
+msgstr "Выход"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:268 ../share/symbols/symbols.h:269
+msgctxt "Symbol"
+msgid "Fire Extinguisher"
+msgstr "Огнетушитель"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:270 ../share/symbols/symbols.h:271
+msgctxt "Symbol"
+msgid "Right Arrow"
+msgstr "Стрелка вправо"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:272 ../share/symbols/symbols.h:273
+msgctxt "Symbol"
+msgid "Forward and Right Arrow"
+msgstr "Стрелка вперёд и вправо"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:274 ../share/symbols/symbols.h:275
+msgctxt "Symbol"
+msgid "Up Arrow"
+msgstr "Стрелка вверх"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:276 ../share/symbols/symbols.h:277
+msgctxt "Symbol"
+msgid "Forward and Left Arrow"
+msgstr "Стрелка вперёд и влево"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:278 ../share/symbols/symbols.h:279
+msgctxt "Symbol"
+msgid "Left Arrow"
+msgstr "Стрелка влево"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:280 ../share/symbols/symbols.h:281
+msgctxt "Symbol"
+msgid "Left and Down Arrow"
+msgstr "Стрелка влево и вниз"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:282 ../share/symbols/symbols.h:283
+msgctxt "Symbol"
+msgid "Down Arrow"
+msgstr "Стрелка вниз"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:284 ../share/symbols/symbols.h:285
+msgctxt "Symbol"
+msgid "Right and Down Arrow"
+msgstr "Стрелка вправо и вниз"
+
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:286 ../share/symbols/symbols.h:287
+msgctxt "Symbol"
+msgid "NPS Wheelchair Accessible - 1996"
msgstr ""
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:289 ../share/symbols/symbols.h:290
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:288 ../share/symbols/symbols.h:289
msgctxt "Symbol"
-msgid "Wind Surfing"
+msgid "NPS Wheelchair Accessible"
msgstr ""
-#. Symbols: ./MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:291
+#. Symbols: ./AigaSymbols.svg
+#: ../share/symbols/symbols.h:290 ../share/symbols/symbols.h:291
msgctxt "Symbol"
-msgid "Blank"
+msgid "New Wheelchair Accessible"
msgstr ""
#: ../share/templates/templates.h:1
@@ -4498,7 +4502,7 @@ msgid "guidelines typography canvas"
msgstr "1 Настроить холст"
#. 3D box
-#: ../src/box3d.cpp:250 ../src/box3d.cpp:1304
+#: ../src/box3d.cpp:255 ../src/box3d.cpp:1309
#: ../src/ui/dialog/inkscape-preferences.cpp:407
msgid "3D Box"
msgstr "Паралеллепипед"
@@ -5133,9 +5137,8 @@ msgstr "Адаптивная постеризация"
#: ../src/ui/dialog/object-attributes.cpp:77
#: ../src/ui/widget/page-sizer.cpp:249
#: ../src/widgets/calligraphy-toolbar.cpp:430
-#: ../src/widgets/eraser-toolbar.cpp:128 ../src/widgets/spray-toolbar.cpp:116
-#: ../src/widgets/tweak-toolbar.cpp:128
-#: ../share/extensions/foldablebox.inx.h:2
+#: ../src/widgets/eraser-toolbar.cpp:128 ../src/widgets/spray-toolbar.cpp:289
+#: ../src/widgets/tweak-toolbar.cpp:128 ../share/extensions/foldablebox.inx.h:2
msgid "Width:"
msgstr "Ширина:"
@@ -5149,6 +5152,7 @@ msgid "Height:"
msgstr "Высота:"
#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:43
+#: ../src/widgets/measure-toolbar.cpp:320
#: ../share/extensions/printing_marks.inx.h:12
msgid "Offset:"
msgstr "Смещение:"
@@ -5208,8 +5212,8 @@ msgstr "Добавить шум"
#: ../src/extension/internal/filter/color.h:1660
#: ../src/extension/internal/filter/distort.h:69
#: ../src/extension/internal/filter/morphology.h:60 ../src/rdf.cpp:244
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2858
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2932
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2856
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2930
#: ../src/ui/dialog/object-attributes.cpp:49
#: ../share/extensions/jessyInk_effects.inx.h:5
#: ../share/extensions/jessyInk_export.inx.h:3
@@ -5261,7 +5265,7 @@ msgstr "Размывание"
#: ../src/extension/internal/bitmap/oilPaint.cpp:39
#: ../src/extension/internal/bitmap/sharpen.cpp:40
#: ../src/extension/internal/bitmap/unsharpmask.cpp:43
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2910
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2908
msgid "Radius:"
msgstr "Радиус:"
@@ -5404,7 +5408,7 @@ msgstr "Вращение цветовой карты"
#: ../src/extension/internal/bitmap/cycleColormap.cpp:39
#: ../src/extension/internal/bitmap/spread.cpp:39
#: ../src/extension/internal/bitmap/unsharpmask.cpp:45
-#: ../src/widgets/spray-toolbar.cpp:208
+#: ../src/widgets/spray-toolbar.cpp:403
msgid "Amount:"
msgstr "Количество:"
@@ -5468,9 +5472,8 @@ msgstr "Гауссово размывание"
#: ../src/extension/internal/bitmap/gaussianBlur.cpp:40
#: ../src/extension/internal/bitmap/implode.cpp:39
#: ../src/extension/internal/bitmap/solarize.cpp:41
-#, fuzzy
msgid "Factor:"
-msgstr "Коэффициент"
+msgstr "Коэффициент:"
#: ../src/extension/internal/bitmap/gaussianBlur.cpp:47
#, fuzzy
@@ -5506,9 +5509,8 @@ msgstr "Белая точка:"
#: ../src/extension/internal/bitmap/level.cpp:45
#: ../src/extension/internal/bitmap/levelChannel.cpp:67
-#, fuzzy
msgid "Gamma Correction:"
-msgstr "Гамма-коррекция"
+msgstr "Гамма-коррекция:"
#: ../src/extension/internal/bitmap/level.cpp:51
#, fuzzy
@@ -5525,9 +5527,8 @@ msgstr "Уровень (с каналом)"
#: ../src/extension/internal/bitmap/levelChannel.cpp:54
#: ../src/extension/internal/filter/color.h:711
-#, fuzzy
msgid "Channel:"
-msgstr "Каналы:"
+msgstr "Канал:"
#: ../src/extension/internal/bitmap/levelChannel.cpp:73
#, fuzzy
@@ -5554,18 +5555,16 @@ msgid "HSB Adjust"
msgstr "Коррекция в HSB"
#: ../src/extension/internal/bitmap/modulate.cpp:42
-#, fuzzy
msgid "Hue:"
-msgstr "Тон"
+msgstr "Тон:"
#: ../src/extension/internal/bitmap/modulate.cpp:43
msgid "Saturation:"
msgstr "Насыщенность:"
#: ../src/extension/internal/bitmap/modulate.cpp:44
-#, fuzzy
msgid "Brightness:"
-msgstr "Яркость"
+msgstr "Яркость:"
#: ../src/extension/internal/bitmap/modulate.cpp:50
msgid ""
@@ -5607,14 +5606,14 @@ msgstr ""
#: ../src/extension/internal/bitmap/opacity.cpp:38
#: ../src/extension/internal/filter/blurs.h:333
#: ../src/extension/internal/filter/transparency.h:279
-#: ../src/ui/dialog/clonetiler.cpp:838 ../src/ui/dialog/clonetiler.cpp:991
+#: ../src/ui/dialog/clonetiler.cpp:836 ../src/ui/dialog/clonetiler.cpp:989
#: ../src/widgets/tweak-toolbar.cpp:334
-#: ../share/extensions/interp_att_g.inx.h:16
+#: ../share/extensions/interp_att_g.inx.h:18
msgid "Opacity"
msgstr "Непрозрачность"
#: ../src/extension/internal/bitmap/opacity.cpp:40
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2900
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2898
#: ../src/ui/dialog/objects.cpp:1625 ../src/widgets/dropper-toolbar.cpp:83
msgid "Opacity:"
msgstr "Непрозрачность:"
@@ -5673,14 +5672,12 @@ msgid "Shade"
msgstr "Тень"
#: ../src/extension/internal/bitmap/shade.cpp:42
-#, fuzzy
msgid "Azimuth:"
-msgstr "Азимут"
+msgstr "Азимут:"
#: ../src/extension/internal/bitmap/shade.cpp:43
-#, fuzzy
msgid "Elevation:"
-msgstr "Высота"
+msgstr "Высота:"
#: ../src/extension/internal/bitmap/shade.cpp:44
msgid "Colored Shading"
@@ -5765,9 +5762,8 @@ msgid "Amplitude:"
msgstr "Амплитуда:"
#: ../src/extension/internal/bitmap/wave.cpp:41
-#, fuzzy
msgid "Wavelength:"
-msgstr "Длина волны"
+msgstr "Длина волны:"
#: ../src/extension/internal/bitmap/wave.cpp:47
#, fuzzy
@@ -5793,7 +5789,7 @@ msgstr "Количество копий втяжки/растяжки объек
#: ../src/extension/internal/bluredge.cpp:141
#: ../share/extensions/extrude.inx.h:5
#: ../share/extensions/generate_voronoi.inx.h:9
-#: ../share/extensions/interp.inx.h:7 ../share/extensions/motion.inx.h:4
+#: ../share/extensions/interp.inx.h:9 ../share/extensions/motion.inx.h:4
#: ../share/extensions/pathalongpath.inx.h:18
#: ../share/extensions/pathscatter.inx.h:20
#: ../share/extensions/voronoi2svg.inx.h:13
@@ -5830,14 +5826,12 @@ msgstr "Направление текста"
#: ../src/extension/internal/cairo-ps-out.cpp:334
#: ../src/extension/internal/cairo-ps-out.cpp:376
#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:251
-#, fuzzy
msgid "Embed fonts"
-msgstr "Встроить все растровые изображения"
+msgstr "Встроить шрифты"
#: ../src/extension/internal/cairo-ps-out.cpp:335
#: ../src/extension/internal/cairo-ps-out.cpp:377
#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:252
-#, fuzzy
msgid "Convert text to paths"
msgstr "Текст в кривые Безье"
@@ -5862,9 +5856,8 @@ msgstr "Разрешение для растеризации (dpi):"
#: ../src/extension/internal/cairo-ps-out.cpp:340
#: ../src/extension/internal/cairo-ps-out.cpp:382
-#, fuzzy
msgid "Output page size"
-msgstr "Смена формата страницы"
+msgstr ""
#: ../src/extension/internal/cairo-ps-out.cpp:341
#: ../src/extension/internal/cairo-ps-out.cpp:383
@@ -5933,9 +5926,8 @@ msgid "PDF 1.4"
msgstr "PDF 1.4"
#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:257
-#, fuzzy
msgid "Output page size:"
-msgstr "Смена формата страницы"
+msgstr ""
#: ../src/extension/internal/cdr-input.cpp:116
#: ../src/extension/internal/pdfinput/pdf-input.cpp:92
@@ -5953,9 +5945,8 @@ msgstr "из %i"
#: ../src/extension/internal/cdr-input.cpp:165
#: ../src/extension/internal/vsd-input.cpp:165
-#, fuzzy
msgid "Page Selector"
-msgstr "Выделитель"
+msgstr "Выбор страницы"
#: ../src/extension/internal/cdr-input.cpp:300
#, fuzzy
@@ -6017,82 +6008,82 @@ msgstr "Файлы Corel DRAW Presentation Exchange (.cmx)"
msgid "Open presentation exchange files saved in Corel DRAW"
msgstr "Открыть файлы, сохраненные Corel DRAW для обмена данными"
-#: ../src/extension/internal/emf-inout.cpp:3584
+#: ../src/extension/internal/emf-inout.cpp:3581
msgid "EMF Input"
msgstr "Импорт EMF"
-#: ../src/extension/internal/emf-inout.cpp:3589
+#: ../src/extension/internal/emf-inout.cpp:3586
msgid "Enhanced Metafiles (*.emf)"
msgstr "Файлы Enhanced Metafiles (*.emf)"
-#: ../src/extension/internal/emf-inout.cpp:3590
+#: ../src/extension/internal/emf-inout.cpp:3587
msgid "Enhanced Metafiles"
msgstr "Файлы Enhanced Metafile"
-#: ../src/extension/internal/emf-inout.cpp:3598
+#: ../src/extension/internal/emf-inout.cpp:3595
msgid "EMF Output"
msgstr "Экспорт в EMF"
-#: ../src/extension/internal/emf-inout.cpp:3600
+#: ../src/extension/internal/emf-inout.cpp:3597
#: ../src/extension/internal/wmf-inout.cpp:3176
msgid "Convert texts to paths"
msgstr "Текст в кривые Безье"
-#: ../src/extension/internal/emf-inout.cpp:3601
+#: ../src/extension/internal/emf-inout.cpp:3598
#: ../src/extension/internal/wmf-inout.cpp:3177
msgid "Map Unicode to Symbol font"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3602
+#: ../src/extension/internal/emf-inout.cpp:3599
#: ../src/extension/internal/wmf-inout.cpp:3178
msgid "Map Unicode to Wingdings"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3603
+#: ../src/extension/internal/emf-inout.cpp:3600
#: ../src/extension/internal/wmf-inout.cpp:3179
msgid "Map Unicode to Zapf Dingbats"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3604
+#: ../src/extension/internal/emf-inout.cpp:3601
#: ../src/extension/internal/wmf-inout.cpp:3180
msgid "Use MS Unicode PUA (0xF020-0xF0FF) for converted characters"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3605
+#: ../src/extension/internal/emf-inout.cpp:3602
#: ../src/extension/internal/wmf-inout.cpp:3181
msgid "Compensate for PPT font bug"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3606
+#: ../src/extension/internal/emf-inout.cpp:3603
#: ../src/extension/internal/wmf-inout.cpp:3182
msgid "Convert dashed/dotted lines to single lines"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3607
+#: ../src/extension/internal/emf-inout.cpp:3604
#: ../src/extension/internal/wmf-inout.cpp:3183
#, fuzzy
msgid "Convert gradients to colored polygon series"
msgstr "Смена цвета опорной точки градиента"
-#: ../src/extension/internal/emf-inout.cpp:3608
+#: ../src/extension/internal/emf-inout.cpp:3605
#, fuzzy
msgid "Use native rectangular linear gradients"
msgstr "Создать линейный градиент"
-#: ../src/extension/internal/emf-inout.cpp:3609
+#: ../src/extension/internal/emf-inout.cpp:3606
msgid "Map all fill patterns to standard EMF hatches"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3610
+#: ../src/extension/internal/emf-inout.cpp:3607
#, fuzzy
msgid "Ignore image rotations"
msgstr "Ориентация"
-#: ../src/extension/internal/emf-inout.cpp:3614
+#: ../src/extension/internal/emf-inout.cpp:3611
msgid "Enhanced Metafile (*.emf)"
msgstr "Файлы Enhanced Metafile (*.emf)"
-#: ../src/extension/internal/emf-inout.cpp:3615
+#: ../src/extension/internal/emf-inout.cpp:3612
msgid "Enhanced Metafile"
msgstr "Enhanced Metafile"
@@ -6181,7 +6172,7 @@ msgstr "По_дсветка:"
#: ../src/extension/internal/filter/transparency.h:214
#: ../src/extension/internal/filter/transparency.h:287
#: ../src/extension/internal/filter/transparency.h:349
-#: ../src/ui/dialog/inkscape-preferences.cpp:1795
+#: ../src/ui/dialog/inkscape-preferences.cpp:1793
#, c-format
msgid "Filters"
msgstr "Фильтры"
@@ -6403,7 +6394,6 @@ msgstr "Режим смешивания:"
#: ../src/extension/internal/filter/textures.h:77
#: ../src/extension/internal/filter/transparency.h:61
#: ../src/filter-enums.cpp:52 ../src/ui/dialog/inkscape-preferences.cpp:685
-#: ../src/ui/widget/font-variants.cpp:45 ../src/ui/widget/font-variants.cpp:50
msgid "Normal"
msgstr "Нормальный"
@@ -6499,7 +6489,7 @@ msgstr "Рассеянный свет"
#: ../src/extension/internal/filter/bumps.h:329
#: ../src/libgdl/gdl-dock-placeholder.c:175 ../src/libgdl/gdl-dock.c:199
#: ../src/ui/widget/page-sizer.cpp:250 ../src/widgets/rect-toolbar.cpp:334
-#: ../share/extensions/interp_att_g.inx.h:11
+#: ../share/extensions/interp_att_g.inx.h:13
msgid "Height"
msgstr "Высота"
@@ -6521,6 +6511,7 @@ msgstr "Яркость"
#: ../src/extension/internal/filter/bumps.h:100
#: ../src/extension/internal/filter/bumps.h:331
+#: ../src/widgets/measure-toolbar.cpp:294
#, fuzzy
msgid "Precision"
msgstr "Точность:"
@@ -6689,15 +6680,13 @@ msgid "Transparency type:"
msgstr "0 (прозрачно)"
#: ../src/extension/internal/filter/bumps.h:353
-#: ../src/extension/internal/filter/morphology.h:176
-#: ../src/filter-enums.cpp:91
+#: ../src/extension/internal/filter/morphology.h:176 ../src/filter-enums.cpp:91
msgid "Atop"
msgstr "Сверху (atop)"
#: ../src/extension/internal/filter/bumps.h:354
#: ../src/extension/internal/filter/distort.h:70
-#: ../src/extension/internal/filter/morphology.h:174
-#: ../src/filter-enums.cpp:89
+#: ../src/extension/internal/filter/morphology.h:174 ../src/filter-enums.cpp:89
msgid "In"
msgstr "Вход"
@@ -7077,8 +7066,10 @@ msgstr "Тени:"
#: ../src/extension/internal/filter/color.h:1119
#: ../src/extension/internal/filter/paint.h:356 ../src/filter-enums.cpp:33
#: ../src/live_effects/effect.cpp:108
+#: ../src/live_effects/lpe-transform_2pts.cpp:40
#: ../src/ui/dialog/filter-effects-dialog.cpp:1048
#: ../src/widgets/gradient-toolbar.cpp:1162
+#: ../src/widgets/measure-toolbar.cpp:320
msgid "Offset"
msgstr "Смещение"
@@ -7262,8 +7253,7 @@ msgid "Felt Feather"
msgstr "Растушёвка"
#: ../src/extension/internal/filter/distort.h:71
-#: ../src/extension/internal/filter/morphology.h:175
-#: ../src/filter-enums.cpp:90
+#: ../src/extension/internal/filter/morphology.h:175 ../src/filter-enums.cpp:90
msgid "Out"
msgstr "Выход"
@@ -7439,8 +7429,8 @@ msgstr ""
#: ../src/extension/internal/filter/morphology.h:65
#: ../src/libgdl/gdl-dock-placeholder.c:167 ../src/libgdl/gdl-dock.c:191
#: ../src/ui/widget/page-sizer.cpp:249 ../src/widgets/rect-toolbar.cpp:317
-#: ../src/widgets/spray-toolbar.cpp:116 ../src/widgets/tweak-toolbar.cpp:128
-#: ../share/extensions/interp_att_g.inx.h:10
+#: ../src/widgets/spray-toolbar.cpp:289 ../src/widgets/tweak-toolbar.cpp:128
+#: ../share/extensions/interp_att_g.inx.h:12
msgid "Width"
msgstr "Ширина"
@@ -7477,19 +7467,18 @@ msgstr "Сокрытие слоя"
msgid "Composite type:"
msgstr "Совмещение"
-#: ../src/extension/internal/filter/morphology.h:173
-#: ../src/filter-enums.cpp:88
+#: ../src/extension/internal/filter/morphology.h:173 ../src/filter-enums.cpp:88
msgid "Over"
msgstr "Над"
-#: ../src/extension/internal/filter/morphology.h:177
-#: ../src/filter-enums.cpp:92
+#: ../src/extension/internal/filter/morphology.h:177 ../src/filter-enums.cpp:92
msgid "XOR"
msgstr "Исключающее ИЛИ (XOR)"
#: ../src/extension/internal/filter/morphology.h:179
#: ../src/ui/dialog/layer-properties.cpp:185
#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:59
+#: ../share/extensions/measure.inx.h:5
msgid "Position:"
msgstr "Положение:"
@@ -7533,6 +7522,7 @@ msgid "Erosion 2"
msgstr "Эрозия 2"
#: ../src/extension/internal/filter/morphology.h:191
+#: ../src/live_effects/lpe-roughen.cpp:40
msgid "Smooth"
msgstr "Сгладить"
@@ -7560,8 +7550,8 @@ msgstr "Заливка шумом"
#: ../src/ui/dialog/tracedialog.cpp:747
#: ../share/extensions/color_HSL_adjust.inx.h:2
#: ../share/extensions/color_custom.inx.h:2
-#: ../share/extensions/color_randomize.inx.h:2
-#: ../share/extensions/dots.inx.h:2 ../share/extensions/dxf_input.inx.h:2
+#: ../share/extensions/color_randomize.inx.h:2 ../share/extensions/dots.inx.h:2
+#: ../share/extensions/dxf_input.inx.h:2
#: ../share/extensions/dxf_outlines.inx.h:2
#: ../share/extensions/gcodetools_area.inx.h:29
#: ../share/extensions/gcodetools_engraving.inx.h:7
@@ -7685,7 +7675,7 @@ msgid "Clean-up"
msgstr "Очистка"
#: ../src/extension/internal/filter/paint.h:238
-#: ../share/extensions/measure.inx.h:11
+#: ../share/extensions/measure.inx.h:17
msgid "Length"
msgstr "Длина"
@@ -7982,6 +7972,7 @@ msgstr "Изменить извне..."
#: ../src/extension/internal/filter/textures.h:81
#: ../share/extensions/markers_strokepaint.inx.h:8
+#: ../share/extensions/restack.inx.h:4
msgid "Custom"
msgstr "Другой"
@@ -8020,9 +8011,9 @@ msgid "Background"
msgstr "Фон"
#: ../src/extension/internal/filter/transparency.h:59
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2855
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2853
#: ../src/ui/dialog/input.cpp:1088 ../src/widgets/eraser-toolbar.cpp:106
-#: ../src/widgets/pencil-toolbar.cpp:144 ../src/widgets/spray-toolbar.cpp:186
+#: ../src/widgets/pencil-toolbar.cpp:144 ../src/widgets/spray-toolbar.cpp:381
#: ../src/widgets/tweak-toolbar.cpp:254 ../share/extensions/extrude.inx.h:2
#: ../share/extensions/triangle.inx.h:8
msgid "Mode:"
@@ -8091,13 +8082,13 @@ msgstr ""
"что файл будет вне SVG, их придётся перемещать вместе."
#: ../src/extension/internal/gdkpixbuf-input.cpp:191
-#: ../src/ui/dialog/inkscape-preferences.cpp:1500
+#: ../src/ui/dialog/inkscape-preferences.cpp:1498
#, c-format
msgid "Embed"
msgstr "Встроить"
#: ../src/extension/internal/gdkpixbuf-input.cpp:192 ../src/sp-anchor.cpp:105
-#: ../src/ui/dialog/inkscape-preferences.cpp:1500
+#: ../src/ui/dialog/inkscape-preferences.cpp:1498
#, c-format
msgid "Link"
msgstr "Связать"
@@ -8139,19 +8130,19 @@ msgstr ""
"пикселеватой. Не работает во всех браузерах."
#: ../src/extension/internal/gdkpixbuf-input.cpp:201
-#: ../src/ui/dialog/inkscape-preferences.cpp:1507
+#: ../src/ui/dialog/inkscape-preferences.cpp:1505
#, c-format
msgid "None (auto)"
msgstr "Нет (автоматически)"
#: ../src/extension/internal/gdkpixbuf-input.cpp:202
-#: ../src/ui/dialog/inkscape-preferences.cpp:1507
+#: ../src/ui/dialog/inkscape-preferences.cpp:1505
#, c-format
msgid "Smooth (optimizeQuality)"
msgstr "Сглаженный (optimizeQuality)"
#: ../src/extension/internal/gdkpixbuf-input.cpp:203
-#: ../src/ui/dialog/inkscape-preferences.cpp:1507
+#: ../src/ui/dialog/inkscape-preferences.cpp:1505
#, c-format
msgid "Blocky (optimizeSpeed)"
msgstr "Ступенчатый (optimizeSpeed)"
@@ -8205,17 +8196,15 @@ msgid "Vertical Offset:"
msgstr "Смещение по вертикали:"
#: ../src/extension/internal/grid.cpp:215
-#: ../src/ui/dialog/inkscape-preferences.cpp:1521
+#: ../src/ui/dialog/inkscape-preferences.cpp:1519
#: ../share/extensions/draw_from_triangle.inx.h:58
-#: ../share/extensions/eqtexsvg.inx.h:4
-#: ../share/extensions/foldablebox.inx.h:9
+#: ../share/extensions/eqtexsvg.inx.h:4 ../share/extensions/foldablebox.inx.h:9
#: ../share/extensions/funcplot.inx.h:38
#: ../share/extensions/grid_cartesian.inx.h:23
#: ../share/extensions/grid_isometric.inx.h:11
#: ../share/extensions/grid_polar.inx.h:22
#: ../share/extensions/guides_creator.inx.h:25
-#: ../share/extensions/hershey.inx.h:52
-#: ../share/extensions/layout_nup.inx.h:35
+#: ../share/extensions/hershey.inx.h:52 ../share/extensions/layout_nup.inx.h:35
#: ../share/extensions/lindenmayer.inx.h:34
#: ../share/extensions/param_curves.inx.h:30
#: ../share/extensions/perfectboundcover.inx.h:19
@@ -8226,7 +8215,7 @@ msgstr "Смещение по вертикали:"
#: ../share/extensions/render_barcode_datamatrix.inx.h:5
#: ../share/extensions/render_barcode_qrcode.inx.h:18
#: ../share/extensions/render_gear_rack.inx.h:5
-#: ../share/extensions/render_gears.inx.h:11 ../share/extensions/rtree.inx.h:4
+#: ../share/extensions/render_gears.inx.h:11 ../share/extensions/rtree.inx.h:6
#: ../share/extensions/seamless_pattern.inx.h:5
#: ../share/extensions/spirograph.inx.h:10
#: ../share/extensions/svgcalendar.inx.h:38
@@ -8238,7 +8227,7 @@ msgstr "Отрисовка"
#: ../src/extension/internal/grid.cpp:216
#: ../src/ui/dialog/document-properties.cpp:162
#: ../src/ui/dialog/inkscape-preferences.cpp:819
-#: ../src/widgets/toolbox.cpp:1825
+#: ../src/widgets/toolbox.cpp:1857
msgid "Grids"
msgstr "Сетки"
@@ -8375,55 +8364,55 @@ msgstr "Встроить все растровые изображения"
msgid "Import settings"
msgstr "Параметры импорта"
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:290
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:291
msgid "PDF Import Settings"
msgstr "Параметры импорта PDF"
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:437
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:438
#, fuzzy
msgctxt "PDF input precision"
msgid "rough"
msgstr "невысокая"
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:438
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:439
#, fuzzy
msgctxt "PDF input precision"
msgid "medium"
msgstr "Средние"
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:439
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:440
#, fuzzy
msgctxt "PDF input precision"
msgid "fine"
msgstr "высокая"
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:440
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:441
#, fuzzy
msgctxt "PDF input precision"
msgid "very fine"
msgstr "очень высокая"
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:936
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:937
msgid "PDF Input"
msgstr "Импорт PDF"
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:941
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:942
msgid "Adobe PDF (*.pdf)"
msgstr "Adobe PDF (*.pdf)"
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:942
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:943
msgid "Adobe Portable Document Format"
msgstr "Adobe Portable Document Format"
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:949
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:950
msgid "AI Input"
msgstr "Импорт AI"
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:954
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:955
msgid "Adobe Illustrator 9.0 and above (*.ai)"
msgstr "Adobe Illustrator 9.0 и выше (*.ai)"
-#: ../src/extension/internal/pdfinput/pdf-input.cpp:955
+#: ../src/extension/internal/pdfinput/pdf-input.cpp:956
msgid "Open files saved in Adobe Illustrator 9.0 and newer versions"
msgstr ""
"Открыть файлы, сохраненные в Adobe Illustrator 9.0 и более новых версиях"
@@ -8575,8 +8564,7 @@ msgid "Map all fill patterns to standard WMF hatches"
msgstr ""
#: ../src/extension/internal/wmf-inout.cpp:3188
-#: ../share/extensions/wmf_input.inx.h:2
-#: ../share/extensions/wmf_output.inx.h:2
+#: ../share/extensions/wmf_input.inx.h:2 ../share/extensions/wmf_output.inx.h:2
msgid "Windows Metafile (*.wmf)"
msgstr "Файлы Windows Metafile (*.wmf)"
@@ -8717,7 +8705,7 @@ msgstr "Файл не был изменен. Сохранение не треб
msgid "Saving document..."
msgstr "Выполняется сохранение документа..."
-#: ../src/file.cpp:1271 ../src/ui/dialog/inkscape-preferences.cpp:1494
+#: ../src/file.cpp:1271 ../src/ui/dialog/inkscape-preferences.cpp:1492
#: ../src/ui/dialog/ocaldialogs.cpp:1244
msgid "Import"
msgstr "Импорт"
@@ -8796,27 +8784,24 @@ msgstr "Цвет обводки"
#. New in Compositing and Blending Level 1
#: ../src/filter-enums.cpp:58
-#, fuzzy
msgid "Overlay"
-msgstr "Перекрытия"
+msgstr "Перекрытие"
#: ../src/filter-enums.cpp:59
msgid "Color Dodge"
-msgstr ""
+msgstr "Осветление"
#: ../src/filter-enums.cpp:60
-#, fuzzy
msgid "Color Burn"
-msgstr "Контрольные цветовые полосы"
+msgstr "Затемнение"
#: ../src/filter-enums.cpp:61
-#, fuzzy
msgid "Hard Light"
-msgstr "Высота штрих-кода:"
+msgstr "Направленный свет"
#: ../src/filter-enums.cpp:62
msgid "Soft Light"
-msgstr "Мягкий свет"
+msgstr "Рассеянный свет"
#: ../src/filter-enums.cpp:63 ../src/splivarot.cpp:89 ../src/splivarot.cpp:95
msgid "Difference"
@@ -8837,7 +8822,7 @@ msgstr "Тон"
#: ../src/filter-enums.cpp:68
msgid "Luminosity"
-msgstr ""
+msgstr "Светлота"
#: ../src/filter-enums.cpp:78
msgid "Matrix"
@@ -8855,9 +8840,9 @@ msgstr "Вращение тона"
msgid "Luminance to Alpha"
msgstr "Освещенность в альфа"
-#: ../src/filter-enums.cpp:87
-#: ../share/extensions/jessyInk_mouseHandler.inx.h:3
+#: ../src/filter-enums.cpp:87 ../share/extensions/jessyInk_mouseHandler.inx.h:3
#: ../share/extensions/jessyInk_transitions.inx.h:7
+#: ../share/extensions/measure.inx.h:20
msgid "Default"
msgstr "По умолчанию"
@@ -8989,23 +8974,20 @@ msgid "Radial gradient <b>mid stop</b>"
msgstr "<b>Опорная точка</b> радиального градиента"
#: ../src/gradient-drag.cpp:106 ../src/ui/tools/mesh-tool.cpp:93
-#, fuzzy
msgid "Mesh gradient <b>corner</b>"
-msgstr "Радиальный градиент: <b>центр</b>"
+msgstr "<b>Угол</b> сетчатого градиента"
#: ../src/gradient-drag.cpp:107 ../src/ui/tools/mesh-tool.cpp:94
-#, fuzzy
msgid "Mesh gradient <b>handle</b>"
-msgstr "Смещение рычага градиента"
+msgstr "<b>Рычаг</b> сетчатого градиента"
#: ../src/gradient-drag.cpp:108 ../src/ui/tools/mesh-tool.cpp:95
-#, fuzzy
msgid "Mesh gradient <b>tensor</b>"
-msgstr "Линейный градиент: <b>конец</b>"
+msgstr "<b>Тензор</b> сетчатого градиента"
#: ../src/gradient-drag.cpp:567
msgid "Added patch row or column"
-msgstr ""
+msgstr "Добавка столбца/строки в сетку"
#: ../src/gradient-drag.cpp:799
msgid "Merge gradient handles"
@@ -9081,18 +9063,20 @@ msgid "Delete gradient stop(s)"
msgstr "Удалить опорную точку (-и)"
#: ../src/inkscape.cpp:242
-#, fuzzy
msgid "Autosave failed! Cannot create directory %1."
-msgstr "Невозможно создать каталог с профилем %s."
+msgstr ""
+"Не удалось выполнить автоматическое сохранение! Невозможно создать каталог "
+"%1."
#: ../src/inkscape.cpp:251
-#, fuzzy
msgid "Autosave failed! Cannot open directory %1."
-msgstr "Некорректный рабочий каталог: %s"
+msgstr ""
+"Не удалось выполнить автоматическое сохранение! Невозможно открыть каталог "
+"%1."
#: ../src/inkscape.cpp:267
msgid "Autosaving documents..."
-msgstr "Выполняется автоматическое сохранение документов..."
+msgstr "Выполняется автоматическое сохранение..."
#: ../src/inkscape.cpp:335
msgid "Autosave failed! Could not find inkscape extension to save document."
@@ -9179,8 +9163,7 @@ msgstr "Свернуть эту панель"
msgid "Close this dock"
msgstr "Закрыть эту панель"
-#: ../src/libgdl/gdl-dock-item-grip.c:723
-#: ../src/libgdl/gdl-dock-tablabel.c:125
+#: ../src/libgdl/gdl-dock-item-grip.c:723 ../src/libgdl/gdl-dock-tablabel.c:125
msgid "Controlling dock item"
msgstr "Controlling dock item"
@@ -9348,9 +9331,8 @@ msgstr "Индекс текущей страницы"
#: ../src/libgdl/gdl-dock-object.c:125
#: ../src/live_effects/parameter/originalpatharray.cpp:82
-#: ../src/ui/dialog/inkscape-preferences.cpp:1555
-#: ../src/ui/widget/page-sizer.cpp:285
-#: ../src/widgets/gradient-selector.cpp:154
+#: ../src/ui/dialog/inkscape-preferences.cpp:1553
+#: ../src/ui/widget/page-sizer.cpp:285 ../src/widgets/gradient-selector.cpp:154
#: ../src/widgets/sp-xmlview-attr-list.cpp:49
msgid "Name"
msgstr "Имя"
@@ -9421,8 +9403,7 @@ msgid ""
msgstr ""
"Attempt to bind to %p an already bound dock object %p (current master: %p)"
-#: ../src/libgdl/gdl-dock-paned.c:130 ../src/ui/widget/font-variants.cpp:44
-#: ../src/widgets/ruler.cpp:230
+#: ../src/libgdl/gdl-dock-paned.c:130 ../src/widgets/ruler.cpp:230
msgid "Position"
msgstr "Положение"
@@ -9479,22 +9460,18 @@ msgid "Whether the placeholder is standing in for a floating toplevel dock"
msgstr "Whether the placeholder is standing in for a floating toplevel dock"
#: ../src/libgdl/gdl-dock-placeholder.c:189
-#, fuzzy
msgid "X Coordinate"
msgstr "Координата X"
#: ../src/libgdl/gdl-dock-placeholder.c:190
-#, fuzzy
msgid "X coordinate for dock when floating"
msgstr "Координата плавающей панели по оси X"
#: ../src/libgdl/gdl-dock-placeholder.c:196
-#, fuzzy
msgid "Y Coordinate"
msgstr "Координата Y"
#: ../src/libgdl/gdl-dock-placeholder.c:197
-#, fuzzy
msgid "Y coordinate for dock when floating"
msgstr "Координата плавающей панели по оси Y"
@@ -9596,7 +9573,7 @@ msgstr "Деформация по сетке"
#: ../src/live_effects/effect.cpp:106
msgid "Line Segment"
-msgstr "Сегмент линии"
+msgstr "Линия по сегменту"
#: ../src/live_effects/effect.cpp:107
msgid "Mirror symmetry"
@@ -9696,80 +9673,67 @@ msgid "Power stroke"
msgstr "Текстурная обводка"
#: ../src/live_effects/effect.cpp:135
-#, fuzzy
msgid "Clone original path"
-msgstr "Заменить текст"
+msgstr "Клон исходного контура"
#. EXPERIMENTAL
#: ../src/live_effects/effect.cpp:137
#: ../src/live_effects/lpe-show_handles.cpp:26
-#, fuzzy
msgid "Show handles"
-msgstr "Показывать рычаги"
+msgstr "Визуализация рычагов"
#: ../src/live_effects/effect.cpp:139 ../src/widgets/pencil-toolbar.cpp:121
-#, fuzzy
msgid "BSpline"
-msgstr "линий"
+msgstr "BSpline"
#: ../src/live_effects/effect.cpp:140
-#, fuzzy
msgid "Join type"
-msgstr "Тип линии:"
+msgstr "Тип соединения"
#: ../src/live_effects/effect.cpp:141
-#, fuzzy
msgid "Taper stroke"
-msgstr "Текстурная обводка"
+msgstr ""
#. Ponyscape
#: ../src/live_effects/effect.cpp:143
-#, fuzzy
msgid "Attach path"
-msgstr "Сшивающий контур"
+msgstr ""
#: ../src/live_effects/effect.cpp:144
-#, fuzzy
msgid "Fill between strokes"
-msgstr "Заливку и обводку"
+msgstr ""
#: ../src/live_effects/effect.cpp:145 ../src/selection-chemistry.cpp:2871
msgid "Fill between many"
msgstr ""
#: ../src/live_effects/effect.cpp:146
-#, fuzzy
msgid "Ellipse by 5 points"
-msgstr "Окружность через три точки"
+msgstr "Эллипс через пять точек"
#: ../src/live_effects/effect.cpp:147
-#, fuzzy
msgid "Bounding Box"
msgstr "Площадка (BB)"
#: ../src/live_effects/effect.cpp:150
-#, fuzzy
msgid "Lattice Deformation 2"
-msgstr "Деформация по сетке"
+msgstr ""
#: ../src/live_effects/effect.cpp:151
-#, fuzzy
msgid "Perspective/Envelope"
-msgstr "Перспектива"
+msgstr "Перспектива/огибающая"
#: ../src/live_effects/effect.cpp:152
msgid "Fillet/Chamfer"
msgstr ""
#: ../src/live_effects/effect.cpp:153
-#, fuzzy
msgid "Interpolate points"
-msgstr "Интерполяция"
+msgstr "Интерполяция точек"
#: ../src/live_effects/effect.cpp:154
-#, fuzzy
msgid "Transform by 2 points"
-msgstr "Трансформировать градиенты"
+msgstr "Трансформация по двум точкам"
#: ../src/live_effects/effect.cpp:361
msgid "Is visible?"
@@ -9934,61 +9898,78 @@ msgstr "Видимая площадка (BB)"
msgid "Uses the visual bounding box"
msgstr "Видимая площадка (BB)"
-#: ../src/live_effects/lpe-bspline.cpp:28
+#: ../src/live_effects/lpe-bspline.cpp:30
msgid "Steps with CTRL:"
msgstr ""
-#: ../src/live_effects/lpe-bspline.cpp:28
+#: ../src/live_effects/lpe-bspline.cpp:30
msgid "Change number of steps with CTRL pressed"
msgstr ""
-#: ../src/live_effects/lpe-bspline.cpp:29
+#: ../src/live_effects/lpe-bspline.cpp:31
#: ../src/live_effects/lpe-simplify.cpp:33
-#: ../src/live_effects/lpe-transform_2pts.cpp:38
+#: ../src/live_effects/lpe-transform_2pts.cpp:43
#, fuzzy
msgid "Helper size:"
msgstr "_Размер рычагов:"
-#: ../src/live_effects/lpe-bspline.cpp:29
+#: ../src/live_effects/lpe-bspline.cpp:31
#: ../src/live_effects/lpe-simplify.cpp:33
#, fuzzy
msgid "Helper size"
msgstr "_Размер рычагов:"
-#: ../src/live_effects/lpe-bspline.cpp:30
+#: ../src/live_effects/lpe-bspline.cpp:32
msgid "Apply changes if weight = 0%"
msgstr ""
-#: ../src/live_effects/lpe-bspline.cpp:31
+#: ../src/live_effects/lpe-bspline.cpp:33
msgid "Apply changes if weight > 0%"
msgstr ""
-#: ../src/live_effects/lpe-bspline.cpp:32
+#: ../src/live_effects/lpe-bspline.cpp:34
#: ../src/live_effects/lpe-fillet-chamfer.cpp:56
#, fuzzy
msgid "Change only selected nodes"
msgstr "Соединить выделенные узлы"
-#: ../src/live_effects/lpe-bspline.cpp:33
+#: ../src/live_effects/lpe-bspline.cpp:35
#, fuzzy
msgid "Change weight %:"
msgstr "Высота прописных:"
-#: ../src/live_effects/lpe-bspline.cpp:33
+#: ../src/live_effects/lpe-bspline.cpp:35
#, fuzzy
msgid "Change weight percent of the effect"
msgstr "Высота области действия фильтра эффектов"
-#: ../src/live_effects/lpe-bspline.cpp:95
+#: ../src/live_effects/lpe-bspline.cpp:99
#, fuzzy
msgid "Default weight"
msgstr "Заголовок по умолчанию"
-#: ../src/live_effects/lpe-bspline.cpp:100
+#: ../src/live_effects/lpe-bspline.cpp:104
#, fuzzy
msgid "Make cusp"
msgstr "Многоугольник → звезда"
+#: ../src/live_effects/lpe-bspline.cpp:148
+#, fuzzy
+msgid "Change to default weight"
+msgstr "Заголовок по умолчанию"
+
+#: ../src/live_effects/lpe-bspline.cpp:154
+#, fuzzy
+msgid "Change to 0 weight"
+msgstr "Высота прописных:"
+
+#: ../src/live_effects/lpe-bspline.cpp:160
+#: ../src/live_effects/lpe-fillet-chamfer.cpp:232
+#: ../src/live_effects/lpe-fillet-chamfer.cpp:254
+#: ../src/live_effects/parameter/parameter.cpp:170
+msgid "Change scalar parameter"
+msgstr "Смена скалярного параметра"
+
#: ../src/live_effects/lpe-constructgrid.cpp:27
#, fuzzy
msgid "Size _X:"
@@ -10228,9 +10209,8 @@ msgid "Use knots distance instead radius"
msgstr ""
#: ../src/live_effects/lpe-fillet-chamfer.cpp:59
-#, fuzzy
msgid "Method:"
-msgstr "Режим"
+msgstr "Способ:"
#: ../src/live_effects/lpe-fillet-chamfer.cpp:59
#, fuzzy
@@ -10266,30 +10246,50 @@ msgstr "Угол в направлении X"
msgid "Helper size with direction"
msgstr "Угол в направлении X"
-#: ../src/live_effects/lpe-fillet-chamfer.cpp:154
+#: ../src/live_effects/lpe-fillet-chamfer.cpp:157
#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:72
#, fuzzy
msgid "Fillet"
msgstr "Заливка"
-#: ../src/live_effects/lpe-fillet-chamfer.cpp:158
+#: ../src/live_effects/lpe-fillet-chamfer.cpp:161
#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:74
#, fuzzy
msgid "Inverse fillet"
msgstr "Инвертирование заливки"
-#: ../src/live_effects/lpe-fillet-chamfer.cpp:163
+#: ../src/live_effects/lpe-fillet-chamfer.cpp:166
#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:76
#, fuzzy
msgid "Chamfer"
msgstr "Тямское письмо "
-#: ../src/live_effects/lpe-fillet-chamfer.cpp:167
+#: ../src/live_effects/lpe-fillet-chamfer.cpp:170
#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:78
#, fuzzy
msgid "Inverse chamfer"
msgstr "Инвертировать тон"
+#: ../src/live_effects/lpe-fillet-chamfer.cpp:239
+#, fuzzy
+msgid "Convert to fillet"
+msgstr "Преобразовать в брайлев текст"
+
+#: ../src/live_effects/lpe-fillet-chamfer.cpp:246
+#: ../src/live_effects/lpe-fillet-chamfer.cpp:270
+#, fuzzy
+msgid "Convert to inverse fillet"
+msgstr "Преобразовать в брайлев текст"
+
+#: ../src/live_effects/lpe-fillet-chamfer.cpp:262
+#, fuzzy
+msgid "Convert to chamfer"
+msgstr "Преобразовать в пунктир"
+
+#: ../src/live_effects/lpe-fillet-chamfer.cpp:282
+msgid "Knots and helper paths refreshed"
+msgstr ""
+
#: ../src/live_effects/lpe-gears.cpp:214
msgid "_Teeth:"
msgstr "_Зубцов:"
@@ -11318,80 +11318,129 @@ msgstr ""
"Относительное положение к исходной точке определяет глобальное направление и "
"силу изгиба"
-#: ../src/live_effects/lpe-roughen.cpp:29 ../share/extensions/addnodes.inx.h:4
+#: ../src/live_effects/lpe-roughen.cpp:30 ../share/extensions/addnodes.inx.h:4
msgid "By number of segments"
msgstr "По числу сегментов"
-#: ../src/live_effects/lpe-roughen.cpp:30
+#: ../src/live_effects/lpe-roughen.cpp:31
#, fuzzy
msgid "By max. segment size"
msgstr "По максимальной длине сегмента"
-#. initialise your parameters here:
+#: ../src/live_effects/lpe-roughen.cpp:37
+#, fuzzy
+msgid "Along nodes"
+msgstr "Соединение узлов"
+
#: ../src/live_effects/lpe-roughen.cpp:38
#, fuzzy
+msgid "Rand"
+msgstr "Случайные значения"
+
+#: ../src/live_effects/lpe-roughen.cpp:39
+#, fuzzy
+msgid "Retract"
+msgstr "Извлечь"
+
+#. initialise your parameters here:
+#: ../src/live_effects/lpe-roughen.cpp:48
msgid "Method"
-msgstr "Режим"
+msgstr "Способ"
-#: ../src/live_effects/lpe-roughen.cpp:38
+#: ../src/live_effects/lpe-roughen.cpp:48
#, fuzzy
msgid "Division method"
msgstr "Способ деления:"
-#: ../src/live_effects/lpe-roughen.cpp:40
+#: ../src/live_effects/lpe-roughen.cpp:50
#, fuzzy
msgid "Max. segment size"
msgstr "По максимальной длине сегмента"
-#: ../src/live_effects/lpe-roughen.cpp:42
+#: ../src/live_effects/lpe-roughen.cpp:52
#, fuzzy
msgid "Number of segments"
msgstr "Количество сегментов:"
-#: ../src/live_effects/lpe-roughen.cpp:44
+#: ../src/live_effects/lpe-roughen.cpp:54
#, fuzzy
msgid "Max. displacement in X"
msgstr "Максимальное смещение по X (px):"
-#: ../src/live_effects/lpe-roughen.cpp:46
+#: ../src/live_effects/lpe-roughen.cpp:56
#, fuzzy
msgid "Max. displacement in Y"
msgstr "Максимальное смещение по Y (px):"
-#: ../src/live_effects/lpe-roughen.cpp:48
+#: ../src/live_effects/lpe-roughen.cpp:58
#, fuzzy
msgid "Global randomize"
msgstr "заметная случайность"
-#: ../src/live_effects/lpe-roughen.cpp:50
+#: ../src/live_effects/lpe-roughen.cpp:60
+#, fuzzy
+msgid "Handles"
+msgstr "Рычаг"
+
+#: ../src/live_effects/lpe-roughen.cpp:60
+#, fuzzy
+msgid "Handles options"
+msgstr "Случайное расположение объектов"
+
+#: ../src/live_effects/lpe-roughen.cpp:62
+#, fuzzy
+msgid "Max. smooth handle angle"
+msgstr "Рычаг сглаженного узла"
+
+#: ../src/live_effects/lpe-roughen.cpp:64
#: ../share/extensions/radiusrand.inx.h:5
msgid "Shift nodes"
msgstr "Смещение узлов"
-#: ../src/live_effects/lpe-roughen.cpp:52
-#: ../share/extensions/radiusrand.inx.h:6
-msgid "Shift node handles"
-msgstr "Смещение рычагов узла"
+#: ../src/live_effects/lpe-roughen.cpp:66
+#, fuzzy
+msgid "Fixed displacement"
+msgstr "Смещение по X:"
+
+#: ../src/live_effects/lpe-roughen.cpp:66
+#, fuzzy
+msgid "Fixed displacement, 1/3 of segment length"
+msgstr "Смещение по X:"
-#: ../src/live_effects/lpe-roughen.cpp:100
+#: ../src/live_effects/lpe-roughen.cpp:68
+#, fuzzy
+msgid "Spray Tool friendly"
+msgstr "Параметры Распылителя"
+
+#: ../src/live_effects/lpe-roughen.cpp:68
+msgid "For use with spray tool"
+msgstr ""
+
+#: ../src/live_effects/lpe-roughen.cpp:128
msgid "<b>Add nodes</b> Subdivide each segment"
msgstr ""
-#: ../src/live_effects/lpe-roughen.cpp:109
+#: ../src/live_effects/lpe-roughen.cpp:137
msgid "<b>Jitter nodes</b> Move nodes/handles"
msgstr ""
-#: ../src/live_effects/lpe-roughen.cpp:118
+#: ../src/live_effects/lpe-roughen.cpp:146
msgid "<b>Extra roughen</b> Add a extra layer of rough"
msgstr ""
-#: ../src/live_effects/lpe-ruler.cpp:25 ../share/extensions/restack.inx.h:12
+#: ../src/live_effects/lpe-roughen.cpp:155
+msgid "<b>Options</b> Modify options to rough"
+msgstr ""
+
+#: ../src/live_effects/lpe-ruler.cpp:25 ../share/extensions/measure.inx.h:27
+#: ../share/extensions/restack.inx.h:16
#: ../share/extensions/text_extract.inx.h:8
#: ../share/extensions/text_merge.inx.h:8
msgid "Left"
msgstr "Слева"
-#: ../src/live_effects/lpe-ruler.cpp:26 ../share/extensions/restack.inx.h:14
+#: ../src/live_effects/lpe-ruler.cpp:26 ../share/extensions/measure.inx.h:29
+#: ../share/extensions/restack.inx.h:18
#: ../share/extensions/text_extract.inx.h:10
#: ../share/extensions/text_merge.inx.h:10
msgid "Right"
@@ -11407,14 +11456,14 @@ msgid "None"
msgstr "Нет"
#: ../src/live_effects/lpe-ruler.cpp:33
-#: ../src/live_effects/lpe-transform_2pts.cpp:34
-#: ../src/widgets/arc-toolbar.cpp:319
+#: ../src/live_effects/lpe-transform_2pts.cpp:37
+#: ../src/ui/tools/measure-tool.cpp:728 ../src/widgets/arc-toolbar.cpp:319
msgid "Start"
msgstr "Начало"
#: ../src/live_effects/lpe-ruler.cpp:34
-#: ../src/live_effects/lpe-transform_2pts.cpp:35
-#: ../src/widgets/arc-toolbar.cpp:332
+#: ../src/live_effects/lpe-transform_2pts.cpp:38
+#: ../src/ui/tools/measure-tool.cpp:729 ../src/widgets/arc-toolbar.cpp:332
msgid "End"
msgstr "Конец"
@@ -11426,8 +11475,7 @@ msgstr "_Расстояние между метками:"
msgid "Distance between successive ruler marks"
msgstr "Расстояние между соседними метками линейки"
-#: ../src/live_effects/lpe-ruler.cpp:42
-#: ../share/extensions/foldablebox.inx.h:7
+#: ../src/live_effects/lpe-ruler.cpp:42 ../share/extensions/foldablebox.inx.h:7
#: ../share/extensions/interp_att_g.inx.h:9
#: ../share/extensions/layout_nup.inx.h:3
#: ../share/extensions/printing_marks.inx.h:11
@@ -11542,7 +11590,7 @@ msgid "Smooth angles:"
msgstr "Сглаженность:"
#: ../src/live_effects/lpe-simplify.cpp:32
-msgid "Max degree difference on handles to preform a smooth"
+msgid "Max degree difference on handles to perform a smooth"
msgstr ""
#: ../src/live_effects/lpe-simplify.cpp:34
@@ -11659,7 +11707,7 @@ msgid "How many construction lines (tangents) to draw"
msgstr "Как много касательных линий рисовать"
#: ../src/live_effects/lpe-sketch.cpp:58
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2894
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2892
#: ../share/extensions/render_alphabetsoup.inx.h:3
msgid "Scale:"
msgstr "Масштабирование:"
@@ -11775,72 +11823,102 @@ msgstr "Прилипать к сглаженным узлам"
msgid "Limit for miter joins"
msgstr ""
-#: ../src/live_effects/lpe-taperstroke.cpp:448
+#: ../src/live_effects/lpe-taperstroke.cpp:447
msgid "Start point of the taper"
msgstr ""
-#: ../src/live_effects/lpe-taperstroke.cpp:452
+#: ../src/live_effects/lpe-taperstroke.cpp:451
#, fuzzy
msgid "End point of the taper"
msgstr "Ширина текстуры"
-#: ../src/live_effects/lpe-transform_2pts.cpp:30
+#: ../src/live_effects/lpe-transform_2pts.cpp:31
#, fuzzy
msgid "Elastic"
msgstr "Пластилин"
-#: ../src/live_effects/lpe-transform_2pts.cpp:30
+#: ../src/live_effects/lpe-transform_2pts.cpp:31
#, fuzzy
msgid "Elastic transform mode"
msgstr "Выделять и трансформировать объекты"
-#: ../src/live_effects/lpe-transform_2pts.cpp:31
+#: ../src/live_effects/lpe-transform_2pts.cpp:32
#, fuzzy
msgid "From original width"
msgstr "Заменить текст"
-#: ../src/live_effects/lpe-transform_2pts.cpp:32
+#: ../src/live_effects/lpe-transform_2pts.cpp:33
#, fuzzy
-msgid "Lock lenght"
+msgid "Lock length"
msgstr "Блокировка слоя"
-#: ../src/live_effects/lpe-transform_2pts.cpp:32
+#: ../src/live_effects/lpe-transform_2pts.cpp:33
#, fuzzy
-msgid "Lock lenght to current distance"
+msgid "Lock length to current distance"
msgstr "Заблокировать или разблокировать текущий слой"
-#: ../src/live_effects/lpe-transform_2pts.cpp:33
+#: ../src/live_effects/lpe-transform_2pts.cpp:34
#, fuzzy
msgid "Lock angle"
msgstr "Угол конуса"
-#: ../src/live_effects/lpe-transform_2pts.cpp:34
+#: ../src/live_effects/lpe-transform_2pts.cpp:35
+#, fuzzy
+msgid "Flip horizontal"
+msgstr "Отразить горизонтально"
+
+#: ../src/live_effects/lpe-transform_2pts.cpp:36
+#, fuzzy
+msgid "Flip vertical"
+msgstr "Отразить вертикально"
+
+#: ../src/live_effects/lpe-transform_2pts.cpp:37
#, fuzzy
msgid "Start point"
msgstr "Сортировать точки"
-#: ../src/live_effects/lpe-transform_2pts.cpp:35
+#: ../src/live_effects/lpe-transform_2pts.cpp:38
#, fuzzy
msgid "End point"
msgstr "Контур изгиба"
-#: ../src/live_effects/lpe-transform_2pts.cpp:36
+#: ../src/live_effects/lpe-transform_2pts.cpp:39
+#, fuzzy
+msgid "Stretch"
+msgstr "Сила:"
+
+#: ../src/live_effects/lpe-transform_2pts.cpp:39
+#, fuzzy
+msgid "Stretch the result"
+msgstr "Разрешение для экспорта:"
+
+#: ../src/live_effects/lpe-transform_2pts.cpp:40
+#, fuzzy
+msgid "Offset from knots"
+msgstr "Точки смещения"
+
+#: ../src/live_effects/lpe-transform_2pts.cpp:41
#, fuzzy
msgid "First Knot"
msgstr "Первая помощь"
-#: ../src/live_effects/lpe-transform_2pts.cpp:37
+#: ../src/live_effects/lpe-transform_2pts.cpp:42
#, fuzzy
msgid "Last Knot"
msgstr "Кельтский узел"
-#: ../src/live_effects/lpe-transform_2pts.cpp:38
+#: ../src/live_effects/lpe-transform_2pts.cpp:43
#, fuzzy
msgid "Rotation helper size"
msgstr "Центры вращения"
-#: ../src/live_effects/lpe-transform_2pts.cpp:319
-#: ../src/ui/dialog/inkscape-preferences.cpp:1612
+#: ../src/live_effects/lpe-transform_2pts.cpp:197
+#, fuzzy
+msgid "Change index of knot"
+msgstr "Смена типа узла"
+
+#: ../src/live_effects/lpe-transform_2pts.cpp:350
+#: ../src/ui/dialog/inkscape-preferences.cpp:1610
#: ../src/ui/dialog/pixelartdialog.cpp:296
#: ../src/ui/dialog/svg-fonts-dialog.cpp:699
#: ../src/ui/dialog/tracedialog.cpp:813
@@ -11849,9 +11927,8 @@ msgid "Reset"
msgstr "Сбросить "
#: ../src/live_effects/lpe-vonkoch.cpp:46
-#, fuzzy
msgid "N_r of generations:"
-msgstr "Количество поколений"
+msgstr "Коли_чество поколений:"
#: ../src/live_effects/lpe-vonkoch.cpp:46
msgid "Depth of the recursion --- keep low!!"
@@ -11911,7 +11988,7 @@ msgstr "Макс. сложность"
msgid "Disable effect if the output is too complex"
msgstr "Отключить эффект, если вывод слишком сложен"
-#: ../src/live_effects/parameter/bool.cpp:67
+#: ../src/live_effects/parameter/bool.cpp:68
msgid "Change bool parameter"
msgstr "Смена логического параметра"
@@ -11919,29 +11996,29 @@ msgstr "Смена логического параметра"
msgid "Change enumeration parameter"
msgstr "Смена параметра перечня"
-#: ../src/live_effects/parameter/filletchamferpointarray.cpp:780
-#: ../src/live_effects/parameter/filletchamferpointarray.cpp:841
+#: ../src/live_effects/parameter/filletchamferpointarray.cpp:778
+#: ../src/live_effects/parameter/filletchamferpointarray.cpp:839
msgid ""
"<b>Chamfer</b>: <b>Ctrl+Click</b> toggle type, <b>Shift+Click</b> open "
"dialog, <b>Ctrl+Alt+Click</b> reset"
msgstr ""
-#: ../src/live_effects/parameter/filletchamferpointarray.cpp:784
-#: ../src/live_effects/parameter/filletchamferpointarray.cpp:845
+#: ../src/live_effects/parameter/filletchamferpointarray.cpp:782
+#: ../src/live_effects/parameter/filletchamferpointarray.cpp:843
msgid ""
"<b>Inverse Chamfer</b>: <b>Ctrl+Click</b> toggle type, <b>Shift+Click</b> "
"open dialog, <b>Ctrl+Alt+Click</b> reset"
msgstr ""
-#: ../src/live_effects/parameter/filletchamferpointarray.cpp:788
-#: ../src/live_effects/parameter/filletchamferpointarray.cpp:849
+#: ../src/live_effects/parameter/filletchamferpointarray.cpp:786
+#: ../src/live_effects/parameter/filletchamferpointarray.cpp:847
msgid ""
"<b>Inverse Fillet</b>: <b>Ctrl+Click</b> toggle type, <b>Shift+Click</b> "
"open dialog, <b>Ctrl+Alt+Click</b> reset"
msgstr ""
-#: ../src/live_effects/parameter/filletchamferpointarray.cpp:792
-#: ../src/live_effects/parameter/filletchamferpointarray.cpp:853
+#: ../src/live_effects/parameter/filletchamferpointarray.cpp:790
+#: ../src/live_effects/parameter/filletchamferpointarray.cpp:851
msgid ""
"<b>Fillet</b>: <b>Ctrl+Click</b> toggle type, <b>Shift+Click</b> open "
"dialog, <b>Ctrl+Alt+Click</b> reset"
@@ -12000,11 +12077,6 @@ msgstr "Опускание контурного эффекта"
msgid "Remove path"
msgstr "Смещать текстуры"
-#: ../src/live_effects/parameter/parameter.cpp:152
-#: ../src/live_effects/parameter/parameter.cpp:170
-msgid "Change scalar parameter"
-msgstr "Смена скалярного параметра"
-
#: ../src/live_effects/parameter/path.cpp:170
msgid "Edit on-canvas"
msgstr "Изменить на холсте"
@@ -12174,7 +12246,7 @@ msgid "The ID of the object to export"
msgstr "Идентификатор экспортируемого объекта"
#: ../src/main.cpp:366 ../src/main.cpp:479
-#: ../src/ui/dialog/inkscape-preferences.cpp:1558
+#: ../src/ui/dialog/inkscape-preferences.cpp:1556
msgid "ID"
msgstr "ID"
@@ -12223,8 +12295,8 @@ msgstr "Экспортировать документ в файл EPS"
#: ../src/main.cpp:407
msgid ""
-"Choose the PostScript Level used to export. Possible choices are 2 (the "
-"default) and 3"
+"Choose the PostScript Level used to export. Possible choices are 2 and 3 "
+"(the default)"
msgstr ""
#: ../src/main.cpp:409
@@ -12736,7 +12808,7 @@ msgstr "Отношение:"
msgid "A related resource"
msgstr "Режим смешивания:"
-#: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1914
+#: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1912
msgid "Language:"
msgstr "Язык:"
@@ -12806,7 +12878,7 @@ msgstr ""
msgid "XML fragment for the RDF 'License' section"
msgstr "XML-фрагмент RDF-раздела \"Лицензия\"."
-#: ../src/resource-manager.cpp:332
+#: ../src/resource-manager.cpp:336
msgid "Fixup broken links"
msgstr ""
@@ -12824,8 +12896,7 @@ msgstr "<b>Ничего</b> не удалено."
#: ../src/widgets/eraser-toolbar.cpp:93
#: ../src/widgets/gradient-toolbar.cpp:1184
#: ../src/widgets/gradient-toolbar.cpp:1198
-#: ../src/widgets/gradient-toolbar.cpp:1212
-#: ../src/widgets/node-toolbar.cpp:401
+#: ../src/widgets/gradient-toolbar.cpp:1212 ../src/widgets/node-toolbar.cpp:401
msgid "Delete"
msgstr "Удаление"
@@ -12989,7 +13060,7 @@ msgstr "Перенос выделения в слой"
#. An SVG element cannot have a transform. We could change 'x' and 'y' in response
#. to a translation... but leave that for another day.
-#: ../src/selection-chemistry.cpp:1526 ../src/seltrans.cpp:390
+#: ../src/selection-chemistry.cpp:1526 ../src/seltrans.cpp:391
msgid "Cannot transform an embedded SVG."
msgstr ""
@@ -13007,7 +13078,7 @@ msgstr "Повернуть на 90° против часовой стрелки"
msgid "Rotate 90° CW"
msgstr "Повернуть на 90° по часовой стрелке"
-#: ../src/selection-chemistry.cpp:1824 ../src/seltrans.cpp:483
+#: ../src/selection-chemistry.cpp:1824 ../src/seltrans.cpp:484
#: ../src/ui/dialog/transformation.cpp:891
msgid "Rotate"
msgstr "Вращение"
@@ -13016,9 +13087,9 @@ msgstr "Вращение"
msgid "Rotate by pixels"
msgstr "Вращение по пикселам"
-#: ../src/selection-chemistry.cpp:2203 ../src/seltrans.cpp:480
+#: ../src/selection-chemistry.cpp:2203 ../src/seltrans.cpp:481
#: ../src/ui/dialog/transformation.cpp:865 ../src/ui/widget/page-sizer.cpp:450
-#: ../share/extensions/interp_att_g.inx.h:12
+#: ../share/extensions/interp_att_g.inx.h:14
msgid "Scale"
msgstr "Масштабирование:"
@@ -13035,7 +13106,7 @@ msgid "Move horizontally"
msgstr "Смещение по горизонтали"
#: ../src/selection-chemistry.cpp:2249 ../src/selection-chemistry.cpp:2275
-#: ../src/seltrans.cpp:477 ../src/ui/dialog/transformation.cpp:802
+#: ../src/seltrans.cpp:478 ../src/ui/dialog/transformation.cpp:802
msgid "Move"
msgstr "Смещение"
@@ -13051,7 +13122,7 @@ msgstr "Попиксельное смещение по горизонтали"
msgid "The selection has no applied path effect."
msgstr "В выделении нет примененного контурного эффекта."
-#: ../src/selection-chemistry.cpp:2567 ../src/ui/dialog/clonetiler.cpp:2221
+#: ../src/selection-chemistry.cpp:2567 ../src/ui/dialog/clonetiler.cpp:2230
msgid "Select an <b>object</b> to clone."
msgstr "Выделите <b>объект</b> для клонирования."
@@ -13184,71 +13255,71 @@ msgstr "В выделении <b>нет текстурной заливки</b>.
msgid "Pattern to objects"
msgstr "Текстура в объекты"
-#: ../src/selection-chemistry.cpp:3516
+#: ../src/selection-chemistry.cpp:3515
msgid "Select <b>object(s)</b> to make a bitmap copy."
msgstr "Выделите <b>объект(ы)</b> для создания растровой копии."
-#: ../src/selection-chemistry.cpp:3520
+#: ../src/selection-chemistry.cpp:3519
msgid "Rendering bitmap..."
msgstr "Создается растровая копия..."
-#: ../src/selection-chemistry.cpp:3705
+#: ../src/selection-chemistry.cpp:3704
msgid "Create bitmap"
msgstr "Создание растровой копии"
-#: ../src/selection-chemistry.cpp:3730 ../src/selection-chemistry.cpp:3842
+#: ../src/selection-chemistry.cpp:3729 ../src/selection-chemistry.cpp:3841
msgid "Select <b>object(s)</b> to create clippath or mask from."
msgstr ""
"Выделите <b>объект(ы)</b>, из которых будет создан обтравочный контур или "
"маска."
-#: ../src/selection-chemistry.cpp:3816 ../src/ui/dialog/objects.cpp:1918
+#: ../src/selection-chemistry.cpp:3815 ../src/ui/dialog/objects.cpp:1918
#, fuzzy
msgid "Create Clip Group"
msgstr "Создать _клон"
-#: ../src/selection-chemistry.cpp:3845
+#: ../src/selection-chemistry.cpp:3844
msgid "Select mask object and <b>object(s)</b> to apply clippath or mask to."
msgstr ""
"Выделите объект-маску и <b>объект(ы)</b>, к которым применить обтравочный "
"контур или маску."
-#: ../src/selection-chemistry.cpp:3992
+#: ../src/selection-chemistry.cpp:3991
msgid "Set clipping path"
msgstr "Установлен обтравочный контур"
-#: ../src/selection-chemistry.cpp:3994
+#: ../src/selection-chemistry.cpp:3993
msgid "Set mask"
msgstr "Установлена маска"
-#: ../src/selection-chemistry.cpp:4009
+#: ../src/selection-chemistry.cpp:4008
msgid "Select <b>object(s)</b> to remove clippath or mask from."
msgstr ""
"Выделите <b>объект(ы)</b>, с которых нужно снять обтравочный контур или "
"маску."
-#: ../src/selection-chemistry.cpp:4125
+#: ../src/selection-chemistry.cpp:4124
msgid "Release clipping path"
msgstr "Обтравочный контур снят"
-#: ../src/selection-chemistry.cpp:4127
+#: ../src/selection-chemistry.cpp:4126
msgid "Release mask"
msgstr "Маска снята"
-#: ../src/selection-chemistry.cpp:4146
+#: ../src/selection-chemistry.cpp:4145
msgid "Select <b>object(s)</b> to fit canvas to."
msgstr "Выделите <b>объект</b>, по размеру которого подогнать холст."
#. Fit Page
-#: ../src/selection-chemistry.cpp:4166 ../src/verbs.cpp:2961
+#: ../src/selection-chemistry.cpp:4165 ../src/verbs.cpp:2961
msgid "Fit Page to Selection"
msgstr "Cтраница до выделения"
-#: ../src/selection-chemistry.cpp:4195 ../src/verbs.cpp:2963
+#: ../src/selection-chemistry.cpp:4194 ../src/verbs.cpp:2963
msgid "Fit Page to Drawing"
msgstr "Откадрировать холст до рисунка"
-#: ../src/selection-chemistry.cpp:4216 ../src/verbs.cpp:2965
+#: ../src/selection-chemistry.cpp:4215 ../src/verbs.cpp:2965
msgid "Fit Page to Selection or Drawing"
msgstr "Откадрировать холст до выделения или рисунка"
@@ -13390,23 +13461,23 @@ msgstr ""
"<b>Центр</b> вращения и наклона: его можно перетащить; масштабирование с "
"Shift также выполняется по этому центру"
-#: ../src/seltrans.cpp:486 ../src/ui/dialog/transformation.cpp:980
+#: ../src/seltrans.cpp:487 ../src/ui/dialog/transformation.cpp:980
msgid "Skew"
msgstr "Наклон"
-#: ../src/seltrans.cpp:500
+#: ../src/seltrans.cpp:501
msgid "Set center"
msgstr "Смена центра объекта"
-#: ../src/seltrans.cpp:573
+#: ../src/seltrans.cpp:574
msgid "Stamp"
msgstr "Штамповка"
-#: ../src/seltrans.cpp:722
+#: ../src/seltrans.cpp:723
msgid "Reset center"
msgstr "Возврат к исходному центру"
-#: ../src/seltrans.cpp:954 ../src/seltrans.cpp:1059
+#: ../src/seltrans.cpp:961 ../src/seltrans.cpp:1065
#, c-format
msgid "<b>Scale</b>: %0.2f%% x %0.2f%%; with <b>Ctrl</b> to lock ratio"
msgstr ""
@@ -13414,24 +13485,24 @@ msgstr ""
#. TRANSLATORS: don't modify the first ";"
#. (it will NOT be displayed as ";" - only the second one will be)
-#: ../src/seltrans.cpp:1198
+#: ../src/seltrans.cpp:1202
#, c-format
msgid "<b>Skew</b>: %0.2f&#176;; with <b>Ctrl</b> to snap angle"
msgstr "<b>Наклон</b>: %0.2f&#176;; <b>Ctrl</b> ограничивает угол"
#. TRANSLATORS: don't modify the first ";"
#. (it will NOT be displayed as ";" - only the second one will be)
-#: ../src/seltrans.cpp:1273
+#: ../src/seltrans.cpp:1278
#, c-format
msgid "<b>Rotate</b>: %0.2f&#176;; with <b>Ctrl</b> to snap angle"
msgstr "<b>Вращение</b>: %0.2f&#176;; <b>Ctrl</b> ограничивает угол"
-#: ../src/seltrans.cpp:1310
+#: ../src/seltrans.cpp:1315
#, c-format
msgid "Move <b>center</b> to %s, %s"
msgstr "Переместить <b>центр</b> в %s, %s"
-#: ../src/seltrans.cpp:1464
+#: ../src/seltrans.cpp:1461
#, c-format
msgid ""
"<b>Move</b> by %s, %s; with <b>Ctrl</b> to restrict to horizontal/vertical; "
@@ -13445,8 +13516,8 @@ msgstr ""
msgid "Keyboard directory (%s) is unavailable."
msgstr "Каталог с палитрами (%s) недоступен."
-#: ../src/shortcuts.cpp:337 ../src/ui/dialog/export.cpp:1298
-#: ../src/ui/dialog/export.cpp:1332
+#: ../src/shortcuts.cpp:337 ../src/ui/dialog/export.cpp:1305
+#: ../src/ui/dialog/export.cpp:1339
msgid "Select a filename for exporting"
msgstr "Выберите имя файла для экспорта"
@@ -13713,8 +13784,8 @@ msgstr ""
#: ../src/sp-text.cpp:351 ../src/verbs.cpp:347
#: ../share/extensions/lorem_ipsum.inx.h:8
-#: ../share/extensions/replace_font.inx.h:11
-#: ../share/extensions/split.inx.h:10 ../share/extensions/text_braille.inx.h:2
+#: ../share/extensions/replace_font.inx.h:11 ../share/extensions/split.inx.h:10
+#: ../share/extensions/text_braille.inx.h:2
#: ../share/extensions/text_extract.inx.h:14
#: ../share/extensions/text_flipcase.inx.h:2
#: ../share/extensions/text_lowercase.inx.h:2
@@ -13781,9 +13852,9 @@ msgid "..."
msgstr "..."
#: ../src/sp-use.cpp:266
-#, fuzzy, c-format
+#, c-format
msgid "of: %s"
-msgstr "Ошибка: %s"
+msgstr "из: %s"
#: ../src/splivarot.cpp:71 ../src/splivarot.cpp:77
msgid "Union"
@@ -14198,7 +14269,7 @@ msgid "Rearrange"
msgstr "Переставить"
#: ../src/ui/dialog/align-and-distribute.cpp:851
-#: ../src/widgets/toolbox.cpp:1727
+#: ../src/widgets/toolbox.cpp:1759
msgid "Nodes"
msgstr "Узлы"
@@ -14791,9 +14862,10 @@ msgid "Initial color of tiled clones"
msgstr "Исходный цвет элементов узора"
#: ../src/ui/dialog/clonetiler.cpp:665
+#, fuzzy
msgid ""
"Initial color for clones (works only if the original has unset fill or "
-"stroke)"
+"stroke or on spray tool in copy mode)"
msgstr ""
"Исходный цвет клонов (у оригинала должен быть сброшен цвет заливки или "
"обводки)"
@@ -14870,117 +14942,119 @@ msgstr ""
msgid "_Trace"
msgstr "_Обводка"
-#: ../src/ui/dialog/clonetiler.cpp:790
-msgid "Trace the drawing under the tiles"
+#: ../src/ui/dialog/clonetiler.cpp:788
+#, fuzzy
+msgid "Trace the drawing under the clones/sprayed items"
msgstr "Обвести узором рисунок под ним"
-#: ../src/ui/dialog/clonetiler.cpp:794
+#: ../src/ui/dialog/clonetiler.cpp:792
+#, fuzzy
msgid ""
-"For each clone, pick a value from the drawing in that clone's location and "
-"apply it to the clone"
+"For each clone/sprayed item, pick a value from the drawing in its location "
+"and apply it"
msgstr ""
"Для каждого клона в узоре взять значение под клоном и применить его к клону"
-#: ../src/ui/dialog/clonetiler.cpp:813
+#: ../src/ui/dialog/clonetiler.cpp:811
msgid "1. Pick from the drawing:"
msgstr "1. Взять значение:"
-#: ../src/ui/dialog/clonetiler.cpp:831
+#: ../src/ui/dialog/clonetiler.cpp:829
msgid "Pick the visible color and opacity"
msgstr "Взять видимый цвет (без прозрачности) в каждой точке"
-#: ../src/ui/dialog/clonetiler.cpp:839
+#: ../src/ui/dialog/clonetiler.cpp:837
msgid "Pick the total accumulated opacity"
msgstr "Взять суммарную непрозрачность в каждой точке"
-#: ../src/ui/dialog/clonetiler.cpp:846
+#: ../src/ui/dialog/clonetiler.cpp:844
msgid "R"
msgstr "R"
-#: ../src/ui/dialog/clonetiler.cpp:847
+#: ../src/ui/dialog/clonetiler.cpp:845
msgid "Pick the Red component of the color"
msgstr "Взять значение красного канала цвета"
-#: ../src/ui/dialog/clonetiler.cpp:854
+#: ../src/ui/dialog/clonetiler.cpp:852
msgid "G"
msgstr "G"
-#: ../src/ui/dialog/clonetiler.cpp:855
+#: ../src/ui/dialog/clonetiler.cpp:853
msgid "Pick the Green component of the color"
msgstr "Взять значение зеленого канала цвета"
-#: ../src/ui/dialog/clonetiler.cpp:862
+#: ../src/ui/dialog/clonetiler.cpp:860
msgid "B"
msgstr "B"
-#: ../src/ui/dialog/clonetiler.cpp:863
+#: ../src/ui/dialog/clonetiler.cpp:861
msgid "Pick the Blue component of the color"
msgstr "Взять значение синего канала цвета"
-#: ../src/ui/dialog/clonetiler.cpp:870
+#: ../src/ui/dialog/clonetiler.cpp:868
msgctxt "Clonetiler color hue"
msgid "H"
msgstr "H"
-#: ../src/ui/dialog/clonetiler.cpp:871
+#: ../src/ui/dialog/clonetiler.cpp:869
msgid "Pick the hue of the color"
msgstr "Взять цветовой тон"
-#: ../src/ui/dialog/clonetiler.cpp:878
+#: ../src/ui/dialog/clonetiler.cpp:876
msgctxt "Clonetiler color saturation"
msgid "S"
msgstr "S"
-#: ../src/ui/dialog/clonetiler.cpp:879
+#: ../src/ui/dialog/clonetiler.cpp:877
msgid "Pick the saturation of the color"
msgstr "Взять насыщенность цвета"
-#: ../src/ui/dialog/clonetiler.cpp:886
+#: ../src/ui/dialog/clonetiler.cpp:884
msgctxt "Clonetiler color lightness"
msgid "L"
msgstr "L"
-#: ../src/ui/dialog/clonetiler.cpp:887
+#: ../src/ui/dialog/clonetiler.cpp:885
msgid "Pick the lightness of the color"
msgstr "Взять яркость цвета"
-#: ../src/ui/dialog/clonetiler.cpp:897
+#: ../src/ui/dialog/clonetiler.cpp:895
msgid "2. Tweak the picked value:"
msgstr "2. Изменить взятое значение:"
-#: ../src/ui/dialog/clonetiler.cpp:914
+#: ../src/ui/dialog/clonetiler.cpp:912
msgid "Gamma-correct:"
msgstr "Гамма-коррекция:"
-#: ../src/ui/dialog/clonetiler.cpp:918
+#: ../src/ui/dialog/clonetiler.cpp:916
msgid "Shift the mid-range of the picked value upwards (>0) or downwards (<0)"
msgstr "Сдвинуть середину диапазона снятых значений вверх (>0) или вниз (<0)"
-#: ../src/ui/dialog/clonetiler.cpp:925
+#: ../src/ui/dialog/clonetiler.cpp:923
msgid "Randomize:"
msgstr "Случайно:"
-#: ../src/ui/dialog/clonetiler.cpp:929
+#: ../src/ui/dialog/clonetiler.cpp:927
msgid "Randomize the picked value by this percentage"
msgstr "Случайно менять взятое значение, максимум на данный процент"
-#: ../src/ui/dialog/clonetiler.cpp:936
+#: ../src/ui/dialog/clonetiler.cpp:934
msgid "Invert:"
msgstr "Инвертировать:"
-#: ../src/ui/dialog/clonetiler.cpp:940
+#: ../src/ui/dialog/clonetiler.cpp:938
msgid "Invert the picked value"
msgstr "Инвертировать взятое значение"
-#: ../src/ui/dialog/clonetiler.cpp:946
+#: ../src/ui/dialog/clonetiler.cpp:944
msgid "3. Apply the value to the clones':"
msgstr "3. Применить это значение к клонам через:"
-#: ../src/ui/dialog/clonetiler.cpp:961
+#: ../src/ui/dialog/clonetiler.cpp:959
msgid "Presence"
msgstr "Наличие"
-#: ../src/ui/dialog/clonetiler.cpp:964
+#: ../src/ui/dialog/clonetiler.cpp:962
msgid ""
"Each clone is created with the probability determined by the picked value in "
"that point"
@@ -14988,15 +15062,15 @@ msgstr ""
"Вероятность появления каждого клона определяется значением, взятым в данной "
"точке"
-#: ../src/ui/dialog/clonetiler.cpp:971
+#: ../src/ui/dialog/clonetiler.cpp:969
msgid "Size"
msgstr "Размер"
-#: ../src/ui/dialog/clonetiler.cpp:974
+#: ../src/ui/dialog/clonetiler.cpp:972
msgid "Each clone's size is determined by the picked value in that point"
msgstr "Размер каждого клона определяется значением, взятым в данной точке"
-#: ../src/ui/dialog/clonetiler.cpp:984
+#: ../src/ui/dialog/clonetiler.cpp:982
msgid ""
"Each clone is painted by the picked color (the original must have unset fill "
"or stroke)"
@@ -15004,48 +15078,53 @@ msgstr ""
"Каждый клон красится взятым в данной точке цветом (у оригинала должен быть "
"сброшен цвет заливки или обводки)"
-#: ../src/ui/dialog/clonetiler.cpp:994
+#: ../src/ui/dialog/clonetiler.cpp:992
msgid "Each clone's opacity is determined by the picked value in that point"
msgstr ""
"Прозрачность каждого клона определяется значением, взятым в данной точке"
-#: ../src/ui/dialog/clonetiler.cpp:1042
+#: ../src/ui/dialog/clonetiler.cpp:1011
+#, fuzzy
+msgid "Apply to tiled clones:"
+msgstr "Удаление узора из клонов"
+
+#: ../src/ui/dialog/clonetiler.cpp:1052
msgid "How many rows in the tiling"
msgstr "Количество строк в узоре"
-#: ../src/ui/dialog/clonetiler.cpp:1072
+#: ../src/ui/dialog/clonetiler.cpp:1082
msgid "How many columns in the tiling"
msgstr "Количество столбцов в узоре"
-#: ../src/ui/dialog/clonetiler.cpp:1117
+#: ../src/ui/dialog/clonetiler.cpp:1127
msgid "Width of the rectangle to be filled"
msgstr "Ширина заполняемой области"
-#: ../src/ui/dialog/clonetiler.cpp:1150
+#: ../src/ui/dialog/clonetiler.cpp:1160
msgid "Height of the rectangle to be filled"
msgstr "Высота заполняемой области"
-#: ../src/ui/dialog/clonetiler.cpp:1167
+#: ../src/ui/dialog/clonetiler.cpp:1177
msgid "Rows, columns: "
msgstr "Строк, столбцов: "
-#: ../src/ui/dialog/clonetiler.cpp:1168
+#: ../src/ui/dialog/clonetiler.cpp:1178
msgid "Create the specified number of rows and columns"
msgstr "Создать указанное количество строк и столбцов"
-#: ../src/ui/dialog/clonetiler.cpp:1177
+#: ../src/ui/dialog/clonetiler.cpp:1187
msgid "Width, height: "
msgstr "Ширина, высота: "
-#: ../src/ui/dialog/clonetiler.cpp:1178
+#: ../src/ui/dialog/clonetiler.cpp:1188
msgid "Fill the specified width and height with the tiling"
msgstr "Заполнить узором указанную область"
-#: ../src/ui/dialog/clonetiler.cpp:1199
+#: ../src/ui/dialog/clonetiler.cpp:1209
msgid "Use saved size and position of the tile"
msgstr "Использовать запомненный размер и позицию оригинала"
-#: ../src/ui/dialog/clonetiler.cpp:1202
+#: ../src/ui/dialog/clonetiler.cpp:1212
msgid ""
"Pretend that the size and position of the tile are the same as the last time "
"you tiled it (if any), instead of using the current size"
@@ -15055,11 +15134,11 @@ msgstr ""
"узор из этого же объекта (если делали),\n"
"вместо того чтобы использовать его настоящий размер/позицию"
-#: ../src/ui/dialog/clonetiler.cpp:1236
+#: ../src/ui/dialog/clonetiler.cpp:1246
msgid " <b>_Create</b> "
msgstr "<b>_Создать</b>"
-#: ../src/ui/dialog/clonetiler.cpp:1238
+#: ../src/ui/dialog/clonetiler.cpp:1248
msgid "Create and tile the clones of the selection"
msgstr "Создать узор из клонов выделенного объекта"
@@ -15068,32 +15147,32 @@ msgstr "Создать узор из клонов выделенного объ
#. diagrams on the left in the following screenshot:
#. http://www.inkscape.org/screenshots/gallery/inkscape-0.42-CVS-tiles-unclump.png
#. So unclumping is the process of spreading a number of objects out more evenly.
-#: ../src/ui/dialog/clonetiler.cpp:1258
+#: ../src/ui/dialog/clonetiler.cpp:1268
msgid " _Unclump "
msgstr " _Разровнять"
-#: ../src/ui/dialog/clonetiler.cpp:1259
+#: ../src/ui/dialog/clonetiler.cpp:1269
msgid "Spread out clones to reduce clumping; can be applied repeatedly"
msgstr ""
"Распределить клоны более равномерно, избавиться от комков; можно применять "
"несколько раз подряд"
-#: ../src/ui/dialog/clonetiler.cpp:1265
+#: ../src/ui/dialog/clonetiler.cpp:1275
msgid " Re_move "
msgstr " _Удалить "
-#: ../src/ui/dialog/clonetiler.cpp:1266
+#: ../src/ui/dialog/clonetiler.cpp:1276
msgid "Remove existing tiled clones of the selected object (siblings only)"
msgstr ""
"Удалить составляющие узор клоны выделенного объекта\n"
"(только в том же слое/группе)"
-#: ../src/ui/dialog/clonetiler.cpp:1283
+#: ../src/ui/dialog/clonetiler.cpp:1293
msgid " R_eset "
msgstr " С_бросить "
#. TRANSLATORS: "change" is a noun here
-#: ../src/ui/dialog/clonetiler.cpp:1285
+#: ../src/ui/dialog/clonetiler.cpp:1295
msgid ""
"Reset all shifts, scales, rotates, opacity and color changes in the dialog "
"to zero"
@@ -15101,42 +15180,42 @@ msgstr ""
"Обнулить все введенные значения смещения, масштабирования, поворотов, "
"непрозрачности и цвета"
-#: ../src/ui/dialog/clonetiler.cpp:1358
+#: ../src/ui/dialog/clonetiler.cpp:1367
msgid "<small>Nothing selected.</small>"
msgstr "<small>Ничего не было выделено.</small>"
-#: ../src/ui/dialog/clonetiler.cpp:1364
+#: ../src/ui/dialog/clonetiler.cpp:1373
msgid "<small>More than one object selected.</small>"
msgstr ""
"<small>Выделено больше одного объекта. Невозможно взять стиль от нескольких "
"объектов сразу.</small>"
-#: ../src/ui/dialog/clonetiler.cpp:1371
+#: ../src/ui/dialog/clonetiler.cpp:1380
#, c-format
msgid "<small>Object has <b>%d</b> tiled clones.</small>"
msgstr "<small>У объекта узор из <b>%d</b> клонов.</small>"
-#: ../src/ui/dialog/clonetiler.cpp:1376
+#: ../src/ui/dialog/clonetiler.cpp:1385
msgid "<small>Object has no tiled clones.</small>"
msgstr "<small>У объекта нет узора из клонов.</small>"
-#: ../src/ui/dialog/clonetiler.cpp:2100
+#: ../src/ui/dialog/clonetiler.cpp:2109
msgid "Select <b>one object</b> whose tiled clones to unclump."
msgstr "Выделите <b>один объект</b> для разравнивания узора из его клонов."
-#: ../src/ui/dialog/clonetiler.cpp:2120
+#: ../src/ui/dialog/clonetiler.cpp:2129
msgid "Unclump tiled clones"
msgstr "Разравнивание узора из клонов"
-#: ../src/ui/dialog/clonetiler.cpp:2149
+#: ../src/ui/dialog/clonetiler.cpp:2158
msgid "Select <b>one object</b> whose tiled clones to remove."
msgstr "Выделите <b>один объект</b> для удаления узора из его клонов."
-#: ../src/ui/dialog/clonetiler.cpp:2174
+#: ../src/ui/dialog/clonetiler.cpp:2183
msgid "Delete tiled clones"
msgstr "Удаление узора из клонов"
-#: ../src/ui/dialog/clonetiler.cpp:2227
+#: ../src/ui/dialog/clonetiler.cpp:2236
msgid ""
"If you want to clone several objects, <b>group</b> them and <b>clone the "
"group</b>."
@@ -15144,23 +15223,23 @@ msgstr ""
"Для клонирования нескольких объектов <b>сгруппируйте</b> их и <b>клонируйте "
"группу</b>."
-#: ../src/ui/dialog/clonetiler.cpp:2236
+#: ../src/ui/dialog/clonetiler.cpp:2245
msgid "<small>Creating tiled clones...</small>"
msgstr "<small>Создается узор из клонов...</small>"
-#: ../src/ui/dialog/clonetiler.cpp:2652
+#: ../src/ui/dialog/clonetiler.cpp:2661
msgid "Create tiled clones"
msgstr "Создание узора из клонов"
-#: ../src/ui/dialog/clonetiler.cpp:2885
+#: ../src/ui/dialog/clonetiler.cpp:2894
msgid "<small>Per row:</small>"
msgstr "<small>На строку:</small>"
-#: ../src/ui/dialog/clonetiler.cpp:2903
+#: ../src/ui/dialog/clonetiler.cpp:2912
msgid "<small>Per column:</small>"
msgstr "<small>На столбец:</small>"
-#: ../src/ui/dialog/clonetiler.cpp:2911
+#: ../src/ui/dialog/clonetiler.cpp:2920
msgid "<small>Randomize:</small>"
msgstr "<small>Случайно:</small>"
@@ -15466,8 +15545,7 @@ msgstr "_Удалить"
msgid "Remove selected grid."
msgstr "Удалить выделенную сетку"
-#: ../src/ui/dialog/document-properties.cpp:161
-#: ../src/widgets/toolbox.cpp:1834
+#: ../src/ui/dialog/document-properties.cpp:161 ../src/widgets/toolbox.cpp:1866
msgid "Guides"
msgstr "Направляющие"
@@ -15665,8 +15743,8 @@ msgstr "_Выделение"
msgid "_Custom"
msgstr "_Заказная"
-#: ../src/ui/dialog/export.cpp:165 ../src/widgets/measure-toolbar.cpp:99
-#: ../src/widgets/measure-toolbar.cpp:107
+#: ../src/ui/dialog/export.cpp:165 ../src/widgets/measure-toolbar.cpp:278
+#: ../src/widgets/measure-toolbar.cpp:286
#: ../share/extensions/render_gears.inx.h:6
msgid "Units:"
msgstr "Единица измерения:"
@@ -15754,9 +15832,9 @@ msgid "_Height:"
msgstr "_Высота:"
#: ../src/ui/dialog/export.cpp:304
-#: ../src/ui/dialog/inkscape-preferences.cpp:1487
-#: ../src/ui/dialog/inkscape-preferences.cpp:1491
-#: ../src/ui/dialog/inkscape-preferences.cpp:1515
+#: ../src/ui/dialog/inkscape-preferences.cpp:1485
+#: ../src/ui/dialog/inkscape-preferences.cpp:1489
+#: ../src/ui/dialog/inkscape-preferences.cpp:1513
msgid "dpi"
msgstr "dpi"
@@ -15768,7 +15846,12 @@ msgstr "<b>_Имя файла</b>"
msgid "Export the bitmap file with these settings"
msgstr "Экспортировать файл с этими установками"
-#: ../src/ui/dialog/export.cpp:607
+#: ../src/ui/dialog/export.cpp:479
+#, fuzzy
+msgid "bitmap"
+msgstr "Растровый"
+
+#: ../src/ui/dialog/export.cpp:614
#, c-format
msgid "B_atch export %d selected object"
msgid_plural "B_atch export %d selected objects"
@@ -15776,81 +15859,81 @@ msgstr[0] "Пакетный экспорт %d выделенного объек
msgstr[1] "Пакетный экспорт %d выделенных объектов"
msgstr[2] "Пакетный экспорт %d выделенных объектов"
-#: ../src/ui/dialog/export.cpp:923
+#: ../src/ui/dialog/export.cpp:930
msgid "Export in progress"
msgstr "Выполняется экспорт"
-#: ../src/ui/dialog/export.cpp:1015
+#: ../src/ui/dialog/export.cpp:1022
msgid "No items selected."
msgstr "Ни один объект не выбран"
-#: ../src/ui/dialog/export.cpp:1019 ../src/ui/dialog/export.cpp:1021
+#: ../src/ui/dialog/export.cpp:1026 ../src/ui/dialog/export.cpp:1028
msgid "Exporting %1 files"
msgstr "Экспорт %d файла"
-#: ../src/ui/dialog/export.cpp:1062 ../src/ui/dialog/export.cpp:1064
+#: ../src/ui/dialog/export.cpp:1069 ../src/ui/dialog/export.cpp:1071
#, c-format
msgid "Exporting file <b>%s</b>..."
msgstr "Экспортируется файл <b>%s</b>..."
-#: ../src/ui/dialog/export.cpp:1073 ../src/ui/dialog/export.cpp:1165
+#: ../src/ui/dialog/export.cpp:1080 ../src/ui/dialog/export.cpp:1172
#, c-format
msgid "Could not export to filename %s.\n"
msgstr "Невозможно экспортировать в файл %s.\n"
-#: ../src/ui/dialog/export.cpp:1076
+#: ../src/ui/dialog/export.cpp:1083
#, c-format
msgid "Could not export to filename <b>%s</b>."
msgstr "Не удалось экспортировать в файл <b>%s</b>."
-#: ../src/ui/dialog/export.cpp:1091
+#: ../src/ui/dialog/export.cpp:1098
#, c-format
msgid "Successfully exported <b>%d</b> files from <b>%d</b> selected items."
msgstr ""
-#: ../src/ui/dialog/export.cpp:1102
+#: ../src/ui/dialog/export.cpp:1109
msgid "You have to enter a filename."
msgstr "Необходимо ввести имя файла."
-#: ../src/ui/dialog/export.cpp:1103
+#: ../src/ui/dialog/export.cpp:1110
msgid "You have to enter a filename"
msgstr "Вы забыли ввести имя файла"
-#: ../src/ui/dialog/export.cpp:1117
+#: ../src/ui/dialog/export.cpp:1124
msgid "The chosen area to be exported is invalid."
msgstr "Экспортируемая область выбрана некорректно."
-#: ../src/ui/dialog/export.cpp:1118
+#: ../src/ui/dialog/export.cpp:1125
msgid "The chosen area to be exported is invalid"
msgstr "Недопустимая область для экспорта"
-#: ../src/ui/dialog/export.cpp:1133
+#: ../src/ui/dialog/export.cpp:1140
#, c-format
msgid "Directory %s does not exist or is not a directory.\n"
msgstr "Каталог %s не существует, либо это не каталог.\n"
#. TRANSLATORS: %1 will be the filename, %2 the width, and %3 the height of the image
-#: ../src/ui/dialog/export.cpp:1147 ../src/ui/dialog/export.cpp:1149
+#: ../src/ui/dialog/export.cpp:1154 ../src/ui/dialog/export.cpp:1156
msgid "Exporting %1 (%2 x %3)"
msgstr "Экспорт %1 (%2 × %3)"
-#: ../src/ui/dialog/export.cpp:1176
+#: ../src/ui/dialog/export.cpp:1183
#, c-format
msgid "Drawing exported to <b>%s</b>."
msgstr "Рисунок экспортирован в <b>%s</b>."
-#: ../src/ui/dialog/export.cpp:1180
+#: ../src/ui/dialog/export.cpp:1187
msgid "Export aborted."
msgstr "Экспорт прерван."
-#: ../src/ui/dialog/export.cpp:1301 ../src/ui/interface.cpp:1392
+#: ../src/ui/dialog/export.cpp:1308 ../src/ui/interface.cpp:1388
#: ../src/widgets/desktop-widget.cpp:1122
#: ../src/widgets/desktop-widget.cpp:1184
#, fuzzy
msgid "_Cancel"
msgstr "Отменить"
-#: ../src/ui/dialog/export.cpp:1302 ../src/ui/dialog/input.cpp:1082
+#: ../src/ui/dialog/export.cpp:1309 ../src/ui/dialog/input.cpp:1082
#: ../src/verbs.cpp:2406 ../src/widgets/desktop-widget.cpp:1123
msgid "_Save"
msgstr "Со_хранить"
@@ -15862,8 +15945,7 @@ msgstr "Информация"
#: ../src/ui/dialog/extension-editor.cpp:82 ../src/verbs.cpp:309
#: ../src/verbs.cpp:328 ../share/extensions/color_HSL_adjust.inx.h:11
#: ../share/extensions/color_custom.inx.h:7
-#: ../share/extensions/color_randomize.inx.h:6
-#: ../share/extensions/dots.inx.h:7
+#: ../share/extensions/color_randomize.inx.h:6 ../share/extensions/dots.inx.h:7
#: ../share/extensions/draw_from_triangle.inx.h:35
#: ../share/extensions/dxf_input.inx.h:10
#: ../share/extensions/dxf_outlines.inx.h:24
@@ -15880,7 +15962,7 @@ msgstr "Информация"
#: ../share/extensions/gcodetools_tools_library.inx.h:12
#: ../share/extensions/generate_voronoi.inx.h:5
#: ../share/extensions/gimp_xcf.inx.h:7
-#: ../share/extensions/interp_att_g.inx.h:27
+#: ../share/extensions/interp_att_g.inx.h:29
#: ../share/extensions/jessyInk_autoTexts.inx.h:8
#: ../share/extensions/jessyInk_effects.inx.h:13
#: ../share/extensions/jessyInk_export.inx.h:7
@@ -15895,12 +15977,11 @@ msgstr "Информация"
#: ../share/extensions/jessyInk_view.inx.h:7
#: ../share/extensions/layout_nup.inx.h:24
#: ../share/extensions/lindenmayer.inx.h:13
-#: ../share/extensions/lorem_ipsum.inx.h:6
-#: ../share/extensions/measure.inx.h:16
+#: ../share/extensions/lorem_ipsum.inx.h:6 ../share/extensions/measure.inx.h:33
#: ../share/extensions/pathalongpath.inx.h:16
#: ../share/extensions/pathscatter.inx.h:18
-#: ../share/extensions/radiusrand.inx.h:8 ../share/extensions/split.inx.h:8
-#: ../share/extensions/voronoi2svg.inx.h:11
+#: ../share/extensions/radiusrand.inx.h:8 ../share/extensions/restack.inx.h:25
+#: ../share/extensions/split.inx.h:8 ../share/extensions/voronoi2svg.inx.h:11
#: ../share/extensions/web-set-att.inx.h:25
#: ../share/extensions/web-transmit-att.inx.h:23
#: ../share/extensions/webslicer_create_group.inx.h:11
@@ -16265,43 +16346,43 @@ msgstr "Ни один эффект не выбран"
msgid "No filter selected"
msgstr "Ни один фильтр не выбран"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2792
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2790
msgid "Effect parameters"
msgstr "Параметры эффекта"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2793
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2791
msgid "Filter General Settings"
msgstr "Общие параметры фильтра"
#. default x:
#. default y:
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2851
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2849
msgid "Coordinates:"
msgstr "Координаты:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2851
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2849
msgid "X coordinate of the left corners of filter effects region"
msgstr "Координата X левых углов области действия фильтра эффектов"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2851
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2849
msgid "Y coordinate of the upper corners of filter effects region"
msgstr "Координата X верхних углов области действия фильтра эффектов"
#. default width:
#. default height:
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2852
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2850
msgid "Dimensions:"
msgstr "Размеры:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2852
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2850
msgid "Width of filter effects region"
msgstr "Ширина области действия фильтра эффектов"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2852
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2850
msgid "Height of filter effects region"
msgstr "Высота области действия фильтра эффектов"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2858
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2856
msgid ""
"Indicates the type of matrix operation. The keyword 'matrix' indicates that "
"a full 5x4 matrix of values will be provided. The other keywords represent "
@@ -16313,40 +16394,40 @@ msgstr ""
"способ выполнить наиболее популярные операции, не задавая все значения "
"матрицы вручную."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2859
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2857
msgid "Value(s):"
msgstr "Значение(-я):"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2863
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2861
msgid "R:"
msgstr "R:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2864
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2862
#: ../src/ui/widget/color-icc-selector.cpp:180
msgid "G:"
msgstr "G:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2865
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2863
msgid "B:"
msgstr "B:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2866
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2864
msgid "A:"
msgstr "A:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2869
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2909
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2867
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2907
msgid "Operator:"
msgstr "Оператор:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2870
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2868
msgid "K1:"
msgstr "K1:"
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2868
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2869
#: ../src/ui/dialog/filter-effects-dialog.cpp:2870
#: ../src/ui/dialog/filter-effects-dialog.cpp:2871
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2872
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2873
msgid ""
"If the arithmetic operation is chosen, each result pixel is computed using "
"the formula k1*i1*i2 + k2*i1 + k3*i2 + k4 where i1 and i2 are the pixel "
@@ -16356,38 +16437,38 @@ msgstr ""
"формуле k1*i1*i2 + k2*i1 + k3*i2 + k4, где i1 и i2 — пикселы первого и "
"второго входов соответственно."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2871
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2869
msgid "K2:"
msgstr "K2:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2872
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2870
msgid "K3:"
msgstr "K3:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2873
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2871
msgid "K4:"
msgstr "K4:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2876
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2874
msgid "Size:"
msgstr "Размер:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2876
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2874
msgid "width of the convolve matrix"
msgstr "Ширина матрицы свёртки"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2876
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2874
msgid "height of the convolve matrix"
msgstr "Высота матрицы свёртки"
#. default x:
#. default y:
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2877
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2875
#: ../src/ui/dialog/object-attributes.cpp:48
msgid "Target:"
msgstr "Target:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2877
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2875
msgid ""
"X coordinate of the target point in the convolve matrix. The convolution is "
"applied to pixels around this point."
@@ -16395,7 +16476,7 @@ msgstr ""
"Координата X конечной точки матрицы свертки. Свертка применяется к пикселам "
"вокруг этой точки."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2877
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2875
msgid ""
"Y coordinate of the target point in the convolve matrix. The convolution is "
"applied to pixels around this point."
@@ -16404,11 +16485,11 @@ msgstr ""
"вокруг этой точки."
#. TRANSLATORS: for info on "Kernel", see http://en.wikipedia.org/wiki/Kernel_(matrix)
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2879
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2877
msgid "Kernel:"
msgstr "Ядро:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2879
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2877
msgid ""
"This matrix describes the convolve operation that is applied to the input "
"image in order to calculate the pixel colors at the output. Different "
@@ -16423,11 +16504,11 @@ msgstr ""
"эффект размывания движением, в то время как матрица, заполненная постоянным "
"ненулевым значением даст обычный эффект размывания."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2881
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2879
msgid "Divisor:"
msgstr "Делитель:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2881
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2879
msgid ""
"After applying the kernelMatrix to the input image to yield a number, that "
"number is divided by divisor to yield the final destination color value. A "
@@ -16439,11 +16520,11 @@ msgstr ""
"Делитель, являющийся суммой всех значений матрицы, имеет тенденцию "
"приглушать общую интенсивность цветов в конечной картинке."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2882
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2880
msgid "Bias:"
msgstr "Смещение:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2882
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2880
msgid ""
"This value is added to each component. This is useful to define a constant "
"value as the zero response of the filter."
@@ -16451,11 +16532,11 @@ msgstr ""
"Это значение добавляется к каждому компоненту. Полезно для задания константы "
"как нулевого отклика фильтра."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2883
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2881
msgid "Edge Mode:"
msgstr "Режим краёв:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2883
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2881
msgid ""
"Determines how to extend the input image as necessary with color values so "
"that the matrix operations can be applied when the kernel is positioned at "
@@ -16465,31 +16546,31 @@ msgstr ""
"матричные операции могли работать с ядром, расположенным на крае изображения "
"или близко к нему."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2884
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2882
msgid "Preserve Alpha"
msgstr "Сохранять альфа-канал"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2884
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2882
msgid "If set, the alpha channel won't be altered by this filter primitive."
msgstr "Если включено, альфа-канал не будет изменен этим примитивом фильтра."
#. default: white
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2887
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2885
msgid "Diffuse Color:"
msgstr "Цвет диффузии:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2887
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2920
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2885
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2918
msgid "Defines the color of the light source"
msgstr "Определяет цвет источника света"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2888
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2921
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2886
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2919
msgid "Surface Scale:"
msgstr "Коэфф. высоты поверхности:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2888
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2921
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2886
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2919
msgid ""
"This value amplifies the heights of the bump map defined by the input alpha "
"channel"
@@ -16497,59 +16578,59 @@ msgstr ""
"На это значение умножается высота карты рельефа, определенная входящим альфа-"
"каналом"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2889
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2922
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2887
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2920
msgid "Constant:"
msgstr "Константа диффузии:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2889
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2922
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2887
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2920
msgid "This constant affects the Phong lighting model."
msgstr "Эта константа касается модели освещения Фонга"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2890
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2924
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2888
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2922
msgid "Kernel Unit Length:"
msgstr "Длина единицы ядра:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2894
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2892
msgid "This defines the intensity of the displacement effect."
msgstr "Определяет интенсивность эффекта смещения"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2895
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2893
msgid "X displacement:"
msgstr "Смещение по X:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2895
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2893
msgid "Color component that controls the displacement in the X direction"
msgstr "Цветовой компонент, контролирующий смещение по оси X"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2896
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2894
msgid "Y displacement:"
msgstr "Смещение по Y:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2896
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2894
msgid "Color component that controls the displacement in the Y direction"
msgstr "Цветовой компонент, контролирующий смещение по оси Y"
#. default: black
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2899
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2897
msgid "Flood Color:"
msgstr "Цвет заливки:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2899
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2897
msgid "The whole filter region will be filled with this color."
msgstr "Вся область действия фильтра будет залита этим цветом"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2903
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2901
msgid "Standard Deviation:"
msgstr "Стандартное отклонение:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2903
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2901
msgid "The standard deviation for the blur operation."
msgstr "Стандартное отклонение при размывании, выражается в процентах"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2909
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2907
msgid ""
"Erode: performs \"thinning\" of input image.\n"
"Dilate: performs \"fattenning\" of input image."
@@ -16557,68 +16638,68 @@ msgstr ""
"Эрозия «утоньшает» изображение на входе.\n"
"Дилатация «утолщает» изображение на входе."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2913
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2911
msgid "Source of Image:"
msgstr "Источник изображения:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2916
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2914
msgid "Delta X:"
msgstr "Дельта X:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2916
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2914
msgid "This is how far the input image gets shifted to the right"
msgstr "Как далеко входящее изображение смещается вправо"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2917
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2915
msgid "Delta Y:"
msgstr "Дельта Y:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2917
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2915
msgid "This is how far the input image gets shifted downwards"
msgstr "Как далеко входящее изображение смещается вниз"
#. default: white
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2920
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2918
msgid "Specular Color:"
msgstr "Цвет отражения:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2923
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2921
#: ../share/extensions/interp.inx.h:2
msgid "Exponent:"
msgstr "Экспонента:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2923
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2921
msgid "Exponent for specular term, larger is more \"shiny\"."
msgstr "Экспонента отражения: чем больше значение, тем ярче отражение"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2932
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2930
msgid ""
"Indicates whether the filter primitive should perform a noise or turbulence "
"function."
msgstr ""
"Должен ли примитив выполнять функцию создания турбулентности или же шума"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2933
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2931
msgid "Base Frequency:"
msgstr "Основная частота:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2934
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2932
msgid "Octaves:"
msgstr "Числа Кейли:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2935
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2933
msgid "Seed:"
msgstr "Случайное значение:"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2935
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2933
msgid "The starting number for the pseudo random number generator."
msgstr "Начальное число для генератора псевдослучайных чисел"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2947
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2945
msgid "Add filter primitive"
msgstr "Добавление примитива фильтра"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2964
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2962
msgid ""
"The <b>feBlend</b> filter primitive provides 4 image blending modes: screen, "
"multiply, darken and lighten."
@@ -16626,7 +16707,7 @@ msgstr ""
"Примитив <b>feBlend</b> дает 4 режима смешивания: экран, умножение, "
"затемнение и осветление."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2968
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2966
msgid ""
"The <b>feColorMatrix</b> filter primitive applies a matrix transformation to "
"color of each rendered pixel. This allows for effects like turning object to "
@@ -16636,7 +16717,7 @@ msgstr ""
"каждого пиксела. Таким образом можно обесцвечивать, повышать насыщенность и "
"менять тон."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2972
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2970
msgid ""
"The <b>feComponentTransfer</b> filter primitive manipulates the input's "
"color components (red, green, blue, and alpha) according to particular "
@@ -16648,7 +16729,7 @@ msgstr ""
"соответствии с определенными функциями передачи, допуская операции вроде "
"коррекции яркости и контраста, цветового баланса и порога."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2976
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2974
msgid ""
"The <b>feComposite</b> filter primitive composites two images using one of "
"the Porter-Duff blending modes or the arithmetic mode described in SVG "
@@ -16660,7 +16741,7 @@ msgstr ""
"SVG. Режимы совмещения Портера-Даффа — по сути, логические операции между "
"значениями соответствующих пикселов этих изображений."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2980
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2978
msgid ""
"The <b>feConvolveMatrix</b> lets you specify a Convolution to be applied on "
"the image. Common effects created using convolution matrices are blur, "
@@ -16674,7 +16755,7 @@ msgstr ""
"гауссово размывание можно выполнить и этим примитивом, специализированный "
"примитив работает быстрее и не зависит от разрешения."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2984
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2982
msgid ""
"The <b>feDiffuseLighting</b> and feSpecularLighting filter primitives create "
"\"embossed\" shadings. The input's alpha channel is used to provide depth "
@@ -16686,7 +16767,7 @@ msgstr ""
"глубине: чем выше непрозрачность, тем выше рельеф и, соответственно, тем "
"ближе к наблюдателю верхняя точка этого рельефа."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2988
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2986
msgid ""
"The <b>feDisplacementMap</b> filter primitive displaces the pixels in the "
"first input using the second input as a displacement map, that shows from "
@@ -16698,7 +16779,7 @@ msgstr ""
"отойти пикселы. Типичные эффекты, создаваемые при помощи карты смещения — "
"завихрение и щипок."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2992
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2990
msgid ""
"The <b>feFlood</b> filter primitive fills the region with a given color and "
"opacity. It is usually used as an input to other filters to apply color to "
@@ -16707,7 +16788,7 @@ msgstr ""
"Примитив <b>feFlood</b> заливает область заданным цветом и непрозрачностью. "
"Обычно он используется как вход для других фильтров, применяющих цвет."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2996
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2994
msgid ""
"The <b>feGaussianBlur</b> filter primitive uniformly blurs its input. It is "
"commonly used together with feOffset to create a drop shadow effect."
@@ -16715,7 +16796,7 @@ msgstr ""
"Примитив <b>feGaussianBlur</b> равномерно размывает объекты на входе. Фильтр "
"часто используется с feOffset для создания эффекта отбрасываемой тени."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:3000
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2998
msgid ""
"The <b>feImage</b> filter primitive fills the region with an external image "
"or another part of the document."
@@ -16723,7 +16804,7 @@ msgstr ""
"Примитив <b>feImage</b> заполняет область внешним изображением или другой "
"частью документа."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:3004
+#: ../src/ui/dialog/filter-effects-dialog.cpp:3002
msgid ""
"The <b>feMerge</b> filter primitive composites several temporary images "
"inside the filter primitive to a single image. It uses normal alpha "
@@ -16735,7 +16816,7 @@ msgstr ""
"нескольким примитивам feBlend в режиме «Обычный» или нескольким примитивам "
"feComposite в режиме «Над» (over)."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:3008
+#: ../src/ui/dialog/filter-effects-dialog.cpp:3006
msgid ""
"The <b>feMorphology</b> filter primitive provides erode and dilate effects. "
"For single-color objects erode makes the object thinner and dilate makes it "
@@ -16745,7 +16826,7 @@ msgstr ""
"Одноцветные объекты с плоской заливкой при эрозии становятся тоньше, а с "
"дилатацией — толще."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:3012
+#: ../src/ui/dialog/filter-effects-dialog.cpp:3010
msgid ""
"The <b>feOffset</b> filter primitive offsets the image by an user-defined "
"amount. For example, this is useful for drop shadows, where the shadow is in "
@@ -16755,7 +16836,7 @@ msgstr ""
"используется, к примеру, для создания эффекта отбрасываемой тени, где тень "
"слегка смещена относительно исходного объекта."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:3016
+#: ../src/ui/dialog/filter-effects-dialog.cpp:3014
msgid ""
"The <b>feDiffuseLighting</b> and <b>feSpecularLighting</b> filter primitives "
"create \"embossed\" shadings. The input's alpha channel is used to provide "
@@ -16767,13 +16848,16 @@ msgstr ""
"глубине: участки с более высокой непрозрачностью ближе к наблюдателю, и "
"наоборот."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:3020
+#: ../src/ui/dialog/filter-effects-dialog.cpp:3018
+#, fuzzy
msgid ""
-"The <b>feTile</b> filter primitive tiles a region with its input graphic"
+"The <b>feTile</b> filter primitive tiles a region with an input graphic. The "
+"source tile is defined by the filter primitive subregion of the input."
msgstr ""
-"Примитив <b>feTile</b> заполняет область мозаикой из входящего изображения."
+"Примитив <b>feImage</b> заполняет область внешним изображением или другой "
+"частью документа."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:3024
+#: ../src/ui/dialog/filter-effects-dialog.cpp:3022
msgid ""
"The <b>feTurbulence</b> filter primitive renders Perlin noise. This kind of "
"noise is useful in simulating several nature phenomena like clouds, fire and "
@@ -16783,11 +16867,11 @@ msgstr ""
"имитации различных природных явлений вроде облаков, огня и дыма, а также для "
"создания сложных текстур наподобие мрамора или гранита."
-#: ../src/ui/dialog/filter-effects-dialog.cpp:3043
+#: ../src/ui/dialog/filter-effects-dialog.cpp:3041
msgid "Duplicate filter primitive"
msgstr "Дубликация примитива фильтра"
-#: ../src/ui/dialog/filter-effects-dialog.cpp:3096
+#: ../src/ui/dialog/filter-effects-dialog.cpp:3094
msgid "Set filter primitive attribute"
msgstr "Смена атрибута примитива фильтра"
@@ -16973,7 +17057,7 @@ msgstr "Спирали"
msgid "Search spirals"
msgstr "Искать в спиралях"
-#: ../src/ui/dialog/find.cpp:103 ../src/widgets/toolbox.cpp:1735
+#: ../src/ui/dialog/find.cpp:103 ../src/widgets/toolbox.cpp:1767
msgid "Paths"
msgstr "Контуры"
@@ -17766,9 +17850,8 @@ msgid "Tai Viet"
msgstr "Тай Вьет"
#: ../src/ui/dialog/glyphs.cpp:285
-#, fuzzy
msgid "Meetei Mayek"
-msgstr "Слой удалён"
+msgstr ""
#: ../src/ui/dialog/glyphs.cpp:286
msgid "Hangul Syllables"
@@ -18957,17 +19040,19 @@ msgid "Set the language for menus and number formats"
msgstr "Укажите язык интерфейса и формата чисел"
#: ../src/ui/dialog/inkscape-preferences.cpp:604
-#: ../src/ui/dialog/inkscape-preferences.cpp:689
+#, fuzzy
+msgctxt "Icon size"
msgid "Large"
msgstr "Большие"
#: ../src/ui/dialog/inkscape-preferences.cpp:604
-#: ../src/ui/dialog/inkscape-preferences.cpp:689
-#: ../src/ui/widget/font-variants.cpp:51
+msgctxt "Icon size"
msgid "Small"
msgstr "Маленькие"
#: ../src/ui/dialog/inkscape-preferences.cpp:604
+#, fuzzy
+msgctxt "Icon size"
msgid "Smaller"
msgstr "Еще меньше"
@@ -19164,6 +19249,19 @@ msgid "Aggressive"
msgstr "Настойчивый"
#: ../src/ui/dialog/inkscape-preferences.cpp:689
+msgctxt "Window size"
+msgid "Small"
+msgstr "Маленькие"
+
+#: ../src/ui/dialog/inkscape-preferences.cpp:689
+#, fuzzy
+msgctxt "Window size"
+msgid "Large"
+msgstr "Большие"
+
+#: ../src/ui/dialog/inkscape-preferences.cpp:689
+#, fuzzy
+msgctxt "Window size"
msgid "Maximized"
msgstr "Максимальное"
@@ -19948,7 +20046,7 @@ msgid "Color custom markers the same color as object"
msgstr "Раскрасить пользовательские маркеры цветом объекта"
#: ../src/ui/dialog/inkscape-preferences.cpp:1178
-#: ../src/ui/dialog/inkscape-preferences.cpp:1400
+#: ../src/ui/dialog/inkscape-preferences.cpp:1398
msgid "Update marker color when object color changes"
msgstr "Обновлять цвет маркера при смене цвета объекта"
@@ -20168,16 +20266,20 @@ msgstr ""
"включилась автопрокрутка; положительные значения - за пределами окна,\n"
"отрицательные - внутри окна"
-#.
-#. _scroll_space.init ( _("Left mouse button pans when Space is pressed"), "/options/spacepans/value", false);
-#. _page_scrolling.add_line( false, "", _scroll_space, "",
-#. _("When on, pressing and holding Space and dragging with left mouse button pans canvas (as in Adobe Illustrator); when off, Space temporarily switches to Selector tool (default)"));
-#.
-#: ../src/ui/dialog/inkscape-preferences.cpp:1258
+#: ../src/ui/dialog/inkscape-preferences.cpp:1253
+#, fuzzy
+msgid "Mouse move pans when Space is pressed"
+msgstr "Перемещение по окну с нажатым пробелом и левой клавишей мыши"
+
+#: ../src/ui/dialog/inkscape-preferences.cpp:1255
+msgid "When on, pressing and holding Space and dragging pans canvas"
+msgstr ""
+
+#: ../src/ui/dialog/inkscape-preferences.cpp:1256
msgid "Mouse wheel zooms by default"
msgstr "По умолчанию колесо мыши масштабирует вид"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1260
+#: ../src/ui/dialog/inkscape-preferences.cpp:1258
msgid ""
"When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when "
"off, it zooms with Ctrl and scrolls without Ctrl"
@@ -20186,54 +20288,54 @@ msgstr ""
"с Ctrl — прокручивает холст; если выключено, с Ctrl масштабируется вид "
"документа, а без - прокручивается холст."
-#: ../src/ui/dialog/inkscape-preferences.cpp:1261
+#: ../src/ui/dialog/inkscape-preferences.cpp:1259
msgid "Scrolling"
msgstr "Прокрутка"
#. Snapping options
-#: ../src/ui/dialog/inkscape-preferences.cpp:1264
+#: ../src/ui/dialog/inkscape-preferences.cpp:1262
#, fuzzy
msgid "Snap indicator"
msgstr "Включить индикатор прилипания"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1266
+#: ../src/ui/dialog/inkscape-preferences.cpp:1264
msgid "Enable snap indicator"
msgstr "Включить индикатор прилипания"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1268
+#: ../src/ui/dialog/inkscape-preferences.cpp:1266
msgid "After snapping, a symbol is drawn at the point that has snapped"
msgstr "В предполагаемой точке прилипания рисуется символ"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1273
+#: ../src/ui/dialog/inkscape-preferences.cpp:1271
msgid "Snap indicator persistence (in seconds):"
msgstr ""
-#: ../src/ui/dialog/inkscape-preferences.cpp:1274
+#: ../src/ui/dialog/inkscape-preferences.cpp:1272
msgid ""
"Controls how long the snap indicator message will be shown, before it "
"disappears"
msgstr ""
-#: ../src/ui/dialog/inkscape-preferences.cpp:1276
+#: ../src/ui/dialog/inkscape-preferences.cpp:1274
msgid "What should snap"
msgstr ""
-#: ../src/ui/dialog/inkscape-preferences.cpp:1278
+#: ../src/ui/dialog/inkscape-preferences.cpp:1276
msgid "Only snap the node closest to the pointer"
msgstr "Прилипает только ближайший к указателю узел"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1280
+#: ../src/ui/dialog/inkscape-preferences.cpp:1278
msgid ""
"Only try to snap the node that is initially closest to the mouse pointer"
msgstr ""
"Прилипать только к тому узлу, который изначально расположен ближе остальных "
"к указателю мыши"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1283
+#: ../src/ui/dialog/inkscape-preferences.cpp:1281
msgid "_Weight factor:"
msgstr "Коэффициент _взвешивания:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1284
+#: ../src/ui/dialog/inkscape-preferences.cpp:1282
msgid ""
"When multiple snap solutions are found, then Inkscape can either prefer the "
"closest transformation (when set to 0), or prefer the node that was "
@@ -20243,11 +20345,11 @@ msgstr ""
"либо ближайшую трансформацию (0), либо узел, изначально более близкий к "
"курсору мыши (1)."
-#: ../src/ui/dialog/inkscape-preferences.cpp:1286
+#: ../src/ui/dialog/inkscape-preferences.cpp:1284
msgid "Snap the mouse pointer when dragging a constrained knot"
msgstr "Указатель мыши прилипает при перетаскивании узла с ограничением"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1288
+#: ../src/ui/dialog/inkscape-preferences.cpp:1286
msgid ""
"When dragging a knot along a constraint line, then snap the position of the "
"mouse pointer instead of snapping the projection of the knot onto the "
@@ -20256,17 +20358,17 @@ msgstr ""
"При перемещении узла вдоль ограничительной линии прилипает указатель мыши, а "
"не проекция узла на ограничительную линию"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1290
+#: ../src/ui/dialog/inkscape-preferences.cpp:1288
#, fuzzy
msgid "Delayed snap"
msgstr "Всегда прилипать"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1293
+#: ../src/ui/dialog/inkscape-preferences.cpp:1291
#, fuzzy
msgid "Delay (in seconds):"
msgstr "Задержка (мс):"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1294
+#: ../src/ui/dialog/inkscape-preferences.cpp:1292
msgid ""
"Postpone snapping as long as the mouse is moving, and then wait an "
"additional fraction of a second. This additional delay is specified here. "
@@ -20276,16 +20378,16 @@ msgstr ""
"время. Если значение очень мало или равно нулю, прилипание будет выполняться "
"немедленно."
-#: ../src/ui/dialog/inkscape-preferences.cpp:1296
+#: ../src/ui/dialog/inkscape-preferences.cpp:1294
msgid "Snapping"
msgstr "Прилипание"
#. nudgedistance is limited to 1000 in select-context.cpp: use the same limit here
-#: ../src/ui/dialog/inkscape-preferences.cpp:1301
+#: ../src/ui/dialog/inkscape-preferences.cpp:1299
msgid "_Arrow keys move by:"
msgstr "_Стрелки двигают на:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1302
+#: ../src/ui/dialog/inkscape-preferences.cpp:1300
#, fuzzy
msgid ""
"Pressing an arrow key moves selected object(s) or node(s) by this distance"
@@ -20294,32 +20396,32 @@ msgstr ""
"по нажатию клавиши со стрелкой"
#. defaultscale is limited to 1000 in select-context.cpp: use the same limit here
-#: ../src/ui/dialog/inkscape-preferences.cpp:1305
+#: ../src/ui/dialog/inkscape-preferences.cpp:1303
msgid "> and < _scale by:"
msgstr "Шаг масштабирования по > и <:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1306
+#: ../src/ui/dialog/inkscape-preferences.cpp:1304
#, fuzzy
msgid "Pressing > or < scales selection up or down by this increment"
msgstr ""
"На эту величину (в SVG пикселах) изменяется размер выделения по нажатию "
"клавиш > и <"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1308
+#: ../src/ui/dialog/inkscape-preferences.cpp:1306
msgid "_Inset/Outset by:"
msgstr "Втя_жка и растяжка на:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1309
+#: ../src/ui/dialog/inkscape-preferences.cpp:1307
#, fuzzy
msgid "Inset and Outset commands displace the path by this distance"
msgstr ""
"На это расстояние (в SVG пикселах) команды втяжки и растяжки смещают контур"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1310
+#: ../src/ui/dialog/inkscape-preferences.cpp:1308
msgid "Compass-like display of angles"
msgstr "Компасообразное отображение углов"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1312
+#: ../src/ui/dialog/inkscape-preferences.cpp:1310
msgid ""
"When on, angles are displayed with 0 at north, 0 to 360 range, positive "
"clockwise; otherwise with 0 at east, -180 to 180 range, positive "
@@ -20330,20 +20432,20 @@ msgstr ""
"случае 0° показывает на восток, диапазон значений находится между -180° и "
"180°, приращение угла происходит против часовой стрелки."
-#: ../src/ui/dialog/inkscape-preferences.cpp:1314
+#: ../src/ui/dialog/inkscape-preferences.cpp:1312
msgctxt "Rotation angle"
msgid "None"
msgstr "Нет"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1318
+#: ../src/ui/dialog/inkscape-preferences.cpp:1316
msgid "_Rotation snaps every:"
msgstr "О_граничение вращения каждые:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1318
+#: ../src/ui/dialog/inkscape-preferences.cpp:1316
msgid "degrees"
msgstr "градусов"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1319
+#: ../src/ui/dialog/inkscape-preferences.cpp:1317
msgid ""
"Rotating with Ctrl pressed snaps every that much degrees; also, pressing "
"[ or ] rotates by this amount"
@@ -20351,27 +20453,27 @@ msgstr ""
"Вращение с нажатым Ctrl ограничивает угол значениями, кратными выбранному; "
"нажатие [ или ] поворачивает на выбранный угол"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1320
+#: ../src/ui/dialog/inkscape-preferences.cpp:1318
msgid "Relative snapping of guideline angles"
msgstr "Относительное прилиапние углов направляющих"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1322
+#: ../src/ui/dialog/inkscape-preferences.cpp:1320
msgid ""
"When on, the snap angles when rotating a guideline will be relative to the "
"original angle"
msgstr ""
-#: ../src/ui/dialog/inkscape-preferences.cpp:1324
+#: ../src/ui/dialog/inkscape-preferences.cpp:1322
msgid "_Zoom in/out by:"
msgstr "_Шаг масштаба просмотра:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1324
+#: ../src/ui/dialog/inkscape-preferences.cpp:1322
#: ../src/ui/dialog/objects.cpp:1626
#: ../src/ui/widget/filter-effect-chooser.cpp:27
msgid "%"
msgstr "%"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1325
+#: ../src/ui/dialog/inkscape-preferences.cpp:1323
msgid ""
"Zoom tool click, +/- keys, and middle click zoom in and out by this "
"multiplier"
@@ -20379,44 +20481,44 @@ msgstr ""
"Шаг для щелчка инструментом масштаба,\n"
"нажатия клавиш +/- и щелчка средней клавишей мыши"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1326
+#: ../src/ui/dialog/inkscape-preferences.cpp:1324
msgid "Steps"
msgstr "Шаги"
#. Clones options
-#: ../src/ui/dialog/inkscape-preferences.cpp:1329
+#: ../src/ui/dialog/inkscape-preferences.cpp:1327
msgid "Move in parallel"
msgstr "Двигаются параллельно"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1331
+#: ../src/ui/dialog/inkscape-preferences.cpp:1329
msgid "Stay unmoved"
msgstr "Остаются неподвижными"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1333
+#: ../src/ui/dialog/inkscape-preferences.cpp:1331
msgid "Move according to transform"
msgstr "Двигаются в соответствии с transform="
-#: ../src/ui/dialog/inkscape-preferences.cpp:1335
+#: ../src/ui/dialog/inkscape-preferences.cpp:1333
msgid "Are unlinked"
msgstr "Отсоединяются"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1337
+#: ../src/ui/dialog/inkscape-preferences.cpp:1335
msgid "Are deleted"
msgstr "Удаляются"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1340
+#: ../src/ui/dialog/inkscape-preferences.cpp:1338
msgid "Moving original: clones and linked offsets"
msgstr "При перемещении оригинала его клоны и потомки"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1342
+#: ../src/ui/dialog/inkscape-preferences.cpp:1340
msgid "Clones are translated by the same vector as their original"
msgstr "Каждый клон сдвигается по тому же вектору, что и его оригинал."
-#: ../src/ui/dialog/inkscape-preferences.cpp:1344
+#: ../src/ui/dialog/inkscape-preferences.cpp:1342
msgid "Clones preserve their positions when their original is moved"
msgstr "Клоны остаются на месте, когда перемещаются их оригиналы."
-#: ../src/ui/dialog/inkscape-preferences.cpp:1346
+#: ../src/ui/dialog/inkscape-preferences.cpp:1344
msgid ""
"Each clone moves according to the value of its transform= attribute; for "
"example, a rotated clone will move in a different direction than its original"
@@ -20425,27 +20527,27 @@ msgstr ""
"Например, повёрнутый клон будет перемещаться в ином направлении, нежели его "
"оригинал."
-#: ../src/ui/dialog/inkscape-preferences.cpp:1347
+#: ../src/ui/dialog/inkscape-preferences.cpp:1345
msgid "Deleting original: clones"
msgstr "При удалении оригиналов клоны"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1349
+#: ../src/ui/dialog/inkscape-preferences.cpp:1347
msgid "Orphaned clones are converted to regular objects"
msgstr "Осиротевшие клоны преобразуются в обычные объекты"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1351
+#: ../src/ui/dialog/inkscape-preferences.cpp:1349
msgid "Orphaned clones are deleted along with their original"
msgstr "Осиротевшие клоны удаляются вместе с их оригиналом"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1353
+#: ../src/ui/dialog/inkscape-preferences.cpp:1351
msgid "Duplicating original+clones/linked offset"
msgstr "При дублировании оригиналов с клонами и связканными втяжками"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1355
+#: ../src/ui/dialog/inkscape-preferences.cpp:1353
msgid "Relink duplicated clones"
msgstr "Повторно связывать продублированные клоны"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1357
+#: ../src/ui/dialog/inkscape-preferences.cpp:1355
msgid ""
"When duplicating a selection containing both a clone and its original "
"(possibly in groups), relink the duplicated clone to the duplicated original "
@@ -20456,27 +20558,27 @@ msgstr ""
"оригиналом вместо первого оригинала."
#. TRANSLATORS: Heading for the Inkscape Preferences "Clones" Page
-#: ../src/ui/dialog/inkscape-preferences.cpp:1360
+#: ../src/ui/dialog/inkscape-preferences.cpp:1358
msgid "Clones"
msgstr "Клоны"
#. Clip paths and masks options
-#: ../src/ui/dialog/inkscape-preferences.cpp:1363
+#: ../src/ui/dialog/inkscape-preferences.cpp:1361
msgid "When applying, use the topmost selected object as clippath/mask"
msgstr "Верхний выбранный объект — обтравочный контур или маска"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1365
+#: ../src/ui/dialog/inkscape-preferences.cpp:1363
msgid ""
"Uncheck this to use the bottom selected object as the clipping path or mask"
msgstr ""
"Отключите эту опцию, если хотите использовать в качестве обтравочного "
"контура или маски самый нижний из выбранных объектов"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1366
+#: ../src/ui/dialog/inkscape-preferences.cpp:1364
msgid "Remove clippath/mask object after applying"
msgstr "Убрать обтравочный контур или маску после применения"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1368
+#: ../src/ui/dialog/inkscape-preferences.cpp:1366
msgid ""
"After applying, remove the object used as the clipping path or mask from the "
"drawing"
@@ -20484,110 +20586,109 @@ msgstr ""
"По применении удалить из рисунка объект, использованный в качестве "
"обтравочного контура или маски"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1370
+#: ../src/ui/dialog/inkscape-preferences.cpp:1368
msgid "Before applying"
msgstr "Перед применением"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1372
+#: ../src/ui/dialog/inkscape-preferences.cpp:1370
msgid "Do not group clipped/masked objects"
msgstr "Не группировать обтравленные или замаскированные объекты"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1373
+#: ../src/ui/dialog/inkscape-preferences.cpp:1371
msgid "Put every clipped/masked object in its own group"
msgstr "Помещать каждый обтравленный/замаскированный объект в свою группу"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1374
+#: ../src/ui/dialog/inkscape-preferences.cpp:1372
msgid "Put all clipped/masked objects into one group"
msgstr "Помещать все обтравленные/замаскированные объекты в одну группу"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1377
+#: ../src/ui/dialog/inkscape-preferences.cpp:1375
msgid "Apply clippath/mask to every object"
msgstr "Применить обтравочный контур или маску к каждому объекту"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1380
+#: ../src/ui/dialog/inkscape-preferences.cpp:1378
msgid "Apply clippath/mask to groups containing single object"
msgstr ""
"Применить обтравочный контур или маску к группам, содержащим единичные "
"объекты"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1383
+#: ../src/ui/dialog/inkscape-preferences.cpp:1381
msgid "Apply clippath/mask to group containing all objects"
msgstr ""
"Применить обтравочный контур или маску к группе, содержащей все объекты"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1385
+#: ../src/ui/dialog/inkscape-preferences.cpp:1383
msgid "After releasing"
msgstr "После снятия"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1387
+#: ../src/ui/dialog/inkscape-preferences.cpp:1385
msgid "Ungroup automatically created groups"
msgstr "Разгруппировать автоматически созданные группы"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1389
+#: ../src/ui/dialog/inkscape-preferences.cpp:1387
msgid "Ungroup groups created when setting clip/mask"
msgstr ""
"Разгруппировать группы, созданные при наложении обтравочного контура или "
"маски"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1391
+#: ../src/ui/dialog/inkscape-preferences.cpp:1389
msgid "Clippaths and masks"
msgstr "Обтравочные контуры и маски"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1394
+#: ../src/ui/dialog/inkscape-preferences.cpp:1392
msgid "Stroke Style Markers"
msgstr "Маркеры со стилем обводки"
+#: ../src/ui/dialog/inkscape-preferences.cpp:1394
#: ../src/ui/dialog/inkscape-preferences.cpp:1396
-#: ../src/ui/dialog/inkscape-preferences.cpp:1398
msgid ""
"Stroke color same as object, fill color either object fill color or marker "
"fill color"
msgstr ""
-#: ../src/ui/dialog/inkscape-preferences.cpp:1402
+#: ../src/ui/dialog/inkscape-preferences.cpp:1400
#: ../share/extensions/hershey.inx.h:27
msgid "Markers"
msgstr "Маркеры"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1405
+#: ../src/ui/dialog/inkscape-preferences.cpp:1403
msgid "Document cleanup"
msgstr "Очистка документов"
+#: ../src/ui/dialog/inkscape-preferences.cpp:1404
#: ../src/ui/dialog/inkscape-preferences.cpp:1406
-#: ../src/ui/dialog/inkscape-preferences.cpp:1408
msgid "Remove unused swatches when doing a document cleanup"
msgstr "Удалять неиспользованные цветовые образцы при очистке"
#. tooltip
-#: ../src/ui/dialog/inkscape-preferences.cpp:1409
+#: ../src/ui/dialog/inkscape-preferences.cpp:1407
msgid "Cleanup"
msgstr "Очистка"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1417
+#: ../src/ui/dialog/inkscape-preferences.cpp:1415
msgid "Number of _Threads:"
msgstr "_Количество потоков:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1417
-#: ../src/ui/dialog/inkscape-preferences.cpp:1953
+#: ../src/ui/dialog/inkscape-preferences.cpp:1415
+#: ../src/ui/dialog/inkscape-preferences.cpp:1951
msgid "(requires restart)"
msgstr "(требует перезапуска программы)"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1418
+#: ../src/ui/dialog/inkscape-preferences.cpp:1416
#, fuzzy
msgid "Configure number of processors/threads to use when rendering filters"
msgstr "Количество процессоров/потоков при визуализации гауссова размывания"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1422
+#: ../src/ui/dialog/inkscape-preferences.cpp:1420
msgid "Rendering _cache size:"
msgstr "_Размер кэша для рендеринга:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1422
-#, fuzzy
+#: ../src/ui/dialog/inkscape-preferences.cpp:1420
msgctxt "mebibyte (2^20 bytes) abbreviation"
msgid "MiB"
-msgstr "Мин:"
+msgstr ""
-#: ../src/ui/dialog/inkscape-preferences.cpp:1422
+#: ../src/ui/dialog/inkscape-preferences.cpp:1420
msgid ""
"Set the amount of memory per document which can be used to store rendered "
"parts of the drawing for later reuse; set to zero to disable caching"
@@ -20595,37 +20696,37 @@ msgstr ""
#. blur quality
#. filter quality
-#: ../src/ui/dialog/inkscape-preferences.cpp:1425
-#: ../src/ui/dialog/inkscape-preferences.cpp:1449
+#: ../src/ui/dialog/inkscape-preferences.cpp:1423
+#: ../src/ui/dialog/inkscape-preferences.cpp:1447
msgid "Best quality (slowest)"
msgstr "Наилучшее качество (самая медленная отрисовка)"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1427
-#: ../src/ui/dialog/inkscape-preferences.cpp:1451
+#: ../src/ui/dialog/inkscape-preferences.cpp:1425
+#: ../src/ui/dialog/inkscape-preferences.cpp:1449
msgid "Better quality (slower)"
msgstr "Хорошее качество (медленная отрисовка)"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1429
-#: ../src/ui/dialog/inkscape-preferences.cpp:1453
+#: ../src/ui/dialog/inkscape-preferences.cpp:1427
+#: ../src/ui/dialog/inkscape-preferences.cpp:1451
msgid "Average quality"
msgstr "Среднее качество"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1431
-#: ../src/ui/dialog/inkscape-preferences.cpp:1455
+#: ../src/ui/dialog/inkscape-preferences.cpp:1429
+#: ../src/ui/dialog/inkscape-preferences.cpp:1453
msgid "Lower quality (faster)"
msgstr "Низкое качество (быстрая отрисовка)"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1433
-#: ../src/ui/dialog/inkscape-preferences.cpp:1457
+#: ../src/ui/dialog/inkscape-preferences.cpp:1431
+#: ../src/ui/dialog/inkscape-preferences.cpp:1455
msgid "Lowest quality (fastest)"
msgstr "Самое низкое качество (самая быстрая отрисовка)"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1436
+#: ../src/ui/dialog/inkscape-preferences.cpp:1434
msgid "Gaussian blur quality for display"
msgstr "Качество гауссова размывания на экране"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1438
-#: ../src/ui/dialog/inkscape-preferences.cpp:1462
+#: ../src/ui/dialog/inkscape-preferences.cpp:1436
+#: ../src/ui/dialog/inkscape-preferences.cpp:1460
msgid ""
"Best quality, but display may be very slow at high zooms (bitmap export "
"always uses best quality)"
@@ -20633,161 +20734,161 @@ msgstr ""
"Наилучшее качество, но при большом масштабе отрисовка очень медленная (при "
"экспорте качество остаётся максимальным)"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1440
-#: ../src/ui/dialog/inkscape-preferences.cpp:1464
+#: ../src/ui/dialog/inkscape-preferences.cpp:1438
+#: ../src/ui/dialog/inkscape-preferences.cpp:1462
msgid "Better quality, but slower display"
msgstr "Хорошее качество, но невысокая скорость"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1442
-#: ../src/ui/dialog/inkscape-preferences.cpp:1466
+#: ../src/ui/dialog/inkscape-preferences.cpp:1440
+#: ../src/ui/dialog/inkscape-preferences.cpp:1464
msgid "Average quality, acceptable display speed"
msgstr "Среднее качество, приемлимая скорость отрисовки"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1444
-#: ../src/ui/dialog/inkscape-preferences.cpp:1468
+#: ../src/ui/dialog/inkscape-preferences.cpp:1442
+#: ../src/ui/dialog/inkscape-preferences.cpp:1466
msgid "Lower quality (some artifacts), but display is faster"
msgstr "Низкое качество с видимым артефактами, но быстрая отрисовка"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1446
-#: ../src/ui/dialog/inkscape-preferences.cpp:1470
+#: ../src/ui/dialog/inkscape-preferences.cpp:1444
+#: ../src/ui/dialog/inkscape-preferences.cpp:1468
msgid "Lowest quality (considerable artifacts), but display is fastest"
msgstr ""
"Очень низкое качество с достаточно заметными артефактами, но очень быстрая "
"отрисовка"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1460
+#: ../src/ui/dialog/inkscape-preferences.cpp:1458
msgid "Filter effects quality for display"
msgstr "Качество фильтров эффектов на экране"
#. build custom preferences tab
-#: ../src/ui/dialog/inkscape-preferences.cpp:1472
+#: ../src/ui/dialog/inkscape-preferences.cpp:1470
#: ../src/ui/dialog/print.cpp:215
msgid "Rendering"
msgstr "Тип печати"
#. Note: /options/bitmapoversample removed with Cairo renderer
-#: ../src/ui/dialog/inkscape-preferences.cpp:1478 ../src/verbs.cpp:156
+#: ../src/ui/dialog/inkscape-preferences.cpp:1476 ../src/verbs.cpp:156
#: ../src/widgets/calligraphy-toolbar.cpp:626
msgid "Edit"
msgstr "Правка"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1479
+#: ../src/ui/dialog/inkscape-preferences.cpp:1477
msgid "Automatically reload bitmaps"
msgstr "Автоматически перезагружать растровые файлы"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1481
+#: ../src/ui/dialog/inkscape-preferences.cpp:1479
msgid "Automatically reload linked images when file is changed on disk"
msgstr ""
"Автоматически заново загружать связанные изображения, когда они меняются на "
"диске"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1483
+#: ../src/ui/dialog/inkscape-preferences.cpp:1481
msgid "_Bitmap editor:"
msgstr "_Редактор растровых файлов:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1485
-#: ../share/extensions/guillotine.inx.h:5 ../share/extensions/plotter.inx.h:67
+#: ../src/ui/dialog/inkscape-preferences.cpp:1483
+#: ../share/extensions/guillotine.inx.h:5 ../share/extensions/plotter.inx.h:65
#: ../share/extensions/print_win32_vector.inx.h:2
msgid "Export"
msgstr "Экспорт"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1487
+#: ../src/ui/dialog/inkscape-preferences.cpp:1485
msgid "Default export _resolution:"
msgstr "Разрешение для _экспорта по умолчанию:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1488
+#: ../src/ui/dialog/inkscape-preferences.cpp:1486
msgid "Default bitmap resolution (in dots per inch) in the Export dialog"
msgstr "Разрешение растра (в точках на дюйм) в диалоге экспорта по умолчанию"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1489
+#: ../src/ui/dialog/inkscape-preferences.cpp:1487
#: ../src/ui/dialog/xml-tree.cpp:920
msgid "Create"
msgstr "Создать"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1491
+#: ../src/ui/dialog/inkscape-preferences.cpp:1489
msgid "Resolution for Create Bitmap _Copy:"
msgstr "Разрешение для создания растровой _копии:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1492
+#: ../src/ui/dialog/inkscape-preferences.cpp:1490
msgid "Resolution used by the Create Bitmap Copy command"
msgstr "Разрешение растра при создании растровой копии выделения"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1495
+#: ../src/ui/dialog/inkscape-preferences.cpp:1493
msgid "Ask about linking and scaling when importing"
msgstr ""
-#: ../src/ui/dialog/inkscape-preferences.cpp:1497
+#: ../src/ui/dialog/inkscape-preferences.cpp:1495
msgid "Pop-up linking and scaling dialog when importing bitmap image."
msgstr ""
-#: ../src/ui/dialog/inkscape-preferences.cpp:1503
+#: ../src/ui/dialog/inkscape-preferences.cpp:1501
msgid "Bitmap link:"
msgstr ""
-#: ../src/ui/dialog/inkscape-preferences.cpp:1510
+#: ../src/ui/dialog/inkscape-preferences.cpp:1508
msgid "Bitmap scale (image-rendering):"
msgstr "Масштабирование растра (при отрисовке):"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1515
+#: ../src/ui/dialog/inkscape-preferences.cpp:1513
msgid "Default _import resolution:"
msgstr "Разрешение для _импорта по умолчанию:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1516
+#: ../src/ui/dialog/inkscape-preferences.cpp:1514
#, fuzzy
msgid "Default bitmap resolution (in dots per inch) for bitmap import"
msgstr "Разрешение растра (в точках на дюйм) в диалоге экспорта по умолчанию"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1517
+#: ../src/ui/dialog/inkscape-preferences.cpp:1515
#, fuzzy
msgid "Override file resolution"
msgstr "Разрешение для экспорта:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1519
+#: ../src/ui/dialog/inkscape-preferences.cpp:1517
#, fuzzy
msgid "Use default bitmap resolution in favor of information from file"
msgstr "Разрешение растра (в точках на дюйм) в диалоге экспорта по умолчанию"
#. rendering outlines for pixmap image tags
-#: ../src/ui/dialog/inkscape-preferences.cpp:1523
+#: ../src/ui/dialog/inkscape-preferences.cpp:1521
#, fuzzy
msgid "Images in Outline Mode"
msgstr "Нарисовать абрис вокруг"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1524
+#: ../src/ui/dialog/inkscape-preferences.cpp:1522
msgid ""
"When active will render images while in outline mode instead of a red box "
"with an x. This is useful for manual tracing."
msgstr ""
-#: ../src/ui/dialog/inkscape-preferences.cpp:1526
+#: ../src/ui/dialog/inkscape-preferences.cpp:1524
msgid "Bitmaps"
msgstr "Растр"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1538
+#: ../src/ui/dialog/inkscape-preferences.cpp:1536
msgid ""
"Select a file of predefined shortcuts to use. Any customized shortcuts you "
"create will be added separately to "
msgstr ""
-#: ../src/ui/dialog/inkscape-preferences.cpp:1541
+#: ../src/ui/dialog/inkscape-preferences.cpp:1539
msgid "Shortcut file:"
msgstr "Файл схемы:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1544
+#: ../src/ui/dialog/inkscape-preferences.cpp:1542
#: ../src/ui/dialog/template-load-tab.cpp:48
msgid "Search:"
msgstr "Искать:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1556
+#: ../src/ui/dialog/inkscape-preferences.cpp:1554
msgid "Shortcut"
msgstr "Комбинация"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1557
+#: ../src/ui/dialog/inkscape-preferences.cpp:1555
#: ../src/ui/widget/page-sizer.cpp:287
msgid "Description"
msgstr "Описание"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1612
+#: ../src/ui/dialog/inkscape-preferences.cpp:1610
msgid ""
"Remove all your customized keyboard shortcuts, and revert to the shortcuts "
"in the shortcut file listed above"
@@ -20795,47 +20896,47 @@ msgstr ""
"Удалить все заказные клавиатурные комбинации и переключиться на указанные в "
"выбранной предустановке"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1616
+#: ../src/ui/dialog/inkscape-preferences.cpp:1614
#, fuzzy
msgid "Import ..."
msgstr "_Импортировать..."
-#: ../src/ui/dialog/inkscape-preferences.cpp:1616
+#: ../src/ui/dialog/inkscape-preferences.cpp:1614
msgid "Import custom keyboard shortcuts from a file"
msgstr ""
-#: ../src/ui/dialog/inkscape-preferences.cpp:1619
+#: ../src/ui/dialog/inkscape-preferences.cpp:1617
msgid "Export ..."
msgstr "Экспортировать..."
-#: ../src/ui/dialog/inkscape-preferences.cpp:1619
+#: ../src/ui/dialog/inkscape-preferences.cpp:1617
#, fuzzy
msgid "Export custom keyboard shortcuts to a file"
msgstr "Экспортировать документ в файл PS"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1629
+#: ../src/ui/dialog/inkscape-preferences.cpp:1627
msgid "Keyboard Shortcuts"
msgstr "Клавиатурные комбинации"
#. Find this group in the tree
-#: ../src/ui/dialog/inkscape-preferences.cpp:1792
+#: ../src/ui/dialog/inkscape-preferences.cpp:1790
msgid "Misc"
msgstr "Прочее"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1894
+#: ../src/ui/dialog/inkscape-preferences.cpp:1892
msgctxt "Spellchecker language"
msgid "None"
msgstr "Нет"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1915
+#: ../src/ui/dialog/inkscape-preferences.cpp:1913
msgid "Set the main spell check language"
msgstr "Первый по важности язык для проверки орфографии"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1918
+#: ../src/ui/dialog/inkscape-preferences.cpp:1916
msgid "Second language:"
msgstr "Второй язык:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1919
+#: ../src/ui/dialog/inkscape-preferences.cpp:1917
msgid ""
"Set the second spell check language; checking will only stop on words "
"unknown in ALL chosen languages"
@@ -20843,11 +20944,11 @@ msgstr ""
"Второй по важности язык для проверки орфографии; проверка завершится лишь в "
"случае ненахождения слов во ВСЕХ выбранных языках."
-#: ../src/ui/dialog/inkscape-preferences.cpp:1922
+#: ../src/ui/dialog/inkscape-preferences.cpp:1920
msgid "Third language:"
msgstr "Третий язык:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1923
+#: ../src/ui/dialog/inkscape-preferences.cpp:1921
msgid ""
"Set the third spell check language; checking will only stop on words unknown "
"in ALL chosen languages"
@@ -20855,32 +20956,32 @@ msgstr ""
"Третий по важности язык для проверки орфографии; проверка завершится лишь в "
"случае ненахождения слов во ВСЕХ выбранных языках."
-#: ../src/ui/dialog/inkscape-preferences.cpp:1925
+#: ../src/ui/dialog/inkscape-preferences.cpp:1923
msgid "Ignore words with digits"
msgstr "Игнорировать слова с цифрами"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1927
+#: ../src/ui/dialog/inkscape-preferences.cpp:1925
msgid "Ignore words containing digits, such as \"R2D2\""
msgstr "Инорировать слова, содержащие цифры — например, \"R2D2\""
-#: ../src/ui/dialog/inkscape-preferences.cpp:1929
+#: ../src/ui/dialog/inkscape-preferences.cpp:1927
msgid "Ignore words in ALL CAPITALS"
msgstr "Игнорировать слова, написанные заглавными"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1931
+#: ../src/ui/dialog/inkscape-preferences.cpp:1929
msgid "Ignore words in all capitals, such as \"IUPAC\""
msgstr "Игнорировать слова, написанные заглавными — например, «НИИЧАВО»"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1933
+#: ../src/ui/dialog/inkscape-preferences.cpp:1931
msgid "Spellcheck"
msgstr "Проверка орфографии"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1953
+#: ../src/ui/dialog/inkscape-preferences.cpp:1951
#, fuzzy
msgid "Latency _skew:"
msgstr "Отклонение задержки:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1954
+#: ../src/ui/dialog/inkscape-preferences.cpp:1952
#, fuzzy
msgid ""
"Factor by which the event clock is skewed from the actual time (0.9766 on "
@@ -20889,11 +20990,11 @@ msgstr ""
"Коэффициент, на который часы событий отклоняются от настоящего времени "
"(0.9766 в некоторых системах)"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1956
+#: ../src/ui/dialog/inkscape-preferences.cpp:1954
msgid "Pre-render named icons"
msgstr "Предварительно отрисовывать именованные значки"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1958
+#: ../src/ui/dialog/inkscape-preferences.cpp:1956
msgid ""
"When on, named icons will be rendered before displaying the ui. This is for "
"working around bugs in GTK+ named icon notification"
@@ -20902,89 +21003,89 @@ msgstr ""
"интерфейса. Это местечковое решение ошибки в GTK+, касающейся именованных "
"значков."
-#: ../src/ui/dialog/inkscape-preferences.cpp:1966
+#: ../src/ui/dialog/inkscape-preferences.cpp:1964
msgid "System info"
msgstr "Информация о системе"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1970
+#: ../src/ui/dialog/inkscape-preferences.cpp:1968
msgid "User config: "
msgstr "Пользовательская конфигурация:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1970
+#: ../src/ui/dialog/inkscape-preferences.cpp:1968
msgid "Location of users configuration"
msgstr ""
-#: ../src/ui/dialog/inkscape-preferences.cpp:1974
+#: ../src/ui/dialog/inkscape-preferences.cpp:1972
msgid "User preferences: "
msgstr "Пользовательские предпочтения:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1974
+#: ../src/ui/dialog/inkscape-preferences.cpp:1972
#, fuzzy
msgid "Location of the users preferences file"
msgstr "Не удалось загрузить файл параметров %s."
-#: ../src/ui/dialog/inkscape-preferences.cpp:1978
+#: ../src/ui/dialog/inkscape-preferences.cpp:1976
msgid "User extensions: "
msgstr "Пользовательские расширения:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1978
+#: ../src/ui/dialog/inkscape-preferences.cpp:1976
#, fuzzy
msgid "Location of the users extensions"
msgstr "Информация о расширениях Inkscape"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1982
+#: ../src/ui/dialog/inkscape-preferences.cpp:1980
msgid "User cache: "
msgstr "Кэш пользователя:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1982
+#: ../src/ui/dialog/inkscape-preferences.cpp:1980
msgid "Location of users cache"
msgstr ""
-#: ../src/ui/dialog/inkscape-preferences.cpp:1990
+#: ../src/ui/dialog/inkscape-preferences.cpp:1988
msgid "Temporary files: "
msgstr "Временные файлы:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1990
+#: ../src/ui/dialog/inkscape-preferences.cpp:1988
msgid "Location of the temporary files used for autosave"
msgstr ""
-#: ../src/ui/dialog/inkscape-preferences.cpp:1994
+#: ../src/ui/dialog/inkscape-preferences.cpp:1992
#, fuzzy
msgid "Inkscape data: "
msgstr "Руководство по Inkscape"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1994
+#: ../src/ui/dialog/inkscape-preferences.cpp:1992
#, fuzzy
msgid "Location of Inkscape data"
msgstr "Информация о расширениях Inkscape"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1998
+#: ../src/ui/dialog/inkscape-preferences.cpp:1996
msgid "Inkscape extensions: "
msgstr "Расширения Inkscape:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:1998
+#: ../src/ui/dialog/inkscape-preferences.cpp:1996
#, fuzzy
msgid "Location of the Inkscape extensions"
msgstr "Информация о расширениях Inkscape"
-#: ../src/ui/dialog/inkscape-preferences.cpp:2007
+#: ../src/ui/dialog/inkscape-preferences.cpp:2005
msgid "System data: "
msgstr "Данные о системе"
-#: ../src/ui/dialog/inkscape-preferences.cpp:2007
+#: ../src/ui/dialog/inkscape-preferences.cpp:2005
msgid "Locations of system data"
msgstr ""
-#: ../src/ui/dialog/inkscape-preferences.cpp:2031
+#: ../src/ui/dialog/inkscape-preferences.cpp:2029
msgid "Icon theme: "
msgstr "Тема значков:"
-#: ../src/ui/dialog/inkscape-preferences.cpp:2031
+#: ../src/ui/dialog/inkscape-preferences.cpp:2029
#, fuzzy
msgid "Locations of icon themes"
msgstr "Информация о расширениях Inkscape"
-#: ../src/ui/dialog/inkscape-preferences.cpp:2033
+#: ../src/ui/dialog/inkscape-preferences.cpp:2031
msgid "System"
msgstr "Системный"
@@ -21024,6 +21125,7 @@ msgstr "Связь:"
#: ../src/ui/dialog/input.cpp:742 ../src/ui/dialog/input.cpp:743
#: ../src/ui/dialog/input.cpp:1571 ../src/ui/widget/color-scales.cpp:46
+#: ../share/extensions/plotter.inx.h:24
msgid "None"
msgstr "Нет"
@@ -21067,7 +21169,8 @@ msgid ""
msgstr ""
#: ../src/ui/dialog/input.cpp:1616 ../src/widgets/calligraphy-toolbar.cpp:578
-#: ../src/widgets/spray-toolbar.cpp:224 ../src/widgets/tweak-toolbar.cpp:372
+#: ../src/widgets/spray-toolbar.cpp:303 ../src/widgets/spray-toolbar.cpp:419
+#: ../src/widgets/spray-toolbar.cpp:468 ../src/widgets/tweak-toolbar.cpp:372
msgid "Pressure"
msgstr "Нажим"
@@ -21079,8 +21182,7 @@ msgstr ""
msgid "Y tilt"
msgstr ""
-#: ../src/ui/dialog/input.cpp:1616
-#: ../src/ui/widget/color-wheel-selector.cpp:29
+#: ../src/ui/dialog/input.cpp:1616 ../src/ui/widget/color-wheel-selector.cpp:29
msgid "Wheel"
msgstr "Круг"
@@ -21611,25 +21713,30 @@ msgid "Set object blur"
msgstr "Установка метки объекта"
#: ../src/ui/dialog/objects.cpp:1617
+msgctxt "Visibility"
msgid "V"
msgstr ""
-#. TRANSLATORS: "L" here stands for Lightness
-#: ../src/ui/dialog/objects.cpp:1618 ../src/widgets/tweak-toolbar.cpp:323
+#: ../src/ui/dialog/objects.cpp:1618
+#, fuzzy
+msgctxt "Lock"
msgid "L"
msgstr "L"
#: ../src/ui/dialog/objects.cpp:1619
+msgctxt "Type"
msgid "T"
msgstr ""
#: ../src/ui/dialog/objects.cpp:1620
#, fuzzy
+msgctxt "Clip and mask"
msgid "CM"
msgstr "CMS"
#: ../src/ui/dialog/objects.cpp:1621
#, fuzzy
+msgctxt "Highlight"
msgid "HL"
msgstr "HSL"
@@ -21752,7 +21859,7 @@ msgid "Unset Clip"
msgstr "Применить о_бтравочный контур"
#. Set mask
-#: ../src/ui/dialog/objects.cpp:1926 ../src/ui/interface.cpp:1739
+#: ../src/ui/dialog/objects.cpp:1926 ../src/ui/interface.cpp:1735
msgid "Set Mask"
msgstr "Применить маску"
@@ -21902,18 +22009,15 @@ msgstr ""
msgid "Output"
msgstr "Вывод"
-#: ../src/ui/dialog/pixelartdialog.cpp:297
-#: ../src/ui/dialog/tracedialog.cpp:814
+#: ../src/ui/dialog/pixelartdialog.cpp:297 ../src/ui/dialog/tracedialog.cpp:814
msgid "Reset all settings to defaults"
msgstr "Сбросить значения всех параметров до исходных"
-#: ../src/ui/dialog/pixelartdialog.cpp:302
-#: ../src/ui/dialog/tracedialog.cpp:819
+#: ../src/ui/dialog/pixelartdialog.cpp:302 ../src/ui/dialog/tracedialog.cpp:819
msgid "Abort a trace in progress"
msgstr "Прервать векторизацию"
-#: ../src/ui/dialog/pixelartdialog.cpp:306
-#: ../src/ui/dialog/tracedialog.cpp:823
+#: ../src/ui/dialog/pixelartdialog.cpp:306 ../src/ui/dialog/tracedialog.cpp:823
msgid "Execute the trace"
msgstr "Векторизовать"
@@ -22288,8 +22392,7 @@ msgid "Preview Text:"
msgstr "Текст:"
#: ../src/ui/dialog/swatches.cpp:202 ../src/ui/tools/gradient-tool.cpp:360
-#: ../src/ui/tools/gradient-tool.cpp:458
-#: ../src/widgets/gradient-vector.cpp:801
+#: ../src/ui/tools/gradient-tool.cpp:458 ../src/widgets/gradient-vector.cpp:801
msgid "Add gradient stop"
msgstr "Добавка опорной точки в градиент"
@@ -22423,7 +22526,7 @@ msgstr "_Использовать по умолчанию"
#: ../src/ui/dialog/text-edit.cpp:87
#, fuzzy
-msgid "AaBbCcIiPpQq12369$ےے?.;/()"
+msgid "AaBbCcIiPpQq12369$€¢?.;/()"
msgstr "АаБбВвГгЁёФфЩщЯя$€¢?.;/()"
#. Align buttons
@@ -22463,7 +22566,7 @@ msgstr "Межстрочный интервал (в % от кегля шрифт
msgid "Text path offset"
msgstr "Смещение текста от контура"
-#: ../src/ui/dialog/text-edit.cpp:598 ../src/ui/dialog/text-edit.cpp:685
+#: ../src/ui/dialog/text-edit.cpp:612 ../src/ui/dialog/text-edit.cpp:699
#: ../src/ui/tools/text-tool.cpp:1446
msgid "Set text style"
msgstr "Смена стиля текста"
@@ -23044,36 +23147,36 @@ msgstr "Настроить под широкоформатные экраны"
msgid "Verb \"%s\" Unknown"
msgstr "Глагол \"%s\" неизвестен"
-#: ../src/ui/interface.cpp:901
+#: ../src/ui/interface.cpp:897
msgid "Open _Recent"
msgstr "Открыть н_едавние"
-#: ../src/ui/interface.cpp:1009 ../src/ui/interface.cpp:1095
-#: ../src/ui/interface.cpp:1198 ../src/ui/widget/selected-style.cpp:544
+#: ../src/ui/interface.cpp:1005 ../src/ui/interface.cpp:1091
+#: ../src/ui/interface.cpp:1194 ../src/ui/widget/selected-style.cpp:544
msgid "Drop color"
msgstr "Перенос цвета"
-#: ../src/ui/interface.cpp:1048 ../src/ui/interface.cpp:1158
+#: ../src/ui/interface.cpp:1044 ../src/ui/interface.cpp:1154
msgid "Drop color on gradient"
msgstr "Перенос цвета на градиент"
-#: ../src/ui/interface.cpp:1211
+#: ../src/ui/interface.cpp:1207
msgid "Could not parse SVG data"
msgstr "Невозможно разобрать данные SVG"
-#: ../src/ui/interface.cpp:1250
+#: ../src/ui/interface.cpp:1246
msgid "Drop SVG"
msgstr "Drop SVG"
-#: ../src/ui/interface.cpp:1263
+#: ../src/ui/interface.cpp:1259
msgid "Drop Symbol"
msgstr ""
-#: ../src/ui/interface.cpp:1294
+#: ../src/ui/interface.cpp:1290
msgid "Drop bitmap image"
msgstr "Импорт растра"
-#: ../src/ui/interface.cpp:1386
+#: ../src/ui/interface.cpp:1382
#, c-format
msgid ""
"<span weight=\"bold\" size=\"larger\">A file named \"%s\" already exists. Do "
@@ -23086,167 +23189,167 @@ msgstr ""
"\n"
"Этот файл уже есть в каталоге \"%s\". Замена перезапишет его содержание."
-#: ../src/ui/interface.cpp:1393 ../share/extensions/web-set-att.inx.h:21
+#: ../src/ui/interface.cpp:1389 ../share/extensions/web-set-att.inx.h:21
#: ../share/extensions/web-transmit-att.inx.h:19
msgid "Replace"
msgstr "Заменить"
-#: ../src/ui/interface.cpp:1464
+#: ../src/ui/interface.cpp:1460
msgid "Go to parent"
msgstr "На уровень выше"
#. TRANSLATORS: #%1 is the id of the group e.g. <g id="#g7">, not a number.
-#: ../src/ui/interface.cpp:1505
+#: ../src/ui/interface.cpp:1501
msgid "Enter group #%1"
msgstr "Войти в группу #%1"
#. Item dialog
-#: ../src/ui/interface.cpp:1641 ../src/verbs.cpp:2901
+#: ../src/ui/interface.cpp:1637 ../src/verbs.cpp:2901
msgid "_Object Properties..."
msgstr "_Свойства объекта..."
-#: ../src/ui/interface.cpp:1650
+#: ../src/ui/interface.cpp:1646
msgid "_Select This"
msgstr "_Выделить это"
-#: ../src/ui/interface.cpp:1661
+#: ../src/ui/interface.cpp:1657
msgid "Select Same"
msgstr "Выбрать одинаковые"
#. Select same fill and stroke
-#: ../src/ui/interface.cpp:1671
+#: ../src/ui/interface.cpp:1667
msgid "Fill and Stroke"
msgstr "Заливку и обводку"
#. Select same fill color
-#: ../src/ui/interface.cpp:1678
+#: ../src/ui/interface.cpp:1674
msgid "Fill Color"
msgstr "Цвет заливки"
#. Select same stroke color
-#: ../src/ui/interface.cpp:1685
+#: ../src/ui/interface.cpp:1681
msgid "Stroke Color"
msgstr "Цвет обводки"
#. Select same stroke style
-#: ../src/ui/interface.cpp:1692
+#: ../src/ui/interface.cpp:1688
msgid "Stroke Style"
msgstr "Стиль обводки"
#. Select same stroke style
-#: ../src/ui/interface.cpp:1699
+#: ../src/ui/interface.cpp:1695
msgid "Object type"
msgstr "Тип объекта"
#. Move to layer
-#: ../src/ui/interface.cpp:1706
+#: ../src/ui/interface.cpp:1702
msgid "_Move to layer ..."
msgstr "Пере_местить на слой..."
#. Create link
-#: ../src/ui/interface.cpp:1716
+#: ../src/ui/interface.cpp:1712
msgid "Create _Link"
msgstr "Создать сс_ылку"
#. Release mask
-#: ../src/ui/interface.cpp:1750
+#: ../src/ui/interface.cpp:1746
msgid "Release Mask"
msgstr "Снять маску"
#. SSet Clip Group
-#: ../src/ui/interface.cpp:1761
+#: ../src/ui/interface.cpp:1757
#, fuzzy
msgid "Create Clip G_roup"
msgstr "Создать _клон"
#. Set Clip
-#: ../src/ui/interface.cpp:1768
+#: ../src/ui/interface.cpp:1764
msgid "Set Cl_ip"
msgstr "Применить о_бтравочный контур"
#. Release Clip
-#: ../src/ui/interface.cpp:1779
+#: ../src/ui/interface.cpp:1775
msgid "Release C_lip"
msgstr "С_нять обтравочный контур"
#. Group
-#: ../src/ui/interface.cpp:1790 ../src/verbs.cpp:2534
+#: ../src/ui/interface.cpp:1786 ../src/verbs.cpp:2534
msgid "_Group"
msgstr "С_группировать"
-#: ../src/ui/interface.cpp:1861
+#: ../src/ui/interface.cpp:1857
msgid "Create link"
msgstr "Создание ссылки"
#. Ungroup
-#: ../src/ui/interface.cpp:1896 ../src/verbs.cpp:2536
+#: ../src/ui/interface.cpp:1892 ../src/verbs.cpp:2536
msgid "_Ungroup"
msgstr "Разгр_уппировать"
#. Link dialog
-#: ../src/ui/interface.cpp:1920
+#: ../src/ui/interface.cpp:1916
msgid "Link _Properties..."
msgstr "_Свойства ссылки…"
#. Select item
-#: ../src/ui/interface.cpp:1926
+#: ../src/ui/interface.cpp:1922
msgid "_Follow Link"
msgstr "Перейти по ссылке"
#. Reset transformations
-#: ../src/ui/interface.cpp:1932
+#: ../src/ui/interface.cpp:1928
msgid "_Remove Link"
msgstr "_Удалить ссылку"
-#: ../src/ui/interface.cpp:1963
+#: ../src/ui/interface.cpp:1959
msgid "Remove link"
msgstr "_Удалить ссылку"
#. Image properties
-#: ../src/ui/interface.cpp:1973
+#: ../src/ui/interface.cpp:1969
msgid "Image _Properties..."
msgstr "_Свойства изображения…"
#. Edit externally
-#: ../src/ui/interface.cpp:1979
+#: ../src/ui/interface.cpp:1975
msgid "Edit Externally..."
msgstr "Изменить извне..."
#. Trace Bitmap
#. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize)
-#: ../src/ui/interface.cpp:1988 ../src/verbs.cpp:2597
+#: ../src/ui/interface.cpp:1984 ../src/verbs.cpp:2597
msgid "_Trace Bitmap..."
msgstr "_Векторизовать растр..."
#. Trace Pixel Art
-#: ../src/ui/interface.cpp:1997
+#: ../src/ui/interface.cpp:1993
msgid "Trace Pixel Art"
msgstr "Векторизация пиксельной графики"
-#: ../src/ui/interface.cpp:2007
+#: ../src/ui/interface.cpp:2003
msgctxt "Context menu"
msgid "Embed Image"
msgstr "Встроить изображение"
-#: ../src/ui/interface.cpp:2018
+#: ../src/ui/interface.cpp:2014
msgctxt "Context menu"
msgid "Extract Image..."
msgstr "Извлечь изображение..."
#. Item dialog
#. Fill and Stroke dialog
-#: ../src/ui/interface.cpp:2162 ../src/ui/interface.cpp:2182
+#: ../src/ui/interface.cpp:2158 ../src/ui/interface.cpp:2178
#: ../src/verbs.cpp:2864
msgid "_Fill and Stroke..."
msgstr "_Заливка и обводка..."
#. Edit Text dialog
-#: ../src/ui/interface.cpp:2188 ../src/verbs.cpp:2883
+#: ../src/ui/interface.cpp:2184 ../src/verbs.cpp:2883
msgid "_Text and Font..."
msgstr "_Текст и шрифт..."
#. Spellcheck dialog
-#: ../src/ui/interface.cpp:2194 ../src/verbs.cpp:2891
+#: ../src/ui/interface.cpp:2190 ../src/verbs.cpp:2891
msgid "Check Spellin_g..."
msgstr "Проверить _орфографию..."
@@ -23356,11 +23459,11 @@ msgstr ""
"Удлинять или укорачивать спираль снаружи. <b>Ctrl</b> ограничивает угол. "
"<b>Shift</b> растягивает/вращает как целое."
-#: ../src/ui/object-edit.cpp:1396
+#: ../src/ui/object-edit.cpp:1398
msgid "Adjust the <b>offset distance</b>"
msgstr "Менять <b>расстояние втяжки</b>"
-#: ../src/ui/object-edit.cpp:1433
+#: ../src/ui/object-edit.cpp:1435
msgid "Drag to resize the <b>flowed text frame</b>"
msgstr "Изменять размер <b>текстового блока</b>"
@@ -23710,8 +23813,7 @@ msgid "Rotate handle"
msgstr "Рычаг вращения"
#. We need to call MPM's method because it could have been our last node
-#: ../src/ui/tool/path-manipulator.cpp:1555
-#: ../src/widgets/node-toolbar.cpp:397
+#: ../src/ui/tool/path-manipulator.cpp:1555 ../src/widgets/node-toolbar.cpp:397
msgid "Delete node"
msgstr "Удалить узел"
@@ -23728,19 +23830,19 @@ msgstr "Нарисовать рычаги"
msgid "Retract handle"
msgstr "Втяжка узла"
-#: ../src/ui/tool/transform-handle-set.cpp:195
+#: ../src/ui/tool/transform-handle-set.cpp:203
msgctxt "Transform handle tip"
msgid "<b>Shift+Ctrl</b>: scale uniformly about the rotation center"
msgstr ""
"<b>Shift+Ctrl</b>: масштабирование относительно точки вращения с сохранением "
"пропорций"
-#: ../src/ui/tool/transform-handle-set.cpp:197
+#: ../src/ui/tool/transform-handle-set.cpp:205
msgctxt "Transform handle tip"
msgid "<b>Ctrl:</b> scale uniformly"
msgstr "<b>Shift+Ctrl</b>: масштабирование с сохранением пропорций"
-#: ../src/ui/tool/transform-handle-set.cpp:202
+#: ../src/ui/tool/transform-handle-set.cpp:210
msgctxt "Transform handle tip"
msgid ""
"<b>Shift+Alt</b>: scale using an integer ratio about the rotation center"
@@ -23748,28 +23850,28 @@ msgstr ""
"<b>Shift+Alt</b>: масштабирование относительно точки вращения с "
"коэффициентом соотношения сторон"
-#: ../src/ui/tool/transform-handle-set.cpp:204
+#: ../src/ui/tool/transform-handle-set.cpp:212
msgctxt "Transform handle tip"
msgid "<b>Shift</b>: scale from the rotation center"
msgstr "<b>Shift</b>: масштабирование относительно точки вращения"
-#: ../src/ui/tool/transform-handle-set.cpp:207
+#: ../src/ui/tool/transform-handle-set.cpp:215
msgctxt "Transform handle tip"
msgid "<b>Alt</b>: scale using an integer ratio"
msgstr "<b>Alt</b>: масштабирование с коэффициентом соотношения сторон"
-#: ../src/ui/tool/transform-handle-set.cpp:209
+#: ../src/ui/tool/transform-handle-set.cpp:217
msgctxt "Transform handle tip"
msgid "<b>Scale handle</b>: drag to scale the selection"
msgstr "<b>Рычаг масштабирования</b>: перетаскивание масштабирует выделение"
-#: ../src/ui/tool/transform-handle-set.cpp:214
+#: ../src/ui/tool/transform-handle-set.cpp:222
#, c-format
msgctxt "Transform handle tip"
msgid "Scale by %.2f%% x %.2f%%"
msgstr "Масштабирование на %.2f%%×%.2f%%"
-#: ../src/ui/tool/transform-handle-set.cpp:438
+#: ../src/ui/tool/transform-handle-set.cpp:449
#, c-format
msgctxt "Transform handle tip"
msgid ""
@@ -23778,18 +23880,18 @@ msgid ""
msgstr ""
"<b>Shift+Ctrl</b>: вращает относительно противоположного угла с шагом в %f°"
-#: ../src/ui/tool/transform-handle-set.cpp:441
+#: ../src/ui/tool/transform-handle-set.cpp:452
msgctxt "Transform handle tip"
msgid "<b>Shift</b>: rotate around the opposite corner"
msgstr "<b>Shift</b>: вращает относительно противоположного угла"
-#: ../src/ui/tool/transform-handle-set.cpp:445
+#: ../src/ui/tool/transform-handle-set.cpp:456
#, c-format
msgctxt "Transform handle tip"
msgid "<b>Ctrl</b>: snap angle to %f° increments"
msgstr "<b>Ctrl</b>: вращает с шагом %f°"
-#: ../src/ui/tool/transform-handle-set.cpp:447
+#: ../src/ui/tool/transform-handle-set.cpp:458
msgctxt "Transform handle tip"
msgid ""
"<b>Rotation handle</b>: drag to rotate the selection around the rotation "
@@ -23799,13 +23901,13 @@ msgstr ""
"вращения"
#. event
-#: ../src/ui/tool/transform-handle-set.cpp:452
+#: ../src/ui/tool/transform-handle-set.cpp:463
#, c-format
msgctxt "Transform handle tip"
msgid "Rotate by %.2f°"
msgstr "Вращение на %.2f°"
-#: ../src/ui/tool/transform-handle-set.cpp:578
+#: ../src/ui/tool/transform-handle-set.cpp:588
#, c-format
msgctxt "Transform handle tip"
msgid ""
@@ -23813,18 +23915,18 @@ msgid ""
"increments"
msgstr "<b>Shift+Ctrl</b>: наклон относительно центра вращения шагами по %f°"
-#: ../src/ui/tool/transform-handle-set.cpp:581
+#: ../src/ui/tool/transform-handle-set.cpp:591
msgctxt "Transform handle tip"
msgid "<b>Shift</b>: skew about the rotation center"
msgstr "<b>Shift</b>: наклон относительно центра вращения"
-#: ../src/ui/tool/transform-handle-set.cpp:585
+#: ../src/ui/tool/transform-handle-set.cpp:595
#, c-format
msgctxt "Transform handle tip"
msgid "<b>Ctrl</b>: snap skew angle to %f° increments"
msgstr "<b>Ctrl</b>: наклон шагами по %f°"
-#: ../src/ui/tool/transform-handle-set.cpp:588
+#: ../src/ui/tool/transform-handle-set.cpp:598
msgctxt "Transform handle tip"
msgid ""
"<b>Skew handle</b>: drag to skew (shear) selection about the opposite handle"
@@ -23832,19 +23934,19 @@ msgstr ""
"<b>Рычаг наклона</b>: перетаскивание наклоняет выделение относительно "
"противоположного рычага"
-#: ../src/ui/tool/transform-handle-set.cpp:594
+#: ../src/ui/tool/transform-handle-set.cpp:604
#, c-format
msgctxt "Transform handle tip"
msgid "Skew horizontally by %.2f°"
msgstr "Наклонить по горизонтали на %.2f°"
-#: ../src/ui/tool/transform-handle-set.cpp:597
+#: ../src/ui/tool/transform-handle-set.cpp:607
#, c-format
msgctxt "Transform handle tip"
msgid "Skew vertically by %.2f°"
msgstr "Наклонить по вертикали на %.2f°"
-#: ../src/ui/tool/transform-handle-set.cpp:656
+#: ../src/ui/tool/transform-handle-set.cpp:666
msgctxt "Transform handle tip"
msgid "<b>Rotation center</b>: drag to change the origin of transforms"
msgstr ""
@@ -24365,6 +24467,40 @@ msgstr "Выделите <b>объекты</b>, к которым будет п
msgid "Choose a construction tool from the toolbar."
msgstr "Выберите режим инструмента из его контекстной панели"
+#. create the knots
+#: ../src/ui/tools/measure-tool.cpp:338
+msgid "Measure start"
+msgstr "Начало измерения"
+
+#: ../src/ui/tools/measure-tool.cpp:344
+msgid "Measure end"
+msgstr "Конец измерения"
+
+#: ../src/ui/tools/measure-tool.cpp:719 ../share/extensions/measure.inx.h:2
+msgid "Measure"
+msgstr ""
+
+#: ../src/ui/tools/measure-tool.cpp:724
+msgid "Base"
+msgstr ""
+
+#: ../src/ui/tools/measure-tool.cpp:733
+msgid "Add guides from measure tool"
+msgstr "Направляющие из измерения"
+
+#: ../src/ui/tools/measure-tool.cpp:753
+msgid "Convert measure to items"
+msgstr "Объект из измерения"
+
+#: ../src/ui/tools/measure-tool.cpp:791
+msgid "Add global measure line"
+msgstr "Создание размерной линии"
+
+#: ../src/ui/tools/measure-tool.cpp:1221 ../src/ui/tools/measure-tool.cpp:1223
+#, fuzzy, c-format
+msgid "Crossing %d"
+msgstr "Знаки пересечения"
+
#. TRANSLATORS: Mind the space in front. This is part of a compound message
#: ../src/ui/tools/mesh-tool.cpp:122 ../src/ui/tools/mesh-tool.cpp:133
#, fuzzy, c-format
@@ -24763,7 +24899,7 @@ msgstr ""
msgid "Create spiral"
msgstr "Создание спирали"
-#: ../src/ui/tools/spray-tool.cpp:173 ../src/ui/tools/tweak-tool.cpp:157
+#: ../src/ui/tools/spray-tool.cpp:214 ../src/ui/tools/tweak-tool.cpp:157
#, c-format
msgid "<b>%i</b> object selected"
msgid_plural "<b>%i</b> objects selected"
@@ -24771,11 +24907,11 @@ msgstr[0] "<b>%i</b> объект выделен"
msgstr[1] "<b>%i</b> объекта выделено"
msgstr[2] "<b>%i</b> объектов выделено"
-#: ../src/ui/tools/spray-tool.cpp:175 ../src/ui/tools/tweak-tool.cpp:159
+#: ../src/ui/tools/spray-tool.cpp:216 ../src/ui/tools/tweak-tool.cpp:159
msgid "<b>Nothing</b> selected"
msgstr "<b>Ничего</b> не выделено"
-#: ../src/ui/tools/spray-tool.cpp:180
+#: ../src/ui/tools/spray-tool.cpp:221
#, fuzzy, c-format
msgid ""
"%s. Drag, click or click and scroll to spray <b>copies</b> of the initial "
@@ -24784,7 +24920,7 @@ msgstr ""
"%s. Потащите, щёлкните или прокрутите для распыления <b>копий</b> исходного "
"выделения"
-#: ../src/ui/tools/spray-tool.cpp:183
+#: ../src/ui/tools/spray-tool.cpp:224
#, fuzzy, c-format
msgid ""
"%s. Drag, click or click and scroll to spray <b>clones</b> of the initial "
@@ -24793,7 +24929,7 @@ msgstr ""
"%s. Потащите, щёлкните или прокрутите для распыления <b>клонов</b> исходного "
"выделения"
-#: ../src/ui/tools/spray-tool.cpp:186
+#: ../src/ui/tools/spray-tool.cpp:227
#, fuzzy, c-format
msgid ""
"%s. Drag, click or click and scroll to spray in a <b>single path</b> of the "
@@ -24802,19 +24938,19 @@ msgstr ""
"%s. Потащите, щёлкните или прокрутите для распыления исходного выделения в "
"<b>единый контур</b>"
-#: ../src/ui/tools/spray-tool.cpp:618
+#: ../src/ui/tools/spray-tool.cpp:1301
msgid "<b>Nothing selected!</b> Select objects to spray."
msgstr "<b>Ничего не выделено!</b> Выделите объекты, которые хотите распылить."
-#: ../src/ui/tools/spray-tool.cpp:693 ../src/widgets/spray-toolbar.cpp:166
+#: ../src/ui/tools/spray-tool.cpp:1376 ../src/widgets/spray-toolbar.cpp:352
msgid "Spray with copies"
msgstr "Распылять копии"
-#: ../src/ui/tools/spray-tool.cpp:697 ../src/widgets/spray-toolbar.cpp:173
+#: ../src/ui/tools/spray-tool.cpp:1380 ../src/widgets/spray-toolbar.cpp:359
msgid "Spray with clones"
msgstr "Распылять клоны"
-#: ../src/ui/tools/spray-tool.cpp:701
+#: ../src/ui/tools/spray-tool.cpp:1384
msgid "Spray in single path"
msgstr "Распылять по одиночному контуру"
@@ -25000,7 +25136,7 @@ msgstr[2] ""
msgid "Type text"
msgstr "Ввод текста"
-#: ../src/ui/tools/tool-base.cpp:701
+#: ../src/ui/tools/tool-base.cpp:700
#, fuzzy
msgid "<b>Space+mouse move</b> to pan canvas"
msgstr ""
@@ -25289,130 +25425,175 @@ msgid "Blur (%)"
msgstr "Размывание (%)"
#: ../src/ui/widget/font-variants.cpp:38
+msgctxt "Font variant"
msgid "Ligatures"
msgstr ""
#: ../src/ui/widget/font-variants.cpp:39
#, fuzzy
+msgctxt "Font variant"
msgid "Common"
msgstr "Обычные"
#: ../src/ui/widget/font-variants.cpp:40
#, fuzzy
+msgctxt "Font variant"
msgid "Discretionary"
msgstr "Направление"
#: ../src/ui/widget/font-variants.cpp:41
#, fuzzy
+msgctxt "Font variant"
msgid "Historical"
msgstr "Учебник"
#: ../src/ui/widget/font-variants.cpp:42
#, fuzzy
+msgctxt "Font variant"
msgid "Contextual"
msgstr "Контекст"
+#: ../src/ui/widget/font-variants.cpp:44
+#, fuzzy
+msgctxt "Font variant"
+msgid "Position"
+msgstr "Положение"
+
+#: ../src/ui/widget/font-variants.cpp:45 ../src/ui/widget/font-variants.cpp:50
+#, fuzzy
+msgctxt "Font variant"
+msgid "Normal"
+msgstr "Нормальный"
+
#: ../src/ui/widget/font-variants.cpp:46
#, fuzzy
+msgctxt "Font variant"
msgid "Subscript"
msgstr "Сценарий"
#: ../src/ui/widget/font-variants.cpp:47
#, fuzzy
+msgctxt "Font variant"
msgid "Superscript"
msgstr "Переключить верхний индекс"
#: ../src/ui/widget/font-variants.cpp:49
#, fuzzy
+msgctxt "Font variant"
msgid "Capitals"
msgstr "Больница"
+#: ../src/ui/widget/font-variants.cpp:51
+msgctxt "Font variant"
+msgid "Small"
+msgstr "Маленькие"
+
#: ../src/ui/widget/font-variants.cpp:52
#, fuzzy
+msgctxt "Font variant"
msgid "All small"
msgstr "Маленькие"
#: ../src/ui/widget/font-variants.cpp:53
+#, fuzzy
+msgctxt "Font variant"
msgid "Petite"
-msgstr ""
+msgstr "Все неактивны"
#: ../src/ui/widget/font-variants.cpp:54
#, fuzzy
+msgctxt "Font variant"
msgid "All petite"
msgstr "Все неактивны"
#: ../src/ui/widget/font-variants.cpp:55
#, fuzzy
+msgctxt "Font variant"
msgid "Unicase"
msgstr "Пики"
#: ../src/ui/widget/font-variants.cpp:56
#, fuzzy
+msgctxt "Font variant"
msgid "Titling"
msgstr "Прокрутка"
#: ../src/ui/widget/font-variants.cpp:58
+msgctxt "Font variant"
msgid "Numeric"
msgstr ""
#: ../src/ui/widget/font-variants.cpp:59
#, fuzzy
+msgctxt "Font variant"
msgid "Lining"
msgstr "Сужение:"
#: ../src/ui/widget/font-variants.cpp:60
#, fuzzy
+msgctxt "Font variant"
msgid "Old Style"
msgstr "Стиль"
#: ../src/ui/widget/font-variants.cpp:61
#, fuzzy
+msgctxt "Font variant"
msgid "Default Style"
msgstr "Заголовок по умолчанию"
#: ../src/ui/widget/font-variants.cpp:62
#, fuzzy
+msgctxt "Font variant"
msgid "Proportional"
msgstr "Вкладка"
#: ../src/ui/widget/font-variants.cpp:63
+msgctxt "Font variant"
msgid "Tabular"
msgstr ""
#: ../src/ui/widget/font-variants.cpp:64
#, fuzzy
+msgctxt "Font variant"
msgid "Default Width"
msgstr "Заголовок по умолчанию"
#: ../src/ui/widget/font-variants.cpp:65
#, fuzzy
+msgctxt "Font variant"
msgid "Diagonal"
msgstr "Диагональные направляющие"
#: ../src/ui/widget/font-variants.cpp:66
#, fuzzy
+msgctxt "Font variant"
msgid "Stacked"
msgstr "Внутренний механизм печати"
#: ../src/ui/widget/font-variants.cpp:67
#, fuzzy
+msgctxt "Font variant"
msgid "Default Fractions"
msgstr "Параметры сетки по умолчанию"
#: ../src/ui/widget/font-variants.cpp:68
+msgctxt "Font variant"
msgid "Ordinal"
msgstr ""
#: ../src/ui/widget/font-variants.cpp:69
+msgctxt "Font variant"
msgid "Slashed Zero"
msgstr ""
#: ../src/ui/widget/font-variants.cpp:71
#, fuzzy
+msgctxt "Font variant"
msgid "Feature Settings"
msgstr "Параметры страницы"
#: ../src/ui/widget/font-variants.cpp:72
+msgctxt "Font variant"
msgid "Selection has different Feature Settings!"
msgstr ""
@@ -25954,14 +26135,12 @@ msgid "<b>M</b>"
msgstr "<b>Л:</b>"
#: ../src/ui/widget/selected-style.cpp:221
-#, fuzzy
msgid "Mesh gradient fill"
-msgstr "Линейная градиентная заливка"
+msgstr "Заливка сетчатого градиента"
#: ../src/ui/widget/selected-style.cpp:221
-#, fuzzy
msgid "Mesh gradient stroke"
-msgstr "Линейная градиентная обводка"
+msgstr "Обводка сетчатого градиента"
#: ../src/ui/widget/selected-style.cpp:229
msgid "Different"
@@ -26329,7 +26508,7 @@ msgstr[2] ""
msgid "File"
msgstr "_Файл"
-#: ../src/verbs.cpp:232 ../share/extensions/interp_att_g.inx.h:22
+#: ../src/verbs.cpp:232 ../share/extensions/interp_att_g.inx.h:24
msgid "Tag"
msgstr "Тэг"
@@ -26517,7 +26696,6 @@ msgid "Unhide all objects in all layers"
msgstr "Раскрыть все объекты во всех слоях"
#: ../src/verbs.cpp:2397
-#, fuzzy
msgctxt "Verb"
msgid "None"
msgstr "Нет"
@@ -27709,7 +27887,7 @@ msgstr "Создавать и править градиенты"
#: ../src/verbs.cpp:2726
msgctxt "ContextVerb"
msgid "Mesh"
-msgstr ""
+msgstr "Сетка"
#: ../src/verbs.cpp:2727
#, fuzzy
@@ -27895,9 +28073,8 @@ msgid "Open Preferences for the Gradient tool"
msgstr "Открыть окно параметров инструмента для градиентной заливки"
#: ../src/verbs.cpp:2773
-#, fuzzy
msgid "Mesh Preferences"
-msgstr "Параметры Ластика"
+msgstr "Параметры сетчатого градиента"
#: ../src/verbs.cpp:2774
#, fuzzy
@@ -28844,11 +29021,11 @@ msgstr "(волосок)"
#: ../src/widgets/calligraphy-toolbar.cpp:427
#: ../src/widgets/calligraphy-toolbar.cpp:460
#: ../src/widgets/eraser-toolbar.cpp:125 ../src/widgets/pencil-toolbar.cpp:374
-#: ../src/widgets/spray-toolbar.cpp:113 ../src/widgets/spray-toolbar.cpp:129
-#: ../src/widgets/spray-toolbar.cpp:145 ../src/widgets/spray-toolbar.cpp:205
-#: ../src/widgets/spray-toolbar.cpp:235 ../src/widgets/spray-toolbar.cpp:253
-#: ../src/widgets/tweak-toolbar.cpp:125 ../src/widgets/tweak-toolbar.cpp:142
-#: ../src/widgets/tweak-toolbar.cpp:350
+#: ../src/widgets/spray-toolbar.cpp:286 ../src/widgets/spray-toolbar.cpp:315
+#: ../src/widgets/spray-toolbar.cpp:331 ../src/widgets/spray-toolbar.cpp:400
+#: ../src/widgets/spray-toolbar.cpp:430 ../src/widgets/spray-toolbar.cpp:448
+#: ../src/widgets/spray-toolbar.cpp:597 ../src/widgets/tweak-toolbar.cpp:125
+#: ../src/widgets/tweak-toolbar.cpp:142 ../src/widgets/tweak-toolbar.cpp:350
msgid "(default)"
msgstr "(по умолчанию)"
@@ -28921,7 +29098,7 @@ msgid "Pen Angle"
msgstr "Угол пера"
#: ../src/widgets/calligraphy-toolbar.cpp:463
-#: ../share/extensions/motion.inx.h:3 ../share/extensions/restack.inx.h:10
+#: ../share/extensions/motion.inx.h:3 ../share/extensions/restack.inx.h:5
msgid "Angle:"
msgstr "Угол:"
@@ -29509,35 +29686,29 @@ msgstr ""
msgid "Create radial (elliptic or circular) gradient"
msgstr "Создать радиальный (эллиптический или круговой) градиент"
-#: ../src/widgets/gradient-toolbar.cpp:1047
-#: ../src/widgets/mesh-toolbar.cpp:343
+#: ../src/widgets/gradient-toolbar.cpp:1047 ../src/widgets/mesh-toolbar.cpp:384
msgid "New:"
msgstr "Создать:"
-#: ../src/widgets/gradient-toolbar.cpp:1070
-#: ../src/widgets/mesh-toolbar.cpp:366
+#: ../src/widgets/gradient-toolbar.cpp:1070 ../src/widgets/mesh-toolbar.cpp:407
#, fuzzy
msgid "fill"
msgstr "Без заливки"
-#: ../src/widgets/gradient-toolbar.cpp:1070
-#: ../src/widgets/mesh-toolbar.cpp:366
+#: ../src/widgets/gradient-toolbar.cpp:1070 ../src/widgets/mesh-toolbar.cpp:407
msgid "Create gradient in the fill"
msgstr "Создать градиент в заливке"
-#: ../src/widgets/gradient-toolbar.cpp:1074
-#: ../src/widgets/mesh-toolbar.cpp:370
+#: ../src/widgets/gradient-toolbar.cpp:1074 ../src/widgets/mesh-toolbar.cpp:411
#, fuzzy
msgid "stroke"
msgstr "Обводка"
-#: ../src/widgets/gradient-toolbar.cpp:1074
-#: ../src/widgets/mesh-toolbar.cpp:370
+#: ../src/widgets/gradient-toolbar.cpp:1074 ../src/widgets/mesh-toolbar.cpp:411
msgid "Create gradient in the stroke"
msgstr "Создать градиент в обводке"
-#: ../src/widgets/gradient-toolbar.cpp:1077
-#: ../src/widgets/mesh-toolbar.cpp:373
+#: ../src/widgets/gradient-toolbar.cpp:1077 ../src/widgets/mesh-toolbar.cpp:414
msgid "on:"
msgstr "в:"
@@ -29604,7 +29775,7 @@ msgstr "Точки:"
#. Label
#: ../src/widgets/gradient-toolbar.cpp:1162
-#: ../src/widgets/gradient-vector.cpp:915
+#: ../src/widgets/gradient-vector.cpp:916
msgctxt "Gradient"
msgid "Offset:"
msgstr "Смещение:"
@@ -29620,7 +29791,7 @@ msgstr "Вставить опорную точку"
#: ../src/widgets/gradient-toolbar.cpp:1194
#: ../src/widgets/gradient-toolbar.cpp:1195
-#: ../src/widgets/gradient-vector.cpp:897
+#: ../src/widgets/gradient-vector.cpp:898
msgid "Delete stop"
msgstr "Удалить опорную точку"
@@ -29637,8 +29808,7 @@ msgid "Link gradients to change all related gradients"
msgstr ""
"Связать градиенты, чтобы эта заливка обновлялась везде, где она использована"
-#: ../src/widgets/gradient-vector.cpp:317
-#: ../src/widgets/paint-selector.cpp:965
+#: ../src/widgets/gradient-vector.cpp:317 ../src/widgets/paint-selector.cpp:965
#: ../src/widgets/stroke-marker-selector.cpp:154
msgid "No document selected"
msgstr "Документ не выбран"
@@ -29652,28 +29822,28 @@ msgid "No gradient selected"
msgstr "Градиент не выделен"
#. TRANSLATORS: "Stop" means: a "phase" of a gradient
-#: ../src/widgets/gradient-vector.cpp:892
+#: ../src/widgets/gradient-vector.cpp:893
msgid "Add stop"
msgstr "Добавить опорную точку"
-#: ../src/widgets/gradient-vector.cpp:895
+#: ../src/widgets/gradient-vector.cpp:896
msgid "Add another control stop to gradient"
msgstr "Добавить еще одну опорную точку в градиент"
-#: ../src/widgets/gradient-vector.cpp:900
+#: ../src/widgets/gradient-vector.cpp:901
msgid "Delete current control stop from gradient"
msgstr "Удалить опорную точку градиента"
#. TRANSLATORS: "Stop" means: a "phase" of a gradient
-#: ../src/widgets/gradient-vector.cpp:968
+#: ../src/widgets/gradient-vector.cpp:969
msgid "Stop Color"
msgstr "Цвет опорной точки"
-#: ../src/widgets/gradient-vector.cpp:1007
+#: ../src/widgets/gradient-vector.cpp:1008
msgid "Gradient editor"
msgstr "Редактор градиентов"
-#: ../src/widgets/gradient-vector.cpp:1359
+#: ../src/widgets/gradient-vector.cpp:1360
msgid "Change gradient stop color"
msgstr "Смена цвета опорной точки градиента"
@@ -29748,130 +29918,259 @@ msgid "Open LPE dialog (to adapt parameters numerically)"
msgstr ""
"Открыть диалог динамических контурных эффектов для ручного ввода параметров"
-#: ../src/widgets/measure-toolbar.cpp:86 ../src/widgets/text-toolbar.cpp:1268
+#: ../src/widgets/measure-toolbar.cpp:157
+msgid "Start and end measures inactive."
+msgstr ""
+
+#: ../src/widgets/measure-toolbar.cpp:159
+msgid "Start and end measures active."
+msgstr ""
+
+#: ../src/widgets/measure-toolbar.cpp:175
+msgid "Show only visible crossings."
+msgstr "Показывать только видимые пересечения"
+
+#: ../src/widgets/measure-toolbar.cpp:177
+msgid "Show all crossings."
+msgstr "Показывать все пересечения"
+
+#: ../src/widgets/measure-toolbar.cpp:193
+msgid "Use all layers in the measure."
+msgstr "Учитывать объекты всех слоёв при измерении"
+
+#: ../src/widgets/measure-toolbar.cpp:195
+msgid "Use current layer in the measure."
+msgstr "Учитывать объекты текущего слоя при измерении"
+
+#: ../src/widgets/measure-toolbar.cpp:211
+msgid "Compute all elements."
+msgstr ""
+
+#: ../src/widgets/measure-toolbar.cpp:213
+msgid "Compute max lenght."
+msgstr ""
+
+#: ../src/widgets/measure-toolbar.cpp:266 ../src/widgets/text-toolbar.cpp:1268
msgid "Font Size"
msgstr "Кегль шрифта"
-#: ../src/widgets/measure-toolbar.cpp:86
+#: ../src/widgets/measure-toolbar.cpp:266
msgid "Font Size:"
msgstr "Кегль шрифта:"
-#: ../src/widgets/measure-toolbar.cpp:87
+#: ../src/widgets/measure-toolbar.cpp:267
msgid "The font size to be used in the measurement labels"
msgstr "Кегль шрифта в метках инструмента измерения"
-#: ../src/widgets/measure-toolbar.cpp:99
-#: ../src/widgets/measure-toolbar.cpp:107
+#: ../src/widgets/measure-toolbar.cpp:278
+#: ../src/widgets/measure-toolbar.cpp:286
msgid "The units to be used for the measurements"
msgstr "В каких единицах производить измерения"
-#: ../src/widgets/mesh-toolbar.cpp:313
-#, fuzzy
+#: ../src/widgets/measure-toolbar.cpp:294 ../share/extensions/measure.inx.h:14
+msgid "Precision:"
+msgstr "Точность:"
+
+#: ../src/widgets/measure-toolbar.cpp:295
+msgid "Decimal precision of measure"
+msgstr "Десятичная точность измерения"
+
+#: ../src/widgets/measure-toolbar.cpp:307
+msgid "Scale %"
+msgstr "Масштаб %"
+
+#: ../src/widgets/measure-toolbar.cpp:307
+msgid "Scale %:"
+msgstr "Масштаб %:"
+
+#: ../src/widgets/measure-toolbar.cpp:308
+msgid "Scale the results"
+msgstr "Масштабировать результаты измерений"
+
+#: ../src/widgets/measure-toolbar.cpp:321
+msgid "The offset size"
+msgstr "Смещение маркеров измерений"
+
+#: ../src/widgets/measure-toolbar.cpp:333
+#: ../src/widgets/measure-toolbar.cpp:334
+msgid "Ignore first and last"
+msgstr "Игнорировать первую и последнюю точки"
+
+#: ../src/widgets/measure-toolbar.cpp:344
+#: ../src/widgets/measure-toolbar.cpp:345
+msgid "Only visible intersections"
+msgstr "Только видимые пересечения"
+
+#: ../src/widgets/measure-toolbar.cpp:355
+#: ../src/widgets/measure-toolbar.cpp:356
+msgid "Show measures between items"
+msgstr "Измерять интервалы между объектами"
+
+#: ../src/widgets/measure-toolbar.cpp:366
+#: ../src/widgets/measure-toolbar.cpp:367
+msgid "Measure all layers"
+msgstr "Измерять во всех слоях"
+
+#: ../src/widgets/measure-toolbar.cpp:377
+#: ../src/widgets/measure-toolbar.cpp:378
+msgid "Reverse measure"
+msgstr "Развернуть линию измерения"
+
+#: ../src/widgets/measure-toolbar.cpp:387
+#: ../src/widgets/measure-toolbar.cpp:388
+msgid "To guides"
+msgstr "Создать направляющие по краям интервалов"
+
+#: ../src/widgets/measure-toolbar.cpp:397
+#: ../src/widgets/measure-toolbar.cpp:398
+msgid "Mark Dimension"
+msgstr "Проставить размер"
+
+#: ../src/widgets/measure-toolbar.cpp:407
+#: ../src/widgets/measure-toolbar.cpp:408
+msgid "Convert to item"
+msgstr "Преобразовать в объект"
+
+#: ../src/widgets/mesh-toolbar.cpp:315
msgid "Set mesh type"
-msgstr "Смена стиля текста"
+msgstr "Установить тип сетки"
-#: ../src/widgets/mesh-toolbar.cpp:336
-#, fuzzy
+#: ../src/widgets/mesh-toolbar.cpp:377
msgid "normal"
-msgstr "Нормальный"
+msgstr "обычная"
-#: ../src/widgets/mesh-toolbar.cpp:336
-#, fuzzy
+#: ../src/widgets/mesh-toolbar.cpp:377
msgid "Create mesh gradient"
-msgstr "Создать линейный градиент"
+msgstr "Создать сетчатый градиент"
-#: ../src/widgets/mesh-toolbar.cpp:340
+#: ../src/widgets/mesh-toolbar.cpp:381
msgid "conical"
-msgstr ""
+msgstr "коническая"
-#: ../src/widgets/mesh-toolbar.cpp:340
-#, fuzzy
+#: ../src/widgets/mesh-toolbar.cpp:381
msgid "Create conical gradient"
-msgstr "Создать линейный градиент"
+msgstr "Создать конический градиент"
-#: ../src/widgets/mesh-toolbar.cpp:395
+#: ../src/widgets/mesh-toolbar.cpp:436
msgid "Rows"
msgstr "Строк:"
-#: ../src/widgets/mesh-toolbar.cpp:395
+#: ../src/widgets/mesh-toolbar.cpp:436
#: ../share/extensions/guides_creator.inx.h:5
#: ../share/extensions/layout_nup.inx.h:12
msgid "Rows:"
msgstr "Строк:"
-#: ../src/widgets/mesh-toolbar.cpp:395
-#, fuzzy
+#: ../src/widgets/mesh-toolbar.cpp:436
msgid "Number of rows in new mesh"
-msgstr "Количество строк"
+msgstr "Количество строк в новой сетке"
-#: ../src/widgets/mesh-toolbar.cpp:411
+#: ../src/widgets/mesh-toolbar.cpp:452
msgid "Columns"
msgstr "Столбцов:"
-#: ../src/widgets/mesh-toolbar.cpp:411
+#: ../src/widgets/mesh-toolbar.cpp:452
#: ../share/extensions/guides_creator.inx.h:4
msgid "Columns:"
msgstr "Столбцов:"
-#: ../src/widgets/mesh-toolbar.cpp:411
-#, fuzzy
+#: ../src/widgets/mesh-toolbar.cpp:452
msgid "Number of columns in new mesh"
-msgstr "Сколько столбцов в таблице"
+msgstr "Количество столбцов в новой сетке"
-#: ../src/widgets/mesh-toolbar.cpp:425
-#, fuzzy
+#: ../src/widgets/mesh-toolbar.cpp:466
msgid "Edit Fill"
-msgstr "Изменить заливку..."
+msgstr "Изменить заливку"
-#: ../src/widgets/mesh-toolbar.cpp:426
+#: ../src/widgets/mesh-toolbar.cpp:467
#, fuzzy
msgid "Edit fill mesh"
msgstr "Изменить заливку..."
-#: ../src/widgets/mesh-toolbar.cpp:437
-#, fuzzy
+#: ../src/widgets/mesh-toolbar.cpp:478
msgid "Edit Stroke"
-msgstr "Изменить обводку..."
+msgstr "Изменить обводку"
-#: ../src/widgets/mesh-toolbar.cpp:438
+#: ../src/widgets/mesh-toolbar.cpp:479
#, fuzzy
msgid "Edit stroke mesh"
msgstr "Изменить обводку..."
-#: ../src/widgets/mesh-toolbar.cpp:449 ../src/widgets/node-toolbar.cpp:521
+#: ../src/widgets/mesh-toolbar.cpp:490 ../src/widgets/node-toolbar.cpp:521
msgid "Show Handles"
msgstr "Показывать рычаги"
-#: ../src/widgets/mesh-toolbar.cpp:450
-#, fuzzy
+#: ../src/widgets/mesh-toolbar.cpp:491
msgid "Show side and tensor handles"
-msgstr "Сохранение трансформации:"
+msgstr "Показывать рычаги сторон и тензоров"
-#: ../src/widgets/mesh-toolbar.cpp:465
+#: ../src/widgets/mesh-toolbar.cpp:506
msgid "WARNING: Mesh SVG Syntax Subject to Change"
msgstr ""
-#: ../src/widgets/mesh-toolbar.cpp:475
+#: ../src/widgets/mesh-toolbar.cpp:516
msgctxt "Type"
msgid "Coons"
-msgstr ""
+msgstr "По Кунсу"
-#: ../src/widgets/mesh-toolbar.cpp:478
+#: ../src/widgets/mesh-toolbar.cpp:519
msgid "Bicubic"
-msgstr ""
+msgstr "Бикубическое"
-#: ../src/widgets/mesh-toolbar.cpp:480
+#: ../src/widgets/mesh-toolbar.cpp:521
msgid "Coons"
-msgstr ""
+msgstr "По Кунсу"
-#: ../src/widgets/mesh-toolbar.cpp:481
+#: ../src/widgets/mesh-toolbar.cpp:522
msgid "Coons: no smoothing. Bicubic: smoothing across patch boundaries."
msgstr ""
-#: ../src/widgets/mesh-toolbar.cpp:483 ../src/widgets/pencil-toolbar.cpp:377
+#: ../src/widgets/mesh-toolbar.cpp:524 ../src/widgets/pencil-toolbar.cpp:377
msgid "Smoothing:"
msgstr "Сглаживание:"
+#: ../src/widgets/mesh-toolbar.cpp:534
+msgid "Toggle Sides"
+msgstr "Переключить стороны"
+
+#: ../src/widgets/mesh-toolbar.cpp:535
+msgid "Toggle selected sides between Beziers and lines."
+msgstr ""
+
+#: ../src/widgets/mesh-toolbar.cpp:538
+#, fuzzy
+msgid "Toggle side:"
+msgstr "Переключить полужирность"
+
+#: ../src/widgets/mesh-toolbar.cpp:545
+msgid "Make elliptical"
+msgstr "Сделать эллиптическими"
+
+#: ../src/widgets/mesh-toolbar.cpp:546
+msgid ""
+"Make selected sides elliptical by changing length of handles. Works best if "
+"handles already approximate ellipse."
+msgstr ""
+
+#: ../src/widgets/mesh-toolbar.cpp:549
+#, fuzzy
+msgid "Make elliptical:"
+msgstr "Курсивное начертание"
+
+#: ../src/widgets/mesh-toolbar.cpp:556
+#, fuzzy
+msgid "Pick colors:"
+msgstr "Цвет месяца:"
+
+#: ../src/widgets/mesh-toolbar.cpp:557
+msgid "Pick colors for selected corner nodes from underneath mesh."
+msgstr ""
+
+#: ../src/widgets/mesh-toolbar.cpp:560
+#, fuzzy
+msgid "Pick Color"
+msgstr "Цвет заливки"
+
#: ../src/widgets/node-toolbar.cpp:341
msgid "Insert node"
msgstr "Вставка узла"
@@ -29885,9 +30184,8 @@ msgid "Insert"
msgstr "Вставить"
#: ../src/widgets/node-toolbar.cpp:356
-#, fuzzy
msgid "Insert node at min X"
-msgstr "Вставка узла"
+msgstr "Вставить узел в мин. X"
#: ../src/widgets/node-toolbar.cpp:357
#, fuzzy
@@ -29900,9 +30198,8 @@ msgid "Insert min X"
msgstr "Вставка узла"
#: ../src/widgets/node-toolbar.cpp:366
-#, fuzzy
msgid "Insert node at max X"
-msgstr "Вставка узла"
+msgstr "Вставить узел в макс. X"
#: ../src/widgets/node-toolbar.cpp:367
#, fuzzy
@@ -29915,9 +30212,8 @@ msgid "Insert max X"
msgstr "Вставить"
#: ../src/widgets/node-toolbar.cpp:376
-#, fuzzy
msgid "Insert node at min Y"
-msgstr "Вставка узла"
+msgstr "Вставить узел в мин. Y"
#: ../src/widgets/node-toolbar.cpp:377
#, fuzzy
@@ -29930,9 +30226,8 @@ msgid "Insert min Y"
msgstr "Вставка узла"
#: ../src/widgets/node-toolbar.cpp:386
-#, fuzzy
msgid "Insert node at max Y"
-msgstr "Вставка узла"
+msgstr "Вставить узел в макс. Y"
#: ../src/widgets/node-toolbar.cpp:387
#, fuzzy
@@ -30093,9 +30388,8 @@ msgid "Radial gradient"
msgstr "Радиальный градиент"
#: ../src/widgets/paint-selector.cpp:228
-#, fuzzy
msgid "Mesh gradient"
-msgstr "Смещать градиенты"
+msgstr "Сетчатый градиент"
#: ../src/widgets/paint-selector.cpp:235
msgid "Unset paint (make it undefined so it can be inherited)"
@@ -30149,9 +30443,8 @@ msgid "<b>Radial gradient</b>"
msgstr "<b>Радиальный градиент</b>"
#: ../src/widgets/paint-selector.cpp:799
-#, fuzzy
msgid "<b>Mesh gradient</b>"
-msgstr "<b>Линейный градиент</b>"
+msgstr "<b>Сетчатый градиент</b>"
#: ../src/widgets/paint-selector.cpp:1098
msgid ""
@@ -30241,9 +30534,8 @@ msgid "Create Spiro path"
msgstr "Рисовать кривую Спиро"
#: ../src/widgets/pencil-toolbar.cpp:122
-#, fuzzy
msgid "Create BSpline path"
-msgstr "Рисовать кривую Спиро"
+msgstr "Рисовать кривую BSpline"
#: ../src/widgets/pencil-toolbar.cpp:128
msgid "Zigzag"
@@ -30326,11 +30618,11 @@ msgstr ""
#: ../src/widgets/pencil-toolbar.cpp:409 ../src/widgets/pencil-toolbar.cpp:410
msgid "LPE based interactive simplify"
-msgstr ""
+msgstr "Интерактивное упрощение через LPE"
#: ../src/widgets/pencil-toolbar.cpp:420 ../src/widgets/pencil-toolbar.cpp:421
msgid "LPE simplify flatten"
-msgstr ""
+msgstr "Простое упрощение через LPE"
#: ../src/widgets/rect-toolbar.cpp:125
msgid "Change rectangle"
@@ -30389,18 +30681,16 @@ msgid "Make corners sharp"
msgstr "Убрать закругление углов"
#: ../src/widgets/ruler.cpp:193
-#, fuzzy
msgid "The orientation of the ruler"
-msgstr "Ориентация прикрепленной панели"
+msgstr "Ориентация линейки"
#: ../src/widgets/ruler.cpp:203
-#, fuzzy
msgid "Unit of the ruler"
-msgstr "Ширина текстуры"
+msgstr "Единица измерения для линейки"
#: ../src/widgets/ruler.cpp:210
msgid "Lower"
-msgstr "Опустить"
+msgstr "Нижний предел"
#: ../src/widgets/ruler.cpp:211
msgid "Lower limit of ruler"
@@ -30408,16 +30698,15 @@ msgstr "Нижний предел линейки"
#: ../src/widgets/ruler.cpp:220
msgid "Upper"
-msgstr ""
+msgstr "Верхний предел"
#: ../src/widgets/ruler.cpp:221
msgid "Upper limit of ruler"
msgstr "Верхний предел линейки"
#: ../src/widgets/ruler.cpp:231
-#, fuzzy
msgid "Position of mark on the ruler"
-msgstr "Информация о расширениях Inkscape"
+msgstr "Расположение меток на линейке"
#: ../src/widgets/ruler.cpp:240
msgid "Max Size"
@@ -30425,7 +30714,7 @@ msgstr "Макс. размер"
#: ../src/widgets/ruler.cpp:241
msgid "Maximum size of the ruler"
-msgstr ""
+msgstr "Максимальны размер линейки"
#: ../src/widgets/select-toolbar.cpp:262
msgid "Transform by toolbar"
@@ -30677,31 +30966,36 @@ msgstr ""
"можно изменить в настройках Inkscape)"
#. Width
-#: ../src/widgets/spray-toolbar.cpp:113
+#: ../src/widgets/spray-toolbar.cpp:286
msgid "(narrow spray)"
msgstr "(узкое распыление)"
-#: ../src/widgets/spray-toolbar.cpp:113
+#: ../src/widgets/spray-toolbar.cpp:286
msgid "(broad spray)"
msgstr "(широкое распыление)"
-#: ../src/widgets/spray-toolbar.cpp:116
+#: ../src/widgets/spray-toolbar.cpp:289
msgid "The width of the spray area (relative to the visible canvas area)"
msgstr "Ширина области распыления (относительно видимой области холста)"
-#: ../src/widgets/spray-toolbar.cpp:129
+#: ../src/widgets/spray-toolbar.cpp:304
+#, fuzzy
+msgid "Use the pressure of the input device to alter the width of spray area"
+msgstr "Нажим (pressure) устройства ввода изменяет ширину пера"
+
+#: ../src/widgets/spray-toolbar.cpp:315
msgid "(maximum mean)"
msgstr "(максимальный)"
-#: ../src/widgets/spray-toolbar.cpp:132
+#: ../src/widgets/spray-toolbar.cpp:318
msgid "Focus"
msgstr "Фокус"
-#: ../src/widgets/spray-toolbar.cpp:132
+#: ../src/widgets/spray-toolbar.cpp:318
msgid "Focus:"
msgstr "Фокус:"
-#: ../src/widgets/spray-toolbar.cpp:132
+#: ../src/widgets/spray-toolbar.cpp:318
#, fuzzy
msgid "0 to spray a spot; increase to enlarge the ring radius"
msgstr ""
@@ -30709,84 +31003,94 @@ msgstr ""
"кольца рассеивания."
#. Standard_deviation
-#: ../src/widgets/spray-toolbar.cpp:145
+#: ../src/widgets/spray-toolbar.cpp:331
msgid "(minimum scatter)"
msgstr "(минимальное рассеивание)"
-#: ../src/widgets/spray-toolbar.cpp:145
+#: ../src/widgets/spray-toolbar.cpp:331
msgid "(maximum scatter)"
msgstr "(максимальное рассеивание)"
-#: ../src/widgets/spray-toolbar.cpp:148
+#: ../src/widgets/spray-toolbar.cpp:334
msgctxt "Spray tool"
msgid "Scatter"
msgstr "Рассеивание"
-#: ../src/widgets/spray-toolbar.cpp:148
+#: ../src/widgets/spray-toolbar.cpp:334
msgctxt "Spray tool"
msgid "Scatter:"
msgstr "Рассеивание:"
-#: ../src/widgets/spray-toolbar.cpp:148
+#: ../src/widgets/spray-toolbar.cpp:334
msgid "Increase to scatter sprayed objects"
msgstr "Увеличение значения приводит к рассеиванию распыляемых объектов"
-#: ../src/widgets/spray-toolbar.cpp:167
+#: ../src/widgets/spray-toolbar.cpp:353
msgid "Spray copies of the initial selection"
msgstr "Распылять копии исходного выделения"
-#: ../src/widgets/spray-toolbar.cpp:174
+#: ../src/widgets/spray-toolbar.cpp:360
msgid "Spray clones of the initial selection"
msgstr "Распылять клоны исходного выделения"
-#: ../src/widgets/spray-toolbar.cpp:180
+#: ../src/widgets/spray-toolbar.cpp:367
msgid "Spray single path"
msgstr "Распылять в один контур"
-#: ../src/widgets/spray-toolbar.cpp:181
+#: ../src/widgets/spray-toolbar.cpp:368
msgid "Spray objects in a single path"
msgstr "Распылять копии объекта, объединяя их в один контур"
-#: ../src/widgets/spray-toolbar.cpp:185 ../src/widgets/tweak-toolbar.cpp:253
+#: ../src/widgets/spray-toolbar.cpp:375
+#, fuzzy
+msgid "Delete sprayed items"
+msgstr "Удаление опорной точки"
+
+#: ../src/widgets/spray-toolbar.cpp:376
+#, fuzzy
+msgid "Delete sprayed items from selection"
+msgstr "Получить кривые из выделения"
+
+#: ../src/widgets/spray-toolbar.cpp:380 ../src/widgets/tweak-toolbar.cpp:253
msgid "Mode"
msgstr "Режим"
#. Population
-#: ../src/widgets/spray-toolbar.cpp:205
+#: ../src/widgets/spray-toolbar.cpp:400
msgid "(low population)"
msgstr "(слабое заполнение)"
-#: ../src/widgets/spray-toolbar.cpp:205
+#: ../src/widgets/spray-toolbar.cpp:400
msgid "(high population)"
msgstr "(обильное заполнение)"
-#: ../src/widgets/spray-toolbar.cpp:208
+#: ../src/widgets/spray-toolbar.cpp:403
msgid "Amount"
msgstr "Количество"
-#: ../src/widgets/spray-toolbar.cpp:209
+#: ../src/widgets/spray-toolbar.cpp:404
msgid "Adjusts the number of items sprayed per click"
msgstr "Число объектов, появляющихся по одному щелчку"
-#: ../src/widgets/spray-toolbar.cpp:225
+#: ../src/widgets/spray-toolbar.cpp:420
msgid ""
"Use the pressure of the input device to alter the amount of sprayed objects"
msgstr ""
"Менять число распыляемых объектов в зависимости от нажима устройством ввода"
-#: ../src/widgets/spray-toolbar.cpp:235
+#: ../src/widgets/spray-toolbar.cpp:430
msgid "(high rotation variation)"
msgstr "(существенное варьирование вращения)"
-#: ../src/widgets/spray-toolbar.cpp:238
+#: ../src/widgets/spray-toolbar.cpp:433
msgid "Rotation"
msgstr "Вращение"
-#: ../src/widgets/spray-toolbar.cpp:238
+#: ../src/widgets/spray-toolbar.cpp:433
msgid "Rotation:"
msgstr "Вращение:"
-#: ../src/widgets/spray-toolbar.cpp:240
+#: ../src/widgets/spray-toolbar.cpp:435
#, no-c-format
msgid ""
"Variation of the rotation of the sprayed objects; 0% for the same rotation "
@@ -30795,21 +31099,21 @@ msgstr ""
"Варьирование вращения распыляемых объектов. 0% означает отсутствие вращения "
"исходного выделения."
-#: ../src/widgets/spray-toolbar.cpp:253
+#: ../src/widgets/spray-toolbar.cpp:448
msgid "(high scale variation)"
msgstr "(существенное варьирование масштаба)"
-#: ../src/widgets/spray-toolbar.cpp:256
+#: ../src/widgets/spray-toolbar.cpp:451
msgctxt "Spray tool"
msgid "Scale"
msgstr "Масштаб"
-#: ../src/widgets/spray-toolbar.cpp:256
+#: ../src/widgets/spray-toolbar.cpp:451
msgctxt "Spray tool"
msgid "Scale:"
msgstr "Масштаб:"
-#: ../src/widgets/spray-toolbar.cpp:258
+#: ../src/widgets/spray-toolbar.cpp:453
#, no-c-format
msgid ""
"Variation in the scale of the sprayed objects; 0% for the same scale than "
@@ -30818,6 +31122,69 @@ msgstr ""
"Варьирование масштаба распыляемых объектов. 0% означает размер исходного "
"выделения."
+#: ../src/widgets/spray-toolbar.cpp:469
+#, fuzzy
+msgid "Use the pressure of the input device to alter the scale of new items"
+msgstr "Нажим (pressure) устройства ввода изменяет ширину пера"
+
+#: ../src/widgets/spray-toolbar.cpp:481 ../src/widgets/spray-toolbar.cpp:482
+msgid ""
+"Pick color from the drawing. You can use clonetiler trace dialog for avanced "
+"effects. In clone mode original fill or stroke colors must be unset."
+msgstr ""
+
+#: ../src/widgets/spray-toolbar.cpp:494 ../src/widgets/spray-toolbar.cpp:495
+msgid "Pick from center instead average area."
+msgstr ""
+
+#: ../src/widgets/spray-toolbar.cpp:507 ../src/widgets/spray-toolbar.cpp:508
+msgid "Inversed pick value, retaining color in advanced trace mode"
+msgstr ""
+
+#: ../src/widgets/spray-toolbar.cpp:520 ../src/widgets/spray-toolbar.cpp:521
+msgid "Apply picked color to fill"
+msgstr "Применить снятый цвет к заливке"
+
+#: ../src/widgets/spray-toolbar.cpp:533 ../src/widgets/spray-toolbar.cpp:534
+msgid "Apply picked color to stroke"
+msgstr "Применить снятый цвет к обводке"
+
+#: ../src/widgets/spray-toolbar.cpp:546 ../src/widgets/spray-toolbar.cpp:547
+msgid "No overlap between colors"
+msgstr ""
+
+#: ../src/widgets/spray-toolbar.cpp:559 ../src/widgets/spray-toolbar.cpp:560
+msgid "Apply over transparent areas"
+msgstr "Распылять над прозрачными областями"
+
+#: ../src/widgets/spray-toolbar.cpp:572 ../src/widgets/spray-toolbar.cpp:573
+msgid "Apply over no transparent areas"
+msgstr "Распылять над непрозрачными областями"
+
+#: ../src/widgets/spray-toolbar.cpp:585 ../src/widgets/spray-toolbar.cpp:586
+msgid "Prevent overlapping objects"
+msgstr "Исключить перекрывание объектами друг друга"
+
+#: ../src/widgets/spray-toolbar.cpp:597
+msgid "(minimum offset)"
+msgstr "(минимальное смещение)"
+
+#: ../src/widgets/spray-toolbar.cpp:597
+msgid "(maximum offset)"
+msgstr "(максимальное смещение)"
+
+#: ../src/widgets/spray-toolbar.cpp:600
+msgid "Offset %"
+msgstr "Смещение %"
+
+#: ../src/widgets/spray-toolbar.cpp:600
+msgid "Offset %:"
+msgstr "Смещение %:"
+
+#: ../src/widgets/spray-toolbar.cpp:601
+msgid "Increase to segregate objects more (value in percent)"
+msgstr "Чем больше значение, тем дальше объекты друг от друга"
+
#: ../src/widgets/star-toolbar.cpp:103
msgid "Star: Change number of corners"
msgstr "Смена количества лучей"
@@ -31089,14 +31456,12 @@ msgid "Set stroke style"
msgstr "Установка стиля обводки"
#: ../src/widgets/stroke-style.cpp:1206
-#, fuzzy
msgid "Set marker color"
-msgstr "Установка цвета обводки"
+msgstr "Установка цвета маркера"
#: ../src/widgets/swatch-selector.cpp:127
-#, fuzzy
msgid "Change swatch color"
-msgstr "Смена цвета опорной точки градиента"
+msgstr "Смена цвета образца"
#: ../src/widgets/text-toolbar.cpp:173
msgid "Text: Change font family"
@@ -31333,177 +31698,177 @@ msgstr "Вращ.:"
msgid "Character rotation (degrees)"
msgstr "Вращение символа (градусы)"
-#: ../src/widgets/toolbox.cpp:177
+#: ../src/widgets/toolbox.cpp:178
msgid "Color/opacity used for color tweaking"
msgstr "Цвет/непрозрачность, используемые для коррекции цвета"
-#: ../src/widgets/toolbox.cpp:185
+#: ../src/widgets/toolbox.cpp:186
msgid "Style of new stars"
msgstr "Стиль новых звёзд"
-#: ../src/widgets/toolbox.cpp:187
+#: ../src/widgets/toolbox.cpp:188
msgid "Style of new rectangles"
msgstr "Стиль новых прямоугольников"
-#: ../src/widgets/toolbox.cpp:189
+#: ../src/widgets/toolbox.cpp:190
msgid "Style of new 3D boxes"
msgstr "Стиль новых параллелепипедов"
-#: ../src/widgets/toolbox.cpp:191
+#: ../src/widgets/toolbox.cpp:192
msgid "Style of new ellipses"
msgstr "Стиль новых эллипсов"
-#: ../src/widgets/toolbox.cpp:193
+#: ../src/widgets/toolbox.cpp:194
msgid "Style of new spirals"
msgstr "Стиль новых спиралей"
-#: ../src/widgets/toolbox.cpp:195
+#: ../src/widgets/toolbox.cpp:196
msgid "Style of new paths created by Pencil"
msgstr "Стиль новых контуров, созданных Карандашом"
-#: ../src/widgets/toolbox.cpp:197
+#: ../src/widgets/toolbox.cpp:198
msgid "Style of new paths created by Pen"
msgstr "Стиль новых контуров, созданных Пером"
-#: ../src/widgets/toolbox.cpp:199
+#: ../src/widgets/toolbox.cpp:200
msgid "Style of new calligraphic strokes"
msgstr "Стиль новых каллиграфических штрихов"
-#: ../src/widgets/toolbox.cpp:201 ../src/widgets/toolbox.cpp:203
+#: ../src/widgets/toolbox.cpp:202 ../src/widgets/toolbox.cpp:204
msgid "TBD"
msgstr "k"
-#: ../src/widgets/toolbox.cpp:215
+#: ../src/widgets/toolbox.cpp:216
msgid "Style of Paint Bucket fill objects"
msgstr "Стиль заливки новых объектов, созданных инструментом заливки"
-#: ../src/widgets/toolbox.cpp:1681
+#: ../src/widgets/toolbox.cpp:1713
msgid "Bounding box"
msgstr "Площадка (BB)"
-#: ../src/widgets/toolbox.cpp:1681
+#: ../src/widgets/toolbox.cpp:1713
msgid "Snap bounding boxes"
msgstr "Прилипать к углам площадок"
-#: ../src/widgets/toolbox.cpp:1690
+#: ../src/widgets/toolbox.cpp:1722
msgid "Bounding box edges"
msgstr "Края площадок"
-#: ../src/widgets/toolbox.cpp:1690
+#: ../src/widgets/toolbox.cpp:1722
msgid "Snap to edges of a bounding box"
msgstr "Прилипать к краям площадки"
-#: ../src/widgets/toolbox.cpp:1699
+#: ../src/widgets/toolbox.cpp:1731
msgid "Bounding box corners"
msgstr "Углы площадок (BB)"
-#: ../src/widgets/toolbox.cpp:1699
+#: ../src/widgets/toolbox.cpp:1731
msgid "Snap bounding box corners"
msgstr "Прилипать к углам площадки"
-#: ../src/widgets/toolbox.cpp:1708
+#: ../src/widgets/toolbox.cpp:1740
msgid "BBox Edge Midpoints"
msgstr "Средние точки сторон площадок"
-#: ../src/widgets/toolbox.cpp:1708
+#: ../src/widgets/toolbox.cpp:1740
msgid "Snap midpoints of bounding box edges"
msgstr "Прилипать центрами краёв площадки"
-#: ../src/widgets/toolbox.cpp:1718
+#: ../src/widgets/toolbox.cpp:1750
msgid "BBox Centers"
msgstr "Центры площадок"
-#: ../src/widgets/toolbox.cpp:1718
+#: ../src/widgets/toolbox.cpp:1750
msgid "Snapping centers of bounding boxes"
msgstr "Прилипать центрами площадок"
-#: ../src/widgets/toolbox.cpp:1727
+#: ../src/widgets/toolbox.cpp:1759
msgid "Snap nodes, paths, and handles"
msgstr "Прилипать к узлам, контурам и рычагами"
-#: ../src/widgets/toolbox.cpp:1735
+#: ../src/widgets/toolbox.cpp:1767
msgid "Snap to paths"
msgstr "Прилипать к контурам"
-#: ../src/widgets/toolbox.cpp:1744
+#: ../src/widgets/toolbox.cpp:1776
msgid "Path intersections"
msgstr "Пересечения контуров"
-#: ../src/widgets/toolbox.cpp:1744
+#: ../src/widgets/toolbox.cpp:1776
msgid "Snap to path intersections"
msgstr "Прилипать к пересечениям контуров"
-#: ../src/widgets/toolbox.cpp:1753
+#: ../src/widgets/toolbox.cpp:1785
msgid "To nodes"
msgstr "К узлам"
-#: ../src/widgets/toolbox.cpp:1753
+#: ../src/widgets/toolbox.cpp:1785
msgid "Snap cusp nodes, incl. rectangle corners"
msgstr "Прилипать острыми узлами, включая углы прямоугольников"
-#: ../src/widgets/toolbox.cpp:1762
+#: ../src/widgets/toolbox.cpp:1794
msgid "Smooth nodes"
msgstr "Сглаженные узлы"
-#: ../src/widgets/toolbox.cpp:1762
+#: ../src/widgets/toolbox.cpp:1794
msgid "Snap smooth nodes, incl. quadrant points of ellipses"
msgstr "Прилипать сглаженными узлами, включая точки квадрантов эллипсов"
-#: ../src/widgets/toolbox.cpp:1771
+#: ../src/widgets/toolbox.cpp:1803
msgid "Line Midpoints"
msgstr "Средние точки линий"
-#: ../src/widgets/toolbox.cpp:1771
+#: ../src/widgets/toolbox.cpp:1803
msgid "Snap midpoints of line segments"
msgstr "Прилипать средними точками сегментов линий"
-#: ../src/widgets/toolbox.cpp:1780
+#: ../src/widgets/toolbox.cpp:1812
msgid "Others"
msgstr "Прочее"
-#: ../src/widgets/toolbox.cpp:1780
+#: ../src/widgets/toolbox.cpp:1812
msgid "Snap other points (centers, guide origins, gradient handles, etc.)"
msgstr ""
"Прилипать остальными точками (центрами, нулевыми точками направляющих, "
"рычагами градиента и пр.)"
-#: ../src/widgets/toolbox.cpp:1788
+#: ../src/widgets/toolbox.cpp:1820
msgid "Object Centers"
msgstr "Центры объектов"
-#: ../src/widgets/toolbox.cpp:1788
+#: ../src/widgets/toolbox.cpp:1820
msgid "Snap centers of objects"
msgstr "Прилипать центрами объектов"
-#: ../src/widgets/toolbox.cpp:1797
+#: ../src/widgets/toolbox.cpp:1829
msgid "Rotation Centers"
msgstr "Центры вращения"
-#: ../src/widgets/toolbox.cpp:1797
+#: ../src/widgets/toolbox.cpp:1829
msgid "Snap an item's rotation center"
msgstr "Прилипать центром вращения"
-#: ../src/widgets/toolbox.cpp:1806
+#: ../src/widgets/toolbox.cpp:1838
msgid "Text baseline"
msgstr "Линия шрифта текста"
-#: ../src/widgets/toolbox.cpp:1806
+#: ../src/widgets/toolbox.cpp:1838
msgid "Snap text anchors and baselines"
msgstr "Прилипать к линии шрифта"
-#: ../src/widgets/toolbox.cpp:1816
+#: ../src/widgets/toolbox.cpp:1848
msgid "Page border"
msgstr "Кайма холста"
-#: ../src/widgets/toolbox.cpp:1816
+#: ../src/widgets/toolbox.cpp:1848
msgid "Snap to the page border"
msgstr "Прилипать к краю страницы"
-#: ../src/widgets/toolbox.cpp:1825
+#: ../src/widgets/toolbox.cpp:1857
msgid "Snap to grids"
msgstr "Прилипать к сеткам"
-#: ../src/widgets/toolbox.cpp:1834
+#: ../src/widgets/toolbox.cpp:1866
msgid "Snap guides"
msgstr "Прилипать направляющими"
@@ -31660,6 +32025,8 @@ msgstr "В режиме изменения цвета влиять на тон
#. TRANSLATORS: "H" here stands for hue
#: ../src/widgets/tweak-toolbar.cpp:291
+#, fuzzy
+msgctxt "Hue"
msgid "H"
msgstr "H"
@@ -31669,6 +32036,8 @@ msgstr "В режиме изменения цвета влиять на насы
#. TRANSLATORS: "S" here stands for Saturation
#: ../src/widgets/tweak-toolbar.cpp:307
+#, fuzzy
+msgctxt "Saturation"
msgid "S"
msgstr "S"
@@ -31676,12 +32045,21 @@ msgstr "S"
msgid "In color mode, act on objects' lightness"
msgstr "В режиме изменения цвета влиять на яркость объектов"
+#. TRANSLATORS: "L" here stands for Lightness
+#: ../src/widgets/tweak-toolbar.cpp:323
+#, fuzzy
+msgctxt "Lightness"
+msgid "L"
+msgstr "L"
+
#: ../src/widgets/tweak-toolbar.cpp:335
msgid "In color mode, act on objects' opacity"
msgstr "В режиме изменения цвета влиять на непрозрачность объектов"
#. TRANSLATORS: "O" here stands for Opacity
#: ../src/widgets/tweak-toolbar.cpp:339
+#, fuzzy
+msgctxt "Opacity"
msgid "O"
msgstr "Н"
@@ -32108,12 +32486,12 @@ msgstr "Этому расширению нужно два контура в вы
msgid "The sliced bitmaps have been saved as:"
msgstr ""
-#: ../share/extensions/hpgl_decoder.py:43
+#: ../share/extensions/hpgl_decoder.py:42
#, fuzzy
msgid "Movements"
msgstr "Смещать градиенты"
-#: ../share/extensions/hpgl_decoder.py:44
+#: ../share/extensions/hpgl_decoder.py:43
#, fuzzy
msgid "Pen "
msgstr "Масса пера"
@@ -32171,7 +32549,7 @@ msgstr "Нет узла, подходящего условиям запроса:
msgid "SVG Width not set correctly! Assuming width = 100"
msgstr ""
-#: ../share/extensions/interp_att_g.py:167
+#: ../share/extensions/interp_att_g.py:176
msgid "There is no selection to interpolate"
msgstr "Нет интерполируемого выделения"
@@ -32367,7 +32745,7 @@ msgstr "Для ID %s не найден атрибут стиля"
msgid "unable to locate marker: %s"
msgstr "Не удалось найти маркер: %s"
-#: ../share/extensions/measure.py:50
+#: ../share/extensions/measure.py:58
#, fuzzy
msgid ""
"Failed to import the numpy modules. These modules are required by this "
@@ -32379,13 +32757,12 @@ msgstr ""
"снова. На системах вроде Debian это делается командой sudo apt-get install "
"python-numpy."
-#: ../share/extensions/measure.py:112
+#: ../share/extensions/measure.py:120
msgid "Area is zero, cannot calculate Center of Mass"
msgstr ""
#: ../share/extensions/pathalongpath.py:208
-#: ../share/extensions/pathscatter.py:228
-#: ../share/extensions/perspective.py:53
+#: ../share/extensions/pathscatter.py:228 ../share/extensions/perspective.py:53
msgid "This extension requires two selected paths."
msgstr "Этому расширению нужно два контура в выделении."
@@ -32418,8 +32795,7 @@ msgstr ""
"снова. На системах вроде Debian это делается командой sudo apt-get install "
"python-numpy."
-#: ../share/extensions/perspective.py:61
-#: ../share/extensions/summersnight.py:52
+#: ../share/extensions/perspective.py:61 ../share/extensions/summersnight.py:52
#, python-format
msgid ""
"The first selected object is of type '%s'.\n"
@@ -32428,14 +32804,12 @@ msgstr ""
"Первый выбранный объект относится к типу «%s».\n"
"Превратите его в контур командой «Контур > Оконтурить объект»."
-#: ../share/extensions/perspective.py:68
-#: ../share/extensions/summersnight.py:60
+#: ../share/extensions/perspective.py:68 ../share/extensions/summersnight.py:60
msgid ""
"This extension requires that the second selected path be four nodes long."
msgstr "Второй выбранный контур должен содержать четыре узла."
-#: ../share/extensions/perspective.py:94
-#: ../share/extensions/summersnight.py:93
+#: ../share/extensions/perspective.py:94 ../share/extensions/summersnight.py:93
msgid ""
"The second selected object is a group, not a path.\n"
"Try using the procedure Object->Ungroup."
@@ -32443,8 +32817,7 @@ msgstr ""
"Второй выделенный объект является группой, а не контуром.\n"
"Попробуйте выполнить команду »Объект > Разгруппировать»."
-#: ../share/extensions/perspective.py:96
-#: ../share/extensions/summersnight.py:95
+#: ../share/extensions/perspective.py:96 ../share/extensions/summersnight.py:95
msgid ""
"The second selected object is not a path.\n"
"Try using the procedure Path->Object to Path."
@@ -32452,8 +32825,7 @@ msgstr ""
"Второй выделенный объект не является контуром.\n"
"Попробуйте выполнить команду »Контур > Оконтурить объект»."
-#: ../share/extensions/perspective.py:99
-#: ../share/extensions/summersnight.py:98
+#: ../share/extensions/perspective.py:99 ../share/extensions/summersnight.py:98
msgid ""
"The first selected object is not a path.\n"
"Try using the procedure Path->Object to Path."
@@ -32462,12 +32834,12 @@ msgstr ""
"Попробуйте выполнить команду »Контур > Оконтурить объект»."
#. issue error if no paths found
-#: ../share/extensions/plotter.py:70
+#: ../share/extensions/plotter.py:69
msgid ""
"No paths where found. Please convert all objects you want to plot into paths."
msgstr ""
-#: ../share/extensions/plotter.py:148
+#: ../share/extensions/plotter.py:147
msgid ""
"pySerial is not installed.\n"
"\n"
@@ -32478,7 +32850,7 @@ msgid ""
"3. Restart Inkscape."
msgstr ""
-#: ../share/extensions/plotter.py:200
+#: ../share/extensions/plotter.py:199
msgid ""
"Could not open port. Please check that your plotter is running, connected "
"and the settings are correct."
@@ -32600,6 +32972,11 @@ msgstr ""
msgid "Please enter a replacement font in the replace all box."
msgstr ""
+#: ../share/extensions/restack.py:76
+#, fuzzy
+msgid "There is no selection to restack."
+msgstr "Нет интерполируемого выделения"
+
#: ../share/extensions/summersnight.py:44
msgid ""
"This extension requires two selected paths. \n"
@@ -32717,7 +33094,7 @@ msgstr "Количество сегментов:"
#: ../share/extensions/convert2dashes.inx.h:2
#: ../share/extensions/edge3d.inx.h:9 ../share/extensions/flatten.inx.h:3
#: ../share/extensions/fractalize.inx.h:4
-#: ../share/extensions/interp_att_g.inx.h:29
+#: ../share/extensions/interp_att_g.inx.h:31
#: ../share/extensions/markers_strokepaint.inx.h:13
#: ../share/extensions/perspective.inx.h:2
#: ../share/extensions/pixelsnap.inx.h:3
@@ -33082,7 +33459,7 @@ msgid "Visual"
msgstr "Визуализация контура"
#: ../share/extensions/dimension.inx.h:7 ../share/extensions/dots.inx.h:13
-#: ../share/extensions/handles.inx.h:2 ../share/extensions/measure.inx.h:25
+#: ../share/extensions/handles.inx.h:2 ../share/extensions/measure.inx.h:42
msgid "Visualize Path"
msgstr "Визуализация контура"
@@ -33324,7 +33701,7 @@ msgstr "Импорт DXF"
#: ../share/extensions/dxf_input.inx.h:3
msgid "Method of Scaling:"
-msgstr ""
+msgstr "Способ масштабирования:"
#: ../share/extensions/dxf_input.inx.h:4
#, fuzzy
@@ -33672,9 +34049,8 @@ msgid "Page orientation:"
msgstr "Ориентация холста:"
#: ../share/extensions/empty_page.inx.h:4
-#, fuzzy
msgid "Page background:"
-msgstr "crane background"
+msgstr "Фон страницы:"
#: ../share/extensions/empty_video.inx.h:1
#, fuzzy
@@ -34392,9 +34768,8 @@ msgid "Graffiti"
msgstr "Граффити"
#: ../share/extensions/gcodetools_graffiti.inx.h:2
-#, fuzzy
msgid "Maximum segment length:"
-msgstr "Макс. длина сегмента (px)"
+msgstr "Макс. длина сегмента:"
#: ../share/extensions/gcodetools_graffiti.inx.h:3
#, fuzzy
@@ -35260,28 +35635,24 @@ msgid ""
msgstr ""
#: ../share/extensions/hpgl_input.inx.h:3
-#: ../share/extensions/hpgl_output.inx.h:4
-#: ../share/extensions/plotter.inx.h:34
+#: ../share/extensions/hpgl_output.inx.h:4 ../share/extensions/plotter.inx.h:32
msgid "Resolution X (dpi):"
msgstr "Разрешение по X (dpi)"
#: ../share/extensions/hpgl_input.inx.h:4
-#: ../share/extensions/hpgl_output.inx.h:5
-#: ../share/extensions/plotter.inx.h:35
+#: ../share/extensions/hpgl_output.inx.h:5 ../share/extensions/plotter.inx.h:33
msgid ""
"The amount of steps the plotter moves if it moves for 1 inch on the X axis "
"(Default: 1016.0)"
msgstr ""
#: ../share/extensions/hpgl_input.inx.h:5
-#: ../share/extensions/hpgl_output.inx.h:6
-#: ../share/extensions/plotter.inx.h:36
+#: ../share/extensions/hpgl_output.inx.h:6 ../share/extensions/plotter.inx.h:34
msgid "Resolution Y (dpi):"
msgstr "Разрешение по Y (dpi):"
#: ../share/extensions/hpgl_input.inx.h:6
-#: ../share/extensions/hpgl_output.inx.h:7
-#: ../share/extensions/plotter.inx.h:37
+#: ../share/extensions/hpgl_output.inx.h:7 ../share/extensions/plotter.inx.h:35
msgid ""
"The amount of steps the plotter moves if it moves for 1 inch on the Y axis "
"(Default: 1016.0)"
@@ -35316,37 +35687,34 @@ msgid ""
"serial connection."
msgstr ""
-#: ../share/extensions/hpgl_output.inx.h:3
-#: ../share/extensions/plotter.inx.h:33
+#: ../share/extensions/hpgl_output.inx.h:3 ../share/extensions/plotter.inx.h:31
#, fuzzy
msgid "Plotter Settings "
msgstr "Параметры импорта PDF"
-#: ../share/extensions/hpgl_output.inx.h:8
-#: ../share/extensions/plotter.inx.h:38
+#: ../share/extensions/hpgl_output.inx.h:8 ../share/extensions/plotter.inx.h:36
#, fuzzy
msgid "Pen number:"
msgstr "Номер цвета"
-#: ../share/extensions/hpgl_output.inx.h:9
-#: ../share/extensions/plotter.inx.h:39
+#: ../share/extensions/hpgl_output.inx.h:9 ../share/extensions/plotter.inx.h:37
msgid "The number of the pen (tool) to use (Standard: '1')"
msgstr ""
#: ../share/extensions/hpgl_output.inx.h:10
-#: ../share/extensions/plotter.inx.h:40
+#: ../share/extensions/plotter.inx.h:38
msgid "Pen force (g):"
msgstr ""
#: ../share/extensions/hpgl_output.inx.h:11
-#: ../share/extensions/plotter.inx.h:41
+#: ../share/extensions/plotter.inx.h:39
msgid ""
"The amount of force pushing down the pen in grams, set to 0 to omit command; "
"most plotters ignore this command (Default: 0)"
msgstr ""
#: ../share/extensions/hpgl_output.inx.h:12
-#: ../share/extensions/plotter.inx.h:42
+#: ../share/extensions/plotter.inx.h:40
msgid "Pen speed (cm/s or mm/s):"
msgstr ""
@@ -35362,44 +35730,44 @@ msgid "Rotation (°, Clockwise):"
msgstr "Вращение (°, по часовой стрелке):"
#: ../share/extensions/hpgl_output.inx.h:15
-#: ../share/extensions/plotter.inx.h:45
+#: ../share/extensions/plotter.inx.h:43
msgid "Rotation of the drawing (Default: 0°)"
msgstr "Вращение рисунка (по умолчанию: 0°)"
#: ../share/extensions/hpgl_output.inx.h:16
-#: ../share/extensions/plotter.inx.h:46
+#: ../share/extensions/plotter.inx.h:44
msgid "Mirror X axis"
msgstr "Отразить по оси X"
#: ../share/extensions/hpgl_output.inx.h:17
-#: ../share/extensions/plotter.inx.h:47
+#: ../share/extensions/plotter.inx.h:45
msgid "Check this to mirror the X axis (Default: Unchecked)"
msgstr ""
#: ../share/extensions/hpgl_output.inx.h:18
-#: ../share/extensions/plotter.inx.h:48
+#: ../share/extensions/plotter.inx.h:46
msgid "Mirror Y axis"
msgstr "Отразить по оси Y"
#: ../share/extensions/hpgl_output.inx.h:19
-#: ../share/extensions/plotter.inx.h:49
+#: ../share/extensions/plotter.inx.h:47
msgid "Check this to mirror the Y axis (Default: Unchecked)"
msgstr ""
#: ../share/extensions/hpgl_output.inx.h:20
-#: ../share/extensions/plotter.inx.h:50
+#: ../share/extensions/plotter.inx.h:48
#, fuzzy
msgid "Center zero point"
msgstr "Центрировать строки"
#: ../share/extensions/hpgl_output.inx.h:21
-#: ../share/extensions/plotter.inx.h:51
+#: ../share/extensions/plotter.inx.h:49
msgid ""
"Check this if your plotter uses a centered zero point (Default: Unchecked)"
msgstr ""
#: ../share/extensions/hpgl_output.inx.h:22
-#: ../share/extensions/plotter.inx.h:52
+#: ../share/extensions/plotter.inx.h:50
msgid ""
"If you want to use multiple pens on your pen plotter create one layer for "
"each pen, name the layers \"Pen 1\", \"Pen 2\", etc., and put your drawings "
@@ -35407,70 +35775,70 @@ msgid ""
msgstr ""
#: ../share/extensions/hpgl_output.inx.h:23
-#: ../share/extensions/plotter.inx.h:53
+#: ../share/extensions/plotter.inx.h:51
#, fuzzy
msgid "Plot Features "
msgstr "Растушёвка"
#: ../share/extensions/hpgl_output.inx.h:24
-#: ../share/extensions/plotter.inx.h:54
+#: ../share/extensions/plotter.inx.h:52
msgid "Overcut (mm):"
msgstr ""
#: ../share/extensions/hpgl_output.inx.h:25
-#: ../share/extensions/plotter.inx.h:55
+#: ../share/extensions/plotter.inx.h:53
msgid ""
"The distance in mm that will be cut over the starting point of the path to "
"prevent open paths, set to 0.0 to omit command (Default: 1.00)"
msgstr ""
#: ../share/extensions/hpgl_output.inx.h:26
-#: ../share/extensions/plotter.inx.h:56
+#: ../share/extensions/plotter.inx.h:54
#, fuzzy
-msgid "Tool offset (mm):"
+msgid "Tool (Knife) offset correction (mm):"
msgstr "Сдвиг по горизонтали, px"
#: ../share/extensions/hpgl_output.inx.h:27
-#: ../share/extensions/plotter.inx.h:57
+#: ../share/extensions/plotter.inx.h:55
msgid ""
"The offset from the tool tip to the tool axis in mm, set to 0.0 to omit "
"command (Default: 0.25)"
msgstr ""
#: ../share/extensions/hpgl_output.inx.h:28
-#: ../share/extensions/plotter.inx.h:58
+#: ../share/extensions/plotter.inx.h:56
#, fuzzy
-msgid "Use precut"
+msgid "Precut"
msgstr "Используемый системой"
#: ../share/extensions/hpgl_output.inx.h:29
-#: ../share/extensions/plotter.inx.h:59
+#: ../share/extensions/plotter.inx.h:57
msgid ""
"Check this to cut a small line before the real drawing starts to correctly "
"align the tool orientation. (Default: Checked)"
msgstr ""
#: ../share/extensions/hpgl_output.inx.h:30
-#: ../share/extensions/plotter.inx.h:60
+#: ../share/extensions/plotter.inx.h:58
#, fuzzy
msgid "Curve flatness:"
msgstr "Гладкость"
#: ../share/extensions/hpgl_output.inx.h:31
-#: ../share/extensions/plotter.inx.h:61
+#: ../share/extensions/plotter.inx.h:59
msgid ""
"Curves are divided into lines, this number controls how fine the curves will "
"be reproduced, the smaller the finer (Default: '1.2')"
msgstr ""
#: ../share/extensions/hpgl_output.inx.h:32
-#: ../share/extensions/plotter.inx.h:62
+#: ../share/extensions/plotter.inx.h:60
#, fuzzy
msgid "Auto align"
msgstr "Выровнять"
#: ../share/extensions/hpgl_output.inx.h:33
-#: ../share/extensions/plotter.inx.h:63
+#: ../share/extensions/plotter.inx.h:61
msgid ""
"Check this to auto align the drawing to the zero point (Plus the tool offset "
"if used). If unchecked you have to make sure that all parts of your drawing "
@@ -35478,7 +35846,7 @@ msgid ""
msgstr ""
#: ../share/extensions/hpgl_output.inx.h:34
-#: ../share/extensions/plotter.inx.h:66
+#: ../share/extensions/plotter.inx.h:64
msgid ""
"All these settings depend on the plotter you use, for more information "
"please consult the manual or homepage for your plotter."
@@ -35501,7 +35869,7 @@ msgstr "Базовая латиница"
#. render images like in 0.48
#: ../share/extensions/image_attributes.inx.h:5
-msgid "Support non-unifom scaling"
+msgid "Support non-uniform scaling"
msgstr ""
#. render images like in 0.48
@@ -35670,6 +36038,15 @@ msgstr "Продублировать оконечные контуры"
msgid "Interpolate style"
msgstr "Интерполировать стиль"
+#: ../share/extensions/interp.inx.h:7 ../share/extensions/interp_att_g.inx.h:10
+#, fuzzy
+msgid "Use Z-order"
+msgstr "Приподнятый край"
+
+#: ../share/extensions/interp.inx.h:8 ../share/extensions/interp_att_g.inx.h:11
+msgid "Workaround for reversed selection order in Live Preview cycles"
+msgstr ""
+
#: ../share/extensions/interp_att_g.inx.h:1
msgid "Interpolate Attribute in a group"
msgstr "Интерполировать атрибут в группе"
@@ -35699,24 +36076,24 @@ msgstr "Начальное значение:"
msgid "End Value:"
msgstr "Конечное значение:"
-#: ../share/extensions/interp_att_g.inx.h:13
+#: ../share/extensions/interp_att_g.inx.h:15
msgid "Translate X"
msgstr "Перемещение по X"
-#: ../share/extensions/interp_att_g.inx.h:14
+#: ../share/extensions/interp_att_g.inx.h:16
msgid "Translate Y"
msgstr "Перемещение по Y"
-#: ../share/extensions/interp_att_g.inx.h:15
+#: ../share/extensions/interp_att_g.inx.h:17
#: ../share/extensions/markers_strokepaint.inx.h:9
msgid "Fill"
msgstr "Заливка"
-#: ../share/extensions/interp_att_g.inx.h:17
+#: ../share/extensions/interp_att_g.inx.h:19
msgid "Other"
msgstr "Другой"
-#: ../share/extensions/interp_att_g.inx.h:18
+#: ../share/extensions/interp_att_g.inx.h:20
#, fuzzy
msgid ""
"If you select \"Other\", you must know the SVG attributes to identify here "
@@ -35725,32 +36102,32 @@ msgstr ""
"Если выбран «другой» интерполируемый атрибут, вы должны знать, какой именно "
"другой:"
-#: ../share/extensions/interp_att_g.inx.h:20
+#: ../share/extensions/interp_att_g.inx.h:22
msgid "Integer Number"
msgstr "Переменная"
-#: ../share/extensions/interp_att_g.inx.h:21
+#: ../share/extensions/interp_att_g.inx.h:23
msgid "Float Number"
msgstr "Число с плавающей точкой"
-#: ../share/extensions/interp_att_g.inx.h:23
+#: ../share/extensions/interp_att_g.inx.h:25
#: ../share/extensions/polyhedron_3d.inx.h:33
msgid "Style"
msgstr "Стиль"
-#: ../share/extensions/interp_att_g.inx.h:24
+#: ../share/extensions/interp_att_g.inx.h:26
msgid "Transformation"
msgstr "Преобразование"
-#: ../share/extensions/interp_att_g.inx.h:25
+#: ../share/extensions/interp_att_g.inx.h:27
msgid "••••••••••••••••••••••••••••••••••••••••••••••••"
msgstr "••••••••••••••••••••••••••••••••••••••••••••••••"
-#: ../share/extensions/interp_att_g.inx.h:26
+#: ../share/extensions/interp_att_g.inx.h:28
msgid "No Unit"
msgstr "Нет"
-#: ../share/extensions/interp_att_g.inx.h:28
+#: ../share/extensions/interp_att_g.inx.h:30
#, fuzzy
msgid ""
"This effect applies a value for any interpolatable attribute for all "
@@ -36270,9 +36647,8 @@ msgid "N-up layout"
msgstr ""
#: ../share/extensions/layout_nup.inx.h:2
-#, fuzzy
msgid "Page dimensions"
-msgstr "Размеры"
+msgstr "Размер страницы"
#: ../share/extensions/layout_nup.inx.h:4
#, fuzzy
@@ -36305,9 +36681,8 @@ msgid "Right:"
msgstr "Правое:"
#: ../share/extensions/layout_nup.inx.h:10
-#, fuzzy
msgid "Page margins"
-msgstr "Левое поле"
+msgstr "Поля страницы"
#: ../share/extensions/layout_nup.inx.h:11
#, fuzzy
@@ -36483,9 +36858,8 @@ msgid "Sentences per paragraph:"
msgstr "Предложений в абзаце:"
#: ../share/extensions/lorem_ipsum.inx.h:5
-#, fuzzy
msgid "Paragraph length fluctuation (sentences):"
-msgstr "Вариативность длины абзацев (в предложениях)"
+msgstr "Вариативность длины абзацев (в предложениях):"
#: ../share/extensions/lorem_ipsum.inx.h:7
msgid ""
@@ -36542,65 +36916,115 @@ msgstr "Установить цвет обводки"
msgid "Measure Path"
msgstr "Измерить контур"
-#: ../share/extensions/measure.inx.h:2
-msgid "Measure"
-msgstr "Измерить контур"
-
#: ../share/extensions/measure.inx.h:3
msgid "Measurement Type: "
msgstr "Что измерить:"
#: ../share/extensions/measure.inx.h:4
#, fuzzy
-msgid "Text Orientation: "
-msgstr "Направление текста"
-
-#: ../share/extensions/measure.inx.h:5
-msgid "Angle [with Fixed Angle option only] (°):"
-msgstr ""
+msgid "Text Presets"
+msgstr "Параметры Текста"
#: ../share/extensions/measure.inx.h:6
+#, fuzzy
+msgid "Text on Path"
+msgstr "Текст по контуру"
+
+#: ../share/extensions/measure.inx.h:8
+#, fuzzy, no-c-format
+msgid "Offset (%)"
+msgstr "Смещение текстовой метки (px):"
+
+#: ../share/extensions/measure.inx.h:9
+#, fuzzy
+msgid "Text anchor:"
+msgstr "Импорт текстовых файлов"
+
+#: ../share/extensions/measure.inx.h:10
+#, fuzzy
+msgid "Fixed Text"
+msgstr "Текст в рамке"
+
+#: ../share/extensions/measure.inx.h:11
+#, fuzzy
+msgid "Angle (°):"
+msgstr "Угол X:"
+
+#: ../share/extensions/measure.inx.h:12
msgid "Font size (px):"
msgstr "Кегль шрифта (px):"
-#: ../share/extensions/measure.inx.h:7
+#: ../share/extensions/measure.inx.h:13
msgid "Offset (px):"
msgstr "Смещение текстовой метки (px):"
-#: ../share/extensions/measure.inx.h:8
-msgid "Precision:"
-msgstr "Точность:"
-
-#: ../share/extensions/measure.inx.h:9
+#: ../share/extensions/measure.inx.h:15
msgid "Scale Factor (Drawing:Real Length) = 1:"
msgstr "Масштаб (Рисунок:Реальная длина) = 1:"
-#: ../share/extensions/measure.inx.h:10
+#: ../share/extensions/measure.inx.h:16
msgid "Length Unit:"
msgstr "Единица длины:"
-#: ../share/extensions/measure.inx.h:12
+#: ../share/extensions/measure.inx.h:18
msgctxt "measure extension"
msgid "Area"
msgstr "Площадь"
-#: ../share/extensions/measure.inx.h:13
+#: ../share/extensions/measure.inx.h:19
msgctxt "measure extension"
msgid "Center of Mass"
msgstr "Центр массы"
-#: ../share/extensions/measure.inx.h:14
-msgctxt "measure extension"
-msgid "Text On Path"
+#: ../share/extensions/measure.inx.h:21
+#, fuzzy
+msgid "Text on Path, Start"
msgstr "Текст по контуру"
-#: ../share/extensions/measure.inx.h:15
+#: ../share/extensions/measure.inx.h:22
#, fuzzy
-msgctxt "measure extension"
-msgid "Fixed Angle"
-msgstr "Угол пера"
+msgid "Text on Path, Middle"
+msgstr "Текст по контуру"
-#: ../share/extensions/measure.inx.h:18
+#: ../share/extensions/measure.inx.h:23
+#, fuzzy
+msgid "Text on Path, End"
+msgstr "Текст по контуру"
+
+#: ../share/extensions/measure.inx.h:24
+msgid "Fixed Text, Start of Path"
+msgstr ""
+
+#: ../share/extensions/measure.inx.h:25
+msgid "Fixed Text, Center of BBox"
+msgstr ""
+
+#: ../share/extensions/measure.inx.h:26
+#, fuzzy
+msgid "Fixed Text, Center of Mass"
+msgstr "Центр массы"
+
+#: ../share/extensions/measure.inx.h:28
+#, fuzzy
+msgid "Center"
+msgstr "центру"
+
+#: ../share/extensions/measure.inx.h:30
+#, fuzzy
+msgid "Start of Path"
+msgstr "Сшивающий контур"
+
+#: ../share/extensions/measure.inx.h:31
+#, fuzzy
+msgid "Center of BBox"
+msgstr "Центр массы"
+
+#: ../share/extensions/measure.inx.h:32
+#, fuzzy
+msgid "Center of Mass"
+msgstr "Центр массы"
+
+#: ../share/extensions/measure.inx.h:35
#, fuzzy, no-c-format
msgid ""
"This effect measures the length, area, or center-of-mass of the selected "
@@ -37019,79 +37443,64 @@ msgid "The command language to use (Default: HPGL)"
msgstr ""
#: ../share/extensions/plotter.inx.h:21
-msgid "Initialization commands:"
-msgstr ""
-
-#: ../share/extensions/plotter.inx.h:22
-msgid ""
-"Commands that will be sent to the plotter before the main data stream, only "
-"use this if you know what you are doing! (Default: Empty)"
-msgstr ""
-
-#: ../share/extensions/plotter.inx.h:23
msgid "Software (XON/XOFF)"
msgstr ""
-#: ../share/extensions/plotter.inx.h:24
+#: ../share/extensions/plotter.inx.h:22
#, fuzzy
msgid "Hardware (RTS/CTS)"
msgstr "Устройства"
-#: ../share/extensions/plotter.inx.h:25
+#: ../share/extensions/plotter.inx.h:23
msgid "Hardware (DSR/DTR + RTS/CTS)"
msgstr ""
-#: ../share/extensions/plotter.inx.h:26
-msgctxt "Flow control"
-msgid "None"
-msgstr "Нет"
-
-#: ../share/extensions/plotter.inx.h:27
+#: ../share/extensions/plotter.inx.h:25
msgid "HPGL"
msgstr "HPGL"
-#: ../share/extensions/plotter.inx.h:28
+#: ../share/extensions/plotter.inx.h:26
msgid "DMPL"
msgstr "DMPL"
-#: ../share/extensions/plotter.inx.h:29
+#: ../share/extensions/plotter.inx.h:27
#, fuzzy
msgid "KNK Plotter (HPGL variant)"
msgstr "KNK Zing (вариант HPGL)"
-#: ../share/extensions/plotter.inx.h:30
+#: ../share/extensions/plotter.inx.h:28
msgid ""
"Using wrong settings can under certain circumstances cause Inkscape to "
"freeze. Always save your work before plotting!"
msgstr ""
-#: ../share/extensions/plotter.inx.h:31
+#: ../share/extensions/plotter.inx.h:29
msgid ""
"This can be a physical serial connection or a USB-to-Serial bridge. Ask your "
"plotter manufacturer for drivers if needed."
msgstr ""
-#: ../share/extensions/plotter.inx.h:32
+#: ../share/extensions/plotter.inx.h:30
msgid "Parallel (LPT) connections are not supported."
msgstr ""
-#: ../share/extensions/plotter.inx.h:43
+#: ../share/extensions/plotter.inx.h:41
msgid ""
"The speed the pen will move with in centimeters or millimeters per second "
"(depending on your plotter model), set to 0 to omit command. Most plotters "
"ignore this command. (Default: 0)"
msgstr ""
-#: ../share/extensions/plotter.inx.h:44
+#: ../share/extensions/plotter.inx.h:42
msgid "Rotation (°, clockwise):"
msgstr "Вращение (°, по часовой стрелке):"
-#: ../share/extensions/plotter.inx.h:64
+#: ../share/extensions/plotter.inx.h:62
#, fuzzy
msgid "Show debug information"
msgstr "Информация об используемой памяти"
-#: ../share/extensions/plotter.inx.h:65
+#: ../share/extensions/plotter.inx.h:63
msgid ""
"Check this to get verbose information about the plot without actually "
"sending something to the plotter (A.k.a. data dump) (Default: Unchecked)"
@@ -37101,8 +37510,7 @@ msgstr ""
msgid "AutoCAD Plot Input"
msgstr "Импорт файлов AutoCAD Plot (PLT)"
-#: ../share/extensions/plt_input.inx.h:2
-#: ../share/extensions/plt_output.inx.h:2
+#: ../share/extensions/plt_input.inx.h:2 ../share/extensions/plt_output.inx.h:2
msgid "HP Graphics Language Plot file [AutoCAD] (*.plt)"
msgstr "Файл HP Graphics Language [AutoCAD] (*.plt)"
@@ -37396,6 +37804,10 @@ msgstr "Максимальное смещение по X (px):"
msgid "Maximum displacement in Y (px):"
msgstr "Максимальное смещение по Y (px):"
+#: ../share/extensions/radiusrand.inx.h:6
+msgid "Shift node handles"
+msgstr "Смещение рычагов узла"
+
#: ../share/extensions/radiusrand.inx.h:7
msgid "Use normal distribution"
msgstr "Использовать обычное распределение"
@@ -37585,64 +37997,105 @@ msgid "Restack"
msgstr "Поменять вертикальный порядок"
#: ../share/extensions/restack.inx.h:2
-msgid "Restack Direction:"
-msgstr "Направление перестановки:"
+#, fuzzy
+msgid "Based on Position"
+msgstr "Положение"
#: ../share/extensions/restack.inx.h:3
+#, fuzzy
+msgid "Presets"
+msgstr "Предустановка:"
+
+#: ../share/extensions/restack.inx.h:6
+#, fuzzy
+msgid "Horizontal:"
+msgstr "По _горизонтали:"
+
+#: ../share/extensions/restack.inx.h:7
+#, fuzzy
+msgid "Vertical:"
+msgstr "По _вертикали:"
+
+#: ../share/extensions/restack.inx.h:8
+#, fuzzy
+msgid "Restack Direction"
+msgstr "Направление перестановки:"
+
+#: ../share/extensions/restack.inx.h:9
msgid "Left to Right (0)"
msgstr "Слева направо (0)"
-#: ../share/extensions/restack.inx.h:4
+#: ../share/extensions/restack.inx.h:10
msgid "Bottom to Top (90)"
msgstr "Снизу вверх (90)"
-#: ../share/extensions/restack.inx.h:5
+#: ../share/extensions/restack.inx.h:11
msgid "Right to Left (180)"
msgstr "Справа налево (180)"
-#: ../share/extensions/restack.inx.h:6
+#: ../share/extensions/restack.inx.h:12
msgid "Top to Bottom (270)"
msgstr "Сверху вниз (270°)"
-#: ../share/extensions/restack.inx.h:7
+#: ../share/extensions/restack.inx.h:13
msgid "Radial Outward"
msgstr "Радиально наружу"
-#: ../share/extensions/restack.inx.h:8
+#: ../share/extensions/restack.inx.h:14
msgid "Radial Inward"
msgstr "Радиально вовнутрь"
-#: ../share/extensions/restack.inx.h:9
-msgid "Arbitrary Angle"
-msgstr "Произвольный угол"
-
-#: ../share/extensions/restack.inx.h:11
-msgid "Horizontal Point:"
-msgstr "Горизонтальная точка:"
+#: ../share/extensions/restack.inx.h:15
+#, fuzzy
+msgid "Object Reference Point"
+msgstr "Параметры Градиентной заливки"
-#: ../share/extensions/restack.inx.h:13
+#: ../share/extensions/restack.inx.h:17
#: ../share/extensions/text_extract.inx.h:9
#: ../share/extensions/text_merge.inx.h:9
msgid "Middle"
msgstr "Середина"
-#: ../share/extensions/restack.inx.h:15
-msgid "Vertical Point:"
-msgstr "Вертикальная точка:"
-
-#: ../share/extensions/restack.inx.h:16
+#: ../share/extensions/restack.inx.h:19
#: ../share/extensions/text_extract.inx.h:12
#: ../share/extensions/text_merge.inx.h:12
msgid "Top"
msgstr "Верх"
-#: ../share/extensions/restack.inx.h:17
+#: ../share/extensions/restack.inx.h:20
#: ../share/extensions/text_extract.inx.h:13
#: ../share/extensions/text_merge.inx.h:13
msgid "Bottom"
msgstr "Низ"
-#: ../share/extensions/restack.inx.h:18
+#: ../share/extensions/restack.inx.h:21
+#, fuzzy
+msgid "Based on Z-Order"
+msgstr "Приподнятый край"
+
+#: ../share/extensions/restack.inx.h:22
+#, fuzzy
+msgid "Restack Mode"
+msgstr "Поменять вертикальный порядок"
+
+#: ../share/extensions/restack.inx.h:23
+#, fuzzy
+msgid "Reverse Z-Order"
+msgstr "Развернуть градиент"
+
+#: ../share/extensions/restack.inx.h:24
+msgid "Shuffle Z-Order"
+msgstr ""
+
+#: ../share/extensions/restack.inx.h:26
+msgid ""
+"This extension changes the z-order of objects based on their position on the "
+"canvas or their current z-order. Selection: The extension restacks either "
+"objects inside a single selected group, or a selection of multiple objects "
+"on the current drawing level (layer or group)."
+msgstr ""
+
+#: ../share/extensions/restack.inx.h:27
msgid "Arrange"
msgstr "Расстановка"
@@ -37656,9 +38109,17 @@ msgid "Initial size:"
msgstr "Исходный размер"
#: ../share/extensions/rtree.inx.h:3
-#, fuzzy
msgid "Minimum size:"
-msgstr "Минимальный размер"
+msgstr "Минимальный размер:"
+
+#: ../share/extensions/rtree.inx.h:4
+#, fuzzy
+msgid "Omit redundant segments"
+msgstr "Выпрямить сегменты"
+
+#: ../share/extensions/rtree.inx.h:5
+msgid "Lift pen for backward steps"
+msgstr ""
#: ../share/extensions/rubberstretch.inx.h:1
msgid "Rubber Stretch"
@@ -37890,8 +38351,7 @@ msgstr "Нижние выносные:"
msgid "sK1 vector graphics files input"
msgstr "Импорт документов sK1"
-#: ../share/extensions/sk1_input.inx.h:2
-#: ../share/extensions/sk1_output.inx.h:2
+#: ../share/extensions/sk1_input.inx.h:2 ../share/extensions/sk1_output.inx.h:2
#, fuzzy
msgid "sK1 vector graphics files (*.sk1)"
msgstr "Файлы редактора векторной графики sK1 (.sk1)"
@@ -38836,13 +39296,11 @@ msgstr "Наклон (°):"
msgid "Hide lines behind the sphere"
msgstr "Скрыть линии позади сферы"
-#: ../share/extensions/wmf_input.inx.h:1
-#: ../share/extensions/wmf_output.inx.h:1
+#: ../share/extensions/wmf_input.inx.h:1 ../share/extensions/wmf_output.inx.h:1
msgid "Windows Metafile Input"
msgstr "Импорт файлов Windows Metafile"
-#: ../share/extensions/wmf_input.inx.h:3
-#: ../share/extensions/wmf_output.inx.h:3
+#: ../share/extensions/wmf_input.inx.h:3 ../share/extensions/wmf_output.inx.h:3
msgid "A popular graphics file format for clipart"
msgstr "Популярный графический формат для клипарата"
@@ -38850,6 +39308,34 @@ msgstr "Популярный графический формат для клип
msgid "XAML Input"
msgstr "Импорт XAML"
+#~ msgid ""
+#~ "The <b>feTile</b> filter primitive tiles a region with its input graphic"
+#~ msgstr ""
+#~ "Примитив <b>feTile</b> заполняет область мозаикой из входящего "
+#~ "изображения."
+
+#, fuzzy
+#~ msgid "Text Orientation: "
+#~ msgstr "Направление текста"
+
+#, fuzzy
+#~ msgctxt "measure extension"
+#~ msgid "Fixed Angle"
+#~ msgstr "Угол пера"
+
+#~ msgctxt "Flow control"
+#~ msgid "None"
+#~ msgstr "Нет"
+
+#~ msgid "Arbitrary Angle"
+#~ msgstr "Произвольный угол"
+
+#~ msgid "Horizontal Point:"
+#~ msgstr "Горизонтальная точка:"
+
+#~ msgid "Vertical Point:"
+#~ msgstr "Вертикальная точка:"
+
#~ msgid "PS+LaTeX: Omit text in PS, and create LaTeX file"
#~ msgstr "PS+LaTeX: пропустить текст в PS, создать файл LaTeX"
@@ -39217,10 +39703,6 @@ msgstr "Импорт XAML"
#~ msgid "Set Resolution"
#~ msgstr "Разрешение:"
-#, fuzzy
-#~ msgid "Set filter resolution"
-#~ msgstr "Разрешение для экспорта:"
-
#~ msgid "<b>Flowed text</b> (%d character%s)"
#~ msgid_plural "<b>Flowed text</b> (%d characters%s)"
#~ msgstr[0] "<b>Завёрстанный текст</b> (%d символ%s)"
@@ -39619,14 +40101,6 @@ msgstr "Импорт XAML"
#~ msgstr "Не удалось найти шрифт, совпадающий с %s\n"
#, fuzzy
-#~ msgid "keep only visible layers"
-#~ msgstr "Экспортировать невидимые слои"
-
-#, fuzzy
-#~ msgid "Preset:"
-#~ msgstr "Предустановка:"
-
-#, fuzzy
#~ msgid "Vertical guide each:"
#~ msgstr "Вертикальные направляющие каждую:"
@@ -39782,9 +40256,6 @@ msgstr "Импорт XAML"
#~ msgstr ""
#~ "Цвет и прозрачность фона страницы (важно учитывать при экспорте в растр)"
-#~ msgid "Left mouse button pans when Space is pressed"
-#~ msgstr "Перемещение по окну с нажатым пробелом и левой клавишей мыши"
-
#~ msgid ""
#~ "When on, pressing and holding Space and dragging with left mouse button "
#~ "pans canvas (as in Adobe Illustrator); when off, Space temporarily "
@@ -39962,9 +40433,6 @@ msgstr "Импорт XAML"
#~ msgid "_Find..."
#~ msgstr "_Найти..."
-#~ msgid "Toggle Bold"
-#~ msgstr "Переключить полужирность"
-
#~ msgid "Toggle bold or normal weight"
#~ msgstr "Переключить полужирность"
@@ -40487,9 +40955,6 @@ msgstr "Импорт XAML"
#~ msgid "convex hull corner"
#~ msgstr "выпуклому внешнему углу"
-#~ msgid "center"
-#~ msgstr "центру"
-
#, fuzzy
#~ msgid "Experimental"
#~ msgstr "Экспонента"
diff --git a/src/gradient-chemistry.cpp b/src/gradient-chemistry.cpp
index 409e9f0e6..886bf484d 100644
--- a/src/gradient-chemistry.cpp
+++ b/src/gradient-chemistry.cpp
@@ -1571,7 +1571,7 @@ void sp_gradient_invert_selected_gradients(SPDesktop *desktop, Inkscape::PaintTa
Inkscape::Selection *selection = desktop->getSelection();
const std::vector<SPItem*> list=selection->itemList();
- for (std::vector<SPItem*>::const_iterator i = list.begin(); i != list.end(); i++) {
+ for (std::vector<SPItem*>::const_iterator i = list.begin(); i != list.end(); ++i) {
sp_item_gradient_invert_vector_color(*i, fill_or_stroke);
}
@@ -1596,7 +1596,7 @@ void sp_gradient_reverse_selected_gradients(SPDesktop *desktop)
drag->selected_reverse_vector();
} else { // If no drag or no dragger selected, act on selection (both fill and stroke gradients)
const std::vector<SPItem*> list=selection->itemList();
- for (std::vector<SPItem*>::const_iterator i = list.begin(); i != list.end(); i++) {
+ for (std::vector<SPItem*>::const_iterator i = list.begin(); i != list.end(); ++i) {
sp_item_gradient_reverse_vector(*i, Inkscape::FOR_FILL);
sp_item_gradient_reverse_vector(*i, Inkscape::FOR_STROKE);
}
diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index b5a988729..f94ffb838 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -2083,7 +2083,7 @@ void GrDrag::updateDraggers()
g_return_if_fail(this->selection != NULL);
std::vector<SPItem*> list = this->selection->itemList();
- for (std::vector<SPItem*>::const_iterator i = list.begin(); i != list.end(); i++) {
+ for (std::vector<SPItem*>::const_iterator i = list.begin(); i != list.end(); ++i) {
SPItem *item = *i;
SPStyle *style = item->style;
@@ -2152,7 +2152,7 @@ void GrDrag::updateLines()
g_return_if_fail(this->selection != NULL);
std::vector<SPItem*> list = this->selection->itemList();
- for (std::vector<SPItem*>::const_iterator i = list.begin(); i != list.end(); i++) {
+ for (std::vector<SPItem*>::const_iterator i = list.begin(); i != list.end(); ++i) {
SPItem *item = *i;
SPStyle *style = item->style;
@@ -2296,7 +2296,7 @@ void GrDrag::updateLevels()
g_return_if_fail (this->selection != NULL);
std::vector<SPItem*> list = this->selection->itemList();
- for (std::vector<SPItem*>::const_iterator i = list.begin(); i != list.end(); i++) {
+ for (std::vector<SPItem*>::const_iterator i = list.begin(); i != list.end(); ++i) {
SPItem *item = *i;
Geom::OptRect rect = item->desktopVisualBounds();
if (rect) {
diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp
index 40994347c..9b67ba0b5 100644
--- a/src/graphlayout.cpp
+++ b/src/graphlayout.cpp
@@ -89,7 +89,7 @@ struct CheckProgress : TestConvergence {
* not connectors in filtered
*/
void filterConnectors(std::vector<SPItem*> const &items, list<SPItem *> &filtered) {
- for(std::vector<SPItem*>::const_iterator i = items.begin();i !=items.end(); i++){
+ for(std::vector<SPItem*>::const_iterator i = items.begin();i !=items.end(); ++i){
SPItem *item = *i;
if(!isConnector(item)) {
filtered.push_back(item);
diff --git a/src/live_effects/lpe-bspline.cpp b/src/live_effects/lpe-bspline.cpp
index 731b5d645..7e92e767d 100644
--- a/src/live_effects/lpe-bspline.cpp
+++ b/src/live_effects/lpe-bspline.cpp
@@ -206,6 +206,18 @@ void sp_bspline_do_effect(SPCurve *curve, double helper_size)
Geom::D2<Geom::SBasis> sbasis_helper;
Geom::CubicBezier const *cubic = NULL;
curve_n->moveto(curve_it1->initialPoint());
+ if (path_it->closed()) {
+ const Geom::Curve &closingline = path_it->back_closed();
+ // the closing line segment is always of type
+ // Geom::LineSegment.
+ if (are_near(closingline.initialPoint(), closingline.finalPoint())) {
+ // closingline.isDegenerate() did not work, because it only checks for
+ // *exact* zero length, which goes wrong for relative coordinates and
+ // rounding errors...
+ // the closing line segment has zero-length. So stop before that one!
+ curve_endit = path_it->end_open();
+ }
+ }
while (curve_it1 != curve_endit) {
SPCurve *in = new SPCurve();
in->moveto(curve_it1->initialPoint());
@@ -361,6 +373,18 @@ void LPEBSpline::doBSplineFromWidget(SPCurve *curve, double weight_ammount)
Geom::D2<Geom::SBasis> sbasis_out;
Geom::CubicBezier const *cubic = NULL;
curve_n->moveto(curve_it1->initialPoint());
+ if (path_it->closed()) {
+ const Geom::Curve &closingline = path_it->back_closed();
+ // the closing line segment is always of type
+ // Geom::LineSegment.
+ if (are_near(closingline.initialPoint(), closingline.finalPoint())) {
+ // closingline.isDegenerate() did not work, because it only checks for
+ // *exact* zero length, which goes wrong for relative coordinates and
+ // rounding errors...
+ // the closing line segment has zero-length. So stop before that one!
+ curve_endit = path_it->end_open();
+ }
+ }
while (curve_it1 != curve_endit) {
SPCurve *in = new SPCurve();
in->moveto(curve_it1->initialPoint());
diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp
index 7302f9de6..5b7874c61 100644
--- a/src/object-snapper.cpp
+++ b/src/object-snapper.cpp
@@ -239,7 +239,7 @@ void Inkscape::ObjectSnapper::_collectNodes(SnapSourceType const &t,
bool old_pref2 = _snapmanager->snapprefs.isTargetSnappable(SNAPTARGET_ROTATION_CENTER);
if (old_pref2) {
std::vector<SPItem*> rotationSource=_snapmanager->getRotationCenterSource();
- for ( std::vector<SPItem*>::const_iterator itemlist = rotationSource.begin(); itemlist != rotationSource.end(); itemlist++) {
+ for ( std::vector<SPItem*>::const_iterator itemlist = rotationSource.begin(); itemlist != rotationSource.end(); ++itemlist) {
if ((*i).item == *itemlist) {
// don't snap to this item's rotation center
_snapmanager->snapprefs.setTargetSnappable(SNAPTARGET_ROTATION_CENTER, false);
diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
index c71465782..7b52ac2e1 100644
--- a/src/path-chemistry.cpp
+++ b/src/path-chemistry.cpp
@@ -71,14 +71,14 @@ sp_selected_path_combine(SPDesktop *desktop)
items = sp_degroup_list (items); // descend into any groups in selection
std::vector<SPItem*> to_paths;
- for (std::vector<SPItem*>::const_reverse_iterator i = items.rbegin(); i != items.rend(); i++) {
+ for (std::vector<SPItem*>::const_reverse_iterator i = items.rbegin(); i != items.rend(); ++i) {
if (!dynamic_cast<SPPath *>(*i) && !dynamic_cast<SPGroup *>(*i)) {
to_paths.push_back(*i);
}
}
std::vector<Inkscape::XML::Node*> converted;
bool did = sp_item_list_to_curves(to_paths, items, converted);
- for (std::vector<Inkscape::XML::Node*>::const_iterator i = converted.begin(); i != converted.end(); i++)
+ for (std::vector<Inkscape::XML::Node*>::const_iterator i = converted.begin(); i != converted.end(); ++i)
items.push_back((SPItem*)doc->getObjectByRepr(*i));
items = sp_degroup_list (items); // converting to path may have added more groups, descend again
@@ -101,7 +101,7 @@ sp_selected_path_combine(SPDesktop *desktop)
selection->clear();
}
- for (std::vector<SPItem*>::const_reverse_iterator i = items.rbegin(); i != items.rend(); i++){
+ for (std::vector<SPItem*>::const_reverse_iterator i = items.rbegin(); i != items.rend(); ++i){
SPItem *item = *i;
SPPath *path = dynamic_cast<SPPath *>(item);
@@ -204,7 +204,7 @@ sp_selected_path_break_apart(SPDesktop *desktop)
bool did = false;
std::vector<SPItem*> itemlist(selection->itemList());
- for (std::vector<SPItem*>::const_iterator i = itemlist.begin(); i != itemlist.end(); i++){
+ for (std::vector<SPItem*>::const_iterator i = itemlist.begin(); i != itemlist.end(); ++i){
SPItem *item = *i;
@@ -354,7 +354,7 @@ bool
sp_item_list_to_curves(const std::vector<SPItem*> &items, std::vector<SPItem*>& selected, std::vector<Inkscape::XML::Node*> &to_select, bool skip_all_lpeitems)
{
bool did = false;
- for (std::vector<SPItem*>::const_iterator i = items.begin(); i != items.end(); i++){
+ for (std::vector<SPItem*>::const_iterator i = items.begin(); i != items.end(); ++i){
SPItem *item = *i;
g_assert(item != NULL);
SPDocument *document = item->document;
@@ -621,7 +621,7 @@ sp_selected_path_reverse(SPDesktop *desktop)
bool did = false;
desktop->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Reversing paths..."));
- for (std::vector<SPItem*>::const_iterator i = items.begin(); i != items.end(); i++){
+ for (std::vector<SPItem*>::const_iterator i = items.begin(); i != items.end(); ++i){
SPPath *path = dynamic_cast<SPPath *>(*i);
if (!path) {
diff --git a/src/persp3d.cpp b/src/persp3d.cpp
index dc0975d12..a48481145 100644
--- a/src/persp3d.cpp
+++ b/src/persp3d.cpp
@@ -36,10 +36,10 @@ static int global_counter = 0;
/* Constructor/destructor for the internal class */
-Persp3DImpl::Persp3DImpl() {
- tmat = Proj::TransfMat3x4 ();
- document = NULL;
-
+Persp3DImpl::Persp3DImpl() :
+ tmat (Proj::TransfMat3x4 ()),
+ document (NULL)
+{
my_counter = global_counter++;
}
diff --git a/src/selcue.cpp b/src/selcue.cpp
index c73219b7d..297b9fffc 100644
--- a/src/selcue.cpp
+++ b/src/selcue.cpp
@@ -104,7 +104,7 @@ void Inkscape::SelCue::_updateItemBboxes(gint mode, int prefs_bbox)
int bcount = 0;
std::vector<SPItem*> ll=_selection->itemList();
- for (std::vector<SPItem*>::const_iterator l = ll.begin(); l != ll.end(); l++) {
+ for (std::vector<SPItem*>::const_iterator l = ll.begin(); l != ll.end(); ++l) {
SPItem *item = *l;
SPCanvasItem* box = _item_bboxes[bcount ++];
@@ -147,7 +147,7 @@ void Inkscape::SelCue::_newItemBboxes()
int prefs_bbox = prefs->getBool("/tools/bounding_box");
std::vector<SPItem*> ll=_selection->itemList();
- for (std::vector<SPItem*>::const_iterator l = ll.begin(); l != ll.end(); l++) {
+ for (std::vector<SPItem*>::const_iterator l = ll.begin(); l != ll.end(); ++l) {
SPItem *item = *l;
Geom::OptRect const b = (prefs_bbox == 0) ?
@@ -202,7 +202,7 @@ void Inkscape::SelCue::_newTextBaselines()
_text_baselines.clear();
std::vector<SPItem*> ll = _selection->itemList();
- for (std::vector<SPItem*>::const_iterator l=ll.begin();l!=ll.end();l++) {
+ for (std::vector<SPItem*>::const_iterator l=ll.begin();l!=ll.end();++l) {
SPItem *item = *l;
SPCanvasItem* baseline_point = NULL;
diff --git a/src/sp-clippath.cpp b/src/sp-clippath.cpp
index d66508eae..0c07d1b3d 100644
--- a/src/sp-clippath.cpp
+++ b/src/sp-clippath.cpp
@@ -308,7 +308,7 @@ const gchar *SPClipPath::create (std::vector<Inkscape::XML::Node*> &reprs, SPDoc
const gchar *id = repr->attribute("id");
SPObject *clip_path_object = document->getObjectById(id);
- for (std::vector<Inkscape::XML::Node*>::const_iterator it = reprs.begin(); it != reprs.end(); it++) {
+ for (std::vector<Inkscape::XML::Node*>::const_iterator it = reprs.begin(); it != reprs.end(); ++it) {
Inkscape::XML::Node *node = (*it);
SPItem *item = SP_ITEM(clip_path_object->appendChildRepr(node));
diff --git a/src/sp-mask.cpp b/src/sp-mask.cpp
index f8fb7aff4..5f7a2ec26 100644
--- a/src/sp-mask.cpp
+++ b/src/sp-mask.cpp
@@ -221,7 +221,7 @@ sp_mask_create (std::vector<Inkscape::XML::Node*> &reprs, SPDocument *document,
const gchar *mask_id = repr->attribute("id");
SPObject *mask_object = document->getObjectById(mask_id);
- for (std::vector<Inkscape::XML::Node*>::const_iterator it = reprs.begin(); it != reprs.end(); it++) {
+ for (std::vector<Inkscape::XML::Node*>::const_iterator it = reprs.begin(); it != reprs.end(); ++it) {
Inkscape::XML::Node *node = (*it);
SPItem *item = SP_ITEM(mask_object->appendChildRepr(node));
diff --git a/src/sp-mask.h b/src/sp-mask.h
index 74bd4d66e..19786b1fd 100644
--- a/src/sp-mask.h
+++ b/src/sp-mask.h
@@ -86,10 +86,10 @@ protected:
Inkscape::XML::Node * const owner_repr = owner->getRepr();
//XML Tree being used directly here while it shouldn't be...
Inkscape::XML::Node * const obj_repr = obj->getRepr();
- char const * owner_name = NULL;
- char const * owner_mask = NULL;
- char const * obj_name = NULL;
- char const * obj_id = NULL;
+ char const * owner_name = "";
+ char const * owner_mask = "";
+ char const * obj_name = "";
+ char const * obj_id = "";
if (owner_repr != NULL) {
owner_name = owner_repr->name();
owner_mask = owner_repr->attribute("mask");
diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp
index 755d3d162..dd351a8d5 100644
--- a/src/sp-pattern.cpp
+++ b/src/sp-pattern.cpp
@@ -244,7 +244,7 @@ void SPPattern::update(SPCtx *ctx, unsigned int flags)
std::list<SPObject *> l;
_getChildren(l);
- for (SPObjectIterator it = l.begin(); it != l.end(); it++) {
+ for (SPObjectIterator it = l.begin(); it != l.end(); ++it) {
SPObject *child = *it;
sp_object_ref(child, NULL);
@@ -270,7 +270,7 @@ void SPPattern::modified(unsigned int flags)
std::list<SPObject *> l;
_getChildren(l);
- for (SPObjectIterator it = l.begin(); it != l.end(); it++) {
+ for (SPObjectIterator it = l.begin(); it != l.end(); ++it) {
SPObject *child = *it;
sp_object_ref(child, NULL);
@@ -398,7 +398,7 @@ const gchar *SPPattern::produce(const std::vector<Inkscape::XML::Node *> &reprs,
const gchar *pat_id = repr->attribute("id");
SPObject *pat_object = document->getObjectById(pat_id);
- for (NodePtrIterator i = reprs.begin(); i != reprs.end(); i++) {
+ for (NodePtrIterator i = reprs.begin(); i != reprs.end(); ++i) {
Inkscape::XML::Node *node = *i;
SPItem *copy = SP_ITEM(pat_object->appendChildRepr(node));
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 22c8c76f2..08a58291d 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -1474,7 +1474,7 @@ void FilterEffectsDialog::FilterModifier::update_selection(Selection *sel)
std::set<SPObject*> used;
std::vector<SPItem*> itemlist=sel->itemList();
- for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
+ for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; ++i) {
SPObject *obj = *i;
SPStyle *style = obj->style;
if (!style || !SP_IS_ITEM(obj)) {
@@ -1555,7 +1555,7 @@ void FilterEffectsDialog::FilterModifier::on_selection_toggled(const Glib::ustri
filter = 0;
std::vector<SPItem*> itemlist=sel->itemList();
- for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
+ for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; ++i) {
SPItem * item = *i;
SPStyle *style = item->style;
g_assert(style != NULL);
@@ -1669,7 +1669,7 @@ void FilterEffectsDialog::FilterModifier::remove_filter()
// Delete all references to this filter
std::vector<SPItem*> x,y;
std::vector<SPItem*> all = get_all_items(x, _desktop->currentRoot(), _desktop, false, false, true, y);
- for(std::vector<SPItem*>::const_iterator i=all.begin(); all.end() != i; i++) {
+ for(std::vector<SPItem*>::const_iterator i=all.begin(); all.end() != i; ++i) {
if (!SP_IS_ITEM(*i)) {
continue;
}
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index a8ac42a1b..0f368c5ac 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -561,7 +561,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
std::vector<SPItem*> out;
if (check_searchin_text.get_active()) {
- for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
+ for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; ++i) {
SPObject *obj = *i;
SPItem *item = dynamic_cast<SPItem *>(obj);
g_assert(item != NULL);
@@ -584,7 +584,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
bool attrvalue = check_attributevalue.get_active();
if (ids) {
- for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
+ for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; ++i) {
SPObject *obj = *i;
SPItem *item = dynamic_cast<SPItem *>(obj);
if (item_id_match(item, text, exact, casematch)) {
@@ -600,7 +600,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
if (style) {
- for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
+ for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; ++i) {
SPObject *obj = *i;
SPItem *item = dynamic_cast<SPItem *>(obj);
g_assert(item != NULL);
@@ -617,7 +617,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
if (attrname) {
- for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
+ for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; ++i) {
SPObject *obj = *i;
SPItem *item = dynamic_cast<SPItem *>(obj);
g_assert(item != NULL);
@@ -634,7 +634,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
if (attrvalue) {
- for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
+ for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; ++i) {
SPObject *obj = *i;
SPItem *item = dynamic_cast<SPItem *>(obj);
g_assert(item != NULL);
@@ -651,7 +651,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
if (font) {
- for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
+ for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; ++i) {
SPObject *obj = *i;
SPItem *item = dynamic_cast<SPItem *>(obj);
g_assert(item != NULL);
@@ -718,7 +718,7 @@ bool Find::item_type_match (SPItem *item)
std::vector<SPItem*> Find::filter_types (std::vector<SPItem*> &l)
{
std::vector<SPItem*> n;
- for(std::vector<SPItem*>::const_reverse_iterator i=l.rbegin(); l.rend() != i; i++) {
+ for(std::vector<SPItem*>::const_reverse_iterator i=l.rbegin(); l.rend() != i; ++i) {
SPObject *obj = *i;
SPItem *item = dynamic_cast<SPItem *>(obj);
g_assert(item != NULL);
@@ -762,7 +762,7 @@ std::vector<SPItem*> &Find::all_items (SPObject *r, std::vector<SPItem*> &l, boo
std::vector<SPItem*> &Find::all_selection_items (Inkscape::Selection *s, std::vector<SPItem*> &l, SPObject *ancestor, bool hidden, bool locked)
{
std::vector<SPItem*> itemlist=s->itemList();
- for(std::vector<SPItem*>::const_reverse_iterator i=itemlist.rbegin(); itemlist.rend() != i; i++) {
+ for(std::vector<SPItem*>::const_reverse_iterator i=itemlist.rbegin(); itemlist.rend() != i; ++i) {
SPObject *obj = *i;
SPItem *item = dynamic_cast<SPItem *>(obj);
g_assert(item != NULL);
diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index 086cbe45f..53c25c3d5 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -164,7 +164,7 @@ void GridArrangeTab::arrange()
Inkscape::Selection *selection = desktop->getSelection();
const std::vector<SPItem*> items = selection ? selection->itemList() : std::vector<SPItem*>();
- for(std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end();i++){
+ for(std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end(); ++i){
SPItem *item = *i;
Geom::OptRect b = item->documentVisualBounds();
if (!b) {
@@ -202,7 +202,7 @@ void GridArrangeTab::arrange()
cnt=0;
const std::vector<SPItem*> sizes(sorted);
- for (std::vector<SPItem*>::const_iterator i = sizes.begin();i!=sizes.end();i++) {
+ for (std::vector<SPItem*>::const_iterator i = sizes.begin();i!=sizes.end(); ++i) {
SPItem *item = *i;
Geom::OptRect b = item->documentVisualBounds();
if (b) {
@@ -301,7 +301,7 @@ g_print("\n row = %f col = %f selection x= %f selection y = %f", total_row_h
cnt=0;
std::vector<SPItem*>::iterator it = sorted.begin();
- for (row_cnt=0; ((it != sorted.end()) && (row_cnt<NoOfRows)); row_cnt++) {
+ for (row_cnt=0; ((it != sorted.end()) && (row_cnt<NoOfRows)); ++row_cnt) {
GSList *current_row = NULL;
col_cnt = 0;
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index d72dda028..726df9a61 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -479,7 +479,7 @@ void ObjectsPanel::_objectsSelected( Selection *sel ) {
_tree.get_selection()->unselect_all();
SPItem *item = NULL;
std::vector<SPItem*> const items = sel->itemList();
- for(std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end();i++){
+ for(std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end(); ++i){
item = *i;
if (setOpacity)
{
diff --git a/src/ui/dialog/polar-arrange-tab.cpp b/src/ui/dialog/polar-arrange-tab.cpp
index a93cebee8..5ec1285c1 100644
--- a/src/ui/dialog/polar-arrange-tab.cpp
+++ b/src/ui/dialog/polar-arrange-tab.cpp
@@ -373,7 +373,7 @@ void PolarArrangeTab::arrange()
Geom::Point realCenter = Geom::Point(cx, cy) * transformation;
int i = 0;
- for(std::vector<SPItem*>::const_iterator it=tmp.begin();it!=tmp.end();it++)
+ for(std::vector<SPItem*>::const_iterator it=tmp.begin();it!=tmp.end(); ++it)
{
SPItem *item = *it;
diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index 0a36877ff..b84d16686 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -1307,7 +1307,7 @@ void cc_selection_set_avoid(bool const set_avoid)
int changes = 0;
std::vector<SPItem*> l = selection->itemList();
- for(std::vector<SPItem*>::const_iterator i=l.begin();i!=l.end();i++) {
+ for(std::vector<SPItem*>::const_iterator i=l.begin();i!=l.end(); ++i) {
SPItem *item = *i;
char const *value = (set_avoid) ? "true" : NULL;
diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp
index 603458983..bcb0b12b7 100644
--- a/src/ui/tools/gradient-tool.cpp
+++ b/src/ui/tools/gradient-tool.cpp
@@ -495,7 +495,7 @@ bool GradientTool::root_handler(GdkEvent* event) {
sp_gradient_context_add_stop_near_point(this, SP_ITEM(selection->itemList().front()), this->mousepoint_doc, event->button.time);
} else {
std::vector<SPItem*> items=selection->itemList();
- for (std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end();i++) {
+ for (std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end();++i) {
SPItem *item = *i;
SPGradientType new_type = (SPGradientType) prefs->getInt("/tools/gradient/newgradient", SP_GRADIENT_TYPE_LINEAR);
Inkscape::PaintTarget fsmode = (prefs->getInt("/tools/gradient/newfillorstroke", 1) != 0) ? Inkscape::FOR_FILL : Inkscape::FOR_STROKE;
@@ -910,7 +910,7 @@ static void sp_gradient_drag(GradientTool &rc, Geom::Point const pt, guint /*sta
sp_repr_css_set_property(css, "fill-opacity", "1.0");
std::vector<SPItem*> itemlist = selection->itemList();
- for (std::vector<SPItem*>::const_iterator i = itemlist.begin();i!=itemlist.end();i++) {
+ for (std::vector<SPItem*>::const_iterator i = itemlist.begin();i!=itemlist.end();++i) {
//FIXME: see above
sp_repr_css_change_recursive((*i)->getRepr(), css, "style");
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 0d3405dbd..7de2a0b04 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -559,21 +559,27 @@ static bool fit_item(SPDesktop *desktop,
if (!rect_sprayed.hasZeroArea()) {
rgba2 = getPickerData(rect_sprayed.roundOutwards());
}
- if(pick_no_overlap){
- if(rgba != rgba2){
- return false;
+ if(pick_no_overlap) {
+ if(rgba != rgba2) {
+ if(mode != SPRAY_MODE_ERASER) {
+ return false;
+ }
}
}
- if(!pick_center){
+ if(!pick_center) {
rgba = rgba2;
}
- if(!over_transparent && (SP_RGBA32_A_F(rgba) == 0 || SP_RGBA32_A_F(rgba) < 1e-6)){
- return false;
+ if(!over_transparent && (SP_RGBA32_A_F(rgba) == 0 || SP_RGBA32_A_F(rgba) < 1e-6)) {
+ if(mode != SPRAY_MODE_ERASER) {
+ return false;
+ }
}
- if(!over_no_transparent && SP_RGBA32_A_F(rgba) > 0){
- return false;
+ if(!over_no_transparent && SP_RGBA32_A_F(rgba) > 0) {
+ if(mode != SPRAY_MODE_ERASER) {
+ return false;
+ }
}
- if(offset < 100 ){
+ if(offset < 100 ) {
offset_width = ((99.0 - offset) * width_transformed)/100.0 - width_transformed;
offset_height = ((99.0 - offset) * height_transformed)/100.0 - height_transformed;
} else {
@@ -608,13 +614,13 @@ static bool fit_item(SPDesktop *desktop,
(item_down->getAttribute("inkscape:spray-origin") &&
strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 ))
{
- if(mode == SPRAY_MODE_ERASER){
+ if(mode == SPRAY_MODE_ERASER) {
if(strcmp(item_down_sharp, spray_origin) != 0 && !selection->includes(item_down) ){
item_down->deleteObject();
items_down_erased.pop_back();
break;
}
- }else if(no_overlap){
+ } else if(no_overlap) {
if(!(offset_width < 0 && offset_height < 0 && std::abs(bbox_left - bbox_left_main) > std::abs(offset_width) &&
std::abs(bbox_top - bbox_top_main) > std::abs(offset_height))){
if(!no_overlap && (picker || over_transparent || over_no_transparent)){
@@ -622,7 +628,7 @@ static bool fit_item(SPDesktop *desktop,
}
return false;
}
- } else if(picker || over_transparent || over_no_transparent){
+ } else if(picker || over_transparent || over_no_transparent) {
item_down->setHidden(true);
item_down->updateRepr();
}
@@ -999,7 +1005,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
int i=1;
std::vector<SPItem*> items=selection->itemList();
- for(std::vector<SPItem*>::const_iterator it=items.begin();it!=items.end();it++){
+ for(std::vector<SPItem*>::const_iterator it=items.begin();it!=items.end(); ++it){
SPItem *item1 = *it;
if (i == 1) {
parent_item = item1;
@@ -1168,13 +1174,13 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
{
std::vector<SPItem*> const items(selection->itemList());
- for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+ for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end(); ++i){
SPItem *item = *i;
g_assert(item != NULL);
sp_object_ref(item);
}
- for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+ for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end(); ++i){
SPItem *item = *i;
g_assert(item != NULL);
if (sp_spray_recursive(desktop
@@ -1218,7 +1224,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
}
}
- for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+ for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end(); ++i){
SPItem *item = *i;
g_assert(item != NULL);
sp_object_unref(item);
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index 94f7aa135..39a7a3f0b 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -1077,7 +1077,7 @@ sp_tweak_dilate (TweakTool *tc, Geom::Point event_p, Geom::Point p, Geom::Point
double color_force = MIN(sqrt(path_force)/20.0, 1);
std::vector<SPItem*> items=selection->itemList();
- for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+ for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end(); ++i){
SPItem *item = *i;
if (is_color_mode (tc->mode)) {
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index fa5eabab4..a57c891e5 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -570,7 +570,7 @@ void FillNStroke::updateFromPaint()
}
}
- for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+ for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end(); ++i){
//FIXME: see above
if (kind == FILL) {
sp_repr_css_change_recursive((*i)->getRepr(), css, "style");
@@ -596,7 +596,7 @@ void FillNStroke::updateFromPaint()
// We have changed from another gradient type, or modified spread/units within
// this gradient type.
vector = sp_gradient_ensure_vector_normalized(vector);
- for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+ for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end(); ++i){
//FIXME: see above
if (kind == FILL) {
sp_repr_css_change_recursive((*i)->getRepr(), css, "style");
@@ -642,7 +642,7 @@ void FillNStroke::updateFromPaint()
// cannot just call sp_desktop_set_style, because we don't want to touch those
// objects who already have the same root pattern but through a different href
// chain. FIXME: move this to a sp_item_set_pattern
- for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+ for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end(); ++i){
Inkscape::XML::Node *selrepr = (*i)->getRepr();
if ( (kind == STROKE) && !selrepr) {
continue;
diff --git a/src/widgets/spiral-toolbar.cpp b/src/widgets/spiral-toolbar.cpp
index 751a60f06..7e7398091 100644
--- a/src/widgets/spiral-toolbar.cpp
+++ b/src/widgets/spiral-toolbar.cpp
@@ -80,7 +80,7 @@ static void sp_spl_tb_value_changed(GtkAdjustment *adj, GObject *tbl, Glib::ustr
bool modmade = false;
std::vector<SPItem*> itemlist=desktop->getSelection()->itemList();
- for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
+ for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end(); ++i){
SPItem *item = *i;
if (SP_IS_SPIRAL(item)) {
Inkscape::XML::Node *repr = item->getRepr();
@@ -196,7 +196,7 @@ static void sp_spiral_toolbox_selection_changed(Inkscape::Selection *selection,
purge_repr_listener( tbl, tbl );
std::vector<SPItem*> itemlist=selection->itemList();
- for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
+ for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end(); ++i){
SPItem *item = *i;
if (SP_IS_SPIRAL(item)) {
n_selected++;
diff --git a/src/widgets/spray-toolbar.cpp b/src/widgets/spray-toolbar.cpp
index db1f9526a..1774ba418 100644
--- a/src/widgets/spray-toolbar.cpp
+++ b/src/widgets/spray-toolbar.cpp
@@ -594,13 +594,15 @@ void sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
/* Offset */
{
+ gchar const* labels[] = {_("(minimum offset)"), 0, 0, 0, _("(default)"), 0, 0, _("(maximum offset)")};
+ gdouble values[] = {0, 25, 50, 75, 100, 150, 200, 1000};
EgeAdjustmentAction *eact = create_adjustment_action( "SprayToolOffsetAction",
_("Offset %"), _("Offset %:"),
_("Increase to segregate objects more (value in percent)"),
"/tools/spray/offset", 100,
GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
- 0, 10000, 1, 4,
- 0, 0, 0,
+ 0, 1000, 1, 4,
+ labels, values, G_N_ELEMENTS(labels),
sp_spray_offset_value_changed, NULL, 0 , 0);
g_object_set_data( holder, "offset", eact );
gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp
index 7b22e4af7..c49fbccaa 100644
--- a/src/widgets/text-toolbar.cpp
+++ b/src/widgets/text-toolbar.cpp
@@ -155,7 +155,7 @@ static void sp_text_fontfamily_value_changed( Ink_ComboBoxEntry_Action *act, GOb
act->active = 0; // New family is always at top of list.
}
- std::pair<Glib::ustring,Glib::ustring> ui = fontlister->set_font_family( act->active );
+ fontlister->set_font_family( act->active );
// active text set in sp_text_toolbox_selection_changed()
SPCSSAttr *css = sp_repr_css_attr_new ();
@@ -373,7 +373,7 @@ static void sp_text_align_mode_changed( EgeSelectOneAction *act, GObject *tbl )
// move the x of all texts to preserve the same bbox
Inkscape::Selection *selection = desktop->getSelection();
std::vector<SPItem*> itemlist=selection->itemList();
- for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
+ for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end(); ++i){
if (SP_IS_TEXT(*i)) {
SPItem *item = *i;
@@ -526,7 +526,7 @@ static void sp_text_lineheight_value_changed( GtkAdjustment *adj, GObject *tbl )
Inkscape::Selection *selection = desktop->getSelection();
bool modmade = false;
std::vector<SPItem*> itemlist=selection->itemList();
- for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
+ for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end(); ++i){
if (SP_IS_TEXT (*i)) {
(*i)->getRepr()->setAttribute("sodipodi:linespacing", sp_repr_css_property (css, "line-height", NULL));
modmade = true;
@@ -871,7 +871,7 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/
// Find out if we have flowed text now so we can use it several places
gboolean isFlow = false;
std::vector<SPItem*> itemlist=SP_ACTIVE_DESKTOP->getSelection()->itemList();
- for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
+ for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end(); ++i){
// const gchar* id = reinterpret_cast<SPItem *>(items->data)->getId();
// std::cout << " " << id << std::endl;
if( SP_IS_FLOWTEXT(*i)) {
@@ -1165,7 +1165,7 @@ static void sp_text_toolbox_select_cb( GtkEntry* entry, GtkEntryIconPosition /*p
SPDocument *document = desktop->getDocument();
std::vector<SPItem*> x,y;
std::vector<SPItem*> allList = get_all_items(x, document->getRoot(), desktop, false, false, true, y);
- for(std::vector<SPItem*>::const_reverse_iterator i=allList.rbegin();i!=allList.rend();i++){
+ for(std::vector<SPItem*>::const_reverse_iterator i=allList.rbegin();i!=allList.rend(); ++i){
SPItem *item = *i;
SPStyle *style = item->style;