=== modified file 'po/inkscape.pot'
--- po/inkscape.pot	2016-12-27 15:49:22 +0000
+++ po/inkscape.pot	2016-12-28 21:37:17 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2016-12-27 15:30+0000\n"
+"POT-Creation-Date: 2016-12-28 23:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3331,1032 +3331,1032 @@
 msgid "Old paint (bitmap)"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:2
 msgctxt "Symbol"
-msgid "AIGA Symbol Signs"
+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"
+msgid "Airport"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:5 ../share/symbols/symbols.h:6
 msgctxt "Symbol"
-msgid "Mail"
+msgid "Amphitheatre"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:7 ../share/symbols/symbols.h:8
 msgctxt "Symbol"
-msgid "Currency Exchange"
+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"
+msgid "Boat Launch"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:11 ../share/symbols/symbols.h:12
 msgctxt "Symbol"
-msgid "Cashier"
+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"
+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"
+msgid "Campfire"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:17 ../share/symbols/symbols.h:18
 msgctxt "Symbol"
-msgid "Coat Check"
+msgid "Campground"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:19 ../share/symbols/symbols.h:20
 msgctxt "Symbol"
-msgid "Baggage Lockers"
+msgid "CanoeAccess"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:21 ../share/symbols/symbols.h:22
 msgctxt "Symbol"
-msgid "Escalator"
+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"
+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"
+msgid "Drinking Water"
 msgstr ""
 
+#. Symbols: MapSymbolsNPS.svg
 #. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:27 ../share/symbols/symbols.h:28
+#: ../share/symbols/symbols.h:161 ../share/symbols/symbols.h:162
 msgctxt "Symbol"
-msgid "Stairs"
+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"
+msgid "Fishing"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:31 ../share/symbols/symbols.h:32
 msgctxt "Symbol"
-msgid "Stairs Up"
+msgid "Food Service"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:33 ../share/symbols/symbols.h:34
 msgctxt "Symbol"
-msgid "Elevator"
+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"
+msgid "Gas Station"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:37 ../share/symbols/symbols.h:38
 msgctxt "Symbol"
-msgid "Toilets - Women"
+msgid "Golfing"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:39 ../share/symbols/symbols.h:40
 msgctxt "Symbol"
-msgid "Toilets"
+msgid "Horseback Riding"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:41 ../share/symbols/symbols.h:42
 msgctxt "Symbol"
-msgid "Nursery"
+msgid "Hospital"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:43 ../share/symbols/symbols.h:44
 msgctxt "Symbol"
-msgid "Drinking Fountain"
+msgid "Ice Skating"
 msgstr ""
 
+#. Symbols: MapSymbolsNPS.svg
 #. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:45 ../share/symbols/symbols.h:46
+#: ../share/symbols/symbols.h:195 ../share/symbols/symbols.h:196
 msgctxt "Symbol"
-msgid "Waiting Room"
+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"
+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"
+msgid "Marina"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:53 ../share/symbols/symbols.h:54
 msgctxt "Symbol"
-msgid "Heliport"
+msgid "Motorbike Trail"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:55 ../share/symbols/symbols.h:56
 msgctxt "Symbol"
-msgid "Taxi"
+msgid "Radiator Water"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:57 ../share/symbols/symbols.h:58
 msgctxt "Symbol"
-msgid "Bus"
+msgid "Recycling"
 msgstr ""
 
+#. Symbols: MapSymbolsNPS.svg
 #. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:59 ../share/symbols/symbols.h:60
+#: ../share/symbols/symbols.h:247 ../share/symbols/symbols.h:248
 msgctxt "Symbol"
-msgid "Ground Transportation"
+msgid "Parking"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:61 ../share/symbols/symbols.h:62
 msgctxt "Symbol"
-msgid "Rail Transportation"
+msgid "Pets On Leash"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:63 ../share/symbols/symbols.h:64
 msgctxt "Symbol"
-msgid "Water Transportation"
+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"
+msgid "Post Office"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:67 ../share/symbols/symbols.h:68
 msgctxt "Symbol"
-msgid "Restaurant"
+msgid "Ranger Station"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:69 ../share/symbols/symbols.h:70
 msgctxt "Symbol"
-msgid "Coffeeshop"
+msgid "RV Campground"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:71 ../share/symbols/symbols.h:72
 msgctxt "Symbol"
-msgid "Bar"
+msgid "Restrooms"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:73 ../share/symbols/symbols.h:74
 msgctxt "Symbol"
-msgid "Shops"
+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"
+msgid "Sanitary Disposal Station"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:77 ../share/symbols/symbols.h:78
 msgctxt "Symbol"
-msgid "Barber Shop"
+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"
+msgid "Self Guided Trail"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:81 ../share/symbols/symbols.h:82
 msgctxt "Symbol"
-msgid "Ticket Purchase"
+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"
+msgid "Showers"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:85 ../share/symbols/symbols.h:86
 msgctxt "Symbol"
-msgid "Baggage Claim"
+msgid "Sledding"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:87 ../share/symbols/symbols.h:88
 msgctxt "Symbol"
-msgid "Customs"
+msgid "SnowmobileTrail"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:89 ../share/symbols/symbols.h:90
 msgctxt "Symbol"
-msgid "Immigration"
+msgid "Stable"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:91 ../share/symbols/symbols.h:92
 msgctxt "Symbol"
-msgid "Departing Flights"
+msgid "Store"
 msgstr ""
 
-#. Symbols: AigaSymbols.svg
+#. Symbols: MapSymbolsNPS.svg
 #: ../share/symbols/symbols.h:93 ../share/symbols/symbols.h:94
 msgctxt "Symbol"
-msgid "Arriving Flights"
+msgid "Swimming"
 msgstr ""
 
+#. Symbols: MapSymbolsNPS.svg
 #. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:95 ../share/symbols/symbols.h:96
+#: ../share/symbols/symbols.h:151 ../share/symbols/symbols.h:152
 msgctxt "Symbol"
-msgid "Smoking"
+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
 msgctxt "Symbol"
-msgid "Parking"
+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
-msgctxt "Symbol"
-msgid "Rounded Balloon"
-msgstr ""
-
-#. Symbols: BalloonSymbols.svg
-#: ../share/symbols/symbols.h:137
-msgctxt "Symbol"
-msgid "Squared Balloon"
-msgstr ""
-
-#. Symbols: BalloonSymbols.svg
-#: ../share/symbols/symbols.h:138
-msgctxt "Symbol"
-msgid "Over the Phone"
-msgstr ""
-
-#. Symbols: BalloonSymbols.svg
-#: ../share/symbols/symbols.h:139
-msgctxt "Symbol"
-msgid "Hip Balloon"
-msgstr ""
-
-#. Symbols: BalloonSymbols.svg
-#: ../share/symbols/symbols.h:140
-msgctxt "Symbol"
-msgid "Circle Balloon"
-msgstr ""
-
-#. Symbols: BalloonSymbols.svg
-#: ../share/symbols/symbols.h:141
-msgctxt "Symbol"
-msgid "Exclaim Balloon"
+msgid "Wind Surfing"
+msgstr ""
+
+#. Symbols: MapSymbolsNPS.svg
+#: ../share/symbols/symbols.h:105
+msgctxt "Symbol"
+msgid "Blank"
 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
 msgctxt "Symbol"
 msgid "Manual Input"
 msgstr ""
 
 #. Symbols: FlowSymbols.svg
-#: ../share/symbols/symbols.h:154
+#: ../share/symbols/symbols.h:118
 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
 msgctxt "Symbol"
 msgid "Connector"
 msgstr ""
 
 #. Symbols: FlowSymbols.svg
-#: ../share/symbols/symbols.h:162
+#: ../share/symbols/symbols.h:126
 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
 msgctxt "Symbol"
 msgid "Collate"
 msgstr ""
 
 #. 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: LogicSymbols.svg
-#: ../share/symbols/symbols.h:177
-msgctxt "Symbol"
-msgid "Logic Symbols"
-msgstr ""
-
-#. Symbols: LogicSymbols.svg
-#: ../share/symbols/symbols.h:178
-msgctxt "Symbol"
-msgid "Xnor Gate"
-msgstr ""
-
-#. Symbols: LogicSymbols.svg
-#: ../share/symbols/symbols.h:179
-msgctxt "Symbol"
-msgid "Xor Gate"
-msgstr ""
-
-#. Symbols: LogicSymbols.svg
-#: ../share/symbols/symbols.h:180
-msgctxt "Symbol"
-msgid "Nor Gate"
-msgstr ""
-
-#. Symbols: LogicSymbols.svg
-#: ../share/symbols/symbols.h:181
-msgctxt "Symbol"
-msgid "Or Gate"
-msgstr ""
-
-#. Symbols: LogicSymbols.svg
-#: ../share/symbols/symbols.h:182
-msgctxt "Symbol"
-msgid "Nand Gate"
-msgstr ""
-
-#. Symbols: LogicSymbols.svg
-#: ../share/symbols/symbols.h:183
-msgctxt "Symbol"
-msgid "And Gate"
-msgstr ""
-
-#. Symbols: LogicSymbols.svg
-#: ../share/symbols/symbols.h:184
-msgctxt "Symbol"
-msgid "Buffer"
-msgstr ""
-
-#. Symbols: LogicSymbols.svg
-#: ../share/symbols/symbols.h:185
-msgctxt "Symbol"
-msgid "Not Gate"
-msgstr ""
-
-#. Symbols: LogicSymbols.svg
-#: ../share/symbols/symbols.h:186
-msgctxt "Symbol"
-msgid "Buffer Small"
-msgstr ""
-
-#. Symbols: LogicSymbols.svg
-#: ../share/symbols/symbols.h:187
-msgctxt "Symbol"
-msgid "Not Gate Small"
-msgstr ""
-
-#. Symbols: MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:188
-msgctxt "Symbol"
-msgid "United States National Park Service Map Symbols"
-msgstr ""
-
-#. Symbols: MapSymbolsNPS.svg
+#. 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
+msgctxt "Symbol"
+msgid "Rounded Balloon"
+msgstr ""
+
+#. Symbols: BalloonSymbols.svg
+#: ../share/symbols/symbols.h:145
+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
+msgctxt "Symbol"
+msgid "Circle Balloon"
+msgstr ""
+
+#. Symbols: BalloonSymbols.svg
+#: ../share/symbols/symbols.h:149
+msgctxt "Symbol"
+msgid "Exclaim Balloon"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:150
+msgctxt "Symbol"
+msgid "AIGA Symbol Signs"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:153 ../share/symbols/symbols.h:154
+msgctxt "Symbol"
+msgid "Mail"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:155 ../share/symbols/symbols.h:156
+msgctxt "Symbol"
+msgid "Currency Exchange"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:157 ../share/symbols/symbols.h:158
+msgctxt "Symbol"
+msgid "Currency Exchange - Euro"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:159 ../share/symbols/symbols.h:160
+msgctxt "Symbol"
+msgid "Cashier"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:163 ../share/symbols/symbols.h:164
+msgctxt "Symbol"
+msgid "Lost and Found"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:165 ../share/symbols/symbols.h:166
+msgctxt "Symbol"
+msgid "Coat Check"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:167 ../share/symbols/symbols.h:168
+msgctxt "Symbol"
+msgid "Baggage Lockers"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:169 ../share/symbols/symbols.h:170
+msgctxt "Symbol"
+msgid "Escalator"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:171 ../share/symbols/symbols.h:172
+msgctxt "Symbol"
+msgid "Escalator Down"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:173 ../share/symbols/symbols.h:174
+msgctxt "Symbol"
+msgid "Escalator Up"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:175 ../share/symbols/symbols.h:176
+msgctxt "Symbol"
+msgid "Stairs"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:177 ../share/symbols/symbols.h:178
+msgctxt "Symbol"
+msgid "Stairs Down"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:179 ../share/symbols/symbols.h:180
+msgctxt "Symbol"
+msgid "Stairs Up"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:181 ../share/symbols/symbols.h:182
+msgctxt "Symbol"
+msgid "Elevator"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:183 ../share/symbols/symbols.h:184
+msgctxt "Symbol"
+msgid "Toilets - Men"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:185 ../share/symbols/symbols.h:186
+msgctxt "Symbol"
+msgid "Toilets - Women"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:187 ../share/symbols/symbols.h:188
+msgctxt "Symbol"
+msgid "Toilets"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:189 ../share/symbols/symbols.h:190
 msgctxt "Symbol"
-msgid "Airport"
+msgid "Nursery"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:191 ../share/symbols/symbols.h:192
 msgctxt "Symbol"
-msgid "Amphitheatre"
+msgid "Drinking Fountain"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:193 ../share/symbols/symbols.h:194
 msgctxt "Symbol"
-msgid "Bicycle Trail"
-msgstr ""
-
-#. Symbols: MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:195 ../share/symbols/symbols.h:196
-msgctxt "Symbol"
-msgid "Boat Launch"
-msgstr ""
-
-#. Symbols: MapSymbolsNPS.svg
+msgid "Waiting Room"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:197 ../share/symbols/symbols.h:198
 msgctxt "Symbol"
-msgid "Boat Tour"
+msgid "Hotel Information"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:199 ../share/symbols/symbols.h:200
 msgctxt "Symbol"
-msgid "Bus Stop"
+msgid "Air Transportation"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:201 ../share/symbols/symbols.h:202
 msgctxt "Symbol"
-msgid "Campfire"
+msgid "Heliport"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:203 ../share/symbols/symbols.h:204
 msgctxt "Symbol"
-msgid "Campground"
+msgid "Taxi"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:205 ../share/symbols/symbols.h:206
 msgctxt "Symbol"
-msgid "CanoeAccess"
+msgid "Bus"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:207 ../share/symbols/symbols.h:208
 msgctxt "Symbol"
-msgid "Crosscountry Ski Trail"
+msgid "Ground Transportation"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:209 ../share/symbols/symbols.h:210
 msgctxt "Symbol"
-msgid "Downhill Skiing"
+msgid "Rail Transportation"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:211 ../share/symbols/symbols.h:212
 msgctxt "Symbol"
-msgid "Drinking Water"
-msgstr ""
-
-#. Symbols: MapSymbolsNPS.svg
+msgid "Water Transportation"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:213 ../share/symbols/symbols.h:214
+msgctxt "Symbol"
+msgid "Car Rental"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:215 ../share/symbols/symbols.h:216
 msgctxt "Symbol"
-msgid "Fishing"
+msgid "Restaurant"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:217 ../share/symbols/symbols.h:218
 msgctxt "Symbol"
-msgid "Food Service"
+msgid "Coffeeshop"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:219 ../share/symbols/symbols.h:220
 msgctxt "Symbol"
-msgid "Four Wheel Drive Road"
+msgid "Bar"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:221 ../share/symbols/symbols.h:222
 msgctxt "Symbol"
-msgid "Gas Station"
+msgid "Shops"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:223 ../share/symbols/symbols.h:224
 msgctxt "Symbol"
-msgid "Golfing"
+msgid "Barber Shop - Beauty Salon"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:225 ../share/symbols/symbols.h:226
 msgctxt "Symbol"
-msgid "Horseback Riding"
+msgid "Barber Shop"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:227 ../share/symbols/symbols.h:228
 msgctxt "Symbol"
-msgid "Hospital"
+msgid "Beauty Salon"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:229 ../share/symbols/symbols.h:230
 msgctxt "Symbol"
-msgid "Ice Skating"
-msgstr ""
-
-#. Symbols: MapSymbolsNPS.svg
+msgid "Ticket Purchase"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:231 ../share/symbols/symbols.h:232
+msgctxt "Symbol"
+msgid "Baggage Check In"
+msgstr ""
+
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:233 ../share/symbols/symbols.h:234
 msgctxt "Symbol"
-msgid "Litter Receptacle"
+msgid "Baggage Claim"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:235 ../share/symbols/symbols.h:236
 msgctxt "Symbol"
-msgid "Lodging"
+msgid "Customs"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:237 ../share/symbols/symbols.h:238
 msgctxt "Symbol"
-msgid "Marina"
+msgid "Immigration"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:239 ../share/symbols/symbols.h:240
 msgctxt "Symbol"
-msgid "Motorbike Trail"
+msgid "Departing Flights"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:241 ../share/symbols/symbols.h:242
 msgctxt "Symbol"
-msgid "Radiator Water"
+msgid "Arriving Flights"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:243 ../share/symbols/symbols.h:244
 msgctxt "Symbol"
-msgid "Recycling"
+msgid "Smoking"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:247 ../share/symbols/symbols.h:248
+#. Symbols: AigaSymbols.svg
+#: ../share/symbols/symbols.h:245 ../share/symbols/symbols.h:246
 msgctxt "Symbol"
-msgid "Pets On Leash"
+msgid "No Smoking"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:249 ../share/symbols/symbols.h:250
 msgctxt "Symbol"
-msgid "Picnic Area"
+msgid "No Parking"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:251 ../share/symbols/symbols.h:252
 msgctxt "Symbol"
-msgid "Post Office"
+msgid "No Dogs"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:253 ../share/symbols/symbols.h:254
 msgctxt "Symbol"
-msgid "Ranger Station"
+msgid "No Entry"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:255 ../share/symbols/symbols.h:256
 msgctxt "Symbol"
-msgid "RV Campground"
+msgid "Exit"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:257 ../share/symbols/symbols.h:258
 msgctxt "Symbol"
-msgid "Restrooms"
+msgid "Fire Extinguisher"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:259 ../share/symbols/symbols.h:260
 msgctxt "Symbol"
-msgid "Sailing"
+msgid "Right Arrow"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:261 ../share/symbols/symbols.h:262
 msgctxt "Symbol"
-msgid "Sanitary Disposal Station"
+msgid "Forward and Right Arrow"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:263 ../share/symbols/symbols.h:264
 msgctxt "Symbol"
-msgid "Scuba Diving"
+msgid "Up Arrow"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:265 ../share/symbols/symbols.h:266
 msgctxt "Symbol"
-msgid "Self Guided Trail"
+msgid "Forward and Left Arrow"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:267 ../share/symbols/symbols.h:268
 msgctxt "Symbol"
-msgid "Shelter"
+msgid "Left Arrow"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:269 ../share/symbols/symbols.h:270
 msgctxt "Symbol"
-msgid "Showers"
+msgid "Left and Down Arrow"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:271 ../share/symbols/symbols.h:272
 msgctxt "Symbol"
-msgid "Sledding"
+msgid "Down Arrow"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:273 ../share/symbols/symbols.h:274
 msgctxt "Symbol"
-msgid "SnowmobileTrail"
+msgid "Right and Down Arrow"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:275 ../share/symbols/symbols.h:276
 msgctxt "Symbol"
-msgid "Stable"
+msgid "NPS Wheelchair Accessible - 1996"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:277 ../share/symbols/symbols.h:278
 msgctxt "Symbol"
-msgid "Store"
+msgid "NPS Wheelchair Accessible"
 msgstr ""
 
-#. Symbols: MapSymbolsNPS.svg
+#. Symbols: AigaSymbols.svg
 #: ../share/symbols/symbols.h:279 ../share/symbols/symbols.h:280
 msgctxt "Symbol"
-msgid "Swimming"
-msgstr ""
-
-#. Symbols: MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:283 ../share/symbols/symbols.h:284
-msgctxt "Symbol"
-msgid "Emergency Telephone"
-msgstr ""
-
-#. Symbols: MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:285 ../share/symbols/symbols.h:286
-msgctxt "Symbol"
-msgid "Trailhead"
-msgstr ""
-
-#. Symbols: MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:287 ../share/symbols/symbols.h:288
-msgctxt "Symbol"
-msgid "Wheelchair Accessible"
-msgstr ""
-
-#. Symbols: MapSymbolsNPS.svg
-#: ../share/symbols/symbols.h:289 ../share/symbols/symbols.h:290
-msgctxt "Symbol"
-msgid "Wind Surfing"
-msgstr ""
-
-#. Symbols: MapSymbolsNPS.svg
+msgid "New Wheelchair Accessible"
+msgstr ""
+
+#. Symbols: LogicSymbols.svg
+#: ../share/symbols/symbols.h:281
+msgctxt "Symbol"
+msgid "Logic Symbols"
+msgstr ""
+
+#. Symbols: LogicSymbols.svg
+#: ../share/symbols/symbols.h:282
+msgctxt "Symbol"
+msgid "Xnor Gate"
+msgstr ""
+
+#. Symbols: LogicSymbols.svg
+#: ../share/symbols/symbols.h:283
+msgctxt "Symbol"
+msgid "Xor Gate"
+msgstr ""
+
+#. Symbols: LogicSymbols.svg
+#: ../share/symbols/symbols.h:284
+msgctxt "Symbol"
+msgid "Nor Gate"
+msgstr ""
+
+#. Symbols: LogicSymbols.svg
+#: ../share/symbols/symbols.h:285
+msgctxt "Symbol"
+msgid "Or Gate"
+msgstr ""
+
+#. Symbols: LogicSymbols.svg
+#: ../share/symbols/symbols.h:286
+msgctxt "Symbol"
+msgid "Nand Gate"
+msgstr ""
+
+#. Symbols: LogicSymbols.svg
+#: ../share/symbols/symbols.h:287
+msgctxt "Symbol"
+msgid "And Gate"
+msgstr ""
+
+#. Symbols: LogicSymbols.svg
+#: ../share/symbols/symbols.h:288
+msgctxt "Symbol"
+msgid "Buffer"
+msgstr ""
+
+#. Symbols: LogicSymbols.svg
+#: ../share/symbols/symbols.h:289
+msgctxt "Symbol"
+msgid "Not Gate"
+msgstr ""
+
+#. Symbols: LogicSymbols.svg
+#: ../share/symbols/symbols.h:290
+msgctxt "Symbol"
+msgid "Buffer Small"
+msgstr ""
+
+#. Symbols: LogicSymbols.svg
 #: ../share/symbols/symbols.h:291
 msgctxt "Symbol"
-msgid "Blank"
+msgid "Not Gate Small"
 msgstr ""
 
 #: ../share/templates/templates.h:1
@@ -4372,6 +4372,18 @@
 msgstr ""
 
 #: ../share/templates/templates.h:1
+msgid "No Layers"
+msgstr ""
+
+#: ../share/templates/templates.h:1
+msgid "Empty sheet with no layers"
+msgstr ""
+
+#: ../share/templates/templates.h:1
+msgid "no layers empty"
+msgstr ""
+
+#: ../share/templates/templates.h:1
 msgid "LaTeX Beamer"
 msgstr ""
 
@@ -4395,18 +4407,6 @@
 msgid "guidelines typography canvas"
 msgstr ""
 
-#: ../share/templates/templates.h:1
-msgid "No Layers"
-msgstr ""
-
-#: ../share/templates/templates.h:1
-msgid "Empty sheet with no layers"
-msgstr ""
-
-#: ../share/templates/templates.h:1
-msgid "no layers empty"
-msgstr ""
-
 #. 3D box
 #: ../src/box3d.cpp:249 ../src/box3d.cpp:1303
 #: ../src/ui/dialog/inkscape-preferences.cpp:404
@@ -4844,11 +4844,11 @@
 msgstr ""
 
 #. Edit
-#: ../src/event-log.cpp:367 ../src/event-log.cpp:370 ../src/verbs.cpp:2496
+#: ../src/event-log.cpp:367 ../src/event-log.cpp:370 ../src/verbs.cpp:2495
 msgid "_Undo"
 msgstr ""
 
-#: ../src/event-log.cpp:377 ../src/event-log.cpp:381 ../src/verbs.cpp:2498
+#: ../src/event-log.cpp:377 ../src/event-log.cpp:381 ../src/verbs.cpp:2497
 msgid "_Redo"
 msgstr ""
 
@@ -4876,7 +4876,7 @@
 msgid " (No preferences)"
 msgstr ""
 
-#: ../src/extension/effect.h:70 ../src/verbs.cpp:2270
+#: ../src/extension/effect.h:70 ../src/verbs.cpp:2269
 msgid "Extensions"
 msgstr ""
 
@@ -5457,7 +5457,7 @@
 
 #: ../src/extension/internal/bitmap/opacity.cpp:40
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2784
-#: ../src/ui/dialog/objects.cpp:1629 ../src/widgets/dropper-toolbar.cpp:83
+#: ../src/ui/dialog/objects.cpp:1628 ../src/widgets/dropper-toolbar.cpp:83
 msgid "Opacity:"
 msgstr ""
 
@@ -5769,8 +5769,8 @@
 #: ../src/extension/internal/cdr-input.cpp:119
 #: ../src/extension/internal/pdfinput/pdf-input.cpp:88
 #: ../src/extension/internal/vsd-input.cpp:121
-#: ../src/extension/prefdialog.cpp:74
-#: ../src/ui/dialog/calligraphic-profile-rename.cpp:50
+#: ../src/extension/prefdialog.cpp:73
+#: ../src/ui/dialog/calligraphic-profile-rename.cpp:49
 #: ../src/ui/dialog/export.cpp:904 ../src/ui/dialog/export.cpp:1287
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:737
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1052
@@ -5788,8 +5788,8 @@
 #: ../src/extension/internal/cdr-input.cpp:120
 #: ../src/extension/internal/pdfinput/pdf-input.cpp:89
 #: ../src/extension/internal/vsd-input.cpp:122
-#: ../src/extension/prefdialog.cpp:75 ../src/ui/dialog/guides.cpp:159
-#: ../src/ui/dialog/pixelartdialog.cpp:299 ../src/ui/dialog/tracedialog.cpp:821
+#: ../src/extension/prefdialog.cpp:74 ../src/ui/dialog/guides.cpp:159
+#: ../src/ui/dialog/pixelartdialog.cpp:298 ../src/ui/dialog/tracedialog.cpp:820
 msgid "_OK"
 msgstr ""
 
@@ -7270,7 +7270,7 @@
 #: ../src/extension/internal/filter/overlays.h:59
 #: ../src/extension/internal/filter/paint.h:690
 #: ../src/extension/internal/filter/shadows.h:60 ../src/ui/dialog/find.cpp:81
-#: ../src/ui/dialog/tracedialog.cpp:746
+#: ../src/ui/dialog/tracedialog.cpp:745
 #: ../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
@@ -8239,22 +8239,22 @@
 msgid "Vector graphics format used by Corel WordPerfect"
 msgstr ""
 
-#: ../src/extension/prefdialog.cpp:74 ../src/ui/dialog/aboutbox.cpp:105
+#: ../src/extension/prefdialog.cpp:73 ../src/ui/dialog/aboutbox.cpp:102
 #: ../src/ui/dialog/knot-properties.cpp:44 ../src/ui/dialog/text-edit.cpp:66
-#: ../src/verbs.cpp:2489
+#: ../src/verbs.cpp:2488
 msgid "_Close"
 msgstr ""
 
-#: ../src/extension/prefdialog.cpp:75 ../src/ui/dialog/text-edit.cpp:67
-#: ../src/ui/dialog/transformation.cpp:144
+#: ../src/extension/prefdialog.cpp:74 ../src/ui/dialog/text-edit.cpp:67
+#: ../src/ui/dialog/transformation.cpp:143
 msgid "_Apply"
 msgstr ""
 
-#: ../src/extension/prefdialog.cpp:248
+#: ../src/extension/prefdialog.cpp:247
 msgid "Live preview"
 msgstr ""
 
-#: ../src/extension/prefdialog.cpp:248
+#: ../src/extension/prefdialog.cpp:247
 msgid "Is the effect previewed live on canvas?"
 msgstr ""
 
@@ -8584,7 +8584,7 @@
 msgstr ""
 
 #: ../src/filter-enums.cpp:120 ../src/selection-chemistry.cpp:542
-#: ../src/ui/dialog/objects.cpp:1880
+#: ../src/ui/dialog/objects.cpp:1879
 msgid "Duplicate"
 msgstr ""
 
@@ -9146,7 +9146,7 @@
 
 #: ../src/live_effects/lpe-bendpath.cpp:56
 #: ../src/live_effects/lpe-patternalongpath.cpp:67
-#: ../src/ui/dialog/export.cpp:254 ../src/ui/dialog/transformation.cpp:69
+#: ../src/ui/dialog/export.cpp:254 ../src/ui/dialog/transformation.cpp:68
 #: ../src/ui/widget/page-sizer.cpp:220
 msgid "_Width:"
 msgstr ""
@@ -10519,7 +10519,7 @@
 
 #: ../src/live_effects/lpe-perspective-envelope.cpp:411
 #: ../src/ui/dialog/debug.cpp:77 ../src/ui/dialog/messages.cpp:47
-#: ../src/ui/dialog/transformation.cpp:137
+#: ../src/ui/dialog/transformation.cpp:136
 msgid "_Clear"
 msgstr ""
 
@@ -11274,9 +11274,9 @@
 
 #: ../src/live_effects/lpe-transform_2pts.cpp:346
 #: ../src/ui/dialog/inkscape-preferences.cpp:1587
-#: ../src/ui/dialog/pixelartdialog.cpp:290
+#: ../src/ui/dialog/pixelartdialog.cpp:289
 #: ../src/ui/dialog/svg-fonts-dialog.cpp:795
-#: ../src/ui/dialog/tracedialog.cpp:812
+#: ../src/ui/dialog/tracedialog.cpp:811
 #: ../src/ui/widget/preferences-widget.cpp:661
 msgid "Reset"
 msgstr ""
@@ -11407,12 +11407,12 @@
 msgstr ""
 
 #: ../src/live_effects/parameter/originalpatharray.cpp:179
-#: ../src/ui/dialog/objects.cpp:1841
+#: ../src/ui/dialog/objects.cpp:1840
 msgid "Move Down"
 msgstr ""
 
 #: ../src/live_effects/parameter/originalpatharray.cpp:191
-#: ../src/ui/dialog/objects.cpp:1849
+#: ../src/ui/dialog/objects.cpp:1848
 msgid "Move Up"
 msgstr ""
 
@@ -11778,11 +11778,11 @@
 
 #. "       <verb verb-id=\"FileExportToOCAL\" />\n"
 #. "       <verb verb-id=\"DialogMetadata\" />\n"
-#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2767 ../src/verbs.cpp:2775
+#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2766 ../src/verbs.cpp:2774
 msgid "_Edit"
 msgstr ""
 
-#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2508
+#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2507
 msgid "Paste Si_ze"
 msgstr ""
 
@@ -12252,7 +12252,7 @@
 msgstr ""
 
 #: ../src/selection-chemistry.cpp:886 ../src/sp-item-group.cpp:655
-#: ../src/ui/dialog/objects.cpp:1903
+#: ../src/ui/dialog/objects.cpp:1902
 msgid "Ungroup"
 msgstr ""
 
@@ -12367,7 +12367,7 @@
 msgid "Select <b>object(s)</b> to move."
 msgstr ""
 
-#: ../src/selection-chemistry.cpp:1461 ../src/verbs.cpp:2710
+#: ../src/selection-chemistry.cpp:1461 ../src/verbs.cpp:2709
 msgid "Move selection to layer"
 msgstr ""
 
@@ -12388,7 +12388,7 @@
 msgstr ""
 
 #: ../src/selection-chemistry.cpp:1837 ../src/seltrans.cpp:478
-#: ../src/ui/dialog/transformation.cpp:782
+#: ../src/ui/dialog/transformation.cpp:781
 msgid "Rotate"
 msgstr ""
 
@@ -12397,7 +12397,7 @@
 msgstr ""
 
 #: ../src/selection-chemistry.cpp:2214 ../src/seltrans.cpp:475
-#: ../src/ui/dialog/transformation.cpp:756 ../src/ui/widget/page-sizer.cpp:412
+#: ../src/ui/dialog/transformation.cpp:755 ../src/ui/widget/page-sizer.cpp:412
 #: ../share/extensions/interp_att_g.inx.h:14
 msgid "Scale"
 msgstr ""
@@ -12415,7 +12415,7 @@
 msgstr ""
 
 #: ../src/selection-chemistry.cpp:2258 ../src/selection-chemistry.cpp:2283
-#: ../src/seltrans.cpp:472 ../src/ui/dialog/transformation.cpp:693
+#: ../src/seltrans.cpp:472 ../src/ui/dialog/transformation.cpp:692
 msgid "Move"
 msgstr ""
 
@@ -12567,7 +12567,7 @@
 msgid "Select <b>object(s)</b> to create clippath or mask from."
 msgstr ""
 
-#: ../src/selection-chemistry.cpp:3837 ../src/ui/dialog/objects.cpp:1909
+#: ../src/selection-chemistry.cpp:3837 ../src/ui/dialog/objects.cpp:1908
 msgid "Create Clip Group"
 msgstr ""
 
@@ -12600,11 +12600,11 @@
 msgstr ""
 
 #. Fit Page
-#: ../src/selection-chemistry.cpp:4165 ../src/verbs.cpp:3056
+#: ../src/selection-chemistry.cpp:4165 ../src/verbs.cpp:3055
 msgid "Fit Page to Selection"
 msgstr ""
 
-#: ../src/selection-chemistry.cpp:4198 ../src/verbs.cpp:3058
+#: ../src/selection-chemistry.cpp:4198 ../src/verbs.cpp:3057
 msgid "Fit Page to Drawing"
 msgstr ""
 
@@ -12733,7 +12733,7 @@
 "Shift also uses this center"
 msgstr ""
 
-#: ../src/seltrans.cpp:481 ../src/ui/dialog/transformation.cpp:871
+#: ../src/seltrans.cpp:481 ../src/ui/dialog/transformation.cpp:870
 msgid "Skew"
 msgstr ""
 
@@ -12859,7 +12859,7 @@
 msgid "Create Guides Around the Page"
 msgstr ""
 
-#: ../src/sp-guide.cpp:271 ../src/verbs.cpp:2582
+#: ../src/sp-guide.cpp:271 ../src/verbs.cpp:2581
 msgid "Delete All Guides"
 msgstr ""
 
@@ -12903,7 +12903,7 @@
 msgid "%d &#215; %d: %s"
 msgstr ""
 
-#: ../src/sp-item-group.cpp:312 ../src/ui/dialog/objects.cpp:1902
+#: ../src/sp-item-group.cpp:312 ../src/ui/dialog/objects.cpp:1901
 msgid "Group"
 msgstr ""
 
@@ -12917,7 +12917,7 @@
 msgid "of <b>%d</b> objects"
 msgstr ""
 
-#: ../src/sp-item.cpp:1026 ../src/verbs.cpp:207
+#: ../src/sp-item.cpp:1026 ../src/verbs.cpp:206
 msgid "Object"
 msgstr ""
 
@@ -13043,7 +13043,7 @@
 msgid "Conditional Group"
 msgstr ""
 
-#: ../src/sp-text.cpp:349 ../src/verbs.cpp:341
+#: ../src/sp-text.cpp:349 ../src/verbs.cpp:340
 #: ../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
@@ -13235,7 +13235,7 @@
 msgid "The flowed text(s) must be <b>visible</b> in order to be put on a path."
 msgstr ""
 
-#: ../src/text-chemistry.cpp:181 ../src/verbs.cpp:2607
+#: ../src/text-chemistry.cpp:181 ../src/verbs.cpp:2606
 msgid "Put text on path"
 msgstr ""
 
@@ -13247,7 +13247,7 @@
 msgid "<b>No texts-on-paths</b> in the selection."
 msgstr ""
 
-#: ../src/text-chemistry.cpp:215 ../src/verbs.cpp:2609
+#: ../src/text-chemistry.cpp:215 ../src/verbs.cpp:2608
 msgid "Remove text from path"
 msgstr ""
 
@@ -13304,8 +13304,8 @@
 
 #: ../src/trace/trace.cpp:59 ../src/trace/trace.cpp:124
 #: ../src/trace/trace.cpp:132 ../src/trace/trace.cpp:225
-#: ../src/ui/dialog/pixelartdialog.cpp:364
-#: ../src/ui/dialog/pixelartdialog.cpp:396
+#: ../src/ui/dialog/pixelartdialog.cpp:363
+#: ../src/ui/dialog/pixelartdialog.cpp:395
 msgid "Select an <b>image</b> to trace"
 msgstr ""
 
@@ -13389,23 +13389,23 @@
 #. *
 #. * Constructor
 #.
-#: ../src/ui/dialog/aboutbox.cpp:80
+#: ../src/ui/dialog/aboutbox.cpp:77
 msgid "About Inkscape"
 msgstr ""
 
-#: ../src/ui/dialog/aboutbox.cpp:91
+#: ../src/ui/dialog/aboutbox.cpp:88
 msgid "_Splash"
 msgstr ""
 
-#: ../src/ui/dialog/aboutbox.cpp:95
+#: ../src/ui/dialog/aboutbox.cpp:92
 msgid "_Authors"
 msgstr ""
 
-#: ../src/ui/dialog/aboutbox.cpp:97
+#: ../src/ui/dialog/aboutbox.cpp:94
 msgid "_Translators"
 msgstr ""
 
-#: ../src/ui/dialog/aboutbox.cpp:99
+#: ../src/ui/dialog/aboutbox.cpp:96
 msgid "_License"
 msgstr ""
 
@@ -13420,13 +13420,13 @@
 #. FIXME? INKSCAPE_SCREENSDIR and "about.svg" are in UTF-8, not the
 #. native filename encoding... and the filename passed to sp_document_new
 #. should be in UTF-*8..
-#: ../src/ui/dialog/aboutbox.cpp:167
+#: ../src/ui/dialog/aboutbox.cpp:164
 msgid "about.svg"
 msgstr ""
 
 #. TRANSLATORS: Put here your name (and other national contributors')
 #. one per line in the form of: name surname (email). Use \n for newline.
-#: ../src/ui/dialog/aboutbox.cpp:434
+#: ../src/ui/dialog/aboutbox.cpp:431
 msgid "translator-credits"
 msgstr ""
 
@@ -13510,53 +13510,53 @@
 msgstr ""
 
 #. Align
-#: ../src/ui/dialog/align-and-distribute.cpp:933 ../src/verbs.cpp:3088
-#: ../src/verbs.cpp:3089
+#: ../src/ui/dialog/align-and-distribute.cpp:933 ../src/verbs.cpp:3087
+#: ../src/verbs.cpp:3088
 msgid "Align right edges of objects to the left edge of the anchor"
 msgstr ""
 
-#: ../src/ui/dialog/align-and-distribute.cpp:936 ../src/verbs.cpp:3090
-#: ../src/verbs.cpp:3091
+#: ../src/ui/dialog/align-and-distribute.cpp:936 ../src/verbs.cpp:3089
+#: ../src/verbs.cpp:3090
 msgid "Align left edges"
 msgstr ""
 
-#: ../src/ui/dialog/align-and-distribute.cpp:939 ../src/verbs.cpp:3092
-#: ../src/verbs.cpp:3093
+#: ../src/ui/dialog/align-and-distribute.cpp:939 ../src/verbs.cpp:3091
+#: ../src/verbs.cpp:3092
 msgid "Center on vertical axis"
 msgstr ""
 
-#: ../src/ui/dialog/align-and-distribute.cpp:942 ../src/verbs.cpp:3094
-#: ../src/verbs.cpp:3095
+#: ../src/ui/dialog/align-and-distribute.cpp:942 ../src/verbs.cpp:3093
+#: ../src/verbs.cpp:3094
 msgid "Align right sides"
 msgstr ""
 
-#: ../src/ui/dialog/align-and-distribute.cpp:945 ../src/verbs.cpp:3096
-#: ../src/verbs.cpp:3097
+#: ../src/ui/dialog/align-and-distribute.cpp:945 ../src/verbs.cpp:3095
+#: ../src/verbs.cpp:3096
 msgid "Align left edges of objects to the right edge of the anchor"
 msgstr ""
 
-#: ../src/ui/dialog/align-and-distribute.cpp:948 ../src/verbs.cpp:3098
-#: ../src/verbs.cpp:3099
+#: ../src/ui/dialog/align-and-distribute.cpp:948 ../src/verbs.cpp:3097
+#: ../src/verbs.cpp:3098
 msgid "Align bottom edges of objects to the top edge of the anchor"
 msgstr ""
 
-#: ../src/ui/dialog/align-and-distribute.cpp:951 ../src/verbs.cpp:3100
-#: ../src/verbs.cpp:3101
+#: ../src/ui/dialog/align-and-distribute.cpp:951 ../src/verbs.cpp:3099
+#: ../src/verbs.cpp:3100
 msgid "Align top edges"
 msgstr ""
 
-#: ../src/ui/dialog/align-and-distribute.cpp:954 ../src/verbs.cpp:3102
-#: ../src/verbs.cpp:3103
+#: ../src/ui/dialog/align-and-distribute.cpp:954 ../src/verbs.cpp:3101
+#: ../src/verbs.cpp:3102
 msgid "Center on horizontal axis"
 msgstr ""
 
-#: ../src/ui/dialog/align-and-distribute.cpp:957 ../src/verbs.cpp:3104
-#: ../src/verbs.cpp:3105
+#: ../src/ui/dialog/align-and-distribute.cpp:957 ../src/verbs.cpp:3103
+#: ../src/verbs.cpp:3104
 msgid "Align bottom edges"
 msgstr ""
 
-#: ../src/ui/dialog/align-and-distribute.cpp:960 ../src/verbs.cpp:3106
-#: ../src/verbs.cpp:3107
+#: ../src/ui/dialog/align-and-distribute.cpp:960 ../src/verbs.cpp:3105
+#: ../src/verbs.cpp:3106
 msgid "Align top edges of objects to the bottom edge of the anchor"
 msgstr ""
 
@@ -13699,30 +13699,30 @@
 msgid "Max value"
 msgstr ""
 
-#: ../src/ui/dialog/calligraphic-profile-rename.cpp:31
-#: ../src/ui/dialog/calligraphic-profile-rename.cpp:117
+#: ../src/ui/dialog/calligraphic-profile-rename.cpp:30
+#: ../src/ui/dialog/calligraphic-profile-rename.cpp:116
 msgid "Edit profile"
 msgstr ""
 
-#: ../src/ui/dialog/calligraphic-profile-rename.cpp:39
+#: ../src/ui/dialog/calligraphic-profile-rename.cpp:38
 msgid "Profile name:"
 msgstr ""
 
-#: ../src/ui/dialog/calligraphic-profile-rename.cpp:54
-#: ../src/ui/dialog/guides.cpp:160 ../src/verbs.cpp:2528
+#: ../src/ui/dialog/calligraphic-profile-rename.cpp:53
+#: ../src/ui/dialog/guides.cpp:160 ../src/verbs.cpp:2527
 msgid "_Delete"
 msgstr ""
 
-#: ../src/ui/dialog/calligraphic-profile-rename.cpp:59
+#: ../src/ui/dialog/calligraphic-profile-rename.cpp:58
 #: ../src/ui/dialog/export.cpp:1288
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1053
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1600
-#: ../src/ui/dialog/input.cpp:953 ../src/verbs.cpp:2468
+#: ../src/ui/dialog/input.cpp:953 ../src/verbs.cpp:2467
 #: ../src/widgets/desktop-widget.cpp:1048
 msgid "_Save"
 msgstr ""
 
-#: ../src/ui/dialog/calligraphic-profile-rename.cpp:113
+#: ../src/ui/dialog/calligraphic-profile-rename.cpp:112
 msgid "Add profile"
 msgstr ""
 
@@ -14724,7 +14724,7 @@
 msgid "Guides"
 msgstr ""
 
-#: ../src/ui/dialog/document-properties.cpp:149 ../src/verbs.cpp:2889
+#: ../src/ui/dialog/document-properties.cpp:149 ../src/verbs.cpp:2888
 msgid "Snap"
 msgstr ""
 
@@ -14776,7 +14776,7 @@
 #. Inkscape::GC::release(defsRepr);
 #. inform the document, so we can undo
 #. Color Management
-#: ../src/ui/dialog/document-properties.cpp:498 ../src/verbs.cpp:3072
+#: ../src/ui/dialog/document-properties.cpp:498 ../src/verbs.cpp:3071
 msgid "Link Color Profile"
 msgstr ""
 
@@ -14845,7 +14845,7 @@
 msgstr ""
 
 #: ../src/ui/dialog/document-properties.cpp:800
-#: ../src/ui/dialog/objects.cpp:1881
+#: ../src/ui/dialog/objects.cpp:1880
 msgid "New"
 msgstr ""
 
@@ -14919,15 +14919,15 @@
 msgid "Changed default display unit"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:123 ../src/verbs.cpp:2939
+#: ../src/ui/dialog/export.cpp:123 ../src/verbs.cpp:2938
 msgid "_Page"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:123 ../src/verbs.cpp:2943
+#: ../src/ui/dialog/export.cpp:123 ../src/verbs.cpp:2942
 msgid "_Drawing"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:123 ../src/verbs.cpp:2945
+#: ../src/ui/dialog/export.cpp:123 ../src/verbs.cpp:2944
 msgid "_Selection"
 msgstr ""
 
@@ -15033,7 +15033,7 @@
 msgid "dp_i"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:265 ../src/ui/dialog/transformation.cpp:71
+#: ../src/ui/dialog/export.cpp:265 ../src/ui/dialog/transformation.cpp:70
 #: ../src/ui/widget/page-sizer.cpp:221
 msgid "_Height:"
 msgstr ""
@@ -15150,8 +15150,8 @@
 msgid "Information"
 msgstr ""
 
-#: ../src/ui/dialog/extension-editor.cpp:80 ../src/verbs.cpp:303
-#: ../src/verbs.cpp:322 ../share/extensions/color_HSL_adjust.inx.h:11
+#: ../src/ui/dialog/extension-editor.cpp:80 ../src/verbs.cpp:302
+#: ../src/verbs.cpp:321 ../share/extensions/color_HSL_adjust.inx.h:11
 #: ../share/extensions/color_custom.inx.h:7
 #: ../share/extensions/color_randomize.inx.h:11
 #: ../share/extensions/dots.inx.h:7
@@ -15312,7 +15312,7 @@
 msgid "Document"
 msgstr ""
 
-#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1490 ../src/verbs.cpp:169
+#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1490 ../src/verbs.cpp:168
 #: ../src/widgets/desktop-widget.cpp:1937
 #: ../share/extensions/printing_marks.inx.h:18
 msgid "Selection"
@@ -15488,8 +15488,8 @@
 #. File
 #. Tag
 #: ../src/ui/dialog/filter-effects-dialog.cpp:1321
-#: ../src/ui/dialog/svg-fonts-dialog.cpp:989 ../src/verbs.cpp:2462
-#: ../src/verbs.cpp:2780
+#: ../src/ui/dialog/svg-fonts-dialog.cpp:989 ../src/verbs.cpp:2461
+#: ../src/verbs.cpp:2779
 msgid "_New"
 msgstr ""
 
@@ -17055,11 +17055,11 @@
 msgid "Append text"
 msgstr ""
 
-#: ../src/ui/dialog/grid-arrange-tab.cpp:342
+#: ../src/ui/dialog/grid-arrange-tab.cpp:341
 msgid "Arrange in a grid"
 msgstr ""
 
-#: ../src/ui/dialog/grid-arrange-tab.cpp:570
+#: ../src/ui/dialog/grid-arrange-tab.cpp:569
 #: ../src/ui/dialog/object-attributes.cpp:63
 #: ../src/ui/dialog/object-attributes.cpp:72
 #: ../src/ui/widget/page-sizer.cpp:230 ../src/widgets/desktop-widget.cpp:609
@@ -17067,11 +17067,11 @@
 msgid "X:"
 msgstr ""
 
-#: ../src/ui/dialog/grid-arrange-tab.cpp:570
+#: ../src/ui/dialog/grid-arrange-tab.cpp:569
 msgid "Horizontal spacing between columns."
 msgstr ""
 
-#: ../src/ui/dialog/grid-arrange-tab.cpp:571
+#: ../src/ui/dialog/grid-arrange-tab.cpp:570
 #: ../src/ui/dialog/object-attributes.cpp:64
 #: ../src/ui/dialog/object-attributes.cpp:73
 #: ../src/ui/widget/page-sizer.cpp:231 ../src/widgets/desktop-widget.cpp:610
@@ -17079,54 +17079,54 @@
 msgid "Y:"
 msgstr ""
 
-#: ../src/ui/dialog/grid-arrange-tab.cpp:571
+#: ../src/ui/dialog/grid-arrange-tab.cpp:570
 msgid "Vertical spacing between rows."
 msgstr ""
 
-#: ../src/ui/dialog/grid-arrange-tab.cpp:613
+#: ../src/ui/dialog/grid-arrange-tab.cpp:612
 msgid "_Rows:"
 msgstr ""
 
-#: ../src/ui/dialog/grid-arrange-tab.cpp:622
+#: ../src/ui/dialog/grid-arrange-tab.cpp:621
 msgid "Number of rows"
 msgstr ""
 
-#: ../src/ui/dialog/grid-arrange-tab.cpp:626
+#: ../src/ui/dialog/grid-arrange-tab.cpp:625
 msgid "Equal _height"
 msgstr ""
 
-#: ../src/ui/dialog/grid-arrange-tab.cpp:637
+#: ../src/ui/dialog/grid-arrange-tab.cpp:636
 msgid "If not set, each row has the height of the tallest object in it"
 msgstr ""
 
 #. #### Number of columns ####
-#: ../src/ui/dialog/grid-arrange-tab.cpp:653
+#: ../src/ui/dialog/grid-arrange-tab.cpp:652
 msgid "_Columns:"
 msgstr ""
 
-#: ../src/ui/dialog/grid-arrange-tab.cpp:662
+#: ../src/ui/dialog/grid-arrange-tab.cpp:661
 msgid "Number of columns"
 msgstr ""
 
-#: ../src/ui/dialog/grid-arrange-tab.cpp:666
+#: ../src/ui/dialog/grid-arrange-tab.cpp:665
 msgid "Equal _width"
 msgstr ""
 
-#: ../src/ui/dialog/grid-arrange-tab.cpp:676
+#: ../src/ui/dialog/grid-arrange-tab.cpp:675
 msgid "If not set, each column has the width of the widest object in it"
 msgstr ""
 
 #. Anchor selection widget
-#: ../src/ui/dialog/grid-arrange-tab.cpp:687
+#: ../src/ui/dialog/grid-arrange-tab.cpp:686
 msgid "Alignment:"
 msgstr ""
 
 #. #### Radio buttons to control spacing manually or to fit selection bbox ####
-#: ../src/ui/dialog/grid-arrange-tab.cpp:696
+#: ../src/ui/dialog/grid-arrange-tab.cpp:695
 msgid "_Fit into selection box"
 msgstr ""
 
-#: ../src/ui/dialog/grid-arrange-tab.cpp:703
+#: ../src/ui/dialog/grid-arrange-tab.cpp:702
 msgid "_Set spacing:"
 msgstr ""
 
@@ -17186,25 +17186,25 @@
 msgid "Current: %s"
 msgstr ""
 
-#: ../src/ui/dialog/icon-preview.cpp:152
+#: ../src/ui/dialog/icon-preview.cpp:151
 #, c-format
 msgid "%d x %d"
 msgstr ""
 
-#: ../src/ui/dialog/icon-preview.cpp:164
+#: ../src/ui/dialog/icon-preview.cpp:163
 msgid "Magnified:"
 msgstr ""
 
-#: ../src/ui/dialog/icon-preview.cpp:233
+#: ../src/ui/dialog/icon-preview.cpp:232
 msgid "Actual Size:"
 msgstr ""
 
-#: ../src/ui/dialog/icon-preview.cpp:238
+#: ../src/ui/dialog/icon-preview.cpp:237
 msgctxt "Icon preview window"
 msgid "Sele_ction"
 msgstr ""
 
-#: ../src/ui/dialog/icon-preview.cpp:240
+#: ../src/ui/dialog/icon-preview.cpp:239
 msgid "Selection only or whole document"
 msgstr ""
 
@@ -17542,7 +17542,7 @@
 msgstr ""
 
 #. Measure
-#: ../src/ui/dialog/inkscape-preferences.cpp:387 ../src/verbs.cpp:2815
+#: ../src/ui/dialog/inkscape-preferences.cpp:387 ../src/verbs.cpp:2814
 msgctxt "ContextVerb"
 msgid "Measure"
 msgstr ""
@@ -17597,7 +17597,7 @@
 msgstr ""
 
 #. Text
-#: ../src/ui/dialog/inkscape-preferences.cpp:446 ../src/verbs.cpp:2807
+#: ../src/ui/dialog/inkscape-preferences.cpp:446 ../src/verbs.cpp:2806
 msgctxt "ContextVerb"
 msgid "Text"
 msgstr ""
@@ -19237,7 +19237,7 @@
 msgstr ""
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1240
-#: ../src/ui/dialog/tracedialog.cpp:521 ../src/ui/dialog/tracedialog.cpp:720
+#: ../src/ui/dialog/tracedialog.cpp:520 ../src/ui/dialog/tracedialog.cpp:719
 msgid "_Threshold:"
 msgstr ""
 
@@ -19418,7 +19418,7 @@
 msgstr ""
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1311
-#: ../src/ui/dialog/objects.cpp:1630
+#: ../src/ui/dialog/objects.cpp:1629
 #: ../src/ui/widget/filter-effect-chooser.cpp:23
 msgid "%"
 msgstr ""
@@ -19695,7 +19695,7 @@
 msgstr ""
 
 #. Note: /options/bitmapoversample removed with Cairo renderer
-#: ../src/ui/dialog/inkscape-preferences.cpp:1465 ../src/verbs.cpp:150
+#: ../src/ui/dialog/inkscape-preferences.cpp:1465 ../src/verbs.cpp:149
 #: ../src/widgets/calligraphy-toolbar.cpp:626
 msgid "Edit"
 msgstr ""
@@ -19727,7 +19727,7 @@
 msgstr ""
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1476
-#: ../src/ui/dialog/xml-tree.cpp:898
+#: ../src/ui/dialog/xml-tree.cpp:897
 msgid "Create"
 msgstr ""
 
@@ -20106,7 +20106,7 @@
 #: ../src/ui/dialog/knot-properties.cpp:116
 #: ../src/ui/dialog/layer-properties.cpp:381
 #: ../src/ui/dialog/lpe-powerstroke-properties.cpp:113
-#: ../src/ui/dialog/transformation.cpp:103
+#: ../src/ui/dialog/transformation.cpp:102
 msgid "_Move"
 msgstr ""
 
@@ -20146,8 +20146,8 @@
 
 #. TODO: find an unused layer number, forming name from _("Layer ") + "%d"
 #: ../src/ui/dialog/layer-properties.cpp:324
-#: ../src/ui/dialog/layer-properties.cpp:380 ../src/verbs.cpp:188
-#: ../src/verbs.cpp:2399
+#: ../src/ui/dialog/layer-properties.cpp:380 ../src/verbs.cpp:187
+#: ../src/verbs.cpp:2398
 msgid "Layer"
 msgstr ""
 
@@ -20197,13 +20197,13 @@
 msgid "Unlock layer"
 msgstr ""
 
-#: ../src/ui/dialog/layers.cpp:616 ../src/ui/dialog/objects.cpp:831
-#: ../src/verbs.cpp:1458
+#: ../src/ui/dialog/layers.cpp:616 ../src/ui/dialog/objects.cpp:830
+#: ../src/verbs.cpp:1457
 msgid "Toggle layer solo"
 msgstr ""
 
-#: ../src/ui/dialog/layers.cpp:619 ../src/ui/dialog/objects.cpp:834
-#: ../src/verbs.cpp:1482
+#: ../src/ui/dialog/layers.cpp:619 ../src/ui/dialog/objects.cpp:833
+#: ../src/verbs.cpp:1481
 msgid "Lock other layers"
 msgstr ""
 
@@ -20240,73 +20240,73 @@
 msgid "Add Path Effect"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:111
+#: ../src/ui/dialog/livepatheffect-editor.cpp:110
 msgid "Add path effect"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:115
+#: ../src/ui/dialog/livepatheffect-editor.cpp:114
 msgid "Delete current path effect"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:119
+#: ../src/ui/dialog/livepatheffect-editor.cpp:118
 msgid "Raise the current path effect"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:123
+#: ../src/ui/dialog/livepatheffect-editor.cpp:122
 msgid "Lower the current path effect"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:289
+#: ../src/ui/dialog/livepatheffect-editor.cpp:288
 msgid "Unknown effect is applied"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:292
+#: ../src/ui/dialog/livepatheffect-editor.cpp:291
 msgid "Click button to add an effect"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:307
+#: ../src/ui/dialog/livepatheffect-editor.cpp:306
 msgid "Click add button to convert clone"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:312
-#: ../src/ui/dialog/livepatheffect-editor.cpp:316
-#: ../src/ui/dialog/livepatheffect-editor.cpp:325
+#: ../src/ui/dialog/livepatheffect-editor.cpp:311
+#: ../src/ui/dialog/livepatheffect-editor.cpp:315
+#: ../src/ui/dialog/livepatheffect-editor.cpp:324
 msgid "Select a path or shape"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:321
+#: ../src/ui/dialog/livepatheffect-editor.cpp:320
 msgid "Only one item can be selected"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:353
+#: ../src/ui/dialog/livepatheffect-editor.cpp:352
 msgid "Unknown effect"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:429
+#: ../src/ui/dialog/livepatheffect-editor.cpp:428
 msgid "Create and apply path effect"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:469
+#: ../src/ui/dialog/livepatheffect-editor.cpp:468
 msgid "Create and apply Clone original path effect"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:497
+#: ../src/ui/dialog/livepatheffect-editor.cpp:496
 msgid "Remove path effect"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:515
+#: ../src/ui/dialog/livepatheffect-editor.cpp:514
 msgid "Move path effect up"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:532
+#: ../src/ui/dialog/livepatheffect-editor.cpp:531
 msgid "Move path effect down"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:587
+#: ../src/ui/dialog/livepatheffect-editor.cpp:586
 msgid "Activate path effect"
 msgstr ""
 
-#: ../src/ui/dialog/livepatheffect-editor.cpp:587
+#: ../src/ui/dialog/livepatheffect-editor.cpp:586
 msgid "Deactivate path effect"
 msgstr ""
 
@@ -20500,8 +20500,8 @@
 msgstr ""
 
 #. Button for setting the object's id, label, title and description.
-#: ../src/ui/dialog/object-properties.cpp:240 ../src/verbs.cpp:2765
-#: ../src/verbs.cpp:2771
+#: ../src/ui/dialog/object-properties.cpp:240 ../src/verbs.cpp:2764
+#: ../src/verbs.cpp:2770
 msgid "_Set"
 msgstr ""
 
@@ -20559,192 +20559,192 @@
 msgid "Unhide object"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:861
+#: ../src/ui/dialog/objects.cpp:860
 msgid "Unhide objects"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:861
+#: ../src/ui/dialog/objects.cpp:860
 msgid "Hide objects"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:881
+#: ../src/ui/dialog/objects.cpp:880
 msgid "Lock objects"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:881
+#: ../src/ui/dialog/objects.cpp:880
 msgid "Unlock objects"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:893
+#: ../src/ui/dialog/objects.cpp:892
 msgid "Layer to group"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:893
+#: ../src/ui/dialog/objects.cpp:892
 msgid "Group to layer"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1091
+#: ../src/ui/dialog/objects.cpp:1090
 msgid "Moved objects"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1340 ../src/ui/dialog/tags.cpp:839
+#: ../src/ui/dialog/objects.cpp:1339 ../src/ui/dialog/tags.cpp:839
 #: ../src/ui/dialog/tags.cpp:846
 msgid "Rename object"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1447
+#: ../src/ui/dialog/objects.cpp:1446
 msgid "Set object highlight color"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1457
+#: ../src/ui/dialog/objects.cpp:1456
 msgid "Set object opacity"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1486
+#: ../src/ui/dialog/objects.cpp:1485
 msgid "Set object blend mode"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1555
+#: ../src/ui/dialog/objects.cpp:1554
 msgid "Set object blur"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1621
+#: ../src/ui/dialog/objects.cpp:1620
 msgctxt "Visibility"
 msgid "V"
 msgstr ""
 
+#: ../src/ui/dialog/objects.cpp:1621
+msgctxt "Lock"
+msgid "L"
+msgstr ""
+
 #: ../src/ui/dialog/objects.cpp:1622
-msgctxt "Lock"
-msgid "L"
+msgctxt "Type"
+msgid "T"
 msgstr ""
 
 #: ../src/ui/dialog/objects.cpp:1623
-msgctxt "Type"
-msgid "T"
-msgstr ""
-
-#: ../src/ui/dialog/objects.cpp:1624
 msgctxt "Clip and mask"
 msgid "CM"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1625
+#: ../src/ui/dialog/objects.cpp:1624
 msgctxt "Highlight"
 msgid "HL"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1626
+#: ../src/ui/dialog/objects.cpp:1625
 msgid "Label"
 msgstr ""
 
 #. In order to get tooltips on header, we must create our own label.
-#: ../src/ui/dialog/objects.cpp:1664
+#: ../src/ui/dialog/objects.cpp:1663
 msgid "Toggle visibility of Layer, Group, or Object."
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1677
+#: ../src/ui/dialog/objects.cpp:1676
 msgid "Toggle lock of Layer, Group, or Object."
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1689
+#: ../src/ui/dialog/objects.cpp:1688
 msgid ""
 "Type: Layer, Group, or Object. Clicking on Layer or Group icon, toggles "
 "between the two types."
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1708
+#: ../src/ui/dialog/objects.cpp:1707
 msgid "Is object clipped and/or masked?"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1719
+#: ../src/ui/dialog/objects.cpp:1718
 msgid ""
 "Highlight color of outline in Node tool. Click to set. If alpha is zero, use "
 "inherited color."
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1730
+#: ../src/ui/dialog/objects.cpp:1729
 msgid ""
 "Layer/Group/Object label (inkscape:label). Double-click to set. Default "
 "value is object 'id'."
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1818
+#: ../src/ui/dialog/objects.cpp:1817
 msgid "Add layer..."
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1825
+#: ../src/ui/dialog/objects.cpp:1824
 msgid "Remove object"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1833
+#: ../src/ui/dialog/objects.cpp:1832
 msgid "Move To Bottom"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1857
+#: ../src/ui/dialog/objects.cpp:1856
 msgid "Move To Top"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1865
+#: ../src/ui/dialog/objects.cpp:1864
 msgid "Collapse All"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1879
+#: ../src/ui/dialog/objects.cpp:1878
 msgid "Rename"
 msgstr ""
 
+#: ../src/ui/dialog/objects.cpp:1884
+msgid "Solo"
+msgstr ""
+
 #: ../src/ui/dialog/objects.cpp:1885
-msgid "Solo"
+msgid "Show All"
 msgstr ""
 
 #: ../src/ui/dialog/objects.cpp:1886
-msgid "Show All"
-msgstr ""
-
-#: ../src/ui/dialog/objects.cpp:1887
 msgid "Hide All"
 msgstr ""
 
+#: ../src/ui/dialog/objects.cpp:1890
+msgid "Lock Others"
+msgstr ""
+
 #: ../src/ui/dialog/objects.cpp:1891
-msgid "Lock Others"
-msgstr ""
-
-#: ../src/ui/dialog/objects.cpp:1892
 msgid "Lock All"
 msgstr ""
 
 #. LockAndHide
-#: ../src/ui/dialog/objects.cpp:1893 ../src/verbs.cpp:3063
+#: ../src/ui/dialog/objects.cpp:1892 ../src/verbs.cpp:3062
 msgid "Unlock All"
 msgstr ""
 
+#: ../src/ui/dialog/objects.cpp:1896
+msgid "Up"
+msgstr ""
+
 #: ../src/ui/dialog/objects.cpp:1897
-msgid "Up"
-msgstr ""
-
-#: ../src/ui/dialog/objects.cpp:1898
 msgid "Down"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1907
+#: ../src/ui/dialog/objects.cpp:1906
 msgid "Set Clip"
 msgstr ""
 
 #. will never be implemented
 #. _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_OBJECT_SET_INVERSE_CLIPPATH, 0, "Set Inverse Clip", (int)BUTTON_SETINVCLIP ) );
-#: ../src/ui/dialog/objects.cpp:1913
+#: ../src/ui/dialog/objects.cpp:1912
 msgid "Unset Clip"
 msgstr ""
 
 #. Set mask
-#: ../src/ui/dialog/objects.cpp:1917 ../src/ui/interface.cpp:1712
+#: ../src/ui/dialog/objects.cpp:1916 ../src/ui/interface.cpp:1712
 msgid "Set Mask"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1918
+#: ../src/ui/dialog/objects.cpp:1917
 msgid "Unset Mask"
 msgstr ""
 
-#: ../src/ui/dialog/objects.cpp:1940
+#: ../src/ui/dialog/objects.cpp:1939
 msgid "Select Highlight Color"
 msgstr ""
 
@@ -20802,98 +20802,98 @@
 msgid "Close"
 msgstr ""
 
-#: ../src/ui/dialog/pixelartdialog.cpp:184
+#: ../src/ui/dialog/pixelartdialog.cpp:183
 msgid "_Curves (multiplier):"
 msgstr ""
 
-#: ../src/ui/dialog/pixelartdialog.cpp:187
+#: ../src/ui/dialog/pixelartdialog.cpp:186
 msgid "Favors connections that are part of a long curve"
 msgstr ""
 
-#: ../src/ui/dialog/pixelartdialog.cpp:198
+#: ../src/ui/dialog/pixelartdialog.cpp:197
 msgid "_Islands (weight):"
 msgstr ""
 
-#: ../src/ui/dialog/pixelartdialog.cpp:201
+#: ../src/ui/dialog/pixelartdialog.cpp:200
 msgid "Avoid single disconnected pixels"
 msgstr ""
 
-#: ../src/ui/dialog/pixelartdialog.cpp:203
+#: ../src/ui/dialog/pixelartdialog.cpp:202
 msgid "A constant vote value"
 msgstr ""
 
-#: ../src/ui/dialog/pixelartdialog.cpp:213
+#: ../src/ui/dialog/pixelartdialog.cpp:212
 msgid "Sparse pixels (window _radius):"
 msgstr ""
 
+#: ../src/ui/dialog/pixelartdialog.cpp:221
+msgid "The radius of the window analyzed"
+msgstr ""
+
 #: ../src/ui/dialog/pixelartdialog.cpp:222
-msgid "The radius of the window analyzed"
-msgstr ""
-
-#: ../src/ui/dialog/pixelartdialog.cpp:223
 msgid "Sparse pixels (_multiplier):"
 msgstr ""
 
-#: ../src/ui/dialog/pixelartdialog.cpp:234
+#: ../src/ui/dialog/pixelartdialog.cpp:233
 msgid "Favors connections that are part of foreground color"
 msgstr ""
 
-#: ../src/ui/dialog/pixelartdialog.cpp:240
+#: ../src/ui/dialog/pixelartdialog.cpp:239
 msgid "The heuristic computed vote will be multiplied by this value"
 msgstr ""
 
-#: ../src/ui/dialog/pixelartdialog.cpp:253
+#: ../src/ui/dialog/pixelartdialog.cpp:252
 msgid "Heuristics"
 msgstr ""
 
+#: ../src/ui/dialog/pixelartdialog.cpp:259
+msgid "_Voronoi diagram"
+msgstr ""
+
 #: ../src/ui/dialog/pixelartdialog.cpp:260
-msgid "_Voronoi diagram"
-msgstr ""
-
-#: ../src/ui/dialog/pixelartdialog.cpp:261
 msgid "Output composed of straight lines"
 msgstr ""
 
+#: ../src/ui/dialog/pixelartdialog.cpp:266
+msgid "Convert to _B-spline curves"
+msgstr ""
+
 #: ../src/ui/dialog/pixelartdialog.cpp:267
-msgid "Convert to _B-spline curves"
-msgstr ""
-
-#: ../src/ui/dialog/pixelartdialog.cpp:268
 msgid "Preserve staircasing artifacts"
 msgstr ""
 
+#: ../src/ui/dialog/pixelartdialog.cpp:274
+msgid "_Smooth curves"
+msgstr ""
+
 #: ../src/ui/dialog/pixelartdialog.cpp:275
-msgid "_Smooth curves"
-msgstr ""
-
-#: ../src/ui/dialog/pixelartdialog.cpp:276
 msgid "The Kopf-Lischinski algorithm"
 msgstr ""
 
-#: ../src/ui/dialog/pixelartdialog.cpp:283
+#: ../src/ui/dialog/pixelartdialog.cpp:282
 msgid "Output"
 msgstr ""
 
-#: ../src/ui/dialog/pixelartdialog.cpp:291 ../src/ui/dialog/tracedialog.cpp:813
+#: ../src/ui/dialog/pixelartdialog.cpp:290 ../src/ui/dialog/tracedialog.cpp:812
 msgid "Reset all settings to defaults"
 msgstr ""
 
 #. ## The OK button
-#: ../src/ui/dialog/pixelartdialog.cpp:294 ../src/ui/dialog/spellcheck.cpp:71
-#: ../src/ui/dialog/tracedialog.cpp:816
+#: ../src/ui/dialog/pixelartdialog.cpp:293 ../src/ui/dialog/spellcheck.cpp:71
+#: ../src/ui/dialog/tracedialog.cpp:815
 msgid "_Stop"
 msgstr ""
 
-#: ../src/ui/dialog/pixelartdialog.cpp:296 ../src/ui/dialog/tracedialog.cpp:818
+#: ../src/ui/dialog/pixelartdialog.cpp:295 ../src/ui/dialog/tracedialog.cpp:817
 msgid "Abort a trace in progress"
 msgstr ""
 
-#: ../src/ui/dialog/pixelartdialog.cpp:300 ../src/ui/dialog/tracedialog.cpp:822
+#: ../src/ui/dialog/pixelartdialog.cpp:299 ../src/ui/dialog/tracedialog.cpp:821
 msgid "Execute the trace"
 msgstr ""
 
-#: ../src/ui/dialog/pixelartdialog.cpp:382
-#: ../src/ui/dialog/pixelartdialog.cpp:416
+#: ../src/ui/dialog/pixelartdialog.cpp:381
+#: ../src/ui/dialog/pixelartdialog.cpp:415
 msgid ""
 "Image looks too big. Process may take a while and it is wise to save your "
 "document before continuing.\n"
@@ -20901,7 +20901,7 @@
 "Continue the procedure (without saving)?"
 msgstr ""
 
-#: ../src/ui/dialog/pixelartdialog.cpp:493
+#: ../src/ui/dialog/pixelartdialog.cpp:492
 msgid "Trace pixel art"
 msgstr ""
 
@@ -21488,37 +21488,37 @@
 #. ## begin mode page
 #. # begin single scan
 #. brightness
-#: ../src/ui/dialog/tracedialog.cpp:507
+#: ../src/ui/dialog/tracedialog.cpp:506
 msgid "_Brightness cutoff"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:511
+#: ../src/ui/dialog/tracedialog.cpp:510
 msgid "Trace by a given brightness level"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:518
+#: ../src/ui/dialog/tracedialog.cpp:517
 msgid "Brightness cutoff for black/white"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:528
+#: ../src/ui/dialog/tracedialog.cpp:527
 msgid "Single scan: creates a path"
 msgstr ""
 
 #. canny edge detection
 #. TRANSLATORS: "Canny" is the name of the inventor of this edge detection method
-#: ../src/ui/dialog/tracedialog.cpp:533
+#: ../src/ui/dialog/tracedialog.cpp:532
 msgid "_Edge detection"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:537
+#: ../src/ui/dialog/tracedialog.cpp:536
 msgid "Trace with optimal edge detection by J. Canny's algorithm"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:555
+#: ../src/ui/dialog/tracedialog.cpp:554
 msgid "Brightness cutoff for adjacent pixels (determines edge thickness)"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:558
+#: ../src/ui/dialog/tracedialog.cpp:557
 msgid "T_hreshold:"
 msgstr ""
 
@@ -21526,159 +21526,159 @@
 #. TRANSLATORS: Color Quantization: the process of reducing the number
 #. of colors in an image by selecting an optimized set of representative
 #. colors and then re-applying this reduced set to the original image.
-#: ../src/ui/dialog/tracedialog.cpp:570
+#: ../src/ui/dialog/tracedialog.cpp:569
 msgid "Color _quantization"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:574
+#: ../src/ui/dialog/tracedialog.cpp:573
 msgid "Trace along the boundaries of reduced colors"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:582
+#: ../src/ui/dialog/tracedialog.cpp:581
 msgid "The number of reduced colors"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:585
+#: ../src/ui/dialog/tracedialog.cpp:584
 msgid "_Colors:"
 msgstr ""
 
 #. swap black and white
-#: ../src/ui/dialog/tracedialog.cpp:593
+#: ../src/ui/dialog/tracedialog.cpp:592
 msgid "_Invert image"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:598
+#: ../src/ui/dialog/tracedialog.cpp:597
 msgid "Invert black and white regions"
 msgstr ""
 
 #. # end single scan
 #. # begin multiple scan
-#: ../src/ui/dialog/tracedialog.cpp:608
+#: ../src/ui/dialog/tracedialog.cpp:607
 msgid "B_rightness steps"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:612
+#: ../src/ui/dialog/tracedialog.cpp:611
 msgid "Trace the given number of brightness levels"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:620
+#: ../src/ui/dialog/tracedialog.cpp:619
 msgid "Sc_ans:"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:624
+#: ../src/ui/dialog/tracedialog.cpp:623
 msgid "The desired number of scans"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:629
+#: ../src/ui/dialog/tracedialog.cpp:628
 msgid "Co_lors"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:633
+#: ../src/ui/dialog/tracedialog.cpp:632
 msgid "Trace the given number of reduced colors"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:638
+#: ../src/ui/dialog/tracedialog.cpp:637
 msgid "_Grays"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:642
+#: ../src/ui/dialog/tracedialog.cpp:641
 msgid "Same as Colors, but the result is converted to grayscale"
 msgstr ""
 
 #. TRANSLATORS: "Smooth" is a verb here
-#: ../src/ui/dialog/tracedialog.cpp:648
+#: ../src/ui/dialog/tracedialog.cpp:647
 msgid "S_mooth"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:652
+#: ../src/ui/dialog/tracedialog.cpp:651
 msgid "Apply Gaussian blur to the bitmap before tracing"
 msgstr ""
 
 #. TRANSLATORS: "Stack" is a verb here
-#: ../src/ui/dialog/tracedialog.cpp:656
+#: ../src/ui/dialog/tracedialog.cpp:655
 msgid "Stac_k scans"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:660
+#: ../src/ui/dialog/tracedialog.cpp:659
 msgid ""
 "Stack scans on top of one another (no gaps) instead of tiling (usually with "
 "gaps)"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:664
+#: ../src/ui/dialog/tracedialog.cpp:663
 msgid "Remo_ve background"
 msgstr ""
 
 #. TRANSLATORS: "Layer" refers to one of the stacked paths in the multiscan
-#: ../src/ui/dialog/tracedialog.cpp:669
+#: ../src/ui/dialog/tracedialog.cpp:668
 msgid "Remove bottom (background) layer when done"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:674
+#: ../src/ui/dialog/tracedialog.cpp:673
 msgid "Multiple scans: creates a group of paths"
 msgstr ""
 
 #. # end multiple scan
 #. ## end mode page
-#: ../src/ui/dialog/tracedialog.cpp:683
+#: ../src/ui/dialog/tracedialog.cpp:682
 msgid "_Mode"
 msgstr ""
 
 #. ## begin option page
 #. # potrace parameters
-#: ../src/ui/dialog/tracedialog.cpp:689
+#: ../src/ui/dialog/tracedialog.cpp:688
 msgid "Suppress _speckles"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:691
+#: ../src/ui/dialog/tracedialog.cpp:690
 msgid "Ignore small spots (speckles) in the bitmap"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:699
+#: ../src/ui/dialog/tracedialog.cpp:698
 msgid "Speckles of up to this many pixels will be suppressed"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:702
+#: ../src/ui/dialog/tracedialog.cpp:701
 msgid "S_ize:"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:707
+#: ../src/ui/dialog/tracedialog.cpp:706
 msgid "Smooth _corners"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:709
+#: ../src/ui/dialog/tracedialog.cpp:708
 msgid "Smooth out sharp corners of the trace"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:718
+#: ../src/ui/dialog/tracedialog.cpp:717
 msgid "Increase this to smooth corners more"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:725
+#: ../src/ui/dialog/tracedialog.cpp:724
 msgid "Optimize p_aths"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:728
+#: ../src/ui/dialog/tracedialog.cpp:727
 msgid "Try to optimize paths by joining adjacent Bezier curve segments"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:736
+#: ../src/ui/dialog/tracedialog.cpp:735
 msgid ""
 "Increase this to reduce the number of nodes in the trace by more aggressive "
 "optimization"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:738
+#: ../src/ui/dialog/tracedialog.cpp:737
 msgid "To_lerance:"
 msgstr ""
 
 #. ## end option page
-#: ../src/ui/dialog/tracedialog.cpp:752
+#: ../src/ui/dialog/tracedialog.cpp:751
 msgid "O_ptions"
 msgstr ""
 
 #. ### credits
-#: ../src/ui/dialog/tracedialog.cpp:756
+#: ../src/ui/dialog/tracedialog.cpp:755
 msgid ""
 "Inkscape bitmap tracing\n"
 "is based on Potrace,\n"
@@ -21687,296 +21687,296 @@
 "http://potrace.sourceforge.net"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:759
+#: ../src/ui/dialog/tracedialog.cpp:758
 msgid "Credits"
 msgstr ""
 
 #. #### begin right panel
 #. ## SIOX
-#: ../src/ui/dialog/tracedialog.cpp:773
+#: ../src/ui/dialog/tracedialog.cpp:772
 msgid "SIOX _foreground selection"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:776
+#: ../src/ui/dialog/tracedialog.cpp:775
 msgid "Cover the area you want to select as the foreground"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:781
+#: ../src/ui/dialog/tracedialog.cpp:780
 msgid "Live Preview"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:787
+#: ../src/ui/dialog/tracedialog.cpp:786
 msgid "_Update"
 msgstr ""
 
 #. I guess it's correct to call the "intermediate bitmap" a preview of the trace
-#: ../src/ui/dialog/tracedialog.cpp:795
+#: ../src/ui/dialog/tracedialog.cpp:794
 msgid ""
 "Preview the intermediate bitmap with the current settings, without actual "
 "tracing"
 msgstr ""
 
-#: ../src/ui/dialog/tracedialog.cpp:799
+#: ../src/ui/dialog/tracedialog.cpp:798
 msgid "Preview"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:65
-#: ../src/ui/dialog/transformation.cpp:75
+#: ../src/ui/dialog/transformation.cpp:64
+#: ../src/ui/dialog/transformation.cpp:74
 msgid "_Horizontal:"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:65
+#: ../src/ui/dialog/transformation.cpp:64
 msgid "Horizontal displacement (relative) or position (absolute)"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:67
-#: ../src/ui/dialog/transformation.cpp:77
+#: ../src/ui/dialog/transformation.cpp:66
+#: ../src/ui/dialog/transformation.cpp:76
 msgid "_Vertical:"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:67
+#: ../src/ui/dialog/transformation.cpp:66
 msgid "Vertical displacement (relative) or position (absolute)"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:69
+#: ../src/ui/dialog/transformation.cpp:68
 msgid "Horizontal size (absolute or percentage of current)"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:71
+#: ../src/ui/dialog/transformation.cpp:70
 msgid "Vertical size (absolute or percentage of current)"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:73
+#: ../src/ui/dialog/transformation.cpp:72
 msgid "A_ngle:"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:73
-#: ../src/ui/dialog/transformation.cpp:994
+#: ../src/ui/dialog/transformation.cpp:72
+#: ../src/ui/dialog/transformation.cpp:993
 msgid "Rotation angle (positive = counterclockwise)"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:75
+#: ../src/ui/dialog/transformation.cpp:74
 msgid ""
 "Horizontal skew angle (positive = counterclockwise), or absolute "
 "displacement, or percentage displacement"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:77
+#: ../src/ui/dialog/transformation.cpp:76
 msgid ""
 "Vertical skew angle (positive = counterclockwise), or absolute displacement, "
 "or percentage displacement"
 msgstr ""
 
+#: ../src/ui/dialog/transformation.cpp:79
+msgid "Transformation matrix element A"
+msgstr ""
+
 #: ../src/ui/dialog/transformation.cpp:80
-msgid "Transformation matrix element A"
+msgid "Transformation matrix element B"
 msgstr ""
 
 #: ../src/ui/dialog/transformation.cpp:81
-msgid "Transformation matrix element B"
+msgid "Transformation matrix element C"
 msgstr ""
 
 #: ../src/ui/dialog/transformation.cpp:82
-msgid "Transformation matrix element C"
+msgid "Transformation matrix element D"
 msgstr ""
 
 #: ../src/ui/dialog/transformation.cpp:83
-msgid "Transformation matrix element D"
+msgid "Transformation matrix element E"
 msgstr ""
 
 #: ../src/ui/dialog/transformation.cpp:84
-msgid "Transformation matrix element E"
-msgstr ""
-
-#: ../src/ui/dialog/transformation.cpp:85
 msgid "Transformation matrix element F"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:90
+#: ../src/ui/dialog/transformation.cpp:89
 msgid "Rela_tive move"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:90
+#: ../src/ui/dialog/transformation.cpp:89
 msgid ""
 "Add the specified relative displacement to the current position; otherwise, "
 "edit the current absolute position directly"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:91
+#: ../src/ui/dialog/transformation.cpp:90
 msgid "_Scale proportionally"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:91
+#: ../src/ui/dialog/transformation.cpp:90
 msgid "Preserve the width/height ratio of the scaled objects"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:92
+#: ../src/ui/dialog/transformation.cpp:91
 msgid "Apply to each _object separately"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:92
+#: ../src/ui/dialog/transformation.cpp:91
 msgid ""
 "Apply the scale/rotate/skew to each selected object separately; otherwise, "
 "transform the selection as a whole"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:93
+#: ../src/ui/dialog/transformation.cpp:92
 msgid "Edit c_urrent matrix"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:93
+#: ../src/ui/dialog/transformation.cpp:92
 msgid ""
 "Edit the current transform= matrix; otherwise, post-multiply transform= by "
 "this matrix"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:106
+#: ../src/ui/dialog/transformation.cpp:105
 msgid "_Scale"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:109
+#: ../src/ui/dialog/transformation.cpp:108
 msgid "_Rotate"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:112
+#: ../src/ui/dialog/transformation.cpp:111
 msgid "Ske_w"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:115
+#: ../src/ui/dialog/transformation.cpp:114
 msgid "Matri_x"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:139
+#: ../src/ui/dialog/transformation.cpp:138
 msgid "Reset the values on the current tab to defaults"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:146
+#: ../src/ui/dialog/transformation.cpp:145
 msgid "Apply transformation to selection"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:286
+#: ../src/ui/dialog/transformation.cpp:285
 msgid "Rotate in a counterclockwise direction"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:292
+#: ../src/ui/dialog/transformation.cpp:291
 msgid "Rotate in a clockwise direction"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:797
-#: ../src/ui/dialog/transformation.cpp:808
-#: ../src/ui/dialog/transformation.cpp:822
-#: ../src/ui/dialog/transformation.cpp:841
-#: ../src/ui/dialog/transformation.cpp:852
-#: ../src/ui/dialog/transformation.cpp:862
-#: ../src/ui/dialog/transformation.cpp:886
+#: ../src/ui/dialog/transformation.cpp:796
+#: ../src/ui/dialog/transformation.cpp:807
+#: ../src/ui/dialog/transformation.cpp:821
+#: ../src/ui/dialog/transformation.cpp:840
+#: ../src/ui/dialog/transformation.cpp:851
+#: ../src/ui/dialog/transformation.cpp:861
+#: ../src/ui/dialog/transformation.cpp:885
 msgid "Transform matrix is singular, <b>not used</b>."
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:902
+#: ../src/ui/dialog/transformation.cpp:901
 msgid "Edit transformation matrix"
 msgstr ""
 
-#: ../src/ui/dialog/transformation.cpp:1001
+#: ../src/ui/dialog/transformation.cpp:1000
 msgid "Rotation angle (positive = clockwise)"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:65 ../src/ui/dialog/xml-tree.cpp:115
+#: ../src/ui/dialog/xml-tree.cpp:64 ../src/ui/dialog/xml-tree.cpp:114
 msgid "New element node"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:66 ../src/ui/dialog/xml-tree.cpp:121
+#: ../src/ui/dialog/xml-tree.cpp:65 ../src/ui/dialog/xml-tree.cpp:120
 msgid "New text node"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:67 ../src/ui/dialog/xml-tree.cpp:135
+#: ../src/ui/dialog/xml-tree.cpp:66 ../src/ui/dialog/xml-tree.cpp:134
 msgid "nodeAsInXMLdialogTooltip|Delete node"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:68 ../src/ui/dialog/xml-tree.cpp:127
-#: ../src/ui/dialog/xml-tree.cpp:963
+#: ../src/ui/dialog/xml-tree.cpp:67 ../src/ui/dialog/xml-tree.cpp:126
+#: ../src/ui/dialog/xml-tree.cpp:962
 msgid "Duplicate node"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:74 ../src/ui/dialog/xml-tree.cpp:188
-#: ../src/ui/dialog/xml-tree.cpp:999
+#: ../src/ui/dialog/xml-tree.cpp:73 ../src/ui/dialog/xml-tree.cpp:187
+#: ../src/ui/dialog/xml-tree.cpp:998
 msgid "Delete attribute"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:78
+#: ../src/ui/dialog/xml-tree.cpp:77
 msgid "Set"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:110
+#: ../src/ui/dialog/xml-tree.cpp:109
 msgid "Drag to reorder nodes"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:143 ../src/ui/dialog/xml-tree.cpp:144
-#: ../src/ui/dialog/xml-tree.cpp:1121
+#: ../src/ui/dialog/xml-tree.cpp:142 ../src/ui/dialog/xml-tree.cpp:143
+#: ../src/ui/dialog/xml-tree.cpp:1120
 msgid "Unindent node"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:150 ../src/ui/dialog/xml-tree.cpp:151
-#: ../src/ui/dialog/xml-tree.cpp:1099
+#: ../src/ui/dialog/xml-tree.cpp:149 ../src/ui/dialog/xml-tree.cpp:150
+#: ../src/ui/dialog/xml-tree.cpp:1098
 msgid "Indent node"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:157 ../src/ui/dialog/xml-tree.cpp:158
-#: ../src/ui/dialog/xml-tree.cpp:1050
+#: ../src/ui/dialog/xml-tree.cpp:156 ../src/ui/dialog/xml-tree.cpp:157
+#: ../src/ui/dialog/xml-tree.cpp:1049
 msgid "Raise node"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:164 ../src/ui/dialog/xml-tree.cpp:165
-#: ../src/ui/dialog/xml-tree.cpp:1068
+#: ../src/ui/dialog/xml-tree.cpp:163 ../src/ui/dialog/xml-tree.cpp:164
+#: ../src/ui/dialog/xml-tree.cpp:1067
 msgid "Lower node"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:205
+#: ../src/ui/dialog/xml-tree.cpp:204
 msgid "Attribute name"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:220
+#: ../src/ui/dialog/xml-tree.cpp:219
 msgid "Attribute value"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:308
+#: ../src/ui/dialog/xml-tree.cpp:307
 msgid "<b>Click</b> to select nodes, <b>drag</b> to rearrange."
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:319
+#: ../src/ui/dialog/xml-tree.cpp:318
 msgid "<b>Click</b> attribute to edit."
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:323
+#: ../src/ui/dialog/xml-tree.cpp:322
 #, c-format
 msgid ""
 "Attribute <b>%s</b> selected. Press <b>Ctrl+Enter</b> when done editing to "
 "commit changes."
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:563
+#: ../src/ui/dialog/xml-tree.cpp:562
 msgid "Drag XML subtree"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:866
+#: ../src/ui/dialog/xml-tree.cpp:865
 msgid "New element node..."
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:892
+#: ../src/ui/dialog/xml-tree.cpp:891
 msgid "Cancel"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:929
+#: ../src/ui/dialog/xml-tree.cpp:928
 msgid "Create new element node"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:945
+#: ../src/ui/dialog/xml-tree.cpp:944
 msgid "Create new text node"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:980
+#: ../src/ui/dialog/xml-tree.cpp:979
 msgid "nodeAsInXMLinHistoryDialog|Delete node"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:1024
+#: ../src/ui/dialog/xml-tree.cpp:1023
 msgid "Change attribute"
 msgstr ""
 
@@ -22070,7 +22070,7 @@
 msgstr ""
 
 #. Item dialog
-#: ../src/ui/interface.cpp:1614 ../src/verbs.cpp:2992
+#: ../src/ui/interface.cpp:1614 ../src/verbs.cpp:2991
 msgid "_Object Properties..."
 msgstr ""
 
@@ -22138,7 +22138,7 @@
 msgstr ""
 
 #. Group
-#: ../src/ui/interface.cpp:1763 ../src/verbs.cpp:2599
+#: ../src/ui/interface.cpp:1763 ../src/verbs.cpp:2598
 msgid "_Group"
 msgstr ""
 
@@ -22147,7 +22147,7 @@
 msgstr ""
 
 #. Ungroup
-#: ../src/ui/interface.cpp:1869 ../src/verbs.cpp:2601
+#: ../src/ui/interface.cpp:1869 ../src/verbs.cpp:2600
 msgid "_Ungroup"
 msgstr ""
 
@@ -22182,7 +22182,7 @@
 
 #. Trace Bitmap
 #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize)
-#: ../src/ui/interface.cpp:1967 ../src/verbs.cpp:2680
+#: ../src/ui/interface.cpp:1967 ../src/verbs.cpp:2679
 msgid "_Trace Bitmap..."
 msgstr ""
 
@@ -22204,17 +22204,17 @@
 #. Item dialog
 #. Fill and Stroke dialog
 #: ../src/ui/interface.cpp:2141 ../src/ui/interface.cpp:2161
-#: ../src/verbs.cpp:2955
+#: ../src/verbs.cpp:2954
 msgid "_Fill and Stroke..."
 msgstr ""
 
 #. Edit Text dialog
-#: ../src/ui/interface.cpp:2167 ../src/verbs.cpp:2974
+#: ../src/ui/interface.cpp:2167 ../src/verbs.cpp:2973
 msgid "_Text and Font..."
 msgstr ""
 
 #. Spellcheck dialog
-#: ../src/ui/interface.cpp:2173 ../src/verbs.cpp:2982
+#: ../src/ui/interface.cpp:2173 ../src/verbs.cpp:2981
 msgid "Check Spellin_g..."
 msgstr ""
 
@@ -24025,7 +24025,7 @@
 msgid "Too much ink!"
 msgstr ""
 
-#: ../src/ui/widget/color-notebook.cpp:181 ../src/verbs.cpp:2818
+#: ../src/ui/widget/color-notebook.cpp:181 ../src/verbs.cpp:2817
 msgid "Pick colors from image"
 msgstr ""
 
@@ -25005,19 +25005,19 @@
 msgid "Opacity: %2.1f %%"
 msgstr ""
 
-#: ../src/vanishing-point.cpp:131
+#: ../src/vanishing-point.cpp:126
 msgid "Split vanishing points"
 msgstr ""
 
-#: ../src/vanishing-point.cpp:176
+#: ../src/vanishing-point.cpp:173
 msgid "Merge vanishing points"
 msgstr ""
 
-#: ../src/vanishing-point.cpp:244
+#: ../src/vanishing-point.cpp:240
 msgid "3D box: Move vanishing point"
 msgstr ""
 
-#: ../src/vanishing-point.cpp:327
+#: ../src/vanishing-point.cpp:325
 #, c-format
 msgid "<b>Finite</b> vanishing point shared by <b>%d</b> box"
 msgid_plural ""
@@ -25037,7 +25037,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vanishing-point.cpp:342
+#: ../src/vanishing-point.cpp:345
 #, c-format
 msgid ""
 "shared by <b>%d</b> box; drag with <b>Shift</b> to separate selected box(es)"
@@ -25047,2369 +25047,2369 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/verbs.cpp:131
+#: ../src/verbs.cpp:130
 msgid "File"
 msgstr ""
 
-#: ../src/verbs.cpp:226 ../share/extensions/interp_att_g.inx.h:24
+#: ../src/verbs.cpp:225 ../share/extensions/interp_att_g.inx.h:24
 msgid "Tag"
 msgstr ""
 
-#: ../src/verbs.cpp:245
+#: ../src/verbs.cpp:244
 msgid "Context"
 msgstr ""
 
-#: ../src/verbs.cpp:264 ../src/verbs.cpp:2333
+#: ../src/verbs.cpp:263 ../src/verbs.cpp:2332
 #: ../share/extensions/jessyInk_view.inx.h:1
 #: ../share/extensions/polyhedron_3d.inx.h:26
 msgid "View"
 msgstr ""
 
-#: ../src/verbs.cpp:284
+#: ../src/verbs.cpp:283
 msgid "Dialog"
 msgstr ""
 
+#: ../src/verbs.cpp:1309
+msgid "Switch to next layer"
+msgstr ""
+
 #: ../src/verbs.cpp:1310
-msgid "Switch to next layer"
-msgstr ""
-
-#: ../src/verbs.cpp:1311
 msgid "Switched to next layer."
 msgstr ""
 
-#: ../src/verbs.cpp:1313
+#: ../src/verbs.cpp:1312
 msgid "Cannot go past last layer."
 msgstr ""
 
+#: ../src/verbs.cpp:1321
+msgid "Switch to previous layer"
+msgstr ""
+
 #: ../src/verbs.cpp:1322
-msgid "Switch to previous layer"
-msgstr ""
-
-#: ../src/verbs.cpp:1323
 msgid "Switched to previous layer."
 msgstr ""
 
-#: ../src/verbs.cpp:1325
+#: ../src/verbs.cpp:1324
 msgid "Cannot go before first layer."
 msgstr ""
 
-#: ../src/verbs.cpp:1346 ../src/verbs.cpp:1413 ../src/verbs.cpp:1449
-#: ../src/verbs.cpp:1455 ../src/verbs.cpp:1479 ../src/verbs.cpp:1494
+#: ../src/verbs.cpp:1345 ../src/verbs.cpp:1412 ../src/verbs.cpp:1448
+#: ../src/verbs.cpp:1454 ../src/verbs.cpp:1478 ../src/verbs.cpp:1493
 msgid "No current layer."
 msgstr ""
 
-#: ../src/verbs.cpp:1375 ../src/verbs.cpp:1379
+#: ../src/verbs.cpp:1374 ../src/verbs.cpp:1378
 #, c-format
 msgid "Raised layer <b>%s</b>."
 msgstr ""
 
-#: ../src/verbs.cpp:1376
+#: ../src/verbs.cpp:1375
 msgid "Layer to top"
 msgstr ""
 
-#: ../src/verbs.cpp:1380
+#: ../src/verbs.cpp:1379
 msgid "Raise layer"
 msgstr ""
 
-#: ../src/verbs.cpp:1383 ../src/verbs.cpp:1387
+#: ../src/verbs.cpp:1382 ../src/verbs.cpp:1386
 #, c-format
 msgid "Lowered layer <b>%s</b>."
 msgstr ""
 
-#: ../src/verbs.cpp:1384
+#: ../src/verbs.cpp:1383
 msgid "Layer to bottom"
 msgstr ""
 
-#: ../src/verbs.cpp:1388
+#: ../src/verbs.cpp:1387
 msgid "Lower layer"
 msgstr ""
 
-#: ../src/verbs.cpp:1397
+#: ../src/verbs.cpp:1396
 msgid "Cannot move layer any further."
 msgstr ""
 
-#: ../src/verbs.cpp:1408
+#: ../src/verbs.cpp:1407
 msgid "Duplicate layer"
 msgstr ""
 
 #. TRANSLATORS: this means "The layer has been duplicated."
-#: ../src/verbs.cpp:1411
+#: ../src/verbs.cpp:1410
 msgid "Duplicated layer."
 msgstr ""
 
-#: ../src/verbs.cpp:1444
+#: ../src/verbs.cpp:1443
 msgid "Delete layer"
 msgstr ""
 
 #. TRANSLATORS: this means "The layer has been deleted."
-#: ../src/verbs.cpp:1447
+#: ../src/verbs.cpp:1446
 msgid "Deleted layer."
 msgstr ""
 
-#: ../src/verbs.cpp:1464
+#: ../src/verbs.cpp:1463
 msgid "Show all layers"
 msgstr ""
 
-#: ../src/verbs.cpp:1469
+#: ../src/verbs.cpp:1468
 msgid "Hide all layers"
 msgstr ""
 
-#: ../src/verbs.cpp:1474
+#: ../src/verbs.cpp:1473
 msgid "Lock all layers"
 msgstr ""
 
-#: ../src/verbs.cpp:1488
+#: ../src/verbs.cpp:1487
 msgid "Unlock all layers"
 msgstr ""
 
-#: ../src/verbs.cpp:1572
+#: ../src/verbs.cpp:1571
 msgid "Flip horizontally"
 msgstr ""
 
-#: ../src/verbs.cpp:1577
+#: ../src/verbs.cpp:1576
 msgid "Flip vertically"
 msgstr ""
 
-#: ../src/verbs.cpp:1625
+#: ../src/verbs.cpp:1624
 #, c-format
 msgid "Set %d"
 msgstr ""
 
-#: ../src/verbs.cpp:1634 ../src/verbs.cpp:2781
+#: ../src/verbs.cpp:1633 ../src/verbs.cpp:2780
 msgid "Create new selection set"
 msgstr ""
 
 #. TRANSLATORS: If you have translated the tutorial-basic.en.svgz file to your language,
 #. then translate this string as "tutorial-basic.LANG.svgz" (where LANG is your language
 #. code); otherwise leave as "tutorial-basic.svg".
-#: ../src/verbs.cpp:2211
+#: ../src/verbs.cpp:2210
 msgid "tutorial-basic.svg"
 msgstr ""
 
 #. TRANSLATORS: See "tutorial-basic.svg" comment.
-#: ../src/verbs.cpp:2215
+#: ../src/verbs.cpp:2214
 msgid "tutorial-shapes.svg"
 msgstr ""
 
 #. TRANSLATORS: See "tutorial-basic.svg" comment.
-#: ../src/verbs.cpp:2219
+#: ../src/verbs.cpp:2218
 msgid "tutorial-advanced.svg"
 msgstr ""
 
 #. TRANSLATORS: See "tutorial-basic.svg" comment.
-#: ../src/verbs.cpp:2225
+#: ../src/verbs.cpp:2224
 msgid "tutorial-tracing.svg"
 msgstr ""
 
-#: ../src/verbs.cpp:2230
+#: ../src/verbs.cpp:2229
 msgid "tutorial-tracing-pixelart.svg"
 msgstr ""
 
 #. TRANSLATORS: See "tutorial-basic.svg" comment.
-#: ../src/verbs.cpp:2234
+#: ../src/verbs.cpp:2233
 msgid "tutorial-calligraphy.svg"
 msgstr ""
 
 #. TRANSLATORS: See "tutorial-basic.svg" comment.
-#: ../src/verbs.cpp:2238
+#: ../src/verbs.cpp:2237
 msgid "tutorial-interpolate.svg"
 msgstr ""
 
 #. TRANSLATORS: See "tutorial-basic.svg" comment.
-#: ../src/verbs.cpp:2242
+#: ../src/verbs.cpp:2241
 msgid "tutorial-elements.svg"
 msgstr ""
 
 #. TRANSLATORS: See "tutorial-basic.svg" comment.
-#: ../src/verbs.cpp:2246
+#: ../src/verbs.cpp:2245
 msgid "tutorial-tips.svg"
 msgstr ""
 
-#: ../src/verbs.cpp:2432 ../src/verbs.cpp:3064
+#: ../src/verbs.cpp:2431 ../src/verbs.cpp:3063
 msgid "Unlock all objects in the current layer"
 msgstr ""
 
-#: ../src/verbs.cpp:2436 ../src/verbs.cpp:3066
+#: ../src/verbs.cpp:2435 ../src/verbs.cpp:3065
 msgid "Unlock all objects in all layers"
 msgstr ""
 
-#: ../src/verbs.cpp:2440 ../src/verbs.cpp:3068
+#: ../src/verbs.cpp:2439 ../src/verbs.cpp:3067
 msgid "Unhide all objects in the current layer"
 msgstr ""
 
-#: ../src/verbs.cpp:2444 ../src/verbs.cpp:3070
+#: ../src/verbs.cpp:2443 ../src/verbs.cpp:3069
 msgid "Unhide all objects in all layers"
 msgstr ""
 
-#: ../src/verbs.cpp:2459
+#: ../src/verbs.cpp:2458
 msgctxt "Verb"
 msgid "None"
 msgstr ""
 
-#: ../src/verbs.cpp:2459
+#: ../src/verbs.cpp:2458
 msgid "Does nothing"
 msgstr ""
 
-#: ../src/verbs.cpp:2462
+#: ../src/verbs.cpp:2461
 msgid "Create new document from the default template"
 msgstr ""
 
+#: ../src/verbs.cpp:2463
+msgid "_Open..."
+msgstr ""
+
 #: ../src/verbs.cpp:2464
-msgid "_Open..."
+msgid "Open an existing document"
 msgstr ""
 
 #: ../src/verbs.cpp:2465
-msgid "Open an existing document"
+msgid "Re_vert"
 msgstr ""
 
 #: ../src/verbs.cpp:2466
-msgid "Re_vert"
+msgid "Revert to the last saved version of document (changes will be lost)"
 msgstr ""
 
 #: ../src/verbs.cpp:2467
-msgid "Revert to the last saved version of document (changes will be lost)"
-msgstr ""
-
-#: ../src/verbs.cpp:2468
 msgid "Save document"
 msgstr ""
 
+#: ../src/verbs.cpp:2469
+msgid "Save _As..."
+msgstr ""
+
 #: ../src/verbs.cpp:2470
-msgid "Save _As..."
+msgid "Save document under a new name"
 msgstr ""
 
 #: ../src/verbs.cpp:2471
-msgid "Save document under a new name"
+msgid "Save a Cop_y..."
 msgstr ""
 
 #: ../src/verbs.cpp:2472
-msgid "Save a Cop_y..."
-msgstr ""
-
-#: ../src/verbs.cpp:2473
 msgid "Save a copy of the document under a new name"
 msgstr ""
 
-#: ../src/verbs.cpp:2474
+#: ../src/verbs.cpp:2473
 msgid "_Print..."
 msgstr ""
 
-#: ../src/verbs.cpp:2474
+#: ../src/verbs.cpp:2473
 msgid "Print document"
 msgstr ""
 
 #. TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions)
-#: ../src/verbs.cpp:2477
+#: ../src/verbs.cpp:2476
 msgid "Clean _up document"
 msgstr ""
 
-#: ../src/verbs.cpp:2477
+#: ../src/verbs.cpp:2476
 msgid ""
 "Remove unused definitions (such as gradients or clipping paths) from the &lt;"
 "defs&gt; of the document"
 msgstr ""
 
+#: ../src/verbs.cpp:2478
+msgid "_Import..."
+msgstr ""
+
 #: ../src/verbs.cpp:2479
-msgid "_Import..."
-msgstr ""
-
-#: ../src/verbs.cpp:2480
 msgid "Import a bitmap or SVG image into this document"
 msgstr ""
 
 #. new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."), N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON("document-export")),
+#: ../src/verbs.cpp:2481
+msgid "Import Clip Art..."
+msgstr ""
+
 #: ../src/verbs.cpp:2482
-msgid "Import Clip Art..."
-msgstr ""
-
-#: ../src/verbs.cpp:2483
 msgid "Import clipart from Open Clip Art Library"
 msgstr ""
 
 #. new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL),
+#: ../src/verbs.cpp:2484
+msgid "N_ext Window"
+msgstr ""
+
 #: ../src/verbs.cpp:2485
-msgid "N_ext Window"
+msgid "Switch to the next document window"
 msgstr ""
 
 #: ../src/verbs.cpp:2486
-msgid "Switch to the next document window"
+msgid "P_revious Window"
 msgstr ""
 
 #: ../src/verbs.cpp:2487
-msgid "P_revious Window"
-msgstr ""
-
-#: ../src/verbs.cpp:2488
 msgid "Switch to the previous document window"
 msgstr ""
 
-#: ../src/verbs.cpp:2490
+#: ../src/verbs.cpp:2489
 msgid "Close this document window"
 msgstr ""
 
-#: ../src/verbs.cpp:2491
+#: ../src/verbs.cpp:2490
 msgid "_Quit"
 msgstr ""
 
-#: ../src/verbs.cpp:2491
+#: ../src/verbs.cpp:2490
 msgid "Quit Inkscape"
 msgstr ""
 
+#: ../src/verbs.cpp:2491
+msgid "New from _Template..."
+msgstr ""
+
 #: ../src/verbs.cpp:2492
-msgid "New from _Template..."
-msgstr ""
-
-#: ../src/verbs.cpp:2493
 msgid "Create new project from template"
 msgstr ""
 
-#: ../src/verbs.cpp:2496
+#: ../src/verbs.cpp:2495
 msgid "Undo last action"
 msgstr ""
 
+#: ../src/verbs.cpp:2498
+msgid "Do again the last undone action"
+msgstr ""
+
 #: ../src/verbs.cpp:2499
-msgid "Do again the last undone action"
+msgid "Cu_t"
 msgstr ""
 
 #: ../src/verbs.cpp:2500
-msgid "Cu_t"
+msgid "Cut selection to clipboard"
 msgstr ""
 
 #: ../src/verbs.cpp:2501
-msgid "Cut selection to clipboard"
+msgid "_Copy"
 msgstr ""
 
 #: ../src/verbs.cpp:2502
-msgid "_Copy"
+msgid "Copy selection to clipboard"
 msgstr ""
 
 #: ../src/verbs.cpp:2503
-msgid "Copy selection to clipboard"
+msgid "_Paste"
 msgstr ""
 
 #: ../src/verbs.cpp:2504
-msgid "_Paste"
+msgid "Paste objects from clipboard to mouse point, or paste text"
 msgstr ""
 
 #: ../src/verbs.cpp:2505
-msgid "Paste objects from clipboard to mouse point, or paste text"
+msgid "Paste _Style"
 msgstr ""
 
 #: ../src/verbs.cpp:2506
-msgid "Paste _Style"
-msgstr ""
-
-#: ../src/verbs.cpp:2507
 msgid "Apply the style of the copied object to selection"
 msgstr ""
 
+#: ../src/verbs.cpp:2508
+msgid "Scale selection to match the size of the copied object"
+msgstr ""
+
 #: ../src/verbs.cpp:2509
-msgid "Scale selection to match the size of the copied object"
+msgid "Paste _Width"
 msgstr ""
 
 #: ../src/verbs.cpp:2510
-msgid "Paste _Width"
+msgid "Scale selection horizontally to match the width of the copied object"
 msgstr ""
 
 #: ../src/verbs.cpp:2511
-msgid "Scale selection horizontally to match the width of the copied object"
+msgid "Paste _Height"
 msgstr ""
 
 #: ../src/verbs.cpp:2512
-msgid "Paste _Height"
+msgid "Scale selection vertically to match the height of the copied object"
 msgstr ""
 
 #: ../src/verbs.cpp:2513
-msgid "Scale selection vertically to match the height of the copied object"
+msgid "Paste Size Separately"
 msgstr ""
 
 #: ../src/verbs.cpp:2514
-msgid "Paste Size Separately"
+msgid "Scale each selected object to match the size of the copied object"
 msgstr ""
 
 #: ../src/verbs.cpp:2515
-msgid "Scale each selected object to match the size of the copied object"
+msgid "Paste Width Separately"
 msgstr ""
 
 #: ../src/verbs.cpp:2516
-msgid "Paste Width Separately"
+msgid ""
+"Scale each selected object horizontally to match the width of the copied "
+"object"
 msgstr ""
 
 #: ../src/verbs.cpp:2517
-msgid ""
-"Scale each selected object horizontally to match the width of the copied "
-"object"
+msgid "Paste Height Separately"
 msgstr ""
 
 #: ../src/verbs.cpp:2518
-msgid "Paste Height Separately"
+msgid ""
+"Scale each selected object vertically to match the height of the copied "
+"object"
 msgstr ""
 
 #: ../src/verbs.cpp:2519
-msgid ""
-"Scale each selected object vertically to match the height of the copied "
-"object"
+msgid "Paste _In Place"
 msgstr ""
 
 #: ../src/verbs.cpp:2520
-msgid "Paste _In Place"
+msgid "Paste objects from clipboard to the original location"
 msgstr ""
 
 #: ../src/verbs.cpp:2521
-msgid "Paste objects from clipboard to the original location"
+msgid "Paste Path _Effect"
 msgstr ""
 
 #: ../src/verbs.cpp:2522
-msgid "Paste Path _Effect"
+msgid "Apply the path effect of the copied object to selection"
 msgstr ""
 
 #: ../src/verbs.cpp:2523
-msgid "Apply the path effect of the copied object to selection"
+msgid "Remove Path _Effect"
 msgstr ""
 
 #: ../src/verbs.cpp:2524
-msgid "Remove Path _Effect"
+msgid "Remove any path effects from selected objects"
 msgstr ""
 
 #: ../src/verbs.cpp:2525
-msgid "Remove any path effects from selected objects"
+msgid "_Remove Filters"
 msgstr ""
 
 #: ../src/verbs.cpp:2526
-msgid "_Remove Filters"
-msgstr ""
-
-#: ../src/verbs.cpp:2527
 msgid "Remove any filters from selected objects"
 msgstr ""
 
+#: ../src/verbs.cpp:2528
+msgid "Delete selection"
+msgstr ""
+
 #: ../src/verbs.cpp:2529
-msgid "Delete selection"
+msgid "Duplic_ate"
 msgstr ""
 
 #: ../src/verbs.cpp:2530
-msgid "Duplic_ate"
+msgid "Duplicate selected objects"
 msgstr ""
 
 #: ../src/verbs.cpp:2531
-msgid "Duplicate selected objects"
+msgid "Create Clo_ne"
 msgstr ""
 
 #: ../src/verbs.cpp:2532
-msgid "Create Clo_ne"
+msgid "Create a clone (a copy linked to the original) of selected object"
 msgstr ""
 
 #: ../src/verbs.cpp:2533
-msgid "Create a clone (a copy linked to the original) of selected object"
+msgid "Unlin_k Clone"
 msgstr ""
 
 #: ../src/verbs.cpp:2534
-msgid "Unlin_k Clone"
-msgstr ""
-
-#: ../src/verbs.cpp:2535
 msgid ""
 "Cut the selected clones' links to the originals, turning them into "
 "standalone objects"
 msgstr ""
 
+#: ../src/verbs.cpp:2535
+msgid "Unlink Clones _recursively"
+msgstr ""
+
 #: ../src/verbs.cpp:2536
-msgid "Unlink Clones _recursively"
+msgid "Unlink all clones in the selection, even if they are in groups."
 msgstr ""
 
 #: ../src/verbs.cpp:2537
-msgid "Unlink all clones in the selection, even if they are in groups."
+msgid "Relink to Copied"
 msgstr ""
 
 #: ../src/verbs.cpp:2538
-msgid "Relink to Copied"
+msgid "Relink the selected clones to the object currently on the clipboard"
 msgstr ""
 
 #: ../src/verbs.cpp:2539
-msgid "Relink the selected clones to the object currently on the clipboard"
+msgid "Select _Original"
 msgstr ""
 
 #: ../src/verbs.cpp:2540
-msgid "Select _Original"
+msgid "Select the object to which the selected clone is linked"
 msgstr ""
 
 #: ../src/verbs.cpp:2541
-msgid "Select the object to which the selected clone is linked"
+msgid "Clone original path (LPE)"
 msgstr ""
 
 #: ../src/verbs.cpp:2542
-msgid "Clone original path (LPE)"
-msgstr ""
-
-#: ../src/verbs.cpp:2543
 msgid ""
 "Creates a new path, applies the Clone original LPE, and refers it to the "
 "selected path"
 msgstr ""
 
+#: ../src/verbs.cpp:2543
+msgid "Objects to _Marker"
+msgstr ""
+
 #: ../src/verbs.cpp:2544
-msgid "Objects to _Marker"
+msgid "Convert selection to a line marker"
 msgstr ""
 
 #: ../src/verbs.cpp:2545
-msgid "Convert selection to a line marker"
+msgid "Objects to Gu_ides"
 msgstr ""
 
 #: ../src/verbs.cpp:2546
-msgid "Objects to Gu_ides"
-msgstr ""
-
-#: ../src/verbs.cpp:2547
 msgid ""
 "Convert selected objects to a collection of guidelines aligned with their "
 "edges"
 msgstr ""
 
+#: ../src/verbs.cpp:2547
+msgid "Objects to Patter_n"
+msgstr ""
+
 #: ../src/verbs.cpp:2548
-msgid "Objects to Patter_n"
+msgid "Convert selection to a rectangle with tiled pattern fill"
 msgstr ""
 
 #: ../src/verbs.cpp:2549
-msgid "Convert selection to a rectangle with tiled pattern fill"
+msgid "Pattern to _Objects"
 msgstr ""
 
 #: ../src/verbs.cpp:2550
-msgid "Pattern to _Objects"
+msgid "Extract objects from a tiled pattern fill"
 msgstr ""
 
 #: ../src/verbs.cpp:2551
-msgid "Extract objects from a tiled pattern fill"
+msgid "Group to Symbol"
 msgstr ""
 
 #: ../src/verbs.cpp:2552
-msgid "Group to Symbol"
+msgid "Convert group to a symbol"
 msgstr ""
 
 #: ../src/verbs.cpp:2553
-msgid "Convert group to a symbol"
+msgid "Symbol to Group"
 msgstr ""
 
 #: ../src/verbs.cpp:2554
-msgid "Symbol to Group"
+msgid "Extract group from a symbol"
 msgstr ""
 
 #: ../src/verbs.cpp:2555
-msgid "Extract group from a symbol"
+msgid "Clea_r All"
 msgstr ""
 
 #: ../src/verbs.cpp:2556
-msgid "Clea_r All"
+msgid "Delete all objects from document"
 msgstr ""
 
 #: ../src/verbs.cpp:2557
-msgid "Delete all objects from document"
+msgid "Select Al_l"
 msgstr ""
 
 #: ../src/verbs.cpp:2558
-msgid "Select Al_l"
+msgid "Select all objects or all nodes"
 msgstr ""
 
 #: ../src/verbs.cpp:2559
-msgid "Select all objects or all nodes"
+msgid "Select All in All La_yers"
 msgstr ""
 
 #: ../src/verbs.cpp:2560
-msgid "Select All in All La_yers"
+msgid "Select all objects in all visible and unlocked layers"
 msgstr ""
 
 #: ../src/verbs.cpp:2561
-msgid "Select all objects in all visible and unlocked layers"
+msgid "Fill _and Stroke"
 msgstr ""
 
 #: ../src/verbs.cpp:2562
-msgid "Fill _and Stroke"
+msgid ""
+"Select all objects with the same fill and stroke as the selected objects"
 msgstr ""
 
 #: ../src/verbs.cpp:2563
-msgid ""
-"Select all objects with the same fill and stroke as the selected objects"
+msgid "_Fill Color"
 msgstr ""
 
 #: ../src/verbs.cpp:2564
-msgid "_Fill Color"
+msgid "Select all objects with the same fill as the selected objects"
 msgstr ""
 
 #: ../src/verbs.cpp:2565
-msgid "Select all objects with the same fill as the selected objects"
+msgid "_Stroke Color"
 msgstr ""
 
 #: ../src/verbs.cpp:2566
-msgid "_Stroke Color"
+msgid "Select all objects with the same stroke as the selected objects"
 msgstr ""
 
 #: ../src/verbs.cpp:2567
-msgid "Select all objects with the same stroke as the selected objects"
+msgid "Stroke St_yle"
 msgstr ""
 
 #: ../src/verbs.cpp:2568
-msgid "Stroke St_yle"
-msgstr ""
-
-#: ../src/verbs.cpp:2569
 msgid ""
 "Select all objects with the same stroke style (width, dash, markers) as the "
 "selected objects"
 msgstr ""
 
+#: ../src/verbs.cpp:2569
+msgid "_Object Type"
+msgstr ""
+
 #: ../src/verbs.cpp:2570
-msgid "_Object Type"
-msgstr ""
-
-#: ../src/verbs.cpp:2571
 msgid ""
 "Select all objects with the same object type (rect, arc, text, path, bitmap "
 "etc) as the selected objects"
 msgstr ""
 
+#: ../src/verbs.cpp:2571
+msgid "In_vert Selection"
+msgstr ""
+
 #: ../src/verbs.cpp:2572
-msgid "In_vert Selection"
+msgid "Invert selection (unselect what is selected and select everything else)"
 msgstr ""
 
 #: ../src/verbs.cpp:2573
-msgid "Invert selection (unselect what is selected and select everything else)"
+msgid "Invert in All Layers"
 msgstr ""
 
 #: ../src/verbs.cpp:2574
-msgid "Invert in All Layers"
+msgid "Invert selection in all visible and unlocked layers"
 msgstr ""
 
 #: ../src/verbs.cpp:2575
-msgid "Invert selection in all visible and unlocked layers"
+msgid "Select Next"
 msgstr ""
 
 #: ../src/verbs.cpp:2576
-msgid "Select Next"
+msgid "Select next object or node"
 msgstr ""
 
 #: ../src/verbs.cpp:2577
-msgid "Select next object or node"
+msgid "Select Previous"
 msgstr ""
 
 #: ../src/verbs.cpp:2578
-msgid "Select Previous"
+msgid "Select previous object or node"
 msgstr ""
 
 #: ../src/verbs.cpp:2579
-msgid "Select previous object or node"
+msgid "D_eselect"
 msgstr ""
 
 #: ../src/verbs.cpp:2580
-msgid "D_eselect"
-msgstr ""
-
-#: ../src/verbs.cpp:2581
 msgid "Deselect any selected objects or nodes"
 msgstr ""
 
+#: ../src/verbs.cpp:2582
+msgid "Delete all the guides in the document"
+msgstr ""
+
 #: ../src/verbs.cpp:2583
-msgid "Delete all the guides in the document"
-msgstr ""
-
-#: ../src/verbs.cpp:2584
 msgid "Lock All Guides"
 msgstr ""
 
-#: ../src/verbs.cpp:2584 ../src/widgets/desktop-widget.cpp:372
+#: ../src/verbs.cpp:2583 ../src/widgets/desktop-widget.cpp:372
 msgid "Toggle lock of all guides in the document"
 msgstr ""
 
+#: ../src/verbs.cpp:2584
+msgid "Create _Guides Around the Page"
+msgstr ""
+
 #: ../src/verbs.cpp:2585
-msgid "Create _Guides Around the Page"
+msgid "Create four guides aligned with the page borders"
 msgstr ""
 
 #: ../src/verbs.cpp:2586
-msgid "Create four guides aligned with the page borders"
+msgid "Next path effect parameter"
 msgstr ""
 
 #: ../src/verbs.cpp:2587
-msgid "Next path effect parameter"
-msgstr ""
-
-#: ../src/verbs.cpp:2588
 msgid "Show next editable path effect parameter"
 msgstr ""
 
 #. Selection
+#: ../src/verbs.cpp:2590
+msgid "Raise to _Top"
+msgstr ""
+
 #: ../src/verbs.cpp:2591
-msgid "Raise to _Top"
+msgid "Raise selection to top"
 msgstr ""
 
 #: ../src/verbs.cpp:2592
-msgid "Raise selection to top"
+msgid "Lower to _Bottom"
 msgstr ""
 
 #: ../src/verbs.cpp:2593
-msgid "Lower to _Bottom"
+msgid "Lower selection to bottom"
 msgstr ""
 
 #: ../src/verbs.cpp:2594
-msgid "Lower selection to bottom"
+msgid "_Raise"
 msgstr ""
 
 #: ../src/verbs.cpp:2595
-msgid "_Raise"
+msgid "Raise selection one step"
 msgstr ""
 
 #: ../src/verbs.cpp:2596
-msgid "Raise selection one step"
+msgid "_Lower"
 msgstr ""
 
 #: ../src/verbs.cpp:2597
-msgid "_Lower"
-msgstr ""
-
-#: ../src/verbs.cpp:2598
 msgid "Lower selection one step"
 msgstr ""
 
-#: ../src/verbs.cpp:2600
+#: ../src/verbs.cpp:2599
 msgid "Group selected objects"
 msgstr ""
 
+#: ../src/verbs.cpp:2601
+msgid "Ungroup selected groups"
+msgstr ""
+
 #: ../src/verbs.cpp:2602
-msgid "Ungroup selected groups"
+msgid "_Pop selected objects out of group"
 msgstr ""
 
 #: ../src/verbs.cpp:2603
-msgid "_Pop selected objects out of group"
-msgstr ""
-
-#: ../src/verbs.cpp:2604
 msgid "Pop selected objects out of group"
 msgstr ""
 
-#: ../src/verbs.cpp:2606
+#: ../src/verbs.cpp:2605
 msgid "_Put on Path"
 msgstr ""
 
-#: ../src/verbs.cpp:2608
+#: ../src/verbs.cpp:2607
 msgid "_Remove from Path"
 msgstr ""
 
-#: ../src/verbs.cpp:2610
+#: ../src/verbs.cpp:2609
 msgid "Remove Manual _Kerns"
 msgstr ""
 
 #. TRANSLATORS: "glyph": An image used in the visual representation of characters;
 #. roughly speaking, how a character looks. A font is a set of glyphs.
-#: ../src/verbs.cpp:2613
+#: ../src/verbs.cpp:2612
 msgid "Remove all manual kerns and glyph rotations from a text object"
 msgstr ""
 
+#: ../src/verbs.cpp:2614
+msgid "_Union"
+msgstr ""
+
 #: ../src/verbs.cpp:2615
-msgid "_Union"
+msgid "Create union of selected paths"
 msgstr ""
 
 #: ../src/verbs.cpp:2616
-msgid "Create union of selected paths"
+msgid "_Intersection"
 msgstr ""
 
 #: ../src/verbs.cpp:2617
-msgid "_Intersection"
+msgid "Create intersection of selected paths"
 msgstr ""
 
 #: ../src/verbs.cpp:2618
-msgid "Create intersection of selected paths"
+msgid "_Difference"
 msgstr ""
 
 #: ../src/verbs.cpp:2619
-msgid "_Difference"
+msgid "Create difference of selected paths (bottom minus top)"
 msgstr ""
 
 #: ../src/verbs.cpp:2620
-msgid "Create difference of selected paths (bottom minus top)"
+msgid "E_xclusion"
 msgstr ""
 
 #: ../src/verbs.cpp:2621
-msgid "E_xclusion"
-msgstr ""
-
-#: ../src/verbs.cpp:2622
 msgid ""
 "Create exclusive OR of selected paths (those parts that belong to only one "
 "path)"
 msgstr ""
 
+#: ../src/verbs.cpp:2622
+msgid "Di_vision"
+msgstr ""
+
 #: ../src/verbs.cpp:2623
-msgid "Di_vision"
-msgstr ""
-
-#: ../src/verbs.cpp:2624
 msgid "Cut the bottom path into pieces"
 msgstr ""
 
 #. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the
 #. Advanced tutorial for more info
+#: ../src/verbs.cpp:2626
+msgid "Cut _Path"
+msgstr ""
+
 #: ../src/verbs.cpp:2627
-msgid "Cut _Path"
+msgid "Cut the bottom path's stroke into pieces, removing fill"
 msgstr ""
 
 #: ../src/verbs.cpp:2628
-msgid "Cut the bottom path's stroke into pieces, removing fill"
+msgid "_Grow"
 msgstr ""
 
 #: ../src/verbs.cpp:2629
-msgid "_Grow"
+msgid "Make selected objects bigger"
 msgstr ""
 
 #: ../src/verbs.cpp:2630
-msgid "Make selected objects bigger"
+msgid "_Grow on screen"
 msgstr ""
 
 #: ../src/verbs.cpp:2631
-msgid "_Grow on screen"
+msgid "Make selected objects bigger relative to screen"
 msgstr ""
 
 #: ../src/verbs.cpp:2632
-msgid "Make selected objects bigger relative to screen"
+msgid "_Double size"
 msgstr ""
 
 #: ../src/verbs.cpp:2633
-msgid "_Double size"
+msgid "Double the size of selected objects"
 msgstr ""
 
 #: ../src/verbs.cpp:2634
-msgid "Double the size of selected objects"
+msgid "_Shrink"
 msgstr ""
 
 #: ../src/verbs.cpp:2635
-msgid "_Shrink"
+msgid "Make selected objects smaller"
 msgstr ""
 
 #: ../src/verbs.cpp:2636
-msgid "Make selected objects smaller"
+msgid "_Shrink on screen"
 msgstr ""
 
 #: ../src/verbs.cpp:2637
-msgid "_Shrink on screen"
+msgid "Make selected objects smaller relative to screen"
 msgstr ""
 
 #: ../src/verbs.cpp:2638
-msgid "Make selected objects smaller relative to screen"
+msgid "_Halve size"
 msgstr ""
 
 #: ../src/verbs.cpp:2639
-msgid "_Halve size"
-msgstr ""
-
-#: ../src/verbs.cpp:2640
 msgid "Halve the size of selected objects"
 msgstr ""
 
 #. TRANSLATORS: "outset": expand a shape by offsetting the object's path,
 #. i.e. by displacing it perpendicular to the path in each point.
 #. See also the Advanced Tutorial for explanation.
+#: ../src/verbs.cpp:2643
+msgid "Outs_et"
+msgstr ""
+
 #: ../src/verbs.cpp:2644
-msgid "Outs_et"
-msgstr ""
-
-#: ../src/verbs.cpp:2645
 msgid "Outset selected paths"
 msgstr ""
 
+#: ../src/verbs.cpp:2646
+msgid "O_utset Path by 1 px"
+msgstr ""
+
 #: ../src/verbs.cpp:2647
-msgid "O_utset Path by 1 px"
-msgstr ""
-
-#: ../src/verbs.cpp:2648
 msgid "Outset selected paths by 1 px"
 msgstr ""
 
+#: ../src/verbs.cpp:2649
+msgid "O_utset Path by 10 px"
+msgstr ""
+
 #: ../src/verbs.cpp:2650
-msgid "O_utset Path by 10 px"
-msgstr ""
-
-#: ../src/verbs.cpp:2651
 msgid "Outset selected paths by 10 px"
 msgstr ""
 
 #. TRANSLATORS: "inset": contract a shape by offsetting the object's path,
 #. i.e. by displacing it perpendicular to the path in each point.
 #. See also the Advanced Tutorial for explanation.
+#: ../src/verbs.cpp:2654
+msgid "I_nset"
+msgstr ""
+
 #: ../src/verbs.cpp:2655
-msgid "I_nset"
-msgstr ""
-
-#: ../src/verbs.cpp:2656
 msgid "Inset selected paths"
 msgstr ""
 
+#: ../src/verbs.cpp:2657
+msgid "I_nset Path by 1 px"
+msgstr ""
+
 #: ../src/verbs.cpp:2658
-msgid "I_nset Path by 1 px"
-msgstr ""
-
-#: ../src/verbs.cpp:2659
 msgid "Inset selected paths by 1 px"
 msgstr ""
 
+#: ../src/verbs.cpp:2660
+msgid "I_nset Path by 10 px"
+msgstr ""
+
 #: ../src/verbs.cpp:2661
-msgid "I_nset Path by 10 px"
-msgstr ""
-
-#: ../src/verbs.cpp:2662
 msgid "Inset selected paths by 10 px"
 msgstr ""
 
-#: ../src/verbs.cpp:2664
+#: ../src/verbs.cpp:2663
 msgid "D_ynamic Offset"
 msgstr ""
 
-#: ../src/verbs.cpp:2664
+#: ../src/verbs.cpp:2663
 msgid "Create a dynamic offset object"
 msgstr ""
 
+#: ../src/verbs.cpp:2665
+msgid "_Linked Offset"
+msgstr ""
+
 #: ../src/verbs.cpp:2666
-msgid "_Linked Offset"
-msgstr ""
-
-#: ../src/verbs.cpp:2667
 msgid "Create a dynamic offset object linked to the original path"
 msgstr ""
 
+#: ../src/verbs.cpp:2668
+msgid "_Stroke to Path"
+msgstr ""
+
 #: ../src/verbs.cpp:2669
-msgid "_Stroke to Path"
+msgid "Convert selected object's stroke to paths"
 msgstr ""
 
 #: ../src/verbs.cpp:2670
-msgid "Convert selected object's stroke to paths"
+msgid "_Stroke to Path Legacy"
 msgstr ""
 
 #: ../src/verbs.cpp:2671
-msgid "_Stroke to Path Legacy"
+msgid "Convert selected object's stroke to paths legacy mode"
 msgstr ""
 
 #: ../src/verbs.cpp:2672
-msgid "Convert selected object's stroke to paths legacy mode"
+msgid "Si_mplify"
 msgstr ""
 
 #: ../src/verbs.cpp:2673
-msgid "Si_mplify"
+msgid "Simplify selected paths (remove extra nodes)"
 msgstr ""
 
 #: ../src/verbs.cpp:2674
-msgid "Simplify selected paths (remove extra nodes)"
+msgid "_Reverse"
 msgstr ""
 
 #: ../src/verbs.cpp:2675
-msgid "_Reverse"
-msgstr ""
-
-#: ../src/verbs.cpp:2676
 msgid "Reverse the direction of selected paths (useful for flipping markers)"
 msgstr ""
 
-#: ../src/verbs.cpp:2681
+#: ../src/verbs.cpp:2680
 msgid "Create one or more paths from a bitmap by tracing it"
 msgstr ""
 
+#: ../src/verbs.cpp:2683
+msgid "Trace Pixel Art..."
+msgstr ""
+
 #: ../src/verbs.cpp:2684
-msgid "Trace Pixel Art..."
+msgid "Create paths using Kopf-Lischinski algorithm to vectorize pixel art"
 msgstr ""
 
 #: ../src/verbs.cpp:2685
-msgid "Create paths using Kopf-Lischinski algorithm to vectorize pixel art"
+msgid "Make a _Bitmap Copy"
 msgstr ""
 
 #: ../src/verbs.cpp:2686
-msgid "Make a _Bitmap Copy"
+msgid "Export selection to a bitmap and insert it into document"
 msgstr ""
 
 #: ../src/verbs.cpp:2687
-msgid "Export selection to a bitmap and insert it into document"
+msgid "_Combine"
 msgstr ""
 
 #: ../src/verbs.cpp:2688
-msgid "_Combine"
-msgstr ""
-
-#: ../src/verbs.cpp:2689
 msgid "Combine several paths into one"
 msgstr ""
 
 #. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the
 #. Advanced tutorial for more info
+#: ../src/verbs.cpp:2691
+msgid "Break _Apart"
+msgstr ""
+
 #: ../src/verbs.cpp:2692
-msgid "Break _Apart"
+msgid "Break selected paths into subpaths"
 msgstr ""
 
 #: ../src/verbs.cpp:2693
-msgid "Break selected paths into subpaths"
+msgid "_Arrange..."
 msgstr ""
 
 #: ../src/verbs.cpp:2694
-msgid "_Arrange..."
-msgstr ""
-
-#: ../src/verbs.cpp:2695
 msgid "Arrange selected objects in a table or circle"
 msgstr ""
 
 #. Layer
+#: ../src/verbs.cpp:2696
+msgid "_Add Layer..."
+msgstr ""
+
 #: ../src/verbs.cpp:2697
-msgid "_Add Layer..."
+msgid "Create a new layer"
 msgstr ""
 
 #: ../src/verbs.cpp:2698
-msgid "Create a new layer"
+msgid "Re_name Layer..."
 msgstr ""
 
 #: ../src/verbs.cpp:2699
-msgid "Re_name Layer..."
+msgid "Rename the current layer"
 msgstr ""
 
 #: ../src/verbs.cpp:2700
-msgid "Rename the current layer"
+msgid "Switch to Layer Abov_e"
 msgstr ""
 
 #: ../src/verbs.cpp:2701
-msgid "Switch to Layer Abov_e"
+msgid "Switch to the layer above the current"
 msgstr ""
 
 #: ../src/verbs.cpp:2702
-msgid "Switch to the layer above the current"
+msgid "Switch to Layer Belo_w"
 msgstr ""
 
 #: ../src/verbs.cpp:2703
-msgid "Switch to Layer Belo_w"
+msgid "Switch to the layer below the current"
 msgstr ""
 
 #: ../src/verbs.cpp:2704
-msgid "Switch to the layer below the current"
+msgid "Move Selection to Layer Abo_ve"
 msgstr ""
 
 #: ../src/verbs.cpp:2705
-msgid "Move Selection to Layer Abo_ve"
+msgid "Move selection to the layer above the current"
 msgstr ""
 
 #: ../src/verbs.cpp:2706
-msgid "Move selection to the layer above the current"
+msgid "Move Selection to Layer Bel_ow"
 msgstr ""
 
 #: ../src/verbs.cpp:2707
-msgid "Move Selection to Layer Bel_ow"
+msgid "Move selection to the layer below the current"
 msgstr ""
 
 #: ../src/verbs.cpp:2708
-msgid "Move selection to the layer below the current"
-msgstr ""
-
-#: ../src/verbs.cpp:2709
 msgid "Move Selection to Layer..."
 msgstr ""
 
+#: ../src/verbs.cpp:2710
+msgid "Layer to _Top"
+msgstr ""
+
 #: ../src/verbs.cpp:2711
-msgid "Layer to _Top"
+msgid "Raise the current layer to the top"
 msgstr ""
 
 #: ../src/verbs.cpp:2712
-msgid "Raise the current layer to the top"
+msgid "Layer to _Bottom"
 msgstr ""
 
 #: ../src/verbs.cpp:2713
-msgid "Layer to _Bottom"
+msgid "Lower the current layer to the bottom"
 msgstr ""
 
 #: ../src/verbs.cpp:2714
-msgid "Lower the current layer to the bottom"
+msgid "_Raise Layer"
 msgstr ""
 
 #: ../src/verbs.cpp:2715
-msgid "_Raise Layer"
+msgid "Raise the current layer"
 msgstr ""
 
 #: ../src/verbs.cpp:2716
-msgid "Raise the current layer"
+msgid "_Lower Layer"
 msgstr ""
 
 #: ../src/verbs.cpp:2717
-msgid "_Lower Layer"
+msgid "Lower the current layer"
 msgstr ""
 
 #: ../src/verbs.cpp:2718
-msgid "Lower the current layer"
+msgid "D_uplicate Current Layer"
 msgstr ""
 
 #: ../src/verbs.cpp:2719
-msgid "D_uplicate Current Layer"
+msgid "Duplicate an existing layer"
 msgstr ""
 
 #: ../src/verbs.cpp:2720
-msgid "Duplicate an existing layer"
+msgid "_Delete Current Layer"
 msgstr ""
 
 #: ../src/verbs.cpp:2721
-msgid "_Delete Current Layer"
+msgid "Delete the current layer"
 msgstr ""
 
 #: ../src/verbs.cpp:2722
-msgid "Delete the current layer"
+msgid "_Show/hide other layers"
 msgstr ""
 
 #: ../src/verbs.cpp:2723
-msgid "_Show/hide other layers"
+msgid "Solo the current layer"
 msgstr ""
 
 #: ../src/verbs.cpp:2724
-msgid "Solo the current layer"
+msgid "_Show all layers"
 msgstr ""
 
 #: ../src/verbs.cpp:2725
-msgid "_Show all layers"
+msgid "Show all the layers"
 msgstr ""
 
 #: ../src/verbs.cpp:2726
-msgid "Show all the layers"
+msgid "_Hide all layers"
 msgstr ""
 
 #: ../src/verbs.cpp:2727
-msgid "_Hide all layers"
+msgid "Hide all the layers"
 msgstr ""
 
 #: ../src/verbs.cpp:2728
-msgid "Hide all the layers"
+msgid "_Lock all layers"
 msgstr ""
 
 #: ../src/verbs.cpp:2729
-msgid "_Lock all layers"
+msgid "Lock all the layers"
 msgstr ""
 
 #: ../src/verbs.cpp:2730
-msgid "Lock all the layers"
+msgid "Lock/Unlock _other layers"
 msgstr ""
 
 #: ../src/verbs.cpp:2731
-msgid "Lock/Unlock _other layers"
+msgid "Lock all the other layers"
 msgstr ""
 
 #: ../src/verbs.cpp:2732
-msgid "Lock all the other layers"
+msgid "_Unlock all layers"
 msgstr ""
 
 #: ../src/verbs.cpp:2733
-msgid "_Unlock all layers"
+msgid "Unlock all the layers"
 msgstr ""
 
 #: ../src/verbs.cpp:2734
-msgid "Unlock all the layers"
+msgid "_Lock/Unlock Current Layer"
 msgstr ""
 
 #: ../src/verbs.cpp:2735
-msgid "_Lock/Unlock Current Layer"
+msgid "Toggle lock on current layer"
 msgstr ""
 
 #: ../src/verbs.cpp:2736
-msgid "Toggle lock on current layer"
+msgid "_Show/hide Current Layer"
 msgstr ""
 
 #: ../src/verbs.cpp:2737
-msgid "_Show/hide Current Layer"
-msgstr ""
-
-#: ../src/verbs.cpp:2738
 msgid "Toggle visibility of current layer"
 msgstr ""
 
 #. Object
-#: ../src/verbs.cpp:2741
+#: ../src/verbs.cpp:2740
 msgid "Rotate _90° CW"
 msgstr ""
 
 #. This is shared between tooltips and statusbar, so they
 #. must use UTF-8, not HTML entities for special characters.
+#: ../src/verbs.cpp:2743
+msgid "Rotate selection 90° clockwise"
+msgstr ""
+
 #: ../src/verbs.cpp:2744
-msgid "Rotate selection 90° clockwise"
-msgstr ""
-
-#: ../src/verbs.cpp:2745
 msgid "Rotate 9_0° CCW"
 msgstr ""
 
 #. This is shared between tooltips and statusbar, so they
 #. must use UTF-8, not HTML entities for special characters.
+#: ../src/verbs.cpp:2747
+msgid "Rotate selection 90° counter-clockwise"
+msgstr ""
+
 #: ../src/verbs.cpp:2748
-msgid "Rotate selection 90° counter-clockwise"
+msgid "Remove _Transformations"
 msgstr ""
 
 #: ../src/verbs.cpp:2749
-msgid "Remove _Transformations"
+msgid "Remove transformations from object"
 msgstr ""
 
 #: ../src/verbs.cpp:2750
-msgid "Remove transformations from object"
+msgid "_Object to Path"
 msgstr ""
 
 #: ../src/verbs.cpp:2751
-msgid "_Object to Path"
+msgid "Convert selected object to path"
 msgstr ""
 
 #: ../src/verbs.cpp:2752
-msgid "Convert selected object to path"
+msgid "_Flow into Frame"
 msgstr ""
 
 #: ../src/verbs.cpp:2753
-msgid "_Flow into Frame"
-msgstr ""
-
-#: ../src/verbs.cpp:2754
 msgid ""
 "Put text into a frame (path or shape), creating a flowed text linked to the "
 "frame object"
 msgstr ""
 
+#: ../src/verbs.cpp:2754
+msgid "_Unflow"
+msgstr ""
+
 #: ../src/verbs.cpp:2755
-msgid "_Unflow"
+msgid "Remove text from frame (creates a single-line text object)"
 msgstr ""
 
 #: ../src/verbs.cpp:2756
-msgid "Remove text from frame (creates a single-line text object)"
+msgid "_Convert to Text"
 msgstr ""
 
 #: ../src/verbs.cpp:2757
-msgid "_Convert to Text"
-msgstr ""
-
-#: ../src/verbs.cpp:2758
 msgid "Convert flowed text to regular text object (preserves appearance)"
 msgstr ""
 
-#: ../src/verbs.cpp:2760
+#: ../src/verbs.cpp:2759
 msgid "Flip _Horizontal"
 msgstr ""
 
-#: ../src/verbs.cpp:2760
+#: ../src/verbs.cpp:2759
 msgid "Flip selected objects horizontally"
 msgstr ""
 
-#: ../src/verbs.cpp:2763
+#: ../src/verbs.cpp:2762
 msgid "Flip _Vertical"
 msgstr ""
 
-#: ../src/verbs.cpp:2763
+#: ../src/verbs.cpp:2762
 msgid "Flip selected objects vertically"
 msgstr ""
 
-#: ../src/verbs.cpp:2766
+#: ../src/verbs.cpp:2765
 msgid "Apply mask to selection (using the topmost object as mask)"
 msgstr ""
 
-#: ../src/verbs.cpp:2768
+#: ../src/verbs.cpp:2767
 msgid "Edit mask"
 msgstr ""
 
-#: ../src/verbs.cpp:2769 ../src/verbs.cpp:2777
+#: ../src/verbs.cpp:2768 ../src/verbs.cpp:2776
 msgid "_Release"
 msgstr ""
 
-#: ../src/verbs.cpp:2770
+#: ../src/verbs.cpp:2769
 msgid "Remove mask from selection"
 msgstr ""
 
+#: ../src/verbs.cpp:2771
+msgid ""
+"Apply clipping path to selection (using the topmost object as clipping path)"
+msgstr ""
+
 #: ../src/verbs.cpp:2772
-msgid ""
-"Apply clipping path to selection (using the topmost object as clipping path)"
+msgid "Create Cl_ip Group"
 msgstr ""
 
 #: ../src/verbs.cpp:2773
-msgid "Create Cl_ip Group"
-msgstr ""
-
-#: ../src/verbs.cpp:2774
 msgid "Creates a clip group using the selected objects as a base"
 msgstr ""
 
-#: ../src/verbs.cpp:2776
+#: ../src/verbs.cpp:2775
 msgid "Edit clipping path"
 msgstr ""
 
-#: ../src/verbs.cpp:2778
+#: ../src/verbs.cpp:2777
 msgid "Remove clipping path from selection"
 msgstr ""
 
 #. Tools
+#: ../src/verbs.cpp:2782
+msgctxt "ContextVerb"
+msgid "Select"
+msgstr ""
+
 #: ../src/verbs.cpp:2783
-msgctxt "ContextVerb"
-msgid "Select"
+msgid "Select and transform objects"
 msgstr ""
 
 #: ../src/verbs.cpp:2784
-msgid "Select and transform objects"
+msgctxt "ContextVerb"
+msgid "Node Edit"
 msgstr ""
 
 #: ../src/verbs.cpp:2785
-msgctxt "ContextVerb"
-msgid "Node Edit"
+msgid "Edit paths by nodes"
 msgstr ""
 
 #: ../src/verbs.cpp:2786
-msgid "Edit paths by nodes"
+msgctxt "ContextVerb"
+msgid "Tweak"
 msgstr ""
 
 #: ../src/verbs.cpp:2787
-msgctxt "ContextVerb"
-msgid "Tweak"
+msgid "Tweak objects by sculpting or painting"
 msgstr ""
 
 #: ../src/verbs.cpp:2788
-msgid "Tweak objects by sculpting or painting"
+msgctxt "ContextVerb"
+msgid "Spray"
 msgstr ""
 
 #: ../src/verbs.cpp:2789
-msgctxt "ContextVerb"
-msgid "Spray"
+msgid "Spray objects by sculpting or painting"
 msgstr ""
 
 #: ../src/verbs.cpp:2790
-msgid "Spray objects by sculpting or painting"
+msgctxt "ContextVerb"
+msgid "Rectangle"
 msgstr ""
 
 #: ../src/verbs.cpp:2791
-msgctxt "ContextVerb"
-msgid "Rectangle"
+msgid "Create rectangles and squares"
 msgstr ""
 
 #: ../src/verbs.cpp:2792
-msgid "Create rectangles and squares"
+msgctxt "ContextVerb"
+msgid "3D Box"
 msgstr ""
 
 #: ../src/verbs.cpp:2793
-msgctxt "ContextVerb"
-msgid "3D Box"
+msgid "Create 3D boxes"
 msgstr ""
 
 #: ../src/verbs.cpp:2794
-msgid "Create 3D boxes"
+msgctxt "ContextVerb"
+msgid "Ellipse"
 msgstr ""
 
 #: ../src/verbs.cpp:2795
-msgctxt "ContextVerb"
-msgid "Ellipse"
+msgid "Create circles, ellipses, and arcs"
 msgstr ""
 
 #: ../src/verbs.cpp:2796
-msgid "Create circles, ellipses, and arcs"
+msgctxt "ContextVerb"
+msgid "Star"
 msgstr ""
 
 #: ../src/verbs.cpp:2797
-msgctxt "ContextVerb"
-msgid "Star"
+msgid "Create stars and polygons"
 msgstr ""
 
 #: ../src/verbs.cpp:2798
-msgid "Create stars and polygons"
+msgctxt "ContextVerb"
+msgid "Spiral"
 msgstr ""
 
 #: ../src/verbs.cpp:2799
-msgctxt "ContextVerb"
-msgid "Spiral"
+msgid "Create spirals"
 msgstr ""
 
 #: ../src/verbs.cpp:2800
-msgid "Create spirals"
+msgctxt "ContextVerb"
+msgid "Pencil"
 msgstr ""
 
 #: ../src/verbs.cpp:2801
-msgctxt "ContextVerb"
-msgid "Pencil"
+msgid "Draw freehand lines"
 msgstr ""
 
 #: ../src/verbs.cpp:2802
-msgid "Draw freehand lines"
+msgctxt "ContextVerb"
+msgid "Pen"
 msgstr ""
 
 #: ../src/verbs.cpp:2803
-msgctxt "ContextVerb"
-msgid "Pen"
+msgid "Draw Bezier curves and straight lines"
 msgstr ""
 
 #: ../src/verbs.cpp:2804
-msgid "Draw Bezier curves and straight lines"
+msgctxt "ContextVerb"
+msgid "Calligraphy"
 msgstr ""
 
 #: ../src/verbs.cpp:2805
-msgctxt "ContextVerb"
-msgid "Calligraphy"
-msgstr ""
-
-#: ../src/verbs.cpp:2806
 msgid "Draw calligraphic or brush strokes"
 msgstr ""
 
+#: ../src/verbs.cpp:2807
+msgid "Create and edit text objects"
+msgstr ""
+
 #: ../src/verbs.cpp:2808
-msgid "Create and edit text objects"
+msgctxt "ContextVerb"
+msgid "Gradient"
 msgstr ""
 
 #: ../src/verbs.cpp:2809
-msgctxt "ContextVerb"
-msgid "Gradient"
+msgid "Create and edit gradients"
 msgstr ""
 
 #: ../src/verbs.cpp:2810
-msgid "Create and edit gradients"
+msgctxt "ContextVerb"
+msgid "Mesh"
 msgstr ""
 
 #: ../src/verbs.cpp:2811
-msgctxt "ContextVerb"
-msgid "Mesh"
+msgid "Create and edit meshes"
 msgstr ""
 
 #: ../src/verbs.cpp:2812
-msgid "Create and edit meshes"
+msgctxt "ContextVerb"
+msgid "Zoom"
 msgstr ""
 
 #: ../src/verbs.cpp:2813
-msgctxt "ContextVerb"
-msgid "Zoom"
-msgstr ""
-
-#: ../src/verbs.cpp:2814
 msgid "Zoom in or out"
 msgstr ""
 
+#: ../src/verbs.cpp:2815
+msgid "Measurement tool"
+msgstr ""
+
 #: ../src/verbs.cpp:2816
-msgid "Measurement tool"
-msgstr ""
-
-#: ../src/verbs.cpp:2817
 msgctxt "ContextVerb"
 msgid "Dropper"
 msgstr ""
 
+#: ../src/verbs.cpp:2818
+msgctxt "ContextVerb"
+msgid "Connector"
+msgstr ""
+
 #: ../src/verbs.cpp:2819
-msgctxt "ContextVerb"
-msgid "Connector"
-msgstr ""
-
-#: ../src/verbs.cpp:2820
 msgid "Create diagram connectors"
 msgstr ""
 
+#: ../src/verbs.cpp:2822
+msgctxt "ContextVerb"
+msgid "Paint Bucket"
+msgstr ""
+
 #: ../src/verbs.cpp:2823
-msgctxt "ContextVerb"
-msgid "Paint Bucket"
-msgstr ""
-
-#: ../src/verbs.cpp:2824
 msgid "Fill bounded areas"
 msgstr ""
 
+#: ../src/verbs.cpp:2826
+msgctxt "ContextVerb"
+msgid "LPE Edit"
+msgstr ""
+
 #: ../src/verbs.cpp:2827
-msgctxt "ContextVerb"
-msgid "LPE Edit"
+msgid "Edit Path Effect parameters"
 msgstr ""
 
 #: ../src/verbs.cpp:2828
-msgid "Edit Path Effect parameters"
+msgctxt "ContextVerb"
+msgid "Eraser"
 msgstr ""
 
 #: ../src/verbs.cpp:2829
-msgctxt "ContextVerb"
-msgid "Eraser"
+msgid "Erase existing paths"
 msgstr ""
 
 #: ../src/verbs.cpp:2830
-msgid "Erase existing paths"
+msgctxt "ContextVerb"
+msgid "LPE Tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2831
-msgctxt "ContextVerb"
-msgid "LPE Tool"
-msgstr ""
-
-#: ../src/verbs.cpp:2832
 msgid "Do geometric constructions"
 msgstr ""
 
 #. Tool prefs
+#: ../src/verbs.cpp:2833
+msgid "Selector Preferences"
+msgstr ""
+
 #: ../src/verbs.cpp:2834
-msgid "Selector Preferences"
+msgid "Open Preferences for the Selector tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2835
-msgid "Open Preferences for the Selector tool"
+msgid "Node Tool Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2836
-msgid "Node Tool Preferences"
+msgid "Open Preferences for the Node tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2837
-msgid "Open Preferences for the Node tool"
+msgid "Tweak Tool Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2838
-msgid "Tweak Tool Preferences"
+msgid "Open Preferences for the Tweak tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2839
-msgid "Open Preferences for the Tweak tool"
+msgid "Spray Tool Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2840
-msgid "Spray Tool Preferences"
+msgid "Open Preferences for the Spray tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2841
-msgid "Open Preferences for the Spray tool"
+msgid "Rectangle Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2842
-msgid "Rectangle Preferences"
+msgid "Open Preferences for the Rectangle tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2843
-msgid "Open Preferences for the Rectangle tool"
+msgid "3D Box Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2844
-msgid "3D Box Preferences"
+msgid "Open Preferences for the 3D Box tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2845
-msgid "Open Preferences for the 3D Box tool"
+msgid "Ellipse Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2846
-msgid "Ellipse Preferences"
+msgid "Open Preferences for the Ellipse tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2847
-msgid "Open Preferences for the Ellipse tool"
+msgid "Star Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2848
-msgid "Star Preferences"
+msgid "Open Preferences for the Star tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2849
-msgid "Open Preferences for the Star tool"
+msgid "Spiral Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2850
-msgid "Spiral Preferences"
+msgid "Open Preferences for the Spiral tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2851
-msgid "Open Preferences for the Spiral tool"
+msgid "Pencil Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2852
-msgid "Pencil Preferences"
+msgid "Open Preferences for the Pencil tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2853
-msgid "Open Preferences for the Pencil tool"
+msgid "Pen Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2854
-msgid "Pen Preferences"
+msgid "Open Preferences for the Pen tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2855
-msgid "Open Preferences for the Pen tool"
+msgid "Calligraphic Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2856
-msgid "Calligraphic Preferences"
+msgid "Open Preferences for the Calligraphy tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2857
-msgid "Open Preferences for the Calligraphy tool"
+msgid "Text Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2858
-msgid "Text Preferences"
+msgid "Open Preferences for the Text tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2859
-msgid "Open Preferences for the Text tool"
+msgid "Gradient Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2860
-msgid "Gradient Preferences"
+msgid "Open Preferences for the Gradient tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2861
-msgid "Open Preferences for the Gradient tool"
+msgid "Mesh Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2862
-msgid "Mesh Preferences"
+msgid "Open Preferences for the Mesh tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2863
-msgid "Open Preferences for the Mesh tool"
+msgid "Zoom Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2864
-msgid "Zoom Preferences"
+msgid "Open Preferences for the Zoom tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2865
-msgid "Open Preferences for the Zoom tool"
+msgid "Measure Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2866
-msgid "Measure Preferences"
+msgid "Open Preferences for the Measure tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2867
-msgid "Open Preferences for the Measure tool"
+msgid "Dropper Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2868
-msgid "Dropper Preferences"
+msgid "Open Preferences for the Dropper tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2869
-msgid "Open Preferences for the Dropper tool"
+msgid "Connector Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2870
-msgid "Connector Preferences"
-msgstr ""
-
-#: ../src/verbs.cpp:2871
 msgid "Open Preferences for the Connector tool"
 msgstr ""
 
+#: ../src/verbs.cpp:2873
+msgid "Paint Bucket Preferences"
+msgstr ""
+
 #: ../src/verbs.cpp:2874
-msgid "Paint Bucket Preferences"
-msgstr ""
-
-#: ../src/verbs.cpp:2875
 msgid "Open Preferences for the Paint Bucket tool"
 msgstr ""
 
+#: ../src/verbs.cpp:2877
+msgid "Eraser Preferences"
+msgstr ""
+
 #: ../src/verbs.cpp:2878
-msgid "Eraser Preferences"
+msgid "Open Preferences for the Eraser tool"
 msgstr ""
 
 #: ../src/verbs.cpp:2879
-msgid "Open Preferences for the Eraser tool"
+msgid "LPE Tool Preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2880
-msgid "LPE Tool Preferences"
-msgstr ""
-
-#: ../src/verbs.cpp:2881
 msgid "Open Preferences for the LPETool tool"
 msgstr ""
 
 #. Zoom/View
-#: ../src/verbs.cpp:2883
+#: ../src/verbs.cpp:2882
 msgid "Zoom In"
 msgstr ""
 
-#: ../src/verbs.cpp:2883
+#: ../src/verbs.cpp:2882
 msgid "Zoom in"
 msgstr ""
 
-#: ../src/verbs.cpp:2884
+#: ../src/verbs.cpp:2883
 msgid "Zoom Out"
 msgstr ""
 
-#: ../src/verbs.cpp:2884
+#: ../src/verbs.cpp:2883
 msgid "Zoom out"
 msgstr ""
 
-#: ../src/verbs.cpp:2885
+#: ../src/verbs.cpp:2884
 msgid "_Rulers"
 msgstr ""
 
-#: ../src/verbs.cpp:2885
+#: ../src/verbs.cpp:2884
 msgid "Show or hide the canvas rulers"
 msgstr ""
 
-#: ../src/verbs.cpp:2886
+#: ../src/verbs.cpp:2885
 msgid "Scroll_bars"
 msgstr ""
 
-#: ../src/verbs.cpp:2886
+#: ../src/verbs.cpp:2885
 msgid "Show or hide the canvas scrollbars"
 msgstr ""
 
-#: ../src/verbs.cpp:2887
+#: ../src/verbs.cpp:2886
 msgid "Page _Grid"
 msgstr ""
 
-#: ../src/verbs.cpp:2887
+#: ../src/verbs.cpp:2886
 msgid "Show or hide the page grid"
 msgstr ""
 
-#: ../src/verbs.cpp:2888
+#: ../src/verbs.cpp:2887
 msgid "G_uides"
 msgstr ""
 
-#: ../src/verbs.cpp:2888
+#: ../src/verbs.cpp:2887
 msgid "Show or hide guides (drag from a ruler to create a guide)"
 msgstr ""
 
-#: ../src/verbs.cpp:2889
+#: ../src/verbs.cpp:2888
 msgid "Enable snapping"
 msgstr ""
 
-#: ../src/verbs.cpp:2890
+#: ../src/verbs.cpp:2889
 msgid "_Commands Bar"
 msgstr ""
 
-#: ../src/verbs.cpp:2890
+#: ../src/verbs.cpp:2889
 msgid "Show or hide the Commands bar (under the menu)"
 msgstr ""
 
-#: ../src/verbs.cpp:2891
+#: ../src/verbs.cpp:2890
 msgid "Sn_ap Controls Bar"
 msgstr ""
 
-#: ../src/verbs.cpp:2891
+#: ../src/verbs.cpp:2890
 msgid "Show or hide the snapping controls"
 msgstr ""
 
-#: ../src/verbs.cpp:2892
+#: ../src/verbs.cpp:2891
 msgid "T_ool Controls Bar"
 msgstr ""
 
-#: ../src/verbs.cpp:2892
+#: ../src/verbs.cpp:2891
 msgid "Show or hide the Tool Controls bar"
 msgstr ""
 
-#: ../src/verbs.cpp:2893
+#: ../src/verbs.cpp:2892
 msgid "_Toolbox"
 msgstr ""
 
-#: ../src/verbs.cpp:2893
+#: ../src/verbs.cpp:2892
 msgid "Show or hide the main toolbox (on the left)"
 msgstr ""
 
-#: ../src/verbs.cpp:2894
+#: ../src/verbs.cpp:2893
 msgid "_Palette"
 msgstr ""
 
-#: ../src/verbs.cpp:2894
+#: ../src/verbs.cpp:2893
 msgid "Show or hide the color palette"
 msgstr ""
 
-#: ../src/verbs.cpp:2895
+#: ../src/verbs.cpp:2894
 msgid "_Statusbar"
 msgstr ""
 
-#: ../src/verbs.cpp:2895
+#: ../src/verbs.cpp:2894
 msgid "Show or hide the statusbar (at the bottom of the window)"
 msgstr ""
 
-#: ../src/verbs.cpp:2896
+#: ../src/verbs.cpp:2895
 msgid "Nex_t Zoom"
 msgstr ""
 
-#: ../src/verbs.cpp:2896
+#: ../src/verbs.cpp:2895
 msgid "Next zoom (from the history of zooms)"
 msgstr ""
 
-#: ../src/verbs.cpp:2898
+#: ../src/verbs.cpp:2897
 msgid "Pre_vious Zoom"
 msgstr ""
 
-#: ../src/verbs.cpp:2898
+#: ../src/verbs.cpp:2897
 msgid "Previous zoom (from the history of zooms)"
 msgstr ""
 
-#: ../src/verbs.cpp:2900
+#: ../src/verbs.cpp:2899
 msgid "Zoom 1:_1"
 msgstr ""
 
-#: ../src/verbs.cpp:2900
+#: ../src/verbs.cpp:2899
 msgid "Zoom to 1:1"
 msgstr ""
 
-#: ../src/verbs.cpp:2902
+#: ../src/verbs.cpp:2901
 msgid "Zoom 1:_2"
 msgstr ""
 
-#: ../src/verbs.cpp:2902
+#: ../src/verbs.cpp:2901
 msgid "Zoom to 1:2"
 msgstr ""
 
-#: ../src/verbs.cpp:2904
+#: ../src/verbs.cpp:2903
 msgid "_Zoom 2:1"
 msgstr ""
 
-#: ../src/verbs.cpp:2904
+#: ../src/verbs.cpp:2903
 msgid "Zoom to 2:1"
 msgstr ""
 
-#: ../src/verbs.cpp:2906
+#: ../src/verbs.cpp:2905
 msgid "_Fullscreen"
 msgstr ""
 
-#: ../src/verbs.cpp:2906 ../src/verbs.cpp:2908
+#: ../src/verbs.cpp:2905 ../src/verbs.cpp:2907
 msgid "Stretch this document window to full screen"
 msgstr ""
 
-#: ../src/verbs.cpp:2908
+#: ../src/verbs.cpp:2907
 msgid "Fullscreen & Focus Mode"
 msgstr ""
 
-#: ../src/verbs.cpp:2910
+#: ../src/verbs.cpp:2909
 msgid "Toggle _Focus Mode"
 msgstr ""
 
-#: ../src/verbs.cpp:2910
+#: ../src/verbs.cpp:2909
 msgid "Remove excess toolbars to focus on drawing"
 msgstr ""
 
-#: ../src/verbs.cpp:2912
+#: ../src/verbs.cpp:2911
 msgid "Duplic_ate Window"
 msgstr ""
 
-#: ../src/verbs.cpp:2912
+#: ../src/verbs.cpp:2911
 msgid "Open a new window with the same document"
 msgstr ""
 
+#: ../src/verbs.cpp:2913
+msgid "_New View Preview"
+msgstr ""
+
 #: ../src/verbs.cpp:2914
-msgid "_New View Preview"
-msgstr ""
-
-#: ../src/verbs.cpp:2915
 msgid "New View Preview"
 msgstr ""
 
 #. "view_new_preview"
-#: ../src/verbs.cpp:2917 ../src/verbs.cpp:2925
+#: ../src/verbs.cpp:2916 ../src/verbs.cpp:2924
 msgid "_Normal"
 msgstr ""
 
+#: ../src/verbs.cpp:2917
+msgid "Switch to normal display mode"
+msgstr ""
+
 #: ../src/verbs.cpp:2918
-msgid "Switch to normal display mode"
+msgid "No _Filters"
 msgstr ""
 
 #: ../src/verbs.cpp:2919
-msgid "No _Filters"
+msgid "Switch to normal display without filters"
 msgstr ""
 
 #: ../src/verbs.cpp:2920
-msgid "Switch to normal display without filters"
+msgid "_Outline"
 msgstr ""
 
 #: ../src/verbs.cpp:2921
-msgid "_Outline"
-msgstr ""
-
-#: ../src/verbs.cpp:2922
 msgid "Switch to outline (wireframe) display mode"
 msgstr ""
 
 #. new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_PRINT_COLORS_PREVIEW, "ViewColorModePrintColorsPreview", N_("_Print Colors Preview"),
 #. N_("Switch to print colors preview mode"), NULL),
-#: ../src/verbs.cpp:2923 ../src/verbs.cpp:2931
+#: ../src/verbs.cpp:2922 ../src/verbs.cpp:2930
 msgid "_Toggle"
 msgstr ""
 
-#: ../src/verbs.cpp:2924
+#: ../src/verbs.cpp:2923
 msgid "Toggle between normal and outline display modes"
 msgstr ""
 
+#: ../src/verbs.cpp:2925
+msgid "Switch to normal color display mode"
+msgstr ""
+
 #: ../src/verbs.cpp:2926
-msgid "Switch to normal color display mode"
+msgid "_Grayscale"
 msgstr ""
 
 #: ../src/verbs.cpp:2927
-msgid "_Grayscale"
-msgstr ""
-
-#: ../src/verbs.cpp:2928
 msgid "Switch to grayscale display mode"
 msgstr ""
 
-#: ../src/verbs.cpp:2932
+#: ../src/verbs.cpp:2931
 msgid "Toggle between normal and grayscale color display modes"
 msgstr ""
 
+#: ../src/verbs.cpp:2933
+msgid "Color-managed view"
+msgstr ""
+
 #: ../src/verbs.cpp:2934
-msgid "Color-managed view"
-msgstr ""
-
-#: ../src/verbs.cpp:2935
 msgid "Toggle color-managed display for this document window"
 msgstr ""
 
+#: ../src/verbs.cpp:2936
+msgid "Ico_n Preview..."
+msgstr ""
+
 #: ../src/verbs.cpp:2937
-msgid "Ico_n Preview..."
-msgstr ""
-
-#: ../src/verbs.cpp:2938
 msgid "Open a window to preview objects at different icon resolutions"
 msgstr ""
 
+#: ../src/verbs.cpp:2939
+msgid "Zoom to fit page in window"
+msgstr ""
+
 #: ../src/verbs.cpp:2940
-msgid "Zoom to fit page in window"
+msgid "Page _Width"
 msgstr ""
 
 #: ../src/verbs.cpp:2941
-msgid "Page _Width"
-msgstr ""
-
-#: ../src/verbs.cpp:2942
 msgid "Zoom to fit page width in window"
 msgstr ""
 
-#: ../src/verbs.cpp:2944
+#: ../src/verbs.cpp:2943
 msgid "Zoom to fit drawing in window"
 msgstr ""
 
-#: ../src/verbs.cpp:2946
+#: ../src/verbs.cpp:2945
 msgid "Zoom to fit selection in window"
 msgstr ""
 
 #. Dialogs
+#: ../src/verbs.cpp:2948
+msgid "P_references..."
+msgstr ""
+
 #: ../src/verbs.cpp:2949
-msgid "P_references..."
+msgid "Edit global Inkscape preferences"
 msgstr ""
 
 #: ../src/verbs.cpp:2950
-msgid "Edit global Inkscape preferences"
+msgid "_Document Properties..."
 msgstr ""
 
 #: ../src/verbs.cpp:2951
-msgid "_Document Properties..."
+msgid "Edit properties of this document (to be saved with the document)"
 msgstr ""
 
 #: ../src/verbs.cpp:2952
-msgid "Edit properties of this document (to be saved with the document)"
+msgid "Document _Metadata..."
 msgstr ""
 
 #: ../src/verbs.cpp:2953
-msgid "Document _Metadata..."
-msgstr ""
-
-#: ../src/verbs.cpp:2954
 msgid "Edit document metadata (to be saved with the document)"
 msgstr ""
 
-#: ../src/verbs.cpp:2956
+#: ../src/verbs.cpp:2955
 msgid ""
 "Edit objects' colors, gradients, arrowheads, and other fill and stroke "
 "properties..."
 msgstr ""
 
 #. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-font" icon
+#: ../src/verbs.cpp:2957
+msgid "Gl_yphs..."
+msgstr ""
+
 #: ../src/verbs.cpp:2958
-msgid "Gl_yphs..."
-msgstr ""
-
-#: ../src/verbs.cpp:2959
 msgid "Select characters from a glyphs palette"
 msgstr ""
 
 #. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-color" icon
 #. TRANSLATORS: "Swatches" means: color samples
+#: ../src/verbs.cpp:2961
+msgid "S_watches..."
+msgstr ""
+
 #: ../src/verbs.cpp:2962
-msgid "S_watches..."
+msgid "Select colors from a swatches palette"
 msgstr ""
 
 #: ../src/verbs.cpp:2963
-msgid "Select colors from a swatches palette"
+msgid "S_ymbols..."
 msgstr ""
 
 #: ../src/verbs.cpp:2964
-msgid "S_ymbols..."
+msgid "Select symbol from a symbols palette"
 msgstr ""
 
 #: ../src/verbs.cpp:2965
-msgid "Select symbol from a symbols palette"
+msgid "Transfor_m..."
 msgstr ""
 
 #: ../src/verbs.cpp:2966
-msgid "Transfor_m..."
+msgid "Precisely control objects' transformations"
 msgstr ""
 
 #: ../src/verbs.cpp:2967
-msgid "Precisely control objects' transformations"
+msgid "_Align and Distribute..."
 msgstr ""
 
 #: ../src/verbs.cpp:2968
-msgid "_Align and Distribute..."
+msgid "Align and distribute objects"
 msgstr ""
 
 #: ../src/verbs.cpp:2969
-msgid "Align and distribute objects"
+msgid "_Spray options..."
 msgstr ""
 
 #: ../src/verbs.cpp:2970
-msgid "_Spray options..."
+msgid "Some options for the spray"
 msgstr ""
 
 #: ../src/verbs.cpp:2971
-msgid "Some options for the spray"
+msgid "Undo _History..."
 msgstr ""
 
 #: ../src/verbs.cpp:2972
-msgid "Undo _History..."
-msgstr ""
-
-#: ../src/verbs.cpp:2973
 msgid "Undo History"
 msgstr ""
 
+#: ../src/verbs.cpp:2974
+msgid "View and select font family, font size and other text properties"
+msgstr ""
+
 #: ../src/verbs.cpp:2975
-msgid "View and select font family, font size and other text properties"
+msgid "_XML Editor..."
 msgstr ""
 
 #: ../src/verbs.cpp:2976
-msgid "_XML Editor..."
+msgid "View and edit the XML tree of the document"
 msgstr ""
 
 #: ../src/verbs.cpp:2977
-msgid "View and edit the XML tree of the document"
+msgid "_Find/Replace..."
 msgstr ""
 
 #: ../src/verbs.cpp:2978
-msgid "_Find/Replace..."
+msgid "Find objects in document"
 msgstr ""
 
 #: ../src/verbs.cpp:2979
-msgid "Find objects in document"
+msgid "Find and _Replace Text..."
 msgstr ""
 
 #: ../src/verbs.cpp:2980
-msgid "Find and _Replace Text..."
-msgstr ""
-
-#: ../src/verbs.cpp:2981
 msgid "Find and replace text in document"
 msgstr ""
 
+#: ../src/verbs.cpp:2982
+msgid "Check spelling of text in document"
+msgstr ""
+
 #: ../src/verbs.cpp:2983
-msgid "Check spelling of text in document"
+msgid "_Messages..."
 msgstr ""
 
 #: ../src/verbs.cpp:2984
-msgid "_Messages..."
+msgid "View debug messages"
 msgstr ""
 
 #: ../src/verbs.cpp:2985
-msgid "View debug messages"
+msgid "Show/Hide D_ialogs"
 msgstr ""
 
 #: ../src/verbs.cpp:2986
-msgid "Show/Hide D_ialogs"
+msgid "Show or hide all open dialogs"
 msgstr ""
 
 #: ../src/verbs.cpp:2987
-msgid "Show or hide all open dialogs"
+msgid "Create Tiled Clones..."
 msgstr ""
 
 #: ../src/verbs.cpp:2988
-msgid "Create Tiled Clones..."
-msgstr ""
-
-#: ../src/verbs.cpp:2989
 msgid ""
 "Create multiple clones of selected object, arranging them into a pattern or "
 "scattering"
 msgstr ""
 
+#: ../src/verbs.cpp:2989
+msgid "_Object attributes..."
+msgstr ""
+
 #: ../src/verbs.cpp:2990
-msgid "_Object attributes..."
-msgstr ""
-
-#: ../src/verbs.cpp:2991
 msgid "Edit the object attributes..."
 msgstr ""
 
+#: ../src/verbs.cpp:2992
+msgid "Edit the ID, locked and visible status, and other object properties"
+msgstr ""
+
 #: ../src/verbs.cpp:2993
-msgid "Edit the ID, locked and visible status, and other object properties"
+msgid "_Input Devices..."
 msgstr ""
 
 #: ../src/verbs.cpp:2994
-msgid "_Input Devices..."
+msgid "Configure extended input devices, such as a graphics tablet"
 msgstr ""
 
 #: ../src/verbs.cpp:2995
-msgid "Configure extended input devices, such as a graphics tablet"
+msgid "_Extensions..."
 msgstr ""
 
 #: ../src/verbs.cpp:2996
-msgid "_Extensions..."
+msgid "Query information about extensions"
 msgstr ""
 
 #: ../src/verbs.cpp:2997
-msgid "Query information about extensions"
+msgid "Layer_s..."
 msgstr ""
 
 #: ../src/verbs.cpp:2998
-msgid "Layer_s..."
+msgid "View Layers"
 msgstr ""
 
 #: ../src/verbs.cpp:2999
-msgid "View Layers"
+msgid "Object_s..."
 msgstr ""
 
 #: ../src/verbs.cpp:3000
-msgid "Object_s..."
+msgid "View Objects"
 msgstr ""
 
 #: ../src/verbs.cpp:3001
-msgid "View Objects"
+msgid "Selection se_ts..."
 msgstr ""
 
 #: ../src/verbs.cpp:3002
-msgid "Selection se_ts..."
+msgid "View Tags"
 msgstr ""
 
 #: ../src/verbs.cpp:3003
-msgid "View Tags"
+msgid "Path E_ffects ..."
 msgstr ""
 
 #: ../src/verbs.cpp:3004
-msgid "Path E_ffects ..."
+msgid "Manage, edit, and apply path effects"
 msgstr ""
 
 #: ../src/verbs.cpp:3005
-msgid "Manage, edit, and apply path effects"
+msgid "Filter _Editor..."
 msgstr ""
 
 #: ../src/verbs.cpp:3006
-msgid "Filter _Editor..."
+msgid "Manage, edit, and apply SVG filters"
 msgstr ""
 
 #: ../src/verbs.cpp:3007
-msgid "Manage, edit, and apply SVG filters"
+msgid "SVG Font Editor..."
 msgstr ""
 
 #: ../src/verbs.cpp:3008
-msgid "SVG Font Editor..."
+msgid "Edit SVG fonts"
 msgstr ""
 
 #: ../src/verbs.cpp:3009
-msgid "Edit SVG fonts"
+msgid "Print Colors..."
 msgstr ""
 
 #: ../src/verbs.cpp:3010
-msgid "Print Colors..."
+msgid ""
+"Select which color separations to render in Print Colors Preview rendermode"
 msgstr ""
 
 #: ../src/verbs.cpp:3011
-msgid ""
-"Select which color separations to render in Print Colors Preview rendermode"
+msgid "_Export PNG Image..."
 msgstr ""
 
 #: ../src/verbs.cpp:3012
-msgid "_Export PNG Image..."
-msgstr ""
-
-#: ../src/verbs.cpp:3013
 msgid "Export this document or a selection as a PNG image"
 msgstr ""
 
 #. Help
+#: ../src/verbs.cpp:3014
+msgid "About E_xtensions"
+msgstr ""
+
 #: ../src/verbs.cpp:3015
-msgid "About E_xtensions"
+msgid "Information on Inkscape extensions"
 msgstr ""
 
 #: ../src/verbs.cpp:3016
-msgid "Information on Inkscape extensions"
+msgid "About _Memory"
 msgstr ""
 
 #: ../src/verbs.cpp:3017
-msgid "About _Memory"
+msgid "Memory usage information"
 msgstr ""
 
 #: ../src/verbs.cpp:3018
-msgid "Memory usage information"
+msgid "_About Inkscape"
 msgstr ""
 
 #: ../src/verbs.cpp:3019
-msgid "_About Inkscape"
-msgstr ""
-
-#: ../src/verbs.cpp:3020
 msgid "Inkscape version, authors, license"
 msgstr ""
 
 #. new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"),
 #. N_("Distribution terms"), /*"show_license"*/"inkscape_options"),
 #. Tutorials
+#: ../src/verbs.cpp:3024
+msgid "Inkscape: _Basic"
+msgstr ""
+
 #: ../src/verbs.cpp:3025
-msgid "Inkscape: _Basic"
-msgstr ""
-
-#: ../src/verbs.cpp:3026
 msgid "Getting started with Inkscape"
 msgstr ""
 
 #. "tutorial_basic"
+#: ../src/verbs.cpp:3026
+msgid "Inkscape: _Shapes"
+msgstr ""
+
 #: ../src/verbs.cpp:3027
-msgid "Inkscape: _Shapes"
+msgid "Using shape tools to create and edit shapes"
 msgstr ""
 
 #: ../src/verbs.cpp:3028
-msgid "Using shape tools to create and edit shapes"
+msgid "Inkscape: _Advanced"
 msgstr ""
 
 #: ../src/verbs.cpp:3029
-msgid "Inkscape: _Advanced"
-msgstr ""
-
-#: ../src/verbs.cpp:3030
 msgid "Advanced Inkscape topics"
 msgstr ""
 
 #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize)
+#: ../src/verbs.cpp:3033
+msgid "Inkscape: T_racing"
+msgstr ""
+
 #: ../src/verbs.cpp:3034
-msgid "Inkscape: T_racing"
-msgstr ""
-
-#: ../src/verbs.cpp:3035
 msgid "Using bitmap tracing"
 msgstr ""
 
+#: ../src/verbs.cpp:3037
+msgid "Inkscape: Tracing Pixel Art"
+msgstr ""
+
 #: ../src/verbs.cpp:3038
-msgid "Inkscape: Tracing Pixel Art"
+msgid "Using Trace Pixel Art dialog"
 msgstr ""
 
 #: ../src/verbs.cpp:3039
-msgid "Using Trace Pixel Art dialog"
+msgid "Inkscape: _Calligraphy"
 msgstr ""
 
 #: ../src/verbs.cpp:3040
-msgid "Inkscape: _Calligraphy"
+msgid "Using the Calligraphy pen tool"
 msgstr ""
 
 #: ../src/verbs.cpp:3041
-msgid "Using the Calligraphy pen tool"
+msgid "Inkscape: _Interpolate"
 msgstr ""
 
 #: ../src/verbs.cpp:3042
-msgid "Inkscape: _Interpolate"
-msgstr ""
-
-#: ../src/verbs.cpp:3043
 msgid "Using the interpolate extension"
 msgstr ""
 
 #. "tutorial_interpolate"
+#: ../src/verbs.cpp:3043
+msgid "_Elements of Design"
+msgstr ""
+
 #: ../src/verbs.cpp:3044
-msgid "_Elements of Design"
-msgstr ""
-
-#: ../src/verbs.cpp:3045
 msgid "Principles of design in the tutorial form"
 msgstr ""
 
 #. "tutorial_design"
+#: ../src/verbs.cpp:3045
+msgid "_Tips and Tricks"
+msgstr ""
+
 #: ../src/verbs.cpp:3046
-msgid "_Tips and Tricks"
-msgstr ""
-
-#: ../src/verbs.cpp:3047
 msgid "Miscellaneous tips and tricks"
 msgstr ""
 
 #. "tutorial_tips"
 #. Effect -- renamed Extension
+#: ../src/verbs.cpp:3049
+msgid "Previous Exte_nsion"
+msgstr ""
+
 #: ../src/verbs.cpp:3050
-msgid "Previous Exte_nsion"
+msgid "Repeat the last extension with the same settings"
 msgstr ""
 
 #: ../src/verbs.cpp:3051
-msgid "Repeat the last extension with the same settings"
+msgid "_Previous Extension Settings..."
 msgstr ""
 
 #: ../src/verbs.cpp:3052
-msgid "_Previous Extension Settings..."
-msgstr ""
-
-#: ../src/verbs.cpp:3053
 msgid "Repeat the last extension with new settings"
 msgstr ""
 
-#: ../src/verbs.cpp:3057
+#: ../src/verbs.cpp:3056
 msgid "Fit the page to the current selection"
 msgstr ""
 
+#: ../src/verbs.cpp:3058
+msgid "Fit the page to the drawing"
+msgstr ""
+
 #: ../src/verbs.cpp:3059
-msgid "Fit the page to the drawing"
+msgid "_Resize Page to Selection"
 msgstr ""
 
 #: ../src/verbs.cpp:3060
-msgid "_Resize Page to Selection"
-msgstr ""
-
-#: ../src/verbs.cpp:3061
 msgid ""
 "Fit the page to the current selection or the drawing if there is no selection"
 msgstr ""
 
-#: ../src/verbs.cpp:3065
+#: ../src/verbs.cpp:3064
 msgid "Unlock All in All Layers"
 msgstr ""
 
-#: ../src/verbs.cpp:3067
+#: ../src/verbs.cpp:3066
 msgid "Unhide All"
 msgstr ""
 
-#: ../src/verbs.cpp:3069
+#: ../src/verbs.cpp:3068
 msgid "Unhide All in All Layers"
 msgstr ""
 
+#: ../src/verbs.cpp:3072
+msgid "Link an ICC color profile"
+msgstr ""
+
 #: ../src/verbs.cpp:3073
-msgid "Link an ICC color profile"
+msgid "Remove Color Profile"
 msgstr ""
 
 #: ../src/verbs.cpp:3074
-msgid "Remove Color Profile"
-msgstr ""
-
-#: ../src/verbs.cpp:3075
 msgid "Remove a linked ICC color profile"
 msgstr ""
 
-#: ../src/verbs.cpp:3078
+#: ../src/verbs.cpp:3077
 msgid "Add External Script"
 msgstr ""
 
-#: ../src/verbs.cpp:3078
+#: ../src/verbs.cpp:3077
 msgid "Add an external script"
 msgstr ""
 
-#: ../src/verbs.cpp:3080
+#: ../src/verbs.cpp:3079
 msgid "Add Embedded Script"
 msgstr ""
 
-#: ../src/verbs.cpp:3080
+#: ../src/verbs.cpp:3079
 msgid "Add an embedded script"
 msgstr ""
 
-#: ../src/verbs.cpp:3082
+#: ../src/verbs.cpp:3081
 msgid "Edit Embedded Script"
 msgstr ""
 
-#: ../src/verbs.cpp:3082
+#: ../src/verbs.cpp:3081
 msgid "Edit an embedded script"
 msgstr ""
 
-#: ../src/verbs.cpp:3084
+#: ../src/verbs.cpp:3083
 msgid "Remove External Script"
 msgstr ""
 
-#: ../src/verbs.cpp:3084
+#: ../src/verbs.cpp:3083
 msgid "Remove an external script"
 msgstr ""
 
-#: ../src/verbs.cpp:3086
+#: ../src/verbs.cpp:3085
 msgid "Remove Embedded Script"
 msgstr ""
 
-#: ../src/verbs.cpp:3086
+#: ../src/verbs.cpp:3085
 msgid "Remove an embedded script"
 msgstr ""
 
-#: ../src/verbs.cpp:3108 ../src/verbs.cpp:3109
+#: ../src/verbs.cpp:3107 ../src/verbs.cpp:3108
 msgid "Center on horizontal and vertical axis"
 msgstr ""
 

=== modified file 'src/vanishing-point.cpp'
--- src/vanishing-point.cpp	2016-08-03 14:56:48 +0000
+++ src/vanishing-point.cpp	2016-12-28 21:12:04 +0000
@@ -20,12 +20,12 @@
 #include "desktop.h"
 #include "display/sp-canvas-item.h"
 #include "display/sp-ctrlline.h"
-#include "ui/tools/tool-base.h"
+#include "document-undo.h"
 #include "perspective-line.h"
-#include "ui/shape-editor.h"
 #include "snap.h"
 #include "sp-namedview.h"
-#include "document-undo.h"
+#include "ui/shape-editor.h"
+#include "ui/tools/tool-base.h"
 #include "verbs.h"
 
 using Inkscape::CTLINE_PRIMARY;
@@ -48,45 +48,41 @@
 #define MERGE_DIST 0.1
 
 // knot shapes corresponding to GrPointType enum
-SPKnotShapeType vp_knot_shapes [] = {
-        SP_KNOT_SHAPE_SQUARE, // VP_FINITE
-        SP_KNOT_SHAPE_CIRCLE  //VP_INFINITE
+SPKnotShapeType vp_knot_shapes[] = {
+    SP_KNOT_SHAPE_SQUARE, // VP_FINITE
+    SP_KNOT_SHAPE_CIRCLE  // VP_INFINITE
 };
 
-static void
-vp_drag_sel_changed(Inkscape::Selection */*selection*/, gpointer data)
+static void vp_drag_sel_changed(Inkscape::Selection * /*selection*/, gpointer data)
 {
-    VPDrag *drag = (VPDrag *) data;
+    VPDrag *drag = (VPDrag *)data;
     drag->updateDraggers();
     drag->updateLines();
     drag->updateBoxReprs();
 }
 
-static void
-vp_drag_sel_modified (Inkscape::Selection */*selection*/, guint /*flags*/, gpointer data)
+static void vp_drag_sel_modified(Inkscape::Selection * /*selection*/, guint /*flags*/, gpointer data)
 {
-    VPDrag *drag = (VPDrag *) data;
-    drag->updateLines ();
-    //drag->updateBoxReprs();
-    drag->updateBoxHandles (); // FIXME: Only update the handles of boxes on this dragger (not on all)
-    drag->updateDraggers ();
+    VPDrag *drag = (VPDrag *)data;
+    drag->updateLines();
+    // drag->updateBoxReprs();
+    drag->updateBoxHandles(); // FIXME: Only update the handles of boxes on this dragger (not on all)
+    drag->updateDraggers();
 }
 
-static bool
-have_VPs_of_same_perspective (VPDragger *dr1, VPDragger *dr2)
+static bool have_VPs_of_same_perspective(VPDragger *dr1, VPDragger *dr2)
 {
     for (std::list<VanishingPoint>::iterator i = dr1->vps.begin(); i != dr1->vps.end(); ++i) {
-        if (dr2->hasPerspective ((*i).get_perspective())) {
+        if (dr2->hasPerspective((*i).get_perspective())) {
             return true;
         }
     }
     return false;
 }
 
-static void
-vp_knot_moved_handler (SPKnot *knot, Geom::Point const &ppointer, guint state, gpointer data)
+static void vp_knot_moved_handler(SPKnot *knot, Geom::Point const &ppointer, guint state, gpointer data)
 {
-    VPDragger *dragger = (VPDragger *) data;
+    VPDragger *dragger = (VPDragger *)data;
     VPDrag *drag = dragger->parent;
 
     Geom::Point p = ppointer;
@@ -102,16 +98,16 @@
         /* with Shift; if there is more than one box linked to this VP
            we need to split it and create a new perspective */
         if (dragger->numberOfBoxes() > 1) { // FIXME: Don't do anything if *all* boxes of a VP are selected
-            std::set<VanishingPoint*, less_ptr> sel_vps = dragger->VPsOfSelectedBoxes();
+            std::set<VanishingPoint *, less_ptr> sel_vps = dragger->VPsOfSelectedBoxes();
 
             std::list<SPBox3D *> sel_boxes;
-            for (std::set<VanishingPoint*, less_ptr>::iterator vp = sel_vps.begin(); vp != sel_vps.end(); ++vp) {
+            for (std::set<VanishingPoint *, less_ptr>::iterator vp = sel_vps.begin(); vp != sel_vps.end(); ++vp) {
                 // for each VP that has selected boxes:
                 Persp3D *old_persp = (*vp)->get_perspective();
                 sel_boxes = (*vp)->selectedBoxes(SP_ACTIVE_DESKTOP->getSelection());
 
                 // we create a new perspective ...
-                Persp3D *new_persp = persp3d_create_xml_element (dragger->parent->document, old_persp->perspective_impl);
+                Persp3D *new_persp = persp3d_create_xml_element(dragger->parent->document, old_persp->perspective_impl);
 
                 /* ... unlink the boxes from the old one and
                    FIXME: We need to unlink the _un_selected boxes of each VP so that
@@ -126,19 +122,19 @@
                 }
             }
             // FIXME: Do we need to create a new dragger as well?
-            dragger->updateZOrders ();
-            DocumentUndo::done(SP_ACTIVE_DESKTOP->getDocument(), SP_VERB_CONTEXT_3DBOX,
-                   _("Split vanishing points"));
+            dragger->updateZOrders();
+            DocumentUndo::done(SP_ACTIVE_DESKTOP->getDocument(), SP_VERB_CONTEXT_3DBOX, _("Split vanishing points"));
             return;
         }
     }
 
     if (!(state & GDK_SHIFT_MASK)) {
         // without Shift; see if we need to snap to another dragger
-        for (std::vector<VPDragger *>::const_iterator di = dragger->parent->draggers.begin(); di != dragger->parent->draggers.end(); ++di) {
-            VPDragger *d_new = *di; 
-            if ((d_new != dragger) && (Geom::L2 (d_new->point - p) < snap_dist)) {
-                if (have_VPs_of_same_perspective (dragger, d_new)) {
+        for (std::vector<VPDragger *>::const_iterator di = dragger->parent->draggers.begin();
+             di != dragger->parent->draggers.end(); ++di) {
+            VPDragger *d_new = *di;
+            if ((d_new != dragger) && (Geom::L2(d_new->point - p) < snap_dist)) {
+                if (have_VPs_of_same_perspective(dragger, d_new)) {
                     // this would result in degenerate boxes, which we disallow for the time being
                     continue;
                 }
@@ -153,7 +149,8 @@
                 d_new->vps.merge(dragger->vps);
 
                 // ... delete old dragger ...
-                drag->draggers.erase(std::remove(drag->draggers.begin(), drag->draggers.end(), dragger),drag->draggers.end());
+                drag->draggers.erase(std::remove(drag->draggers.begin(), drag->draggers.end(), dragger),
+                                     drag->draggers.end());
                 delete dragger;
                 dragger = NULL;
 
@@ -163,25 +160,27 @@
                 // TODO: Update the new merged dragger
                 d_new->updateTip();
 
-                d_new->parent->updateBoxDisplays (); // FIXME: Only update boxes in current dragger!
-                d_new->updateZOrders ();
+                d_new->parent->updateBoxDisplays(); // FIXME: Only update boxes in current dragger!
+                d_new->updateZOrders();
 
-                drag->updateLines ();
+                drag->updateLines();
 
                 // TODO: Undo machinery; this doesn't work yet because perspectives must be created and
                 //       deleted according to changes in the svg representation, not based on any user input
                 //       as is currently the case.
 
                 DocumentUndo::done(SP_ACTIVE_DESKTOP->getDocument(), SP_VERB_CONTEXT_3DBOX,
-                   _("Merge vanishing points"));
+                                   _("Merge vanishing points"));
 
                 return;
             }
         }
     }
 
-    // We didn't hit the return statement above, so we didn't snap to another dragger. Therefore we'll now try a regular snap
-    // Regardless of the status of the SHIFT key, we will try to snap; Here SHIFT does not disable snapping, as the shift key
+    // We didn't hit the return statement above, so we didn't snap to another dragger. Therefore we'll now try a regular
+    // snap
+    // Regardless of the status of the SHIFT key, we will try to snap; Here SHIFT does not disable snapping, as the
+    // shift key
     // has a different purpose in this context (see above)
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     SnapManager &m = desktop->namedview->snap_manager;
@@ -197,7 +196,7 @@
 
     dragger->updateVPs(p);
     dragger->updateBoxDisplays();
-    dragger->parent->updateBoxHandles (); // FIXME: Only update the handles of boxes on this dragger (not on all)
+    dragger->parent->updateBoxHandles(); // FIXME: Only update the handles of boxes on this dragger (not on all)
     dragger->updateZOrders();
 
     drag->updateLines();
@@ -205,59 +204,56 @@
     dragger->dragging_started = true;
 }
 
-static void
-vp_knot_grabbed_handler (SPKnot */*knot*/, unsigned int /*state*/, gpointer data)
+static void vp_knot_grabbed_handler(SPKnot * /*knot*/, unsigned int /*state*/, gpointer data)
 {
-    VPDragger *dragger = (VPDragger *) data;
+    VPDragger *dragger = (VPDragger *)data;
     VPDrag *drag = dragger->parent;
 
     drag->dragging = true;
 }
 
-static void
-vp_knot_ungrabbed_handler (SPKnot *knot, guint /*state*/, gpointer data)
+static void vp_knot_ungrabbed_handler(SPKnot *knot, guint /*state*/, gpointer data)
 {
-    VPDragger *dragger = (VPDragger *) data;
+    VPDragger *dragger = (VPDragger *)data;
 
     dragger->point_original = dragger->point = knot->pos;
 
     dragger->dragging_started = false;
 
     for (std::list<VanishingPoint>::iterator i = dragger->vps.begin(); i != dragger->vps.end(); ++i) {
-        (*i).set_pos (knot->pos);
+        (*i).set_pos(knot->pos);
         (*i).updateBoxReprs();
         (*i).updatePerspRepr();
     }
 
-    dragger->parent->updateDraggers ();
-    dragger->parent->updateLines ();
-    dragger->parent->updateBoxHandles ();
+    dragger->parent->updateDraggers();
+    dragger->parent->updateLines();
+    dragger->parent->updateBoxHandles();
 
     // TODO: Update box's paths and svg representation
 
     dragger->parent->dragging = false;
 
     // TODO: Undo machinery!!
-    g_return_if_fail (dragger->parent);
-    g_return_if_fail (dragger->parent->document);
-    DocumentUndo::done(dragger->parent->document, SP_VERB_CONTEXT_3DBOX,
-               _("3D box: Move vanishing point"));
+    g_return_if_fail(dragger->parent);
+    g_return_if_fail(dragger->parent->document);
+    DocumentUndo::done(dragger->parent->document, SP_VERB_CONTEXT_3DBOX, _("3D box: Move vanishing point"));
 }
 
 unsigned int VanishingPoint::global_counter = 0;
 
 // FIXME: Rename to something more meaningful!
-void
-VanishingPoint::set_pos(Proj::Pt2 const &pt) {
-    g_return_if_fail (_persp);
-    _persp->perspective_impl->tmat.set_image_pt (_axis, pt);
+void VanishingPoint::set_pos(Proj::Pt2 const &pt)
+{
+    g_return_if_fail(_persp);
+    _persp->perspective_impl->tmat.set_image_pt(_axis, pt);
 }
 
-std::list<SPBox3D *>
-VanishingPoint::selectedBoxes(Inkscape::Selection *sel) {
+std::list<SPBox3D *> VanishingPoint::selectedBoxes(Inkscape::Selection *sel)
+{
     std::list<SPBox3D *> sel_boxes;
-    auto itemlist= sel->items();
-    for (auto i=itemlist.begin();i!=itemlist.end();++i) {
+    auto itemlist = sel->items();
+    for (auto i = itemlist.begin(); i != itemlist.end(); ++i) {
         SPItem *item = *i;
         SPBox3D *box = dynamic_cast<SPBox3D *>(item);
         if (box && this->hasBox(box)) {
@@ -267,13 +263,13 @@
     return sel_boxes;
 }
 
-VPDragger::VPDragger(VPDrag *parent, Geom::Point p, VanishingPoint &vp) :
-    parent(parent),
-    knot(NULL),
-    point(p),
-    point_original(p),
-    dragging_started(false),
-    vps()
+VPDragger::VPDragger(VPDrag *parent, Geom::Point p, VanishingPoint &vp)
+    : parent(parent)
+    , knot(NULL)
+    , point(p)
+    , point_original(p)
+    , dragging_started(false)
+    , vps()
 {
     if (vp.is_finite()) {
         // create the knot
@@ -290,12 +286,15 @@
         this->knot->show();
 
         // connect knot's signals
-        this->_moved_connection = this->knot->moved_signal.connect(sigc::bind(sigc::ptr_fun(vp_knot_moved_handler), this));
-        this->_grabbed_connection = this->knot->grabbed_signal.connect(sigc::bind(sigc::ptr_fun(vp_knot_grabbed_handler), this));
-        this->_ungrabbed_connection = this->knot->ungrabbed_signal.connect(sigc::bind(sigc::ptr_fun(vp_knot_ungrabbed_handler), this));
+        this->_moved_connection =
+            this->knot->moved_signal.connect(sigc::bind(sigc::ptr_fun(vp_knot_moved_handler), this));
+        this->_grabbed_connection =
+            this->knot->grabbed_signal.connect(sigc::bind(sigc::ptr_fun(vp_knot_grabbed_handler), this));
+        this->_ungrabbed_connection =
+            this->knot->ungrabbed_signal.connect(sigc::bind(sigc::ptr_fun(vp_knot_ungrabbed_handler), this));
 
         // add the initial VP (which may be NULL!)
-        this->addVP (vp);
+        this->addVP(vp);
     }
 }
 
@@ -313,39 +312,42 @@
 /**
 Updates the statusbar tip of the dragger knot, based on its draggables
  */
-void
-VPDragger::updateTip ()
+void VPDragger::updateTip()
 {
     if (this->knot && this->knot->tip) {
-        g_free (this->knot->tip);
+        g_free(this->knot->tip);
         this->knot->tip = NULL;
     }
 
     guint num = this->numberOfBoxes();
     if (this->vps.size() == 1) {
         if (this->vps.front().is_finite()) {
-            this->knot->tip = g_strdup_printf (ngettext("<b>Finite</b> vanishing point shared by <b>%d</b> box",
-                                                        "<b>Finite</b> vanishing point shared by <b>%d</b> boxes; drag with <b>Shift</b> to separate selected box(es)",
-                                                        num),
-                                               num);
-        } else {
+            this->knot->tip = g_strdup_printf(ngettext("<b>Finite</b> vanishing point shared by <b>%d</b> box",
+                                                       "<b>Finite</b> vanishing point shared by <b>%d</b> boxes; drag "
+                                                       "with <b>Shift</b> to separate selected box(es)",
+                                                       num),
+                                              num);
+        }
+        else {
             // This won't make sense any more when infinite VPs are not shown on the canvas,
             // but currently we update the status message anyway
-            this->knot->tip = g_strdup_printf (ngettext("<b>Infinite</b> vanishing point shared by <b>%d</b> box",
-                                                        "<b>Infinite</b> vanishing point shared by <b>%d</b> boxes; drag with <b>Shift</b> to separate selected box(es)",
-                                                        num),
-                                               num);
+            this->knot->tip = g_strdup_printf(ngettext("<b>Infinite</b> vanishing point shared by <b>%d</b> box",
+                                                       "<b>Infinite</b> vanishing point shared by <b>%d</b> boxes; "
+                                                       "drag with <b>Shift</b> to separate selected box(es)",
+                                                       num),
+                                              num);
         }
-    } else {
+    }
+    else {
         int length = this->vps.size();
-        char *desc1 = g_strdup_printf ("Collection of <b>%d</b> vanishing points ", length);
-        char *desc2 = g_strdup_printf (ngettext("shared by <b>%d</b> box; drag with <b>Shift</b> to separate selected box(es)",
-                                                "shared by <b>%d</b> boxes; drag with <b>Shift</b> to separate selected box(es)",
-                                                num),
-                                       num);
+        char *desc1 = g_strdup_printf("Collection of <b>%d</b> vanishing points ", length);
+        char *desc2 = g_strdup_printf(
+            ngettext("shared by <b>%d</b> box; drag with <b>Shift</b> to separate selected box(es)",
+                     "shared by <b>%d</b> boxes; drag with <b>Shift</b> to separate selected box(es)", num),
+            num);
         this->knot->tip = g_strconcat(desc1, desc2, NULL);
-        g_free (desc1);
-        g_free (desc2);
+        g_free(desc1);
+        g_free(desc2);
     }
 }
 
@@ -353,34 +355,32 @@
  * Adds a vanishing point to the dragger (also updates the position if necessary);
  * the perspective is stored separately, too, for efficiency in updating boxes.
  */
-void
-VPDragger::addVP (VanishingPoint &vp, bool update_pos)
+void VPDragger::addVP(VanishingPoint &vp, bool update_pos)
 {
-    if (!vp.is_finite() || std::find (vps.begin(), vps.end(), vp) != vps.end()) {
+    if (!vp.is_finite() || std::find(vps.begin(), vps.end(), vp) != vps.end()) {
         // don't add infinite VPs; don't add the same VP twice
         return;
     }
 
     if (update_pos) {
-        vp.set_pos (this->point);
+        vp.set_pos(this->point);
     }
-    this->vps.push_front (vp);
+    this->vps.push_front(vp);
 
     this->updateTip();
 }
 
-void
-VPDragger::removeVP (VanishingPoint const &vp)
+void VPDragger::removeVP(VanishingPoint const &vp)
 {
-    std::list<VanishingPoint>::iterator i = std::find (this->vps.begin(), this->vps.end(), vp);
+    std::list<VanishingPoint>::iterator i = std::find(this->vps.begin(), this->vps.end(), vp);
     if (i != this->vps.end()) {
-        this->vps.erase (i);
+        this->vps.erase(i);
     }
     this->updateTip();
 }
 
-VanishingPoint *
-VPDragger::findVPWithBox (SPBox3D *box) {
+VanishingPoint *VPDragger::findVPWithBox(SPBox3D *box)
+{
     for (std::list<VanishingPoint>::iterator vp = vps.begin(); vp != vps.end(); ++vp) {
         if ((*vp).hasBox(box)) {
             return &(*vp);
@@ -389,28 +389,27 @@
     return NULL;
 }
 
-std::set<VanishingPoint*, less_ptr>
-VPDragger::VPsOfSelectedBoxes() {
-    std::set<VanishingPoint*, less_ptr> sel_vps;
+std::set<VanishingPoint *, less_ptr> VPDragger::VPsOfSelectedBoxes()
+{
+    std::set<VanishingPoint *, less_ptr> sel_vps;
     VanishingPoint *vp;
     // FIXME: Should we take the selection from the parent VPDrag? I guess it shouldn't make a difference.
     Inkscape::Selection *sel = SP_ACTIVE_DESKTOP->getSelection();
-    auto itemlist= sel->items();
-    for (auto i=itemlist.begin();i!=itemlist.end();++i) {
+    auto itemlist = sel->items();
+    for (auto i = itemlist.begin(); i != itemlist.end(); ++i) {
         SPItem *item = *i;
         SPBox3D *box = dynamic_cast<SPBox3D *>(item);
         if (box) {
             vp = this->findVPWithBox(box);
             if (vp) {
-                sel_vps.insert (vp);
+                sel_vps.insert(vp);
             }
         }
     }
     return sel_vps;
 }
 
-guint
-VPDragger::numberOfBoxes ()
+guint VPDragger::numberOfBoxes()
 {
     guint num = 0;
     for (std::list<VanishingPoint>::iterator vp = vps.begin(); vp != vps.end(); ++vp) {
@@ -419,8 +418,7 @@
     return num;
 }
 
-bool
-VPDragger::hasPerspective (const Persp3D *persp)
+bool VPDragger::hasPerspective(const Persp3D *persp)
 {
     for (std::list<VanishingPoint>::iterator i = vps.begin(); i != vps.end(); ++i) {
         if (persp3d_perspectives_coincide(persp, (*i).get_perspective())) {
@@ -430,8 +428,7 @@
     return false;
 }
 
-void
-VPDragger::mergePerspectives ()
+void VPDragger::mergePerspectives()
 {
     Persp3D *persp1, *persp2;
     for (std::list<VanishingPoint>::iterator i = vps.begin(); i != vps.end(); ++i) {
@@ -442,7 +439,7 @@
                 /* don't merge a perspective with itself */
                 continue;
             }
-            if (persp3d_perspectives_coincide(persp1,persp2)) {
+            if (persp3d_perspectives_coincide(persp1, persp2)) {
                 /* if perspectives coincide but are not the same, merge them */
                 persp3d_absorb(persp1, persp2);
 
@@ -454,39 +451,36 @@
     }
 }
 
-void
-VPDragger::updateBoxDisplays ()
+void VPDragger::updateBoxDisplays()
 {
     for (std::list<VanishingPoint>::iterator i = this->vps.begin(); i != this->vps.end(); ++i) {
         (*i).updateBoxDisplays();
     }
 }
 
-void
-VPDragger::updateVPs (Geom::Point const &pt)
+void VPDragger::updateVPs(Geom::Point const &pt)
 {
     for (std::list<VanishingPoint>::iterator i = this->vps.begin(); i != this->vps.end(); ++i) {
-        (*i).set_pos (pt);
+        (*i).set_pos(pt);
     }
 }
 
-void
-VPDragger::updateZOrders ()
+void VPDragger::updateZOrders()
 {
     for (std::list<VanishingPoint>::iterator i = this->vps.begin(); i != this->vps.end(); ++i) {
         persp3d_update_z_orders((*i).get_perspective());
     }
 }
 
-void
-VPDragger::printVPs() {
-    g_print ("VPDragger at position (%f, %f):\n", point[Geom::X], point[Geom::Y]);
+void VPDragger::printVPs()
+{
+    g_print("VPDragger at position (%f, %f):\n", point[Geom::X], point[Geom::Y]);
     for (std::list<VanishingPoint>::iterator i = this->vps.begin(); i != this->vps.end(); ++i) {
-        g_print ("    VP %s\n", (*i).axisString());
+        g_print("    VP %s\n", (*i).axisString());
     }
 }
 
-VPDrag::VPDrag (SPDocument *document)
+VPDrag::VPDrag(SPDocument *document)
 {
     this->document = document;
     this->selection = SP_ACTIVE_DESKTOP->getSelection();
@@ -496,20 +490,15 @@
 
     this->dragging = false;
 
-    this->sel_changed_connection = this->selection->connectChanged(
-        sigc::bind (
-            sigc::ptr_fun(&vp_drag_sel_changed),
-            (gpointer)this )
-
-        );
-    this->sel_modified_connection = this->selection->connectModified(
-        sigc::bind(
-            sigc::ptr_fun(&vp_drag_sel_modified),
-            (gpointer)this )
-        );
-
-    this->updateDraggers ();
-    this->updateLines ();
+    this->sel_changed_connection =
+        this->selection->connectChanged(sigc::bind(sigc::ptr_fun(&vp_drag_sel_changed), (gpointer) this)
+
+                                            );
+    this->sel_modified_connection =
+        this->selection->connectModified(sigc::bind(sigc::ptr_fun(&vp_drag_sel_modified), (gpointer) this));
+
+    this->updateDraggers();
+    this->updateLines();
 }
 
 VPDrag::~VPDrag()
@@ -525,14 +514,13 @@
     for (std::vector<SPCtrlLine *>::const_iterator i = this->lines.begin(); i != this->lines.end(); ++i) {
         sp_canvas_item_destroy(SP_CANVAS_ITEM(*i));
     }
-    this->lines.clear(); 
+    this->lines.clear();
 }
 
 /**
  * Select the dragger that has the given VP.
  */
-VPDragger *
-VPDrag::getDraggerFor (VanishingPoint const &vp)
+VPDragger *VPDrag::getDraggerFor(VanishingPoint const &vp)
 {
     for (std::vector<VPDragger *>::const_iterator i = this->draggers.begin(); i != this->draggers.end(); ++i) {
         VPDragger *dragger = *i;
@@ -546,22 +534,20 @@
     return NULL;
 }
 
-void
-VPDrag::printDraggers ()
+void VPDrag::printDraggers()
 {
-    g_print ("=== VPDrag info: =================================\n");
+    g_print("=== VPDrag info: =================================\n");
     for (std::vector<VPDragger *>::const_iterator i = this->draggers.begin(); i != this->draggers.end(); ++i) {
         (*i)->printVPs();
-        g_print ("========\n");
+        g_print("========\n");
     }
-    g_print ("=================================================\n");
+    g_print("=================================================\n");
 }
 
 /**
  * Regenerates the draggers list from the current selection; is called when selection is changed or modified
  */
-void
-VPDrag::updateDraggers ()
+void VPDrag::updateDraggers()
 {
     if (this->dragging)
         return;
@@ -571,17 +557,17 @@
     }
     this->draggers.clear();
 
-    g_return_if_fail (this->selection != NULL);
+    g_return_if_fail(this->selection != NULL);
 
-    auto itemlist= this->selection->items();
-    for (auto i=itemlist.begin();i!=itemlist.end();++i) {
+    auto itemlist = this->selection->items();
+    for (auto i = itemlist.begin(); i != itemlist.end(); ++i) {
         SPItem *item = *i;
         SPBox3D *box = dynamic_cast<SPBox3D *>(item);
         if (box) {
             VanishingPoint vp;
             for (int i = 0; i < 3; ++i) {
                 vp.set(box3d_get_perspective(box), Proj::axes[i]);
-                addDragger (vp);
+                addDragger(vp);
             }
         }
     }
@@ -591,8 +577,7 @@
 Regenerates the lines list from the current selection; is called on each move
 of a dragger, so that lines are always in sync with the actual perspective
 */
-void
-VPDrag::updateLines ()
+void VPDrag::updateLines()
 {
     // delete old lines
     for (std::vector<SPCtrlLine *>::const_iterator i = this->lines.begin(); i != this->lines.end(); ++i) {
@@ -601,24 +586,24 @@
     this->lines.clear();
 
     // do nothing if perspective lines are currently disabled
-    if (this->show_lines == 0) return;
-
-    g_return_if_fail (this->selection != NULL);
-
-    auto itemlist= this->selection->items();
-    for (auto i=itemlist.begin();i!=itemlist.end();++i) {
+    if (this->show_lines == 0)
+        return;
+
+    g_return_if_fail(this->selection != NULL);
+
+    auto itemlist = this->selection->items();
+    for (auto i = itemlist.begin(); i != itemlist.end(); ++i) {
         SPItem *item = *i;
         SPBox3D *box = dynamic_cast<SPBox3D *>(item);
         if (box) {
-            this->drawLinesForFace (box, Proj::X);
-            this->drawLinesForFace (box, Proj::Y);
-            this->drawLinesForFace (box, Proj::Z);
+            this->drawLinesForFace(box, Proj::X);
+            this->drawLinesForFace(box, Proj::Y);
+            this->drawLinesForFace(box, Proj::Z);
         }
     }
 }
 
-void
-VPDrag::updateBoxHandles ()
+void VPDrag::updateBoxHandles()
 {
     // FIXME: Is there a way to update the knots without accessing the
     //        (previously) statically linked function KnotHolder::update_knots?
@@ -633,14 +618,13 @@
     }
 
     Inkscape::UI::Tools::ToolBase *ec = INKSCAPE.active_event_context();
-    g_assert (ec != NULL);
+    g_assert(ec != NULL);
     if (ec->shape_editor != NULL) {
         ec->shape_editor->update_knotholder();
     }
 }
 
-void
-VPDrag::updateBoxReprs ()
+void VPDrag::updateBoxReprs()
 {
     for (std::vector<VPDragger *>::const_iterator i = this->draggers.begin(); i != this->draggers.end(); ++i) {
         VPDragger *dragger = *i;
@@ -650,8 +634,7 @@
     }
 }
 
-void
-VPDrag::updateBoxDisplays ()
+void VPDrag::updateBoxDisplays()
 {
     for (std::vector<VPDragger *>::const_iterator i = this->draggers.begin(); i != this->draggers.end(); ++i) {
         VPDragger *dragger = *i;
@@ -665,7 +648,8 @@
 /**
  * Depending on the value of all_lines, draw the front and/or rear perspective lines starting from the given corners.
  */
-void VPDrag::drawLinesForFace(const SPBox3D *box, Proj::Axis axis) //, guint corner1, guint corner2, guint corner3, guint corner4)
+void VPDrag::drawLinesForFace(const SPBox3D *box,
+                              Proj::Axis axis) //, guint corner1, guint corner2, guint corner3, guint corner4)
 {
     CtrlLineType type = CTLINE_PRIMARY;
     switch (axis) {
@@ -684,10 +668,10 @@
     }
 
     Geom::Point corner1, corner2, corner3, corner4;
-    box3d_corners_for_PLs (box, axis, corner1, corner2, corner3, corner4);
+    box3d_corners_for_PLs(box, axis, corner1, corner2, corner3, corner4);
 
-    g_return_if_fail (box3d_get_perspective(box));
-    Proj::Pt2 vp = persp3d_get_VP (box3d_get_perspective(box), axis);
+    g_return_if_fail(box3d_get_perspective(box));
+    Proj::Pt2 vp = persp3d_get_VP(box3d_get_perspective(box), axis);
     if (vp.is_finite()) {
         // draw perspective lines for finite VPs
         Geom::Point pt = vp.affine();
@@ -701,21 +685,22 @@
             this->addLine(corner3, pt, type);
             this->addLine(corner4, pt, type);
         }
-    } else {
+    }
+    else {
         // draw perspective lines for infinite VPs
         boost::optional<Geom::Point> pt1, pt2, pt3, pt4;
         Persp3D *persp = box3d_get_perspective(box);
         SPDesktop *desktop = SP_ACTIVE_DESKTOP; // FIXME: Store the desktop in VPDrag
-        Box3D::PerspectiveLine pl (corner1, axis, persp);
+        Box3D::PerspectiveLine pl(corner1, axis, persp);
         pt1 = pl.intersection_with_viewbox(desktop);
 
-        pl = Box3D::PerspectiveLine (corner2, axis, persp);
+        pl = Box3D::PerspectiveLine(corner2, axis, persp);
         pt2 = pl.intersection_with_viewbox(desktop);
 
-        pl = Box3D::PerspectiveLine (corner3, axis, persp);
+        pl = Box3D::PerspectiveLine(corner3, axis, persp);
         pt3 = pl.intersection_with_viewbox(desktop);
 
-        pl = Box3D::PerspectiveLine (corner4, axis, persp);
+        pl = Box3D::PerspectiveLine(corner4, axis, persp);
         pt4 = pl.intersection_with_viewbox(desktop);
 
         if (!pt1 || !pt2 || !pt3 || !pt4) {
@@ -740,8 +725,7 @@
  * otherwise create new dragger and add it to draggers list
  * We also store the corresponding perspective in case it is not already present.
  */
-void
-VPDrag::addDragger (VanishingPoint &vp)
+void VPDrag::addDragger(VanishingPoint &vp)
 {
     if (!vp.is_finite()) {
         // don't create draggers for infinite vanishing points
@@ -751,9 +735,9 @@
 
     for (std::vector<VPDragger *>::const_iterator i = this->draggers.begin(); i != this->draggers.end(); ++i) {
         VPDragger *dragger = *i;
-        if (Geom::L2 (dragger->point - p) < MERGE_DIST) {
+        if (Geom::L2(dragger->point - p) < MERGE_DIST) {
             // distance is small, merge this draggable into dragger, no need to create new dragger
-            dragger->addVP (vp);
+            dragger->addVP(vp);
             return;
         }
     }
@@ -763,13 +747,11 @@
     this->draggers.push_back(new_dragger);
 }
 
-void
-VPDrag::swap_perspectives_of_VPs(Persp3D *persp2, Persp3D *persp1)
+void VPDrag::swap_perspectives_of_VPs(Persp3D *persp2, Persp3D *persp1)
 {
     // iterate over all VP in all draggers and replace persp2 with persp1
     for (std::vector<VPDragger *>::const_iterator i = this->draggers.begin(); i != this->draggers.end(); ++i) {
-        for (std::list<VanishingPoint>::iterator j = (*i)->vps.begin();
-             j != (*i)->vps.end(); ++j) {
+        for (std::list<VanishingPoint>::iterator j = (*i)->vps.begin(); j != (*i)->vps.end(); ++j) {
             if ((*j).get_perspective() == persp2) {
                 (*j).set_perspective(persp1);
             }

