diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-07-27 01:17:50 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-07-27 01:17:50 +0000 |
| commit | 0ac6f5cccf5aaa8bb8d97fdf96d040646b7056c1 (patch) | |
| tree | f3f00d4c95db349232b1e201fd2e45118d511f6e /share | |
| parent | Fix for 1309050 (diff) | |
| parent | Properly fix 1309050, revert incorrect fix for 601336 (diff) | |
| download | inkscape-0ac6f5cccf5aaa8bb8d97fdf96d040646b7056c1.tar.gz inkscape-0ac6f5cccf5aaa8bb8d97fdf96d040646b7056c1.zip | |
Merge from trunk 13472
(bzr r13341.1.102)
Diffstat (limited to 'share')
| -rwxr-xr-x | share/extensions/inkex.py | 2 | ||||
| -rwxr-xr-x | share/extensions/render_barcode_datamatrix.py | 2 | ||||
| -rw-r--r-- | share/symbols/FlowSymbols.svg | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py index a8adfa43d..0f880005d 100755 --- a/share/extensions/inkex.py +++ b/share/extensions/inkex.py @@ -168,7 +168,7 @@ class Effect: try: stream = open(self.svg_file, 'r') except Exception: - errormsg(_("Unable to open specified file: %s") % self.svg_file) + errormsg(_("Unable to open object member file: %s") % self.svg_file) sys.exit() # Finally, if the filename was not specified anywhere, use diff --git a/share/extensions/render_barcode_datamatrix.py b/share/extensions/render_barcode_datamatrix.py index bca1d2241..83d009db8 100755 --- a/share/extensions/render_barcode_datamatrix.py +++ b/share/extensions/render_barcode_datamatrix.py @@ -140,7 +140,7 @@ def get_parameters(nrow, ncol): elif ( nrow == 20 and ncol == 20 ): return 18, 18, 1, 1, 22, 18, 1 elif ( nrow == 22 and ncol == 22 ): - return 18, 18, 1, 1, 30, 20, 1 + return 20, 20, 1, 1, 30, 20, 1 elif ( nrow == 24 and ncol == 24 ): return 22, 22, 1, 1, 36, 24, 1 elif ( nrow == 26 and ncol == 26 ): diff --git a/share/symbols/FlowSymbols.svg b/share/symbols/FlowSymbols.svg index a9dde4798..91495034e 100644 --- a/share/symbols/FlowSymbols.svg +++ b/share/symbols/FlowSymbols.svg @@ -110,7 +110,7 @@ </symbol> <symbol id="AuxillaryOp"> - <title>Auxillary Operation</title> + <title>Auxiliary Operation</title> <desc>Offline operation.</desc> <rect x="35" y="35" width="80" height="80" style="stroke-width:2"/> </symbol> @@ -123,12 +123,12 @@ <symbol id="Extract"> <title>Extract</title> - <desc>Removel of one or more specific sets of times from a set. (ISO)</desc> + <desc>Removal of one or more specific sets of times from a set. (ISO)</desc> <path d="m 35,115 40,-70 40,70 z" style="stroke-width:2"/> </symbol> <symbol id="Terminal"> - <title>Terminal/Interupt</title> + <title>Terminal/Interrupt</title> <desc>A terminal point in a flowchart: start, stop, halt, etc.</desc> <path d="m 35,95 a 20,20 0 0 1 0,-40 l 80,0 a 20,20 0 0 1 0,40 z" style="stroke-width:2"/> </symbol> |
