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/extensions | |
| 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/extensions')
| -rwxr-xr-x | share/extensions/inkex.py | 2 | ||||
| -rwxr-xr-x | share/extensions/render_barcode_datamatrix.py | 2 |
2 files changed, 2 insertions, 2 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 ): |