From 2b4e6c9e057eaa7268b8ba76e76ff3e38c2ed28e Mon Sep 17 00:00:00 2001 From: Josh Andler Date: Tue, 2 Sep 2014 16:51:04 -0700 Subject: Remove more whiteboard related leftovers. (bzr r13543) --- share/ui/menus-bars.xml | 7 ------- 1 file changed, 7 deletions(-) (limited to 'share') diff --git a/share/ui/menus-bars.xml b/share/ui/menus-bars.xml index ade758788..5ff7f5b83 100644 --- a/share/ui/menus-bars.xml +++ b/share/ui/menus-bars.xml @@ -173,13 +173,6 @@ - - - - - - - -- cgit v1.2.3 From 57ae294b6b97bf7570c0e952bc82d3d608f4ffda Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 17 Sep 2014 15:59:41 +0200 Subject: Remove MapSymbols.svg which contains messy and incorrect SVG ( cannot have the 'transform' attribute, multiple identical - - -Bed and Breakfast - - - - - - - - - -Youth Hostel - - - - - - - - - -Shelter - - - - - - - - - - - - - - - - - - - - - - - - - - - -Motel - - - - - - - - - - - - - - - - - - - - -Hotel - - - - - - - - - - - - -Hostel - - - - - - - - - - - - - - - - -Chalet - - - - - - - - -Caravan Park - - - - - - - -Camping - - - - - - - - - - -Alpine Hut - - - - - - - - - - - - - - -Bench or Park - - - - - - - - - -Playground - - - - - - - - - - - - - - - -Fountain - - - - - - - - - - - - - - - - - - - - -Library - - - - - - - - - - -Town Hall - - - - - - - - - - - - - - - - - - - - - - - - - - - -Court - - - - - - - - - - - - - - - - -Fire Station / House - - - - - - - - - - - - - - - - - - - - - -Police Station - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Prison - - - - - - - - - - - - - - - - - - - - -Post Office - - - - - - - - - -Public Building - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Recycling - - - - - - - -Survey Point - - - - - - - - - - -Toll Booth - - - - - - - - - - - - - - - - - - - - - - -Lift Gate - - - - - - - - - - - - - - -Steps - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Stile - - - - - - - - - - - - - - -Kissing Gate - - - - - - - - - - - - - - - - - - - - - - -Gate - - - - - - - - - - - - - - -Exit - - - - - - - - - - - - - - - - - - - -Entrance - - - - - - - - - - - - - - - - - -Cycle Barrier - - - - - - - - - - - - - - -Cattle Grid - - - - - - - - - - - - -Bollard - - - - - - - - - - - - - - -University - - - - - - - - - - - - - - - -High/Secondary School - - - - - - - - - -School - - - - - - - - - -Kindergarten - - - - - - - - - - - - - - - - - -Nursery - - - - - - - - - - - - - - - - - - - - -Restaurant - - - - - - - -Pub - - - - - - - -Desserts/Cakes Shop - - - - - - - - - - - - -Fast Food - - - - - - - -Public Tap/Water - - - - - - - - - - - - - - - -Cafe - - - - - - - -Beer Garden - - - - - - - - - - - - -Wine Bar - - - - - - -Opticians/Eye Doctors - - - - - - - - -Dentist - - - - - - -Veterinarian - - - - - - - - - - - - -Drugs Dispensary - - - - - - - - - - -Pharmacy - - - - - - - - - -Accident & Emergency - - - - - - - - - - -Hospital - - - - - - - - - -Doctors - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Scrub Land - - - - - - - - - - - - - - - - - -Swamp - - - - - - - - - - - - - - -Hills - - - - - - - - -Grass Land - - - - - - - - - - - - - - - - - - -Deciduous Forest - - - - - - - - -Mixed Forest - - - - - - - - - -Coniferous Forest - - - - - - - - -Church or Place of Worship - - - - - - - - - - - - - -Bank - - - - - - - - - - - - - -Power Lines - - - - - - - - - - - - - - - - - -Watch Tower - - - - - - - - -Transmitter - - - - - - - - - - - - - - - - - - -Village - - - - - - - - -Town - - - - - - - - - -Hamlet - - - - - - - - - -City - - - - - - - - - - - -Peak - - - - - - - - - - - - - - -Mountain Pass - - - - - - - - -Mine - - - - - - - -Military Complex - - - - - - - - - - - - - - - -Embassy - - - - - - - - - -Toy Shop - - - - - - - - - - - - -Supermarket - - - - - - - - - - - - - - - -Jewlers - - - - - - - - - - - - - -Hairdressers - - - - - - - - - - - - - - - - - - - -Greengrocer - - - - - - - - - - - - - -Gift Shop - - - - - - - - - - - - - - - - - - - -Garden Center - - - - - - - - - - - - - - - - -Florist - - - - - - - - - - - - - - - -Fish Monger - - - - - - - - - - -Real Estate - - - - - - - - - - - -Hardware / DIY - - - - - - - - - - - - - - - -Shop - - - - - - - - - - - - - - - -Confectioner - - - - - - - - -Computer Shop - - - - - - - - - - - - - - - - - - - - - - - - -Clothing - - - - - - - - - - - - - - - - - - -Mechanic - - - - - - - - - - - - - - - - - - - - -Car Dealer - - - - - - - - - - - - -Butcher - - - - - - - - - - - - - - - - - - - - -Meat Shop - - - - - - - - - - - - - - - - - -Bicycle Shop - - - - - - - - - - - - - - - - - - - - - -Baker - - - - - - - - - -Off License / Liquor Store - - - - - - - - - - - - - - - - - - - - -Wind Surfing - - - - - - - - - - - - - -Tennis - - - - - - - -Outdoor Pool - - - - - - - - - - - -Indoor Pool - - - - - - - - - - - -Skiing - - - - - - - -Sailing - - - - - - - -Leisure Center - - - - - - - - -Ice Skating - - - - - - - - - - - - - - -Equine Sports - - - - - - - - - - - - - - - -Rock Climbing - - - - - - - -Gym - - - - - - - - - - - - -Golf - - - - - - - - -Diving - - - - - - - -Archery - - - - - - - -Zoo - - - - - - - -Wreck - - - - - - - - -Water Wheel - - - - - - - - - - - - - - - - - - - - - - - - -Point of Interest - - - - - - - - - - - -Theater - - - - - - - - - - -Park / Picnic Area - - - - - - - - - - - - - - - - - - - -Monument - - - - - - - - - -Information - - - - - - -Beach - - - - - - - - -Battle Location - - - - - - - - - - - - - - - - - - - -Archaeology / Ruins - - - - - - - - -Walking - - - - - - - - - - - - - - - - -Train - - - - - - - - - - - - - - - - - -Taxi - - - - - - - - - - - - - - - - - - - - - - - - - -Underground Rail - - - - - - - - -Car Rental - - - - - - - - - - - - - - - - - - -Bike Rental - - - - - - - - - - - - - - - - - - - - - - - - - - - -Heliport - - - - - - - - - - -Carpool - - - - - - - - - - - - - - -Flood Gate - - - - - - - - - - - - - - - - - -Shipping - - - - - - - - - - - - -Disabled Parking - - - - - - - - - -Paid Parking - - - - - - - - - - - - - - - - - - - -Bike Parking - - - - - - - - - - - - - - - - - - - - - - -Parking - - - - - - - - - - - - -Marina - - - - - - - -Fuel Station - - - - - - - - - - - - - -Bus Stop - - - - - - - - - - - - - - - - -Bus Station - - - - - - - - - - - - - - - - - - -Airport - - - - - - - - - - - - - - - - - - - - - - -image/svg+xml - -Map Symbols -2011-04-06 - - -Brian & Authors - - - - -SJJB Management - - -http://www.sjjb.co.uk/mapicons/introduction - - -map -catography - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Accommodation -Amenity -Barrier -Education -Food -Health -Landuse -POI -Shopping -Sport -Tourist -Transport -Other - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/share/symbols/MapSymbolsNPS.svg b/share/symbols/MapSymbolsNPS.svg new file mode 100644 index 000000000..4a8a4bdba --- /dev/null +++ b/share/symbols/MapSymbolsNPS.svg @@ -0,0 +1,1164 @@ + + + + + + + + + + + + image/svg+xml + + NPS Map Signs + + + + + + + + NPS + + + http://www.nps.gov/hfc/carto/map-symbols.cfm + Map symbols from the United States National Park Service + + + + Various + + + Various + + + + + + + + + United States National Park Service Map Symbols + Symbols for use on maps. + + + + Airport + + + + + Airport + + + + + + Amphitheatre + + + + + + + + + Amphitheatre + + + + + + + + + + Bicycle Trail + + + + + + + + Bicycle Trail + + + + + + + + + Boat Launch + + + + + + + + + Boat Launch + + + + + + + + + + Boat Tour + + + + + + + Boat Tour + + + + + + + + Bus Stop + + + + + + + + Bus Stop + + + + + + + + + Campfire + + + + + + + + + + + + Campfire + + + + + + + + + + + + + Campground + + + + + Campground + + + + + + CanoeAccess + + + + + + + CanoeAccess + + + + + + + + Crosscountry Ski Trail + + + + + + + + + + + + Crosscountry Ski Trail + + + + + + + + + + + + + Downhill Skiing + + + + + + + + + Downhill Skiing + + + + + + + + + + Drinking Water + + + + + + Drinking Water + + + + + + + First Aid + + + + + First Aid + + + + + + Fishing + + + + + + Fishing + + + + + + + Food Service + + + + + + + + Food Service + + + + + + + + + Four Wheel Drive Road" + + + + + + + + + Four Wheel Drive Road" + + + + + + + + + + Gas Station + + + + + Gas Station + + + + + + Golfing + + + + + + Golfing + + + + + + + Horseback Riding + + + + + + Horseback Riding + + + + + + + Hospital + + + + + Hospital + + + + + + Ice Skating + + + + + + + + + + + Ice Skating + + + + + + + + + + + + Information + + + + + + + Information + + + + + + + + Litter Receptacle + + + + + + + + + + + + Litter Receptacle + + + + + + + + + + + + + Lodging + + + + + + + + + Lodging + + + + + + + + + + Marina + + + + + Marina + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Recycling + + + + + + + + + + + + Recycling + + + + + + + + + + + + + Parking + + + + + Parking + + + + + + Pets On Leash + + + + + + + + + Pets On Leash + + + + + + + + + + Picnic Area + + + + + Picnic Area + + + + + + Post Office + + + + + + + + + + Post Office + + + + + + + + + + + Ranger Station + + + + + Ranger Station + + + + + + RV Campground + + + + + + + + + + + + RV Campground + + + + + + + + + + + + + Restrooms + + + + + + + + + + + + + + Restrooms + + + + + + + + + + + + + + + Sailing + + + + + + + + Sailing + + + + + + + + + Sanitary Disposal Station + + + + + + + + + + Sanitary Disposal Station + + + + + + + + + + + Scuba Diving + + + + + + + + + + + Scuba Diving + + + + + + + + + + + + Self Guided Trail + + + + + + + + + + + + + + + + + + + + + + Self Guided Trail + + + + + + + + + + + + + + + + + + + + + + + Shelter + + + + + Shelter + + + + + + Showers + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Showers + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sledding + + + + + + Sledding + + + + + + + SnowmobileTrail + + + + + + + + SnowmobileTrail + + + + + + + + + Stable + + + + + + Stable + + + + + + + Store + + + + + + + + + + Store + + + + + + + + + + + Swimming + + + + + + + Swimming + + + + + + + + Telephone + + + + + + + + + Telephone + + + + + + + + + + Emergency Telephone + + + + + + + + + Emergency Telephone + + + + + + + + + + Trailhead + + + + + + + + Trailhead + + + + + + + + + Wheelchair Accessible + + + + + + + + + Wheelchair Accessible + + + + + + + + + + Wind Surfing + + + + + + + + Wind Surfing + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/symbols/README b/share/symbols/README index 2d8ed144f..7f9f30a44 100644 --- a/share/symbols/README +++ b/share/symbols/README @@ -1,6 +1,36 @@ Internationalization -This file is internationalized the same way as share/filters/filters/svg -The i18n.py script called from the makefile will extract strings from the *.svg -into a *.svg.h file. Intltool is then able to extracts these strings just like -from normal .h files. +These files are internationalized the same way as +share/filters/filters/svg The i18n.py script called from the makefile +will extract strings from the *.svg files into a *.svg.h +file. Intltool is then able to extracts these strings just like from +normal .h files. + + +Adding new files + +Symbol files should be carefully prepared. + +1. The SVG should be clean: No unnecessary transforms, sensible path + data, etc. Do a manual inspection. Remove cruft like guide-lines, + grids, etc. + +2. Avoid adding unnecessary style properties in the symbol elements; + this prevents the user from over-riding the default styling by + specifying the style on the element. Default styling can be + specified in the root SVG element. Inkscape will apply this + styling by default in the element. + +3. Provide a meaningful element for each symbol. This will be + appear in the GUI as a tool-tip. + +4. Make sure there are no "transform" elements in the <symbol> + element. Transforms are not allowed per specification and are not + supported in most browsers. ('refX' and 'refY' are allowed in SVG + 2.) + +5. Add a section with <use> elements to demonstrate the symbols is the + file is opened by itself. + + + -- cgit v1.2.3 From 50a19700fb02a712803aa3623f0920d562116534 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour <nicoduf@yahoo.fr> Date: Thu, 2 Oct 2014 10:32:46 +0200 Subject: i18n. Fix for Bug #380522 (strings that need to be fixed for translation). Translations. Inkscape.pot and French translation update. Fixed bugs: - https://launchpad.net/bugs/380522 (bzr r13576) --- share/extensions/gcodetools_area.inx | 2 +- share/extensions/gcodetools_dxf_points.inx | 2 +- share/extensions/gcodetools_engraving.inx | 2 +- share/extensions/gcodetools_graffiti.inx | 2 +- share/extensions/gcodetools_lathe.inx | 2 +- share/extensions/gcodetools_path_to_gcode.inx | 2 +- share/extensions/grid_polar.inx | 2 +- share/extensions/guides_creator.inx | 8 ++++---- share/extensions/plotter.inx | 2 +- share/extensions/scour.inx | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) (limited to 'share') diff --git a/share/extensions/gcodetools_area.inx b/share/extensions/gcodetools_area.inx index ad27ecee4..b487f2c54 100644 --- a/share/extensions/gcodetools_area.inx +++ b/share/extensions/gcodetools_area.inx @@ -88,7 +88,7 @@ For depth function c=color intensity from 0.0 (white) to 1.0 (black), d is the d <_item value="G20 (All units in inches)">in</_item> </param> <param name="postprocessor" type="enum" _gui-text="Post-processor:"> - <_item value=" ">None</_item> + <_item msgctxt="GCode postprocessor" value=" ">None</_item> <_item value="parameterize();">Parameterize Gcode</_item> <_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item> <_item value="round(4);">Round all values to 4 digits</_item> diff --git a/share/extensions/gcodetools_dxf_points.inx b/share/extensions/gcodetools_dxf_points.inx index e4534e8af..4367353b9 100644 --- a/share/extensions/gcodetools_dxf_points.inx +++ b/share/extensions/gcodetools_dxf_points.inx @@ -34,7 +34,7 @@ Also you can manually select object, open XML editor (Shift+Ctrl+X) and add or r <_item value="G20 (All units in inches)">in</_item> </param> <param name="postprocessor" type="enum" _gui-text="Post-processor:"> - <_item value=" ">None</_item> + <_item msgctxt="GCode postprocessor" value=" ">None</_item> <_item value="parameterize();">Parameterize Gcode</_item> <_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item> <_item value="round(4);">Round all values to 4 digits</_item> diff --git a/share/extensions/gcodetools_engraving.inx b/share/extensions/gcodetools_engraving.inx index 6885f32fd..a488f45a1 100644 --- a/share/extensions/gcodetools_engraving.inx +++ b/share/extensions/gcodetools_engraving.inx @@ -46,7 +46,7 @@ ellipse.(minor axis r, major 4r).....: math.sqrt(max(0,r**2-w**2))*4</_param> <_item value="G20 (All units in inches)">in</_item> </param> <param name="postprocessor" type="enum" _gui-text="Post-processor:"> - <_item value=" ">None</_item> + <_item msgctxt="GCode postprocessor" value=" ">None</_item> <_item value="parameterize();">Parameterize Gcode</_item> <_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item> <_item value="round(4);">Round all values to 4 digits</_item> diff --git a/share/extensions/gcodetools_graffiti.inx b/share/extensions/gcodetools_graffiti.inx index 7253b8fa4..bcaec76d4 100644 --- a/share/extensions/gcodetools_graffiti.inx +++ b/share/extensions/gcodetools_graffiti.inx @@ -73,7 +73,7 @@ Now press apply to create control points (independent set for each layer). <_item value="G20 (All units in inches)">in</_item> </param> <param name="postprocessor" type="enum" _gui-text="Post-processor:"> - <_item value=" ">None</_item> + <_item msgctxt="GCode postprocessor" value=" ">None</_item> <_item value="parameterize();">Parameterize Gcode</_item> <_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item> <_item value="round(4);">Round all values to 4 digits</_item> diff --git a/share/extensions/gcodetools_lathe.inx b/share/extensions/gcodetools_lathe.inx index d3c6916fd..c74ae267c 100644 --- a/share/extensions/gcodetools_lathe.inx +++ b/share/extensions/gcodetools_lathe.inx @@ -68,7 +68,7 @@ For depth function c=color intensity from 0.0 (white) to 1.0 (black), d is the d <_item value="G20 (All units in inches)">in</_item> </param> <param name="postprocessor" type="enum" _gui-text="Post-processor:"> - <_item value=" ">None</_item> + <_item msgctxt="GCode postprocessor" value=" ">None</_item> <_item value="parameterize();">Parameterize Gcode</_item> <_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item> <_item value="round(4);">Round all values to 4 digits</_item> diff --git a/share/extensions/gcodetools_path_to_gcode.inx b/share/extensions/gcodetools_path_to_gcode.inx index 8a79d6aae..39cc6571b 100644 --- a/share/extensions/gcodetools_path_to_gcode.inx +++ b/share/extensions/gcodetools_path_to_gcode.inx @@ -48,7 +48,7 @@ For depth function c=color intensity from 0.0 (white) to 1.0 (black), d is the d <_item value="G20 (All units in inches)">in</_item> </param> <param name="postprocessor" type="enum" _gui-text="Post-processor:"> - <_item value=" ">None</_item> + <_item msgctxt="GCode postprocessor" value=" ">None</_item> <_item value="parameterize();">Parameterize Gcode</_item> <_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item> <_item value="round(4);">Round all values to 4 digits</_item> diff --git a/share/extensions/grid_polar.inx b/share/extensions/grid_polar.inx index ee468fa34..ffc64a3d5 100644 --- a/share/extensions/grid_polar.inx +++ b/share/extensions/grid_polar.inx @@ -6,7 +6,7 @@ <dependency type="executable" location="extensions">inkex.py</dependency> <param name="c_dot_dia" type="float" min="1" max="1000" _gui-text="Centre Dot Diameter (px):">5.0</param> <param name="a_labels" type="enum" _gui-text="Circumferential Labels:"> - <_item value="none">None</_item> + <_item msgctxt="Label" value="none">None</_item> <_item value="deg">Degrees</_item> </param> <param name="a_label_size" type="int" min="1" max="1000" _gui-text="Circumferential Label Size (px):">18</param> diff --git a/share/extensions/guides_creator.inx b/share/extensions/guides_creator.inx index 4d032e024..baaa093c3 100644 --- a/share/extensions/guides_creator.inx +++ b/share/extensions/guides_creator.inx @@ -39,7 +39,7 @@ <item value="4">1/4</item> <item value="3">1/3</item> <item value="2">1/2</item> - <_item value="0">None</_item> + <_item msgctxt="Margin" value="0">None</_item> </param> <param name="footer_margin" type="enum" appearance="minimal" _gui-text="Footer margin:"> <item value="10">1/10</item> @@ -51,7 +51,7 @@ <item value="4">1/4</item> <item value="3">1/3</item> <item value="2">1/2</item> - <_item value="0">None</_item> + <_item msgctxt="Margin" value="0">None</_item> </param> <param name="left_margin" type="enum" appearance="minimal" _gui-text="Left margin:"> <item value="10">1/10</item> @@ -63,7 +63,7 @@ <item value="4">1/4</item> <item value="3">1/3</item> <item value="2">1/2</item> - <_item value="0">None</_item> + <_item msgctxt="Margin" value="0">None</_item> </param> <param name="right_margin" type="enum" appearance="minimal" _gui-text="Right margin:"> <item value="10">1/10</item> @@ -75,7 +75,7 @@ <item value="4">1/4</item> <item value="3">1/3</item> <item value="2">1/2</item> - <_item value="0">None</_item> + <_item msgctxt="Margin" value="0">None</_item> </param> <param name="vertical_subdivisions" type="int" min="1" max="1000" _gui-text="Columns:">2</param> <param name="horizontal_subdivisions" type="int" min="1" max="1000" _gui-text="Rows:">3</param> diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx index 4ed5ce9de..80543f02a 100644 --- a/share/extensions/plotter.inx +++ b/share/extensions/plotter.inx @@ -31,7 +31,7 @@ <_item value="xonxoff">Software (XON/XOFF)</_item> <_item value="rtscts">Hardware (RTS/CTS)</_item> <_item value="dsrdtrrtscts">Hardware (DSR/DTR + RTS/CTS)</_item> - <_item value="">None</_item> + <_item msgctxt="Flow control" value="">None</_item> </param> <param name="commandLanguage" type="enum" _gui-text="Command language:" _gui-description="The command language to use (Default: HPGL)"> <_item value="HPGL">HPGL</_item> diff --git a/share/extensions/scour.inx b/share/extensions/scour.inx index ee245b149..45719deeb 100644 --- a/share/extensions/scour.inx +++ b/share/extensions/scour.inx @@ -22,7 +22,7 @@ <param name="indent" type="enum" _gui-text="XML indentation (pretty-printing):"> <_item value="space">Space</_item> <_item value="tab">Tab</_item> - <_item value="none">None</_item> + <_item msgctxt="Indent" value="none">None</_item> </param> </page> <page name="Ids" _gui-text="Ids"> -- cgit v1.2.3